From 280147491d18c666b4d5843abdf934d1f638edf3 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Thu, 11 Jul 2019 07:52:55 +1000
Subject: [PATCH] protochunk

---
 .../boydti/fawe/bukkit/beta/BukkitQueue.java  | 11 +++--
 .../fawe/bukkit/v1_14/BukkitQueue_1_14.java   | 49 ++++++++++++-------
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/beta/BukkitQueue.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/beta/BukkitQueue.java
index 2e48d7329..f27b66fcf 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/beta/BukkitQueue.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/beta/BukkitQueue.java
@@ -33,8 +33,10 @@ import net.minecraft.server.v1_14_R1.DataPaletteBlock;
 import net.minecraft.server.v1_14_R1.DataPaletteLinear;
 import net.minecraft.server.v1_14_R1.GameProfileSerializer;
 import net.minecraft.server.v1_14_R1.IBlockData;
+import net.minecraft.server.v1_14_R1.IChunkAccess;
 import net.minecraft.server.v1_14_R1.PlayerChunk;
 import net.minecraft.server.v1_14_R1.PlayerChunkMap;
+import net.minecraft.server.v1_14_R1.ProtoChunkExtension;
 import net.minecraft.server.v1_14_R1.WorldServer;
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_14_R1.CraftChunk;
@@ -206,11 +208,12 @@ public class BukkitQueue extends SimpleCharQueueExtent {
 
     public static Chunk ensureLoaded(net.minecraft.server.v1_14_R1.World nmsWorld, int X, int Z) {
         ChunkProviderServer provider = (ChunkProviderServer) nmsWorld.getChunkProvider();
-
-
-        Chunk nmsChunk = (Chunk) provider.getChunkAt(X, Z, ChunkStatus.FEATURES, false);;
+        IChunkAccess nmsChunk = provider.getChunkAt(X, Z, ChunkStatus.FEATURES, false);
         if (nmsChunk != null) {
-            return nmsChunk;
+            if (nmsChunk instanceof ProtoChunkExtension) {
+                return ((ProtoChunkExtension) nmsChunk).u();
+            }
+            return (Chunk) nmsChunk;
         }
         if (Fawe.isMainThread()) {
             return nmsWorld.getChunkAt(X, Z);
diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitQueue_1_14.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitQueue_1_14.java
index 1a9cd9ae9..a8ad08768 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitQueue_1_14.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitQueue_1_14.java
@@ -49,6 +49,7 @@ import net.minecraft.server.v1_14_R1.PacketDataSerializer;
 import net.minecraft.server.v1_14_R1.PacketPlayOutMultiBlockChange;
 import net.minecraft.server.v1_14_R1.PlayerChunk;
 import net.minecraft.server.v1_14_R1.PlayerChunkMap;
+import net.minecraft.server.v1_14_R1.ProtoChunkExtension;
 import net.minecraft.server.v1_14_R1.RegistryID;
 import net.minecraft.server.v1_14_R1.TileEntity;
 import net.minecraft.server.v1_14_R1.WorldChunkManager;
@@ -70,7 +71,7 @@ import java.util.concurrent.atomic.LongAdder;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-public class BukkitQueue_1_14 extends BukkitQueue_0<net.minecraft.server.v1_14_R1.Chunk, ChunkSection[], ChunkSection> {
+public class BukkitQueue_1_14 extends BukkitQueue_0<IChunkAccess, ChunkSection[], ChunkSection> {
 
     public final static Field fieldBits;
     public final static Field fieldPalette;
@@ -204,12 +205,12 @@ public class BukkitQueue_1_14 extends BukkitQueue_0<net.minecraft.server.v1_14_R
     }
 
     @Override
-    public ChunkSection[] getSections(net.minecraft.server.v1_14_R1.Chunk chunk) {
+    public ChunkSection[] getSections(IChunkAccess chunk) {
         return chunk.getSections();
     }
 
     @Override
-    public net.minecraft.server.v1_14_R1.Chunk loadChunk(World world, int x, int z, boolean generate) {
+    public IChunkAccess loadChunk(World world, int x, int z, boolean generate) {
         ChunkProviderServer provider = ((CraftWorld) world).getHandle().getChunkProvider();
         IChunkAccess chunk;
         if (generate) {
@@ -217,12 +218,20 @@ public class BukkitQueue_1_14 extends BukkitQueue_0<net.minecraft.server.v1_14_R
         } else {
             chunk = provider.getChunkAt(x, z, ChunkStatus.FEATURES, false);
         }
-        return (net.minecraft.server.v1_14_R1.Chunk) chunk;
+        return cast(chunk);
+    }
+
+    private IChunkAccess cast(IChunkAccess chunkAccess) {
+        if (chunkAccess instanceof ProtoChunkExtension) {
+            ProtoChunkExtension proto = (ProtoChunkExtension) chunkAccess;
+            if (proto.u() != null) chunkAccess = proto.u();
+        }
+        return chunkAccess;
     }
 
     @Override
     public ChunkSection[] getCachedSections(World world, int cx, int cz) {
-        net.minecraft.server.v1_14_R1.Chunk chunk = (net.minecraft.server.v1_14_R1.Chunk) ((CraftWorld) world).getHandle().getChunkProvider().getChunkAt(cx, cz, ChunkStatus.FEATURES, false);
+        IChunkAccess chunk = ((CraftWorld) world).getHandle().getChunkProvider().getChunkAt(cx, cz, ChunkStatus.FEATURES, false);
         if (chunk != null) {
             return chunk.getSections();
         }
@@ -230,8 +239,8 @@ public class BukkitQueue_1_14 extends BukkitQueue_0<net.minecraft.server.v1_14_R
     }
 
     @Override
-    public net.minecraft.server.v1_14_R1.Chunk getCachedChunk(World world, int cx, int cz) {
-        return (net.minecraft.server.v1_14_R1.Chunk) ((CraftWorld) world).getHandle().getChunkProvider().getChunkAt(cx, cz, ChunkStatus.FEATURES, false);
+    public IChunkAccess getCachedChunk(World world, int cx, int cz) {
+        return cast(((CraftWorld) world).getHandle().getChunkProvider().getChunkAt(cx, cz, ChunkStatus.FEATURES, false));
     }
 
     @Override
@@ -240,10 +249,16 @@ public class BukkitQueue_1_14 extends BukkitQueue_0<net.minecraft.server.v1_14_R
     }
 
     @Override
-    public void saveChunk(net.minecraft.server.v1_14_R1.Chunk nmsChunk) {
-        nmsChunk.d(true); // Set Modified
-        nmsChunk.mustNotSave = false;
-        nmsChunk.markDirty();
+    public void saveChunk(IChunkAccess chunkAccess) {
+        chunkAccess = cast(chunkAccess);
+        if (chunkAccess instanceof Chunk) {
+            net.minecraft.server.v1_14_R1.Chunk nmsChunk = (net.minecraft.server.v1_14_R1.Chunk) chunkAccess;
+            nmsChunk.d(true); // Set Modified
+            nmsChunk.mustNotSave = false;
+            nmsChunk.markDirty();
+        } else {
+            chunkAccess.setNeedsSaving(true);
+        }
     }
 
     @Override
@@ -520,7 +535,7 @@ public class BukkitQueue_1_14 extends BukkitQueue_0<net.minecraft.server.v1_14_R
     }
 
     @Override
-    public BiomeType getBiome(net.minecraft.server.v1_14_R1.Chunk chunk, int x, int z) {
+    public BiomeType getBiome(IChunkAccess chunk, int x, int z) {
         BiomeBase base = chunk.getBiomeIndex()[((z & 15) << 4) + (x & 15)];
         return getAdapter().adapt(CraftBlock.biomeBaseToBiome(base));
     }
@@ -542,9 +557,9 @@ public class BukkitQueue_1_14 extends BukkitQueue_0<net.minecraft.server.v1_14_R
 
     @Override
     public void sendChunk(int x, int z, int bitMask) {
-        net.minecraft.server.v1_14_R1.Chunk chunk = getCachedChunk(getWorld(), x, z);
+        IChunkAccess chunk = getCachedChunk(getWorld(), x, z);
         if (chunk != null) {
-            sendChunk(getPlayerChunk((WorldServer) chunk.getWorld(), x, z), chunk, bitMask);
+            sendChunk(getPlayerChunk((WorldServer) nmsWorld, x, z), chunk, bitMask);
         }
     }
 
@@ -656,7 +671,7 @@ public class BukkitQueue_1_14 extends BukkitQueue_0<net.minecraft.server.v1_14_R
         return playerChunk;
     }
 
-    public boolean sendChunk(PlayerChunk playerChunk, net.minecraft.server.v1_14_R1.Chunk nmsChunk, int mask) {
+    public boolean sendChunk(PlayerChunk playerChunk, IChunkAccess nmsChunk, int mask) {
         if (playerChunk == null) {
             return false;
         }
@@ -882,8 +897,8 @@ public class BukkitQueue_1_14 extends BukkitQueue_0<net.minecraft.server.v1_14_R
     protected BlockPosition.MutableBlockPosition pos = new BlockPosition.MutableBlockPosition(0, 0, 0);
 
     @Override
-    public CompoundTag getTileEntity(net.minecraft.server.v1_14_R1.Chunk chunk, int x, int y, int z) {
-        Map<BlockPosition, TileEntity> tiles = chunk.getTileEntities();
+    public CompoundTag getTileEntity(IChunkAccess chunk, int x, int y, int z) {
+        Map<BlockPosition, TileEntity> tiles = ((net.minecraft.server.v1_14_R1.Chunk) cast(chunk)).getTileEntities();
         pos.c(x, y, z);
         TileEntity tile = tiles.get(pos);
         return tile != null ? getTag(tile) : null;