Consolidate 1.13 vs classic ChunkCache code

helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java

@@ -162,7 +162,7 @@ public abstract class BukkitVersionHelper {
      * @return cache
      */
     public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) {
-        NewMapChunkCache c = new NewMapChunkCache();
+        AbstractMapChunkCache c = new MapChunkCacheClassic();
         c.setChunks(dw, chunks);
         return c;
     }

helper/src/main/java/org/dynmap/bukkit/helper/MapChunkCacheClassic.java

@@ -0,0 +1,89 @@
+package org.dynmap.bukkit.helper;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+import org.bukkit.World;
+import org.bukkit.Chunk;
+import org.bukkit.block.Biome;
+import org.bukkit.ChunkSnapshot;
+import org.dynmap.DynmapChunk;
+import org.dynmap.DynmapCore;
+import org.dynmap.DynmapWorld;
+import org.dynmap.Log;
+import org.dynmap.bukkit.helper.AbstractMapChunkCache.Snapshot;
+import org.dynmap.bukkit.helper.SnapshotCache.SnapshotRec;
+import org.dynmap.common.BiomeMap;
+import org.dynmap.hdmap.HDBlockModels;
+import org.dynmap.renderer.DynmapBlockState;
+import org.dynmap.renderer.RenderPatchFactory;
+import org.dynmap.utils.DynIntHashMap;
+import org.dynmap.utils.MapChunkCache;
+import org.dynmap.utils.MapIterator;
+import org.dynmap.utils.BlockStep;
+import org.dynmap.utils.VisibilityLimit;
+
+/**
+ * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
+ */
+public class MapChunkCacheClassic extends AbstractMapChunkCache {
+
+    public static class WrappedSnapshot implements Snapshot {
+    	private final ChunkSnapshot ss;
+    	private final int sectionmask;
+		public WrappedSnapshot(ChunkSnapshot ss) {
+    		this.ss = ss;
+    		int mask = 0;
+    		for (int i = 0; i < 16; i++) {
+    			if (ss.isSectionEmpty(i))
+    				mask |= (1 << i);
+    		}
+    		sectionmask = mask;
+    	}
+		@Override
+    	public final DynmapBlockState getBlockType(int x, int y, int z) {
+    		if ((sectionmask & (1 << (y >> 4))) != 0)
+    			return DynmapBlockState.AIR;
+            return BukkitVersionHelper.stateByID[(ss.getBlockTypeId(x, y, z) << 4) | ss.getBlockData(x, y, z)];
+    	}
+		@Override
+        public final int getBlockSkyLight(int x, int y, int z) {
+        	return ss.getBlockSkyLight(x, y, z);
+        }
+		@Override
+        public final int getBlockEmittedLight(int x, int y, int z) {
+        	return ss.getBlockEmittedLight(x, y, z);
+        }
+		@Override
+        public final int getHighestBlockYAt(int x, int z) {
+        	return ss.getHighestBlockYAt(x, z);
+        }
+		@Override
+        public final Biome getBiome(int x, int z) {
+        	return ss.getBiome(x, z);
+        }
+		@Override
+        public final boolean isSectionEmpty(int sy) {
+        	return (sectionmask & (1 << sy)) != 0;
+        }
+		@Override
+        public final Object[] getBiomeBaseFromSnapshot() {
+        	return BukkitVersionHelper.helper.getBiomeBaseFromSnapshot(ss);
+        }
+    }
+
+    /**
+     * Construct empty cache
+     */
+    public MapChunkCacheClassic() {
+    	
+    }
+
+	@Override
+	public Snapshot wrapChunkSnapshot(ChunkSnapshot css) {
+		return new WrappedSnapshot(css);
+	}
+    
+}