From d42c25b45e8fd716ee84f079e124b70bbe3d34a0 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Fri, 1 Nov 2019 11:11:23 +0100
Subject: [PATCH] Improve to-be invtweaks integration code

---
 .../inventorytweaks/InventoryTweaksIntegration.java      | 9 +++++++++
 .../refinedstorage/screen/grid/GridScreen.java           | 2 +-
 ...aksGridSorter.java => InventoryTweaksGridSorter.java} | 6 +-----
 .../widget/sidebutton/GridSortingTypeSideButton.java     | 3 ++-
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/raoulvdberge/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java
 rename src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/{InvTweaksGridSorter.java => InventoryTweaksGridSorter.java} (92%)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java
new file mode 100644
index 000000000..268ab419a
--- /dev/null
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/inventorytweaks/InventoryTweaksIntegration.java
@@ -0,0 +1,9 @@
+package com.raoulvdberge.refinedstorage.integration.inventorytweaks;
+
+import net.minecraftforge.fml.ModList;
+
+public class InventoryTweaksIntegration {
+    public static boolean isLoaded() {
+        return ModList.get().isLoaded("inventorytweaks");
+    }
+}
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java
index b439340ef..5ec0339cc 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/GridScreen.java
@@ -547,7 +547,7 @@ public class GridScreen extends BaseScreen<GridContainer> implements IScreenInfo
         sorters.add(new QuantityGridSorter());
         sorters.add(new IdGridSorter());
         sorters.add(new LastModifiedGridSorter());
-        sorters.add(new InvTweaksGridSorter());
+        sorters.add(new InventoryTweaksGridSorter());
 
         return sorters;
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InvTweaksGridSorter.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java
similarity index 92%
rename from src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InvTweaksGridSorter.java
rename to src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java
index 8f7dea0df..d652ce30d 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InvTweaksGridSorter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/grid/sorting/InventoryTweaksGridSorter.java
@@ -3,10 +3,7 @@ package com.raoulvdberge.refinedstorage.screen.grid.sorting;
 import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
 import com.raoulvdberge.refinedstorage.screen.grid.stack.IGridStack;
 
-// TODO
-public class InvTweaksGridSorter implements IGridSorter {
-    public static final String MOD_ID = "inventorytweaks";
-
+public class InventoryTweaksGridSorter implements IGridSorter {
     @Override
     public boolean isApplicable(IGrid grid) {
         return false;
@@ -44,5 +41,4 @@ public class InvTweaksGridSorter implements IGridSorter {
 
         return 0;
     }*/
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java
index 43f06e34a..12554302b 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java
@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.screen.widget.sidebutton;
 import com.raoulvdberge.refinedstorage.api.network.grid.GridType;
 import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.GridNetworkNode;
+import com.raoulvdberge.refinedstorage.integration.inventorytweaks.InventoryTweaksIntegration;
 import com.raoulvdberge.refinedstorage.screen.BaseScreen;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.text.TextFormatting;
@@ -45,7 +46,7 @@ public class GridSortingTypeSideButton extends SideButton {
         } else if (type == IGrid.SORTING_TYPE_ID) {
             type = IGrid.SORTING_TYPE_LAST_MODIFIED;
         } else if (type == GridNetworkNode.SORTING_TYPE_LAST_MODIFIED) {
-            if (grid.getGridType() == GridType.FLUID || /* TODO !Loader.isModLoaded(GridSorterInventoryTweaks.MOD_ID)*/false) {
+            if (grid.getGridType() == GridType.FLUID || !InventoryTweaksIntegration.isLoaded()) {
                 type = IGrid.SORTING_TYPE_QUANTITY;
             } else {
                 type = IGrid.SORTING_TYPE_INVENTORYTWEAKS;