Fixed unbound keybinds all being triggered at once. Closes #157

gradle.properties

@@ -4,7 +4,7 @@ forge_version=47.1.43
 forge_version_range=[46,)
 loader_version_range=[46,)
 mod_id=minemenu
-mod_version=1.12.1
+mod_version=1.12.2
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false

src/main/java/dmillerw/menu/MineMenu.java

@@ -2,7 +2,6 @@
 
 import dmillerw.menu.data.json.MenuLoader;
 import dmillerw.menu.handler.ConfigHandler;
-import dmillerw.menu.helper.KeyReflectionHelper;
 import dmillerw.menu.network.PacketHandler;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -17,7 +16,7 @@
 import java.io.File;
 
 @Mod(value = MineMenu.MOD_ID)
-public class MineMenu /*implements ISelectiveResourceReloadListener*/ {
+public class MineMenu {
     public static final String MOD_ID = "minemenu";
     public static final String MOD_NAME = "MineMenu";
     public static File menuFolder = new File(FMLPaths.GAMEDIR.get().toFile(), MOD_ID);
@@ -36,8 +35,6 @@ private void setupCommon(FMLCommonSetupEvent event) {
     }
 
     private void setupMenuLoader(FMLClientSetupEvent event) {
-        KeyReflectionHelper.gatherFields();
-
         if (!menuFolder.exists()) {
             menuFolder.mkdir();
         }

src/main/java/dmillerw/menu/handler/KeyboardHandler.java

@@ -4,7 +4,6 @@
 import dmillerw.menu.MineMenu;
 import dmillerw.menu.data.menu.RadialMenu;
 import dmillerw.menu.gui.RadialMenuScreen;
-import dmillerw.menu.helper.KeyReflectionHelper;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.api.distmarker.Dist;
@@ -27,22 +26,19 @@ public class KeyboardHandler {
     private KeyboardHandler() {
     }
 
-    public void fireKey(KeyMapping key) {
-        FIRED_KEYS.add(key);
-        KeyMapping.set(key.getKey(), true);
-        KeyReflectionHelper.setPressTime(key, 1);
-
+    public void fireKey(KeyMapping keyMapping) {
+        FIRED_KEYS.add(keyMapping);
+        keyMapping.setDown(true);
         ignoreNextTick = true;
     }
 
-    public void toggleKey(KeyMapping key) {
-        if (!TOGGLED_KEYS.contains(key)) {
-            TOGGLED_KEYS.add(key);
-            KeyMapping.set(key.getKey(), true);
-            KeyReflectionHelper.setPressTime(key, 1);
+    public void toggleKey(KeyMapping keyMapping) {
+        if (!TOGGLED_KEYS.contains(keyMapping)) {
+            TOGGLED_KEYS.add(keyMapping);
+            keyMapping.setDown(true);
         } else {
-            TOGGLED_KEYS.remove(key);
-            KeyMapping.set(key.getKey(), false);
+            TOGGLED_KEYS.remove(keyMapping);
+            keyMapping.setDown(false);
         }
         ignoreNextTick = true;
     }
@@ -117,7 +113,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
         }
 
         for (KeyMapping keyBinding : TOGGLED_KEYS) {
-            KeyReflectionHelper.setPressTime(keyBinding, 1);
+            KeyMapping.click(keyBinding.getKey());
         }
     }
 }