update bogosort compat

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"

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();

src/main/java/appeng/core/api/ApiClientHelper.java

@@ -4,25 +4,10 @@ package appeng.core.api;
 import appeng.api.config.IncludeExclude;
 import appeng.api.storage.ICellInventory;
 import appeng.api.storage.ICellInventoryHandler;
-import appeng.api.storage.channels.IFluidStorageChannel;
-import appeng.api.storage.channels.IItemStorageChannel;
-import appeng.api.storage.data.IAEFluidStack;
-import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
-import appeng.api.storage.data.IItemList;
 import appeng.api.util.IClientHelper;
 import appeng.core.localization.GuiText;
-import appeng.fluids.items.FluidDummyItem;
-import appeng.fluids.util.AEFluidStack;
-import appeng.util.item.AEItemStack;
-import net.minecraft.client.Minecraft;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidUtil;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.oredict.OreDictionary;
-import org.lwjgl.input.Keyboard;
 
-import java.util.Collection;
 import java.util.List;
 
 
@@ -42,72 +27,16 @@ public class ApiClientHelper implements IClientHelper {
                     .getLocal());
         }
 
-        IItemList<?> itemList = cellInventory.getChannel().createList();
-
         if (handler.isPreformatted()) {
             final String list = (handler.getIncludeExcludeMode() == IncludeExclude.WHITELIST ? GuiText.Included : GuiText.Excluded).getLocal();
 
             if (handler.isFuzzy()) {
-                lines.add("[" + GuiText.Partitioned.getLocal() + "]" + " - " + list + ' ' + GuiText.Fuzzy.getLocal());
+                lines.add(GuiText.Partitioned.getLocal() + " - " + list + ' ' + GuiText.Fuzzy.getLocal());
             } else {
-                lines.add("[" + GuiText.Partitioned.getLocal() + "]" + " - " + list + ' ' + GuiText.Precise.getLocal());
-            }
-
-            if (Minecraft.getMinecraft().gameSettings.advancedItemTooltips || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
-                IItemHandler inv = cellInventory.getConfigInventory();
-                cellInventory.getAvailableItems((IItemList) itemList);
-                for (int i = 0; i < inv.getSlots(); i++) {
-                    final ItemStack is = inv.getStackInSlot(i);
-                    if (!is.isEmpty()) {
-                        if (cellInventory.getChannel() instanceof IItemStorageChannel) {
-                            if (!handler.isFuzzy()) {
-                                final IAEItemStack ais = AEItemStack.fromItemStack(is);
-                                IAEItemStack stocked = ((IItemList<IAEItemStack>) itemList).findPrecise(ais);
-                                lines.add("[" + is.getDisplayName() + "]" + ": " + (stocked == null ? "0" : String.valueOf(stocked.getStackSize())));
-                            } else {
-                                final IAEItemStack ais = AEItemStack.fromItemStack(is);
-                                Collection<IAEItemStack> stocked = ((IItemList<IAEItemStack>) itemList).findFuzzy(ais, handler.getCellInv().getFuzzyMode());
-
-                                int[] ids = OreDictionary.getOreIDs(is);
-                                long size = 0;
-                                for (IAEItemStack ist : stocked) {
-                                    size += ist.getStackSize();
-                                }
-
-                                if (is.getItem().isDamageable()) {
-                                    lines.add("[" + is.getDisplayName() + "]" + ": " + size);
-                                } else if (ids.length > 0) {
-                                    StringBuilder sb = new StringBuilder();
-                                    for (int j : ids) {
-                                        sb.append(OreDictionary.getOreName(j)).append(", ");
-                                    }
-                                    lines.add("[{" + sb.substring(0, sb.length() - 2) + "}]" + ": " + size);
-                                }
-                            }
-                        } else if (cellInventory.getChannel() instanceof IFluidStorageChannel) {
-                            final AEFluidStack ais;
-                            if (is.getItem() instanceof FluidDummyItem) {
-                                ais = AEFluidStack.fromFluidStack(((FluidDummyItem) is.getItem()).getFluidStack(is));
-                            } else {
-                                ais = AEFluidStack.fromFluidStack(FluidUtil.getFluidContained(is));
-                            }
-                            IAEFluidStack stocked = ((IItemList<IAEFluidStack>) itemList).findPrecise(ais);
-                            lines.add("[" + is.getDisplayName() + "]" + ": " + (stocked == null ? "0" : String.valueOf(stocked.getStackSize())));
-                        }
-                    }
-                }
-            }
-        } else {
-            if (Minecraft.getMinecraft().gameSettings.advancedItemTooltips || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) {
-                cellInventory.getAvailableItems((IItemList) itemList);
-                for (IAEStack<?> s : itemList) {
-                    if (s instanceof IAEItemStack) {
-                        lines.add(((IAEItemStack) s).getDefinition().getDisplayName() + ": " + s.getStackSize());
-                    } else if (s instanceof IAEFluidStack) {
-                        lines.add(((IAEFluidStack) s).getFluidStack().getLocalizedName() + ": " + s.getStackSize() + "mB");
-                    }
-                }
+                lines.add(GuiText.Partitioned.getLocal() + " - " + list + ' ' + GuiText.Precise.getLocal());
             }
         }
+
     }
+
 }

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<IAEItemStack> COMPARATOR = (o1, o2) -> SortHandler.ITEM_COMPARATOR.compare(o1.getDefinition(), o2.getDefinition());
+    public static final Comparator<IAEItemStack> COMPARATOR = (o1, o2) -> SortHandler.getClientItemComparator().compare(o1.getDefinition(), o2.getDefinition());
 
     public static boolean isLoaded() {