diff --git a/src/main/java/appeng/client/me/ClientDCInternalInv.java b/src/main/java/appeng/client/me/ClientDCInternalInv.java index 0dc4f249c..a42561ff4 100644 --- a/src/main/java/appeng/client/me/ClientDCInternalInv.java +++ b/src/main/java/appeng/client/me/ClientDCInternalInv.java @@ -24,7 +24,6 @@ import javax.annotation.Nonnull; import net.minecraft.util.text.translation.I18n; import appeng.tile.inventory.AppEngInternalInventory; -import appeng.util.ItemSorters; public class ClientDCInternalInv implements Comparable @@ -57,7 +56,7 @@ public class ClientDCInternalInv implements Comparable @Override public int compareTo( @Nonnull final ClientDCInternalInv o ) { - return ItemSorters.compareLong( this.sortBy, o.sortBy ); + return Long.compare( this.sortBy, o.sortBy ); } public AppEngInternalInventory getInventory() diff --git a/src/main/java/appeng/container/implementations/CraftingCPURecord.java b/src/main/java/appeng/container/implementations/CraftingCPURecord.java index 94dfc1835..900045e78 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPURecord.java +++ b/src/main/java/appeng/container/implementations/CraftingCPURecord.java @@ -22,7 +22,6 @@ package appeng.container.implementations; import javax.annotation.Nonnull; import appeng.api.networking.crafting.ICraftingCPU; -import appeng.util.ItemSorters; public class CraftingCPURecord implements Comparable @@ -44,12 +43,12 @@ public class CraftingCPURecord implements Comparable @Override public int compareTo( @Nonnull final CraftingCPURecord o ) { - final int a = ItemSorters.compareLong( o.getProcessors(), this.getProcessors() ); + final int a = Long.compare( o.getProcessors(), this.getProcessors() ); if( a != 0 ) { return a; } - return ItemSorters.compareLong( o.getSize(), this.getSize() ); + return Long.compare( o.getSize(), this.getSize() ); } ICraftingCPU getCpu() diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index f4cc9a1ec..dd20d02d9 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -44,7 +44,6 @@ import appeng.container.ContainerNull; import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.features.AEFeature; -import appeng.util.ItemSorters; import appeng.util.Platform; import appeng.util.item.AEItemStack; @@ -398,7 +397,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable @@ -550,20 +549,20 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper { if( prioritizePower ) { - final int comparison = ItemSorters.compareLong( nextCluster.getCoProcessors(), firstCluster.getCoProcessors() ); + final int comparison = Long.compare( nextCluster.getCoProcessors(), firstCluster.getCoProcessors() ); if( comparison != 0 ) { return comparison; } - return ItemSorters.compareLong( nextCluster.getAvailableStorage(), firstCluster.getAvailableStorage() ); + return Long.compare( nextCluster.getAvailableStorage(), firstCluster.getAvailableStorage() ); } - final int comparison = ItemSorters.compareLong( firstCluster.getCoProcessors(), nextCluster.getCoProcessors() ); + final int comparison = Long.compare( firstCluster.getCoProcessors(), nextCluster.getCoProcessors() ); if( comparison != 0 ) { return comparison; } - return ItemSorters.compareLong( firstCluster.getAvailableStorage(), nextCluster.getAvailableStorage() ); + return Long.compare( firstCluster.getAvailableStorage(), nextCluster.getAvailableStorage() ); } } ); diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index 7532df646..54ddd1047 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -40,7 +40,6 @@ import appeng.api.storage.IStorageChannel; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.me.cache.SecurityCache; -import appeng.util.ItemSorters; public class NetworkInventoryHandler> implements IMEInventoryHandler @@ -48,7 +47,7 @@ public class NetworkInventoryHandler> implements IMEInvent private static final ThreadLocal DEPTH_MOD = new ThreadLocal<>(); private static final ThreadLocal DEPTH_SIM = new ThreadLocal<>(); - private static final Comparator PRIORITY_SORTER = ( o1, o2 ) -> ItemSorters.compareInt( o2, o1 ); + private static final Comparator PRIORITY_SORTER = ( o1, o2 ) -> Integer.compare( o2, o1 ); private static int currentPass = 0; private final IStorageChannel myChannel; diff --git a/src/main/java/appeng/util/ItemSorters.java b/src/main/java/appeng/util/ItemSorters.java index d77dc878d..c683e8e9f 100644 --- a/src/main/java/appeng/util/ItemSorters.java +++ b/src/main/java/appeng/util/ItemSorters.java @@ -80,9 +80,9 @@ public class ItemSorters { if( getDirection() == SortDir.ASCENDING ) { - return compareLong( o2.getStackSize(), o1.getStackSize() ); + return Long.compare( o2.getStackSize(), o1.getStackSize() ); } - return compareLong( o1.getStackSize(), o2.getStackSize() ); + return Long.compare( o1.getStackSize(), o2.getStackSize() ); } }; private static IInvTweaks api; @@ -124,45 +124,6 @@ public class ItemSorters } } - public static int compareInt( final int a, final int b ) - { - if( a == b ) - { - return 0; - } - if( a < b ) - { - return -1; - } - return 1; - } - - public static int compareLong( final long a, final long b ) - { - if( a == b ) - { - return 0; - } - if( a < b ) - { - return -1; - } - return 1; - } - - public static int compareDouble( final double a, final double b ) - { - if( a == b ) - { - return 0; - } - if( a < b ) - { - return -1; - } - return 1; - } - private static SortDir getDirection() { return Direction;