fix: global palette is not really any more

dordsor21 · dordsor21 · commit 80187ef7f454 · 2026-02-01T10:28:29.000Z
- supersedes #3431
diff --git a/worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightPlatformAdapter.java
@@ -431,9 +431,9 @@ public static LevelChunkSection newChunkSection(
         try {
             int num_palette;
             if (get == null) {
-                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
+                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, false);
             } else {
-                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
+                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, false);
             }
 
             int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
diff --git a/worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightPlatformAdapter.java
@@ -431,9 +431,9 @@ public static LevelChunkSection newChunkSection(
         try {
             int num_palette;
             if (get == null) {
-                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
+                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, false);
             } else {
-                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
+                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, false);
             }
 
             int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
diff --git a/worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightPlatformAdapter.java
@@ -425,9 +425,9 @@ public static LevelChunkSection newChunkSection(
         try {
             int num_palette;
             if (get == null) {
-                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
+                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, false);
             } else {
-                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
+                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, false);
             }
 
             int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
diff --git a/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightPlatformAdapter.java
@@ -415,9 +415,9 @@ public static LevelChunkSection newChunkSection(
         try {
             int num_palette;
             if (get == null) {
-                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
+                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, false);
             } else {
-                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
+                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, false);
             }
 
             int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
diff --git a/worldedit-bukkit/adapters/adapter-1_21_11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_11/PaperweightGetBlocks.java b/worldedit-bukkit/adapters/adapter-1_21_11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_11/PaperweightGetBlocks.java
@@ -409,6 +409,7 @@ protected <T extends Future<T>> T internalCall(
                                         new char[4096],
                                         adapter,
                                         serverLevel.registryAccess(),
+                                        serverLevel.palettedContainerFactory().blockStatesStrategy(),
                                         biomeData
                                 );
                                 if (PaperweightPlatformAdapter.setSectionAtomic(
@@ -484,6 +485,7 @@ protected <T extends Future<T>> T internalCall(
                                 setArr,
                                 adapter,
                                 serverLevel.registryAccess(),
+                                serverLevel.palettedContainerFactory().blockStatesStrategy(),
                                 biomeData
                         );
                         if (PaperweightPlatformAdapter.setSectionAtomic(
@@ -548,6 +550,7 @@ protected <T extends Future<T>> T internalCall(
                                 setArr,
                                 adapter,
                                 serverLevel.registryAccess(),
+                                serverLevel.palettedContainerFactory().blockStatesStrategy(),
                                 biomeData != null ? biomeData : (PalettedContainer<Holder<Biome>>) existingSection.getBiomes()
                         );
                         if (!PaperweightPlatformAdapter.setSectionAtomic(
diff --git a/worldedit-bukkit/adapters/adapter-1_21_11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_11/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_11/PaperweightPlatformAdapter.java
@@ -18,7 +18,6 @@
 import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.biome.BiomeTypes;
-import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockTypesCache;
 import io.papermc.lib.PaperLib;
 import net.minecraft.core.BlockPos;
@@ -33,13 +32,13 @@
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.Mth;
 import net.minecraft.util.ProblemReporter;
 import net.minecraft.util.ThreadingDetector;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.chunk.LevelChunk;
@@ -402,9 +401,10 @@ public static LevelChunkSection newChunkSection(
             final char[] blocks,
             CachedBukkitAdapter adapter,
             RegistryAccess registryAccess,
+            Strategy<net.minecraft.world.level.block.state.BlockState> strategy,
             @Nullable PalettedContainer<Holder<Biome>> biomes
     ) {
-        return newChunkSection(layer, null, blocks, adapter, registryAccess, biomes);
+        return newChunkSection(layer, null, blocks, adapter, registryAccess, strategy, biomes);
     }
 
     public static LevelChunkSection newChunkSection(
@@ -413,6 +413,7 @@ public static LevelChunkSection newChunkSection(
             char[] set,
             CachedBukkitAdapter adapter,
             RegistryAccess registryAccess,
+            Strategy<net.minecraft.world.level.block.state.BlockState> strategy,
             @Nullable PalettedContainer<Holder<Biome>> biomes
     ) {
         if (set == null) {
@@ -425,17 +426,12 @@ public static LevelChunkSection newChunkSection(
         try {
             int num_palette;
             if (get == null) {
-                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
+                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, true);
             } else {
-                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
+                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, true);
             }
 
-            int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
-            if (bitsPerEntry > 0 && bitsPerEntry < 5) {
-                bitsPerEntry = 4;
-            } else if (bitsPerEntry > 8) {
-                bitsPerEntry = MathMan.log2nlz(Block.BLOCK_STATE_REGISTRY.size() - 1);
-            }
+            int bitsPerEntry = Mth.ceillog2(num_palette);
 
             int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
             final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);
@@ -451,21 +447,19 @@ public static LevelChunkSection newChunkSection(
 
             final long[] bits = Arrays.copyOfRange(blockStates, 0, blockBitArrayEnd);
             List<net.minecraft.world.level.block.state.BlockState> palette;
-            if (bitsPerEntry < 9) {
+            if (bitsPerEntry == 0) {
+                palette = List.of();
+            } else {
                 palette = new ArrayList<>();
                 for (int i = 0; i < num_palette; i++) {
                     int ordinal = paletteToBlock[i];
-                    blockToPalette[ordinal] = Integer.MAX_VALUE;
-                    final BlockState state = BlockTypesCache.states[ordinal];
-                    palette.add(((PaperweightBlockMaterial) state.getMaterial()).getState());
+                    PaperweightBlockMaterial material = (PaperweightBlockMaterial)BlockTypesCache.states[ordinal].getMaterial();
+                    palette.add(material.getState());
                 }
-            } else {
-                palette = List.of();
             }
 
             // Create palette with data
-            var strategy = Strategy.createForBlockStates(Block.BLOCK_STATE_REGISTRY);
-            var packedData = new PalettedContainerRO.PackedData<>(palette, Optional.of(LongStream.of(bits)), bitsPerEntry);
+            var packedData = new PalettedContainerRO.PackedData<>(palette, Optional.of(LongStream.of(bits)));
             DataResult<PalettedContainer<net.minecraft.world.level.block.state.BlockState>> result;
             if (PaperLib.isPaper()) {
                 result = PalettedContainer.unpack(strategy, packedData, Blocks.AIR.defaultBlockState(), null);
diff --git a/worldedit-bukkit/adapters/adapter-1_21_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_4/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_4/PaperweightPlatformAdapter.java
@@ -401,9 +401,9 @@ public static LevelChunkSection newChunkSection(
         try {
             int num_palette;
             if (get == null) {
-                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
+                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, false);
             } else {
-                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
+                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, false);
             }
 
             int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
diff --git a/worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightPlatformAdapter.java
@@ -400,9 +400,9 @@ public static LevelChunkSection newChunkSection(
         try {
             int num_palette;
             if (get == null) {
-                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
+                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, false);
             } else {
-                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
+                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, false);
             }
 
             int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
diff --git a/worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_6/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_6/PaperweightPlatformAdapter.java
@@ -429,9 +429,9 @@ public static LevelChunkSection newChunkSection(
         try {
             int num_palette;
             if (get == null) {
-                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
+                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, false);
             } else {
-                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
+                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, false);
             }
 
             int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
diff --git a/worldedit-bukkit/adapters/adapter-1_21_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightPlatformAdapter.java b/worldedit-bukkit/adapters/adapter-1_21_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightPlatformAdapter.java
@@ -5,6 +5,7 @@
 import com.fastasyncworldedit.bukkit.adapter.CachedBukkitAdapter;
 import com.fastasyncworldedit.bukkit.adapter.DelegateSemaphore;
 import com.fastasyncworldedit.bukkit.adapter.NMSAdapter;
+import com.fastasyncworldedit.bukkit.util.MinecraftVersion;
 import com.fastasyncworldedit.core.Fawe;
 import com.fastasyncworldedit.core.FaweCache;
 import com.fastasyncworldedit.core.math.BitArrayUnstretched;
@@ -106,11 +107,13 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
     private static final Field fieldRemove;
 
     private static final Logger LOGGER = LogManagerCompat.getLogger();
+    private static final boolean GLOBAL_KINDA_DOES_NOT_EXIST = MinecraftVersion.getCurrent().getRelease() == 10;
 
     private static Field SERVER_LEVEL_ENTITY_MANAGER;
 
     static final MethodHandle PALETTED_CONTAINER_GET;
 
+
     static {
         final MethodHandles.Lookup lookup = MethodHandles.lookup();
         try {
@@ -436,9 +439,11 @@ public static LevelChunkSection newChunkSection(
         try {
             int num_palette;
             if (get == null) {
-                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter);
+                num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, GLOBAL_KINDA_DOES_NOT_EXIST);
             } else {
-                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter);
+                num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter,
+                        GLOBAL_KINDA_DOES_NOT_EXIST
+                );
             }
 
             int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
@@ -476,7 +481,9 @@ public static LevelChunkSection newChunkSection(
 
             // Create palette with data
             var strategy = Strategy.createForBlockStates(Block.BLOCK_STATE_REGISTRY);
-            var packedData = new PalettedContainerRO.PackedData<>(palette, Optional.of(LongStream.of(bits)), bitsPerEntry);
+            var packedData = GLOBAL_KINDA_DOES_NOT_EXIST ?
+                    new PalettedContainerRO.PackedData<>(palette, Optional.of(LongStream.of(bits))) :
+                    new PalettedContainerRO.PackedData<>(palette, Optional.of(LongStream.of(bits)), bitsPerEntry);
             DataResult<PalettedContainer<net.minecraft.world.level.block.state.BlockState>> result;
             if (PaperLib.isPaper()) {
                 result = PalettedContainer.unpack(strategy, packedData, Blocks.AIR.defaultBlockState(), null);
diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/NMSAdapter.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/NMSAdapter.java
@@ -20,7 +20,8 @@ public static int createPalette(
             int[] paletteToBlock,
             int[] blocksCopy,
             char[] set,
-            CachedBukkitAdapter adapter
+            CachedBukkitAdapter adapter,
+            final boolean globalKindaDoesNotExist
     ) {
         int numPaletteEntries = 0;
         for (int i = 0; i < 4096; i++) {
@@ -33,7 +34,7 @@ public static int createPalette(
                 numPaletteEntries++;
             }
         }
-        mapPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, numPaletteEntries);
+        mapPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, numPaletteEntries, globalKindaDoesNotExist);
 
         return numPaletteEntries;
     }
@@ -45,7 +46,8 @@ public static int createPalette(
             int[] blocksCopy,
             IntFunction<char[]> get,
             char[] set,
-            CachedBukkitAdapter adapter
+            CachedBukkitAdapter adapter,
+            final boolean globalKindaDoesNotExist
     ) {
         int numPaletteEntries = 0;
         char[] getArr = null;
@@ -67,7 +69,7 @@ public static int createPalette(
                 numPaletteEntries++;
             }
         }
-        mapPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, numPaletteEntries);
+        mapPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, numPaletteEntries, globalKindaDoesNotExist);
 
         return numPaletteEntries;
     }
@@ -78,11 +80,12 @@ private static void mapPalette(
             int[] blocksCopy,
             char[] set,
             CachedBukkitAdapter adapter,
-            int numPaletteEntries
+            int numPaletteEntries,
+            boolean globalKindaDoesNotExist
     ) {
         int bitsPerEntry = MathMan.log2nlz(numPaletteEntries - 1);
         // If bits per entry is over 8, the game uses the global palette.
-        if (bitsPerEntry > 8 && adapter != null) {
+        if (!globalKindaDoesNotExist && bitsPerEntry > 8 && adapter != null) {
             System.arraycopy(adapter.getIbdToOrdinal(), 0, paletteToBlock, 0, adapter.getIbdToOrdinal().length);
             System.arraycopy(adapter.getOrdinalToIbdID(), 0, blockToPalette, 0, adapter.getOrdinalToIbdID().length);
         }
