Optimize map view of legacy and cubic chunks worlds (#1032)

* Statically initialise legacy tags, leading to enormous improvement in legacy world parsing performance

* Actually use heightmap data when initialising SurfaceLayer

* unsynchronise palette in map view surface loading

* Use existing Chunk.X_MAX instead of hardcoded 16

Co-authored-by: Maik Marschner <m.marschner@wertarbyte.com>

* Update map view optimisations to support cubicchunks PR

Co-authored-by: Maik Marschner <m.marschner@wertarbyte.com>

Author: NotStirred

chunky/src/java/se/llbit/chunky/block/legacy/LegacyBlocks.java

@@ -9,12 +9,27 @@
 
 public class LegacyBlocks {
 
+  /** statically initialised array of every possible tag */
+  private static final Tag[] legacyTags = new Tag[(1 << 8) * (1 << 4)];
+
+  static {
+    for (int id = 0; id < 1 << 8; id++) { //id is 8 bits
+      for (int data = 0; data < 1 << 4; data++) { //data is 4 bits
+        legacyTags[id * (1 << 4) + data] = getTag(id, data);
+      }
+    }
+  }
+
   public static Tag getTag(int offset, byte[] blocks, byte[] blockData) {
     int id = blocks[offset] & 0xFF;
     int data = 0xFF & blockData[offset / 2];
     data >>= (offset % 2) * 4;
     data &= 0xF;
 
+    return legacyTags[id * (1 << 4) + data];
+  }
+
+  private static Tag getTag(int id, int data) {
     CompoundTag tag = new CompoundTag();
     switch (id) {
       case 0:   return nameTag(tag, "air");

chunky/src/java/se/llbit/chunky/map/SurfaceLayer.java

@@ -50,14 +50,14 @@ public class SurfaceLayer extends BitmapLayer {
    * @param dim current dimension
    * @param chunkData data for the chunk
    */
-  public SurfaceLayer(int dim, ChunkData chunkData, BlockPalette palette, int yMin, int yMax) {
+  public SurfaceLayer(int dim, ChunkData chunkData, BlockPalette palette, int yMin, int yMax, int[] heightmapData) {
     bitmap = new int[Chunk.X_MAX * Chunk.Z_MAX];
     topo = new int[Chunk.X_MAX * Chunk.Z_MAX];
     for (int x = 0; x < Chunk.X_MAX; ++x) {
       for (int z = 0; z < Chunk.Z_MAX; ++z) {
 
         // Find the topmost non-empty block.
-        int y = Math.min(chunkData.maxY() - 1, yMax);
+        int y = Math.min(Math.min(chunkData.maxY() - 1, yMax), heightmapData[z*Chunk.X_MAX + x]);
         int minY = Math.max(chunkData.minY(), yMin);
         for (; y > minY; --y) {
           if (palette.get(chunkData.getBlockAt(x, y, z)) != Air.INSTANCE) {

chunky/src/java/se/llbit/chunky/world/Chunk.java

@@ -174,10 +174,11 @@ private void loadSurface(Map<String, Tag> data, ChunkData chunkData, int yMin, i
       extractBiomeData(data.get(LEVEL_BIOMES), chunkData);
       if (version.equals("1.13") || version.equals("1.12")) {
         BlockPalette palette = new BlockPalette();
+        palette.unsynchronize(); //only this RegionParser will use this palette
         loadBlockData(data, chunkData, palette, yMin, yMax);
         int[] heightmapData = extractHeightmapData(data, chunkData);
         updateHeightmap(heightmap, position, chunkData, heightmapData, palette, yMax);
-        surface = new SurfaceLayer(world.currentDimension(), chunkData, palette, yMin, yMax);
+        surface = new SurfaceLayer(world.currentDimension(), chunkData, palette, yMin, yMax, heightmapData);
         queueTopography();
       }
     } else {

chunky/src/java/se/llbit/chunky/world/CubicWorld.java

@@ -76,7 +76,6 @@ public synchronized Region getRegion(ChunkPosition pos) {
       if (regionExists(pos)) {
         region = createRegion(pos);
       }
-      setRegion(pos, region);
       return region;
     });
   }
@@ -88,7 +87,6 @@ public synchronized Region getRegionWithinRange(ChunkPosition pos, int minY, int
       if (regionExistsWithinRange(pos, minY, maxY)) {
         region = createRegion(pos);
       }
-      setRegion(pos, region);
       return region;
     });
   }

chunky/src/java/se/llbit/chunky/world/ImposterCubicChunk.java

@@ -4,22 +4,26 @@
 import se.llbit.chunky.chunk.BlockPalette;
 import se.llbit.chunky.chunk.ChunkData;
 import se.llbit.chunky.chunk.EmptyChunkData;
-import se.llbit.chunky.chunk.GenericChunkData;
 import se.llbit.chunky.map.IconLayer;
 import se.llbit.chunky.map.SurfaceLayer;
 import se.llbit.chunky.world.region.ImposterCubicRegion;
-import se.llbit.math.QuickMath;
-import se.llbit.nbt.*;
-import se.llbit.util.BitBuffer;
+import se.llbit.nbt.CompoundTag;
+import se.llbit.nbt.ListTag;
+import se.llbit.nbt.SpecificTag;
+import se.llbit.nbt.Tag;
 import se.llbit.util.Mutable;
-import se.llbit.util.NotNull;
 
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
 import static se.llbit.chunky.world.World.VERSION_1_12_2;
 
+/**
+ * An implementation of a cube wrapper for pre flattening cubic chunks (1.10, 1.11, 1.12)
+ *
+ * Represents an infinitely tall column of 16x16x16 Cubes
+ */
 public class ImposterCubicChunk extends Chunk {
   private final CubicWorld world;
 
@@ -100,7 +104,7 @@ private void loadSurfaceCubic(Map<Integer, Map<String, Tag>> data, ChunkData chu
 
     int[] heightmapData = extractHeightmapDataCubic(null, chunkData);
     updateHeightmap(heightmap, position, chunkData, heightmapData, palette, yMax);
-    surface = new SurfaceLayer(world.currentDimension(), chunkData, palette, yMin, yMax);
+    surface = new SurfaceLayer(world.currentDimension(), chunkData, palette, yMin, yMax, heightmapData);
   }
 
   private int[] extractHeightmapDataCubic(Map<String, Tag> cubeData, ChunkData chunkData) {

chunky/src/java/se/llbit/chunky/world/World.java

@@ -313,7 +313,6 @@ public synchronized Region getRegion(ChunkPosition pos) {
       if (regionExists(pos)) {
         region = createRegion(pos);
       }
-      setRegion(pos, region);
       return region;
     });
   }