From 11e420ea58c80923c1b83a75b96d10172ad29eca Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 8 Aug 2017 09:48:10 +0200 Subject: [PATCH] Bump Forge and JEI version, update changelog, small improvements --- CHANGELOG.md | 2 ++ build.gradle | 8 ++++---- .../sorting/GridSortingInventoryTweaks.java | 17 +++++++++++------ .../sidebutton/SideButtonGridSortingType.java | 3 ++- src/main/resources/mcmod.info | 2 +- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae7daef99..8284b1524 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Refined Storage Changelog ### 1.5.15 +- Updated Forge to 2444 (MC 1.12.1) (raoulvdberge) +- Added InventoryTweaks Grid sorting (cooliojazz) - Added CTM integration for Disk Manipulator (raoulvdberge) ### 1.5.14 diff --git a/build.gradle b/build.gradle index d7bd86367..f476f2a95 100755 --- a/build.gradle +++ b/build.gradle @@ -28,10 +28,10 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 minecraft { - version = "1.12-14.21.1.2426" + version = "1.12.1-14.22.0.2444" runDir = "run" useDepAts = true - mappings = "snapshot_20170727" + mappings = "snapshot_20170807" } repositories { @@ -54,8 +54,8 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.12:4.7.2.77:api" - runtime "mezz.jei:jei_1.12:4.7.2.77" + deobfCompile "mezz.jei:jei_1.12:4.7.5.84:api" + runtime "mezz.jei:jei_1.12:4.7.5.84" deobfCompile "MCMultiPart2:MCMultiPart:2.2.2" // deobfCompile "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.28:api" deobfCompile "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12-5.2.9:api" diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingInventoryTweaks.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingInventoryTweaks.java index 74ccbcddf..e42471475 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingInventoryTweaks.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/sorting/GridSortingInventoryTweaks.java @@ -7,23 +7,28 @@ import invtweaks.api.InvTweaksAPI; import net.minecraftforge.fml.common.Loader; public class GridSortingInventoryTweaks extends GridSorting { + public static final String MOD_ID = "inventorytweaks"; + private InvTweaksAPI api = null; public GridSortingInventoryTweaks() { try { api = (InvTweaksAPI) Class.forName("invtweaks.forge.InvTweaksMod", true, Loader.instance().getModClassLoader()).getField("instance").get(null); - } catch (Exception ex) { } + } catch (Exception e) { + // NO OP + } } - + @Override - public int compare(IGridStack o1, IGridStack o2) { - if (api != null && o1 instanceof GridStackItem && o2 instanceof GridStackItem) { + public int compare(IGridStack left, IGridStack right) { + if (api != null && left instanceof GridStackItem && right instanceof GridStackItem) { if (sortingDirection == NetworkNodeGrid.SORTING_DIRECTION_DESCENDING) { - return api.compareItems(((GridStackItem) o1).getStack(), ((GridStackItem) o2).getStack()); + return api.compareItems(((GridStackItem) left).getStack(), ((GridStackItem) right).getStack()); } else if (sortingDirection == NetworkNodeGrid.SORTING_DIRECTION_ASCENDING) { - return api.compareItems(((GridStackItem) o2).getStack(), ((GridStackItem) o1).getStack()); + return api.compareItems(((GridStackItem) right).getStack(), ((GridStackItem) left).getStack()); } } + return 0; } } \ No newline at end of file diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java index 51d8e5049..f0e505fa4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java @@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.api.network.grid.GridType; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid; import com.raoulvdberge.refinedstorage.gui.GuiBase; +import com.raoulvdberge.refinedstorage.gui.grid.sorting.GridSortingInventoryTweaks; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.common.Loader; @@ -39,7 +40,7 @@ public class SideButtonGridSortingType extends SideButton { type = IGrid.SORTING_TYPE_ID; } } else if (type == IGrid.SORTING_TYPE_ID) { - if (grid.getType() == GridType.FLUID || !Loader.isModLoaded("inventorytweaks")) { + if (grid.getType() == GridType.FLUID || !Loader.isModLoaded(GridSortingInventoryTweaks.MOD_ID)) { type = IGrid.SORTING_TYPE_QUANTITY; } else { type = IGrid.SORTING_TYPE_INVENTORYTWEAKS; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 7ca576557..e5c7a5448 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -4,7 +4,7 @@ "name": "Refined Storage", "description": "An elegant solution to your hoarding problem", "version": "1.5.15", - "mcversion": "1.12", + "mcversion": "1.12.1", "url": "https://refinedstorage.raoulvdberge.com", "updateUrl": "", "authorList": ["Refined Storage contributors"],