the great unboxing

GregTechCEu · Dec 27, 2024 · 98979da · 98979da
1 parent a58923f
commit 98979da
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java
@@ -86,6 +86,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.function.ToIntFunction;
 
 import static gregtech.api.capability.GregtechDataCodes.*;
 
@@ -95,7 +96,7 @@ public abstract class MultiblockControllerBase extends MetaTileEntity implements
 
     protected final Comparator<IMultiblockPart> partComparator = Comparator.comparingLong(part -> {
         MetaTileEntity mte = (MetaTileEntity) part;
-        return ((long) multiblockPartSorter().apply(mte.getPos()) << 32) | mte.getPos().hashCode();
+        return ((long) multiblockPartSorter().applyAsInt(mte.getPos()) << 32) | mte.getPos().hashCode();
     });
 
     private final Map<MultiblockAbility<Object>, List<Object>> multiblockAbilities = new HashMap<>();
@@ -435,7 +436,7 @@ public boolean shouldShowInJei() {
      * Used if MultiblockPart Abilities need to be sorted a certain way, like
      * Distillation Tower and Assembly Line.
      */
-    protected Function<BlockPos, Integer> multiblockPartSorter() {
+    protected ToIntFunction<BlockPos> multiblockPartSorter() {
         return BlockPos::hashCode;
     }
 

diff --git a/src/main/java/gregtech/api/util/RelativeDirection.java b/src/main/java/gregtech/api/util/RelativeDirection.java
@@ -6,7 +6,7 @@
 import net.minecraft.util.math.BlockPos;
 
 import java.util.function.BinaryOperator;
-import java.util.function.Function;
+import java.util.function.ToIntFunction;
 
 /**
  * Relative direction when facing horizontally
@@ -58,7 +58,7 @@ public EnumFacing getRelativeFacing(EnumFacing frontFacing, EnumFacing upwardsFa
                 getRelativeFacing(frontFacing, upwardsFacing);
     }
 
-    public Function<BlockPos, Integer> getSorter(EnumFacing frontFacing, EnumFacing upwardsFacing, boolean isFlipped) {
+    public ToIntFunction<BlockPos> getSorter(EnumFacing frontFacing, EnumFacing upwardsFacing, boolean isFlipped) {
         // get the direction to go in for the part sorter
         EnumFacing sorterDirection = getRelativeFacing(frontFacing, upwardsFacing, isFlipped);
 

diff --git a/...main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityAssemblyLine.java b/...main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityAssemblyLine.java
@@ -52,7 +52,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.ToIntFunction;
 
 import static gregtech.api.util.RelativeDirection.*;
 
@@ -141,7 +141,7 @@ protected static TraceabilityPredicate dataHatchPredicate() {
     }
 
     @Override
-    protected Function<BlockPos, Integer> multiblockPartSorter() {
+    protected ToIntFunction<BlockPos> multiblockPartSorter() {
         // player's right when looking at the controller, but the controller's left
         return RelativeDirection.LEFT.getSorter(getFrontFacing(), getUpwardsFacing(), isFlipped());
     }

diff --git a/...java/gregtech/common/metatileentities/multi/electric/MetaTileEntityDistillationTower.java b/...java/gregtech/common/metatileentities/multi/electric/MetaTileEntityDistillationTower.java
@@ -36,7 +36,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.ToIntFunction;
 
 import static gregtech.api.util.RelativeDirection.*;
 
@@ -70,7 +70,7 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) {
      * a properly overriden {@link DistillationTowerLogicHandler#determineOrderedFluidOutputs()}
      */
     @Override
-    protected Function<BlockPos, Integer> multiblockPartSorter() {
+    protected ToIntFunction<BlockPos> multiblockPartSorter() {
         return RelativeDirection.UP.getSorter(getFrontFacing(), getUpwardsFacing(), isFlipped());
     }