From 96b2b655021f4b7b9a10182cbaf16617d9181b17 Mon Sep 17 00:00:00 2001 From: RecursivePineapple Date: Wed, 12 Feb 2025 16:21:02 -0500 Subject: [PATCH] Improve block sorting when building --- .../common/building/PendingBlock.java | 10 +++------- 1 file changed, 3 insertions(+), 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 index a333a6e..db85816 100644 --- 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 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)); }