Make use of Math.ceilDiv for array length calculation (#3348)

SirYwell · web-flow · commit 2713c8ec61d2 · 2025-10-26T20:50:39.000+01:00
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
@@ -444,8 +444,7 @@ public static LevelChunkSection newChunkSection(
             }
 
             int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-            final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-            final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);
+            final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);
 
             if (num_palette == 1) {
                 for (int i = 0; i < blockBitArrayEnd; i++) {
@@ -602,8 +601,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(
         }
 
         int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-        final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-        final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);
+        final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);
 
 
         BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(
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
@@ -444,8 +444,7 @@ public static LevelChunkSection newChunkSection(
             }
 
             int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-            final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-            final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);
+            final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);
 
             if (num_palette == 1) {
                 for (int i = 0; i < blockBitArrayEnd; i++) {
@@ -602,8 +601,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(
         }
 
         int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-        final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-        final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);
+        final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);
 
 
         BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(
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
@@ -438,8 +438,7 @@ public static LevelChunkSection newChunkSection(
             }
 
             int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-            final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-            final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);
+            final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);
 
             if (num_palette == 1) {
                 for (int i = 0; i < blockBitArrayEnd; i++) {
@@ -596,8 +595,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(
         }
 
         int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-        final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-        final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);
+        final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);
 
 
         BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(
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
@@ -428,8 +428,7 @@ public static LevelChunkSection newChunkSection(
             }
 
             int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-            final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-            final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);
+            final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);
 
             if (num_palette == 1) {
                 for (int i = 0; i < blockBitArrayEnd; i++) {
@@ -586,8 +585,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(
         }
 
         int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-        final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-        final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);
+        final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);
 
 
         BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(
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
@@ -414,8 +414,7 @@ public static LevelChunkSection newChunkSection(
             }
 
             int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-            final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-            final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);
+            final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);
 
             if (num_palette == 1) {
                 for (int i = 0; i < blockBitArrayEnd; i++) {
@@ -572,8 +571,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(
         }
 
         int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-        final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-        final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);
+        final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);
 
 
         BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(
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
@@ -413,8 +413,7 @@ public static LevelChunkSection newChunkSection(
             }
 
             int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-            final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-            final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);
+            final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);
 
             if (num_palette == 1) {
                 for (int i = 0; i < blockBitArrayEnd; i++) {
@@ -571,8 +570,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(
         }
 
         int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-        final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-        final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);
+        final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);
 
 
         BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(
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
@@ -442,8 +442,7 @@ public static LevelChunkSection newChunkSection(
             }
 
             int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-            final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-            final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);
+            final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);
 
             if (num_palette == 1) {
                 for (int i = 0; i < blockBitArrayEnd; i++) {
@@ -600,8 +599,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(
         }
 
         int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-        final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-        final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);
+        final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);
 
 
         BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(
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
@@ -449,8 +449,7 @@ public static LevelChunkSection newChunkSection(
             }
 
             int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-            final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-            final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);
+            final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);
 
             if (num_palette == 1) {
                 for (int i = 0; i < blockBitArrayEnd; i++) {
@@ -548,8 +547,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(
         }
 
         int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
-        final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
-        final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);
+        final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);
 
         var strategy = Strategy.createForBiomes(biomeRegistry);
         var packedData = new PalettedContainerRO.PackedData<>(
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MathMan.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/util/MathMan.java
@@ -436,4 +436,18 @@ public static boolean isPowerOfTwo(int a) {
         return (a & a - 1) == 0;
     }
 
+    /**
+     * Calculates the size an array needs to fit all elements, given that
+     * multiple elements can be stored in a single index.
+     *
+     * @param bitsPerEntry    the number of bits a single element occupies in the array
+     * @param numberOfEntries the number of elements to store in the array
+     * @return the size of the array needed to store the elements
+     * @since TODO
+     */
+    public static int longArrayLength(int bitsPerEntry, int numberOfEntries) {
+        int entriesPerLong = Long.SIZE / bitsPerEntry;
+        return Math.ceilDiv(numberOfEntries, entriesPerLong);
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -444,8 +444,7 @@ public static LevelChunkSection newChunkSection(`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`447`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`448`		`- final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);`
	`447`	`+ final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);`
`449`	`448`
`450`	`449`	`if (num_palette == 1) {`
`451`	`450`	`for (int i = 0; i < blockBitArrayEnd; i++) {`
`@@ -602,8 +601,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(`
`602`	`601`	`}`
`603`	`602`
`604`	`603`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`605`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`606`		`- final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);`
	`604`	`+ final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);`
`607`	`605`
`608`	`606`
`609`	`607`	`BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(`
Original file line number	Diff line number	Diff line change
`@@ -438,8 +438,7 @@ public static LevelChunkSection newChunkSection(`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`441`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`442`		`- final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);`
	`441`	`+ final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);`
`443`	`442`
`444`	`443`	`if (num_palette == 1) {`
`445`	`444`	`for (int i = 0; i < blockBitArrayEnd; i++) {`
`@@ -596,8 +595,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(`
`596`	`595`	`}`
`597`	`596`
`598`	`597`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`599`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`600`		`- final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);`
	`598`	`+ final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);`
`601`	`599`
`602`	`600`
`603`	`601`	`BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(`
Original file line number	Diff line number	Diff line change
`@@ -428,8 +428,7 @@ public static LevelChunkSection newChunkSection(`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`431`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`432`		`- final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);`
	`431`	`+ final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);`
`433`	`432`
`434`	`433`	`if (num_palette == 1) {`
`435`	`434`	`for (int i = 0; i < blockBitArrayEnd; i++) {`
`@@ -586,8 +585,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(`
`586`	`585`	`}`
`587`	`586`
`588`	`587`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`589`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`590`		`- final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);`
	`588`	`+ final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);`
`591`	`589`
`592`	`590`
`593`	`591`	`BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(`
Original file line number	Diff line number	Diff line change
`@@ -414,8 +414,7 @@ public static LevelChunkSection newChunkSection(`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`417`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`418`		`- final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);`
	`417`	`+ final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);`
`419`	`418`
`420`	`419`	`if (num_palette == 1) {`
`421`	`420`	`for (int i = 0; i < blockBitArrayEnd; i++) {`
`@@ -572,8 +571,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(`
`572`	`571`	`}`
`573`	`572`
`574`	`573`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`575`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`576`		`- final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);`
	`574`	`+ final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);`
`577`	`575`
`578`	`576`
`579`	`577`	`BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(`
Original file line number	Diff line number	Diff line change
`@@ -413,8 +413,7 @@ public static LevelChunkSection newChunkSection(`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`416`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`417`		`- final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);`
	`416`	`+ final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);`
`418`	`417`
`419`	`418`	`if (num_palette == 1) {`
`420`	`419`	`for (int i = 0; i < blockBitArrayEnd; i++) {`
`@@ -571,8 +570,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(`
`571`	`570`	`}`
`572`	`571`
`573`	`572`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`574`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`575`		`- final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);`
	`573`	`+ final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);`
`576`	`574`
`577`	`575`
`578`	`576`	`BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(`
Original file line number	Diff line number	Diff line change
`@@ -442,8 +442,7 @@ public static LevelChunkSection newChunkSection(`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`445`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`446`		`- final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);`
	`445`	`+ final int blockBitArrayEnd = MathMan.longArrayLength(bitsPerEntryNonZero, 4096);`
`447`	`446`
`448`	`447`	`if (num_palette == 1) {`
`449`	`448`	`for (int i = 0; i < blockBitArrayEnd; i++) {`
`@@ -600,8 +599,7 @@ public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(`
`600`	`599`	`}`
`601`	`600`
`602`	`601`	`int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes`
`603`		`- final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);`
`604`		`- final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);`
	`602`	`+ final int arrayLength = MathMan.longArrayLength(bitsPerEntryNonZero, 64);`
`605`	`603`
`606`	`604`
`607`	`605`	`BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(`