From 461ac036df070be14b5ce49a35706c908fbd78d0 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 10 Apr 2021 22:42:09 -0700 Subject: [PATCH] Backport `Add ability to disable and invert inventory scroll transfer.` https://github.com/TheCBProject/NotEnoughItems/commit/7943831c2a8898fd6805d39fba57397742ba37f9 --- build.properties | 2 +- resources/assets/nei/lang/en_US.lang | 6 ++++++ src/codechicken/nei/NEIClientConfig.java | 19 +++++++++++++++++++ src/codechicken/nei/NEIController.java | 5 ++++- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/build.properties b/build.properties index 14e2c4a9..16b6c414 100644 --- a/build.properties +++ b/build.properties @@ -2,4 +2,4 @@ mc_version=1.7.10 forge_version=10.13.4.1614-1.7.10 ccl_version=1.1.3.138 ccc_version=1.0.7.+ -mod_version=2.1.0-GTNH-beta16 +mod_version=2.1.0-GTNH-beta17 diff --git a/resources/assets/nei/lang/en_US.lang b/resources/assets/nei/lang/en_US.lang index fd9b220d..eb9f8422 100644 --- a/resources/assets/nei/lang/en_US.lang +++ b/resources/assets/nei/lang/en_US.lang @@ -150,6 +150,12 @@ nei.options.inventory.gamemodes.tip=Select the gamemodes to cycle through nei.options.inventory.gamemodes.creative=Creative nei.options.inventory.gamemodes.creative+=Creative+ nei.options.inventory.gamemodes.adventure=Adventure +nei.options.inventory.disableMouseScrollTransfer=Disable Mouse Wheel Transfer +nei.options.inventory.disableMouseScrollTransfer.true=True +nei.options.inventory.disableMouseScrollTransfer.false=False +nei.options.inventory.invertMouseScrollTransfer=Invert Mouse Wheel Transfer Direction +nei.options.inventory.invertMouseScrollTransfer.true=True +nei.options.inventory.invertMouseScrollTransfer.false=False nei.options.command=Commands nei.options.command.creative=Gamemode diff --git a/src/codechicken/nei/NEIClientConfig.java b/src/codechicken/nei/NEIClientConfig.java index eb87d013..f812c7dc 100644 --- a/src/codechicken/nei/NEIClientConfig.java +++ b/src/codechicken/nei/NEIClientConfig.java @@ -116,6 +116,17 @@ public class NEIClientConfig tag.getTag("inventory.profileRecipes").getBooleanValue(false); API.addOption(new OptionToggleButton("inventory.profileRecipes", true)); + tag.getTag("inventory.disableMouseScrollTransfer").getBooleanValue(false); + API.addOption(new OptionToggleButton("inventory.disableMouseScrollTransfer", true)); + + tag.getTag("inventory.invertMouseScrollTransfer").getBooleanValue(false); + API.addOption(new OptionToggleButton("inventory.invertMouseScrollTransfer", true) { + @Override + public boolean isEnabled() { + return isMouseScrollTransferEnabled(); + } + }); + tag.getTag("command.creative").setDefaultValue("/gamemode {0} {1}"); API.addOption(new OptionTextField("command.creative")); tag.getTag("command.item").setDefaultValue("/give {0} {1} {2} {3} {4}"); @@ -379,6 +390,14 @@ public class NEIClientConfig world.saveNBT(); } + public static boolean isMouseScrollTransferEnabled() { + return !getBooleanSetting("inventory.disableMouseScrollTransfer"); + } + + public static boolean shouldInvertMouseScrollTransfer() { + return !getBooleanSetting("inventory.invertMouseScrollTransfer"); + } + public static boolean getMagnetMode() { return enabledActions.contains("magnet"); } diff --git a/src/codechicken/nei/NEIController.java b/src/codechicken/nei/NEIController.java index 9a35350a..9b1db0fa 100644 --- a/src/codechicken/nei/NEIController.java +++ b/src/codechicken/nei/NEIController.java @@ -224,12 +224,15 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu @Override public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { - if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui)) + if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui) || !NEIClientConfig.isMouseScrollTransferEnabled()) return false; Point mousePos = getMousePosition(); Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y); if (mouseover != null && mouseover.getHasStack()) { + if(NEIClientConfig.shouldInvertMouseScrollTransfer()) { + scrolled = -scrolled; + } if (scrolled > 0) fastTransferManager.transferItem(manager.window, mouseover.slotNumber); else