Revert "Handle 5 bit palette properly (1.16.1)"

This reverts commit 79b41d8.
gbl · Jun 27, 2020 · 11cc043 · 11cc043
1 parent b8e7514
commit 11cc043
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 130 deletions.
diff --git a/bukkit-helper-114-1/src/main/java/org/dynmap/bukkit/helper/v114_1/MapChunkCache114_1.java b/bukkit-helper-114-1/src/main/java/org/dynmap/bukkit/helper/v114_1/MapChunkCache114_1.java
@@ -196,8 +196,7 @@ public NBTSnapshot(NBTTagCompound nbt, int worldheight) {
 	            			palette[pi] = DynmapBlockState.AIR;
 	            		}
 	            	}
-	            	int recsperblock = (4096 + statelist.length - 1) / statelist.length;
-	            	int bitsperblock = 64 / recsperblock;
+	            	int bitsperblock = (statelist.length * 64) / 4096;
 	            	DataBits db = new DataBits(bitsperblock, 4096, statelist);
 	            	if (bitsperblock > 8) {	// Not palette
 	            		for (int j = 0; j < 4096; j++) {

diff --git a/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java b/bukkit-helper-115/src/main/java/org/dynmap/bukkit/helper/v115/MapChunkCache115.java
@@ -208,8 +208,7 @@ public NBTSnapshot(NBTTagCompound nbt, int worldheight) {
 	            			palette[pi] = DynmapBlockState.AIR;
 	            		}
 	            	}
-	            	int recsperblock = (4096 + statelist.length - 1) / statelist.length;
-	            	int bitsperblock = 64 / recsperblock;
+	            	int bitsperblock = (statelist.length * 64) / 4096;
 	            	DataBits db = new DataBits(bitsperblock, 4096, statelist);
 	            	if (bitsperblock > 8) {	// Not palette
 	            		for (int j = 0; j < 4096; j++) {

diff --git a/bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/MapChunkCache115.java b/bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/MapChunkCache115.java
@@ -207,10 +207,8 @@ public NBTSnapshot(NBTTagCompound nbt, int worldheight) {
 	            		if (palette[pi] == null) {
 	            			palette[pi] = DynmapBlockState.AIR;
 	            		}
-	            	}	                
-	            	int recsperblock = (4096 + statelist.length - 1) / statelist.length;
-	            	int bitsperblock = 64 / recsperblock;
-
+	            	}
+	            	int bitsperblock = (statelist.length * 64) / 4096;
 	            	DataBits db = new DataBits(bitsperblock, 4096, statelist);
 	            	if (bitsperblock > 8) {	// Not palette
 	            		for (int j = 0; j < 4096; j++) {

diff --git a/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/ChunkSnapshot.java b/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/ChunkSnapshot.java
@@ -178,8 +178,7 @@ public ChunkSnapshot(NBTTagCompound nbt, int worldheight) {
                         palette[pi] = DynmapBlockState.AIR;
                     }
                 }
-            	int recsperblock = (4096 + statelist.length - 1) / statelist.length;
-            	int bitsperblock = 64 / recsperblock;
+                int bitsperblock = (statelist.length * 64) / 4096;
                 BitArray db = new BitArray(bitsperblock, 4096, statelist);
                 if (bitsperblock > 8) {	// Not palette
                     for (int j = 0; j < 4096; j++) {

diff --git a/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/ChunkSnapshot.java b/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/ChunkSnapshot.java
@@ -178,8 +178,7 @@ public ChunkSnapshot(CompoundNBT nbt, int worldheight) {
                         palette[pi] = DynmapBlockState.AIR;
                     }
                 }
-            	int recsperblock = (4096 + statelist.length - 1) / statelist.length;
-            	int bitsperblock = 64 / recsperblock;
+                int bitsperblock = (statelist.length * 64) / 4096;
                 BitArray db = new BitArray(bitsperblock, 4096, statelist);
                 if (bitsperblock > 8) {	// Not palette
                     for (int j = 0; j < 4096; j++) {

diff --git a/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/ChunkSnapshot.java b/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/ChunkSnapshot.java
@@ -178,8 +178,7 @@ public ChunkSnapshot(CompoundNBT nbt, int worldheight) {
                         palette[pi] = DynmapBlockState.AIR;
                     }
                 }
-            	int recsperblock = (4096 + statelist.length - 1) / statelist.length;
-            	int bitsperblock = 64 / recsperblock;
+                int bitsperblock = (statelist.length * 64) / 4096;
                 BitArray db = new BitArray(bitsperblock, 4096, statelist);
                 if (bitsperblock > 8) {	// Not palette
                     for (int j = 0; j < 4096; j++) {

diff --git a/newblocks b/newblocks