Improve block sorting when building

RecursivePineapple · Feb 12, 2025 · 96b2b65 · 96b2b65
1 parent e1f19c9
commit 96b2b65
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/PendingBlock.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/building/PendingBlock.java
@@ -390,13 +390,9 @@ public boolean equals(Object obj) {
      */
     public static Comparator<PendingBlock> getComparator() {
         return Comparator.comparingInt((PendingBlock b) -> b.buildOrder)
-            .thenComparing(Comparator.comparing(b -> b.spec, ImmutableBlockSpec.getComparator()))
-            .thenComparingLong(b -> {
-                int chunkX = b.x >> 4;
-                int chunkZ = b.z >> 4;
-
-                return (long) chunkX | (long) (chunkZ << 32);
-            })
+            .thenComparing(b -> b.spec, ImmutableBlockSpec.getComparator())
+            .thenComparingInt(b -> b.x >> 4)
+            .thenComparingInt(b -> b.z >> 4)
             .thenComparingInt(b -> Objects.hash(b.gt, b.ae, b.arch, b.mp, b.inventory));
     }