diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index a68a2c5ed..9a1799e0e 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -108,7 +108,7 @@ dependencies { compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf" compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}" compileOnly "curse.maven:inventory-tweaks-223094:2482482" - compileOnly "curse.maven:inventory-bogo-sorter-632327:3975184" + compileOnly "curse.maven:inventory-bogo-sorter-632327:4329854" compileOnly "team.chisel.ctm:CTM:${ctm_version}" compileOnly "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16:api" deobfCompile "net.sengir.forestry:forestry_${minecraft_version}:$forestry_version" diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 7cc7ab176..da928eee1 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -72,7 +72,11 @@ public final class AppEng { private static final String FORGE_CURRENT_VERSION = ForgeVersion.majorVersion + "." + ForgeVersion.minorVersion + "." + ForgeVersion.revisionVersion + "." + ForgeVersion.buildVersion; private static final String FORGE_MAX_VERSION = (ForgeVersion.majorVersion + 1) + ".0.0.0"; - public static final String MOD_DEPENDENCIES = "required-after:forge@[" + FORGE_CURRENT_VERSION + "," + FORGE_MAX_VERSION + ");after:ctm@[" + CTM.VERSION + ",);after:itemstages;after:recipestages"; + public static final String MOD_DEPENDENCIES = "required-after:forge@[" + FORGE_CURRENT_VERSION + "," + FORGE_MAX_VERSION + ");" + + "after:ctm@[" + CTM.VERSION + ",);" + + "after:itemstages;" + + "after:recipestages;" + + "before:bogosorter@[1.2.2,);"; @Nonnull private static final AppEng INSTANCE = new AppEng(); diff --git a/src/main/java/appeng/integration/modules/bogosorter/InventoryBogoSortModule.java b/src/main/java/appeng/integration/modules/bogosorter/InventoryBogoSortModule.java index cefee1a14..b833b4a2b 100644 --- a/src/main/java/appeng/integration/modules/bogosorter/InventoryBogoSortModule.java +++ b/src/main/java/appeng/integration/modules/bogosorter/InventoryBogoSortModule.java @@ -9,7 +9,7 @@ import java.util.Comparator; public class InventoryBogoSortModule { private static final boolean loaded = Loader.isModLoaded("bogosorter"); - public static final Comparator COMPARATOR = (o1, o2) -> SortHandler.ITEM_COMPARATOR.compare(o1.getDefinition(), o2.getDefinition()); + public static final Comparator COMPARATOR = (o1, o2) -> SortHandler.getClientItemComparator().compare(o1.getDefinition(), o2.getDefinition()); public static boolean isLoaded() {