From ad6e7f3f3a6c8dc1c4ce09b09e71ee0de8209251 Mon Sep 17 00:00:00 2001 From: pahimar Date: Thu, 2 Jan 2014 21:33:04 -0500 Subject: [PATCH] Keybinding optimization --- .../ee3/client/handler/ItemTooltipEventHandler.java | 2 +- .../pahimar/ee3/configuration/ConfigurationSettings.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java index c0fc5160..064b61fd 100644 --- a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java @@ -27,7 +27,7 @@ public class ItemTooltipEventHandler @ForgeSubscribe public void handleItemTooltipEvent(ItemTooltipEvent event) { - if (Keyboard.isKeyDown(29)) + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { WrappedStack stack = new WrappedStack(event.itemStack); diff --git a/src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java b/src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java index 8615ab70..c33f8664 100644 --- a/src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java +++ b/src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java @@ -1,6 +1,7 @@ package com.pahimar.ee3.configuration; import com.pahimar.ee3.lib.Strings; +import org.lwjgl.input.Keyboard; /** * Equivalent-Exchange-3 @@ -81,19 +82,19 @@ public class ConfigurationSettings */ // Extra key public static final String KEYBINDING_EXTRA = "key.extra"; - public static final int KEYBINDING_EXTRA_DEFAULT = 46; + public static final int KEYBINDING_EXTRA_DEFAULT = Keyboard.KEY_C; // Release key public static final String KEYBINDING_RELEASE = "key.release"; - public static final int KEYBINDING_RELEASE_DEFAULT = 19; + public static final int KEYBINDING_RELEASE_DEFAULT = Keyboard.KEY_R; // Toggle key public static final String KEYBINDING_TOGGLE = "key.toggle"; - public static final int KEYBINDING_TOGGLE_DEFAULT = 34; + public static final int KEYBINDING_TOGGLE_DEFAULT = Keyboard.KEY_G; // Charge key public static final String KEYBINDING_CHARGE = "key.charge"; - public static final int KEYBINDING_CHARGE_DEFAULT = 47; + public static final int KEYBINDING_CHARGE_DEFAULT = Keyboard.KEY_V; /* * Transmutation related config settings