From f19cdb58c6568bd2de04a68e1937a3268c1cbbbb Mon Sep 17 00:00:00 2001 From: Wilhelm Schuster Date: Fri, 22 Nov 2024 09:31:19 +0100 Subject: [PATCH] Extract toggle magnet keybind handling into method and add support for mouse buttons --- .../client/keybinding/KeyInputHandler.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java index 012835f4..e7c24977 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java @@ -49,11 +49,7 @@ public class KeyInputHandler { } else if (KeyBindings.toggleFlight.isPressed() && player != null) { handleToggleFlightKey(player); } else if (KeyBindings.toggleMagnet.isPressed()) { - Optional magnetOptional = InventoryUtils.getItemInAnyPlayerInventory(player, Magnet.class); - - if (magnetOptional.isPresent()) { - DraconicEvolution.network.sendToServer(new MagnetTogglePacket()); - } + handleToggleMagnetKey(player); } } @@ -70,6 +66,8 @@ public class KeyInputHandler { handleToolProfileChangeKey(player); } else if (KeyBindings.toggleFlight.isPressed() && player != null) { handleToggleFlightKey(player); + } else if (KeyBindings.toggleMagnet.isPressed()) { + handleToggleMagnetKey(player); } if (player != null) { @@ -133,6 +131,14 @@ public class KeyInputHandler { } } + private void handleToggleMagnetKey(EntityClientPlayerMP player) { + Optional magnetOptional = InventoryUtils.getItemInAnyPlayerInventory(player, Magnet.class); + + if (magnetOptional.isPresent()) { + DraconicEvolution.network.sendToServer(new MagnetTogglePacket()); + } + } + private int previouseSlot(int i, int c) { if (c > 0 && c < 8) return c + i; if (c == 0 && i < 0) return 8;