From 996d9adb48faeb8b9362b352ac59c76bf7499c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Lindstr=C3=B6m?= Date: Fri, 4 Sep 2020 00:53:40 +0200 Subject: [PATCH] Add support for binding a key to toggle the Travellers Belt toolbar in inventories This adds support for swapping the toolbar in inventories. For now, no key is assigned by default, so one must be added from the NEI options for this to take effect. --- resources/assets/tinker/lang/en_US.lang | 2 + .../java/tconstruct/client/ArmorControls.java | 17 +++-- .../nei/BeltToggleFromGuiInputHandler.java | 67 +++++++++++++++++++ .../plugins/nei/NEITConstructConfig.java | 2 + 4 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 5b502a8d..de4cf2e9 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -16,6 +16,8 @@ crafters.Smeltery=Smeltery crafters.Frypan=Frying Pan inventory.knapsack=Knapsack +nei.options.keys.gui.tinkers_belt=Toggle Travellers Belt + ToolStation.Crafter.name=Tool Station ToolStation.Parts.name=Part Builder ToolStation.PatternChest.name=Pattern Chest diff --git a/src/main/java/tconstruct/client/ArmorControls.java b/src/main/java/tconstruct/client/ArmorControls.java index 9f6deb3c..e6e3488a 100644 --- a/src/main/java/tconstruct/client/ArmorControls.java +++ b/src/main/java/tconstruct/client/ArmorControls.java @@ -174,10 +174,7 @@ public class ArmorControls { } } if (key == ArmorControls.beltSwap) { - if (ArmorProxyClient.armorExtended.inventory[3] != null) { - PlayerAbilityHelper.swapBelt(mc.thePlayer, ArmorProxyClient.armorExtended); - toggleBelt(); - } + doBeltSwapIfPossible(); } if (key == ArmorControls.zoomKey) { zoom = !zoom; @@ -217,7 +214,17 @@ public class ArmorControls { updateServer(packet); } - private void toggleBelt() { + public static boolean doBeltSwapIfPossible() + { + if (ArmorProxyClient.armorExtended.inventory[3] != null) { + PlayerAbilityHelper.swapBelt(mc.thePlayer, ArmorProxyClient.armorExtended); + toggleBelt(); + return true; + } + return false; + } + + private static void toggleBelt() { AbstractPacket packet = new BeltPacket(); updateServer(packet); } diff --git a/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java b/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java new file mode 100644 index 00000000..c56d14d0 --- /dev/null +++ b/src/main/java/tconstruct/plugins/nei/BeltToggleFromGuiInputHandler.java @@ -0,0 +1,67 @@ +package tconstruct.plugins.nei; + +import codechicken.nei.NEIClientConfig; +import codechicken.nei.api.API; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.guihook.IContainerInputHandler; +import net.minecraft.client.gui.inventory.GuiContainer; +import tconstruct.client.ArmorControls; + +public class BeltToggleFromGuiInputHandler implements IContainerInputHandler { + + static final String KEY_IDENTIFIER = "gui.tinkers_belt"; + public static void init() { + API.addKeyBind(KEY_IDENTIFIER, 0); + GuiContainerManager.addInputHandler((IContainerInputHandler)new BeltToggleFromGuiInputHandler()); + } + + @Override + public boolean keyTyped(GuiContainer guiContainer, char c, int i) { + final int keyBinding = NEIClientConfig.getKeyBinding(KEY_IDENTIFIER); + if (i != keyBinding) { + return false; + } + + return ArmorControls.doBeltSwapIfPossible(); + } + + @Override + public void onKeyTyped(GuiContainer guiContainer, char c, int i) { + + } + + @Override + public boolean lastKeyTyped(GuiContainer guiContainer, char c, int i) { + return false; + } + + @Override + public boolean mouseClicked(GuiContainer guiContainer, int i, int i1, int i2) { + return false; + } + + @Override + public void onMouseClicked(GuiContainer guiContainer, int i, int i1, int i2) { + + } + + @Override + public void onMouseUp(GuiContainer guiContainer, int i, int i1, int i2) { + + } + + @Override + public boolean mouseScrolled(GuiContainer guiContainer, int i, int i1, int i2) { + return false; + } + + @Override + public void onMouseScrolled(GuiContainer guiContainer, int i, int i1, int i2) { + + } + + @Override + public void onMouseDragged(GuiContainer guiContainer, int i, int i1, int i2, long l) { + + } +} diff --git a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java index a9499af6..aeb89ac9 100644 --- a/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java +++ b/src/main/java/tconstruct/plugins/nei/NEITConstructConfig.java @@ -19,6 +19,8 @@ public class NEITConstructConfig implements IConfigureNEI registerHandler(new RecipeHandlerAlloying()); registerHandler(new RecipeHandlerCastingTable()); registerHandler(new RecipeHandlerCastingBasin()); + + BeltToggleFromGuiInputHandler.init(); } @Override