Merge pull request #4 from GTNewHorizons/keybind

unbind keybind and change keybind handler
GTNewHorizons · Feb 5, 2023 · 8bbc91c · 8bbc91c
2 parents 3e8df70 + 877f569
commit 8bbc91c
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/main/java/baubles/common/event/KeyHandler.java b/src/main/java/baubles/common/event/KeyHandler.java
@@ -7,19 +7,17 @@
 
 import baubles.common.network.PacketHandler;
 import baubles.common.network.PacketOpenBaublesInventory;
-import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.Phase;
-import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent;
+import cpw.mods.fml.common.gameevent.InputEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class KeyHandler {
 
     public KeyBinding key = new KeyBinding(
             StatCollector.translateToLocal("keybind.baublesinventory"),
-            Keyboard.KEY_B,
+            Keyboard.KEY_NONE,
             "key.categories.inventory");
 
     public KeyHandler() {
@@ -28,12 +26,9 @@ public KeyHandler() {
 
     @SideOnly(value = Side.CLIENT)
     @SubscribeEvent
-    public void playerTick(PlayerTickEvent event) {
-        if (event.side == Side.SERVER) return;
-        if (event.phase == Phase.START) {
-            if (key.getIsKeyPressed() && FMLClientHandler.instance().getClient().inGameHasFocus) {
-                PacketHandler.INSTANCE.sendToServer(new PacketOpenBaublesInventory(event.player));
-            }
+    public void onKeyPressed(InputEvent.KeyInputEvent event) {
+        if (key.isPressed()) {
+            PacketHandler.INSTANCE.sendToServer(new PacketOpenBaublesInventory());
         }
     }
 }