Merge branch 'master' into 1.16

src/main/java/carpet/fakes/ThreadedAnvilChunkStorageInterface.java

@@ -3,8 +3,9 @@ package carpet.fakes;
 import net.minecraft.util.math.ChunkPos;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ThreadedAnvilChunkStorageInterface
 {
-    void regenerateChunkRegion(List<ChunkPos> requestedChunks);
+    Map<String, Integer> regenerateChunkRegion(List<ChunkPos> requestedChunks);
 }