From 30ffb79a12903b15cda80f14520631d8ba4f0de7 Mon Sep 17 00:00:00 2001
From: Wyvest <45589059+Wyvest@users.noreply.github.com>
Date: Sun, 12 Jun 2022 18:22:03 +0700
Subject: migrate keybinds to oneconfig events

---
 .../oneconfig/internal/config/core/ConfigCore.java        |  2 +-
 .../oneconfig/internal/config/core/KeyBindHandler.java    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/main/java/cc/polyfrost/oneconfig/internal/config')

diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/config/core/ConfigCore.java b/src/main/java/cc/polyfrost/oneconfig/internal/config/core/ConfigCore.java
index 5a9dd0b..a1084a1 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/config/core/ConfigCore.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/config/core/ConfigCore.java
@@ -18,7 +18,7 @@ public class ConfigCore {
         ArrayList<Mod> data = new ArrayList<>(oneConfigMods);
         oneConfigMods.clear();
         HudCore.huds.clear();
-        KeyBindHandler.clearKeyBinds();
+        KeyBindHandler.INSTANCE.clearKeyBinds();
         for (Mod modData : data) {
             modData.config.init(modData);
         }
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/config/core/KeyBindHandler.java b/src/main/java/cc/polyfrost/oneconfig/internal/config/core/KeyBindHandler.java
index da82951..6829ae4 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/config/core/KeyBindHandler.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/config/core/KeyBindHandler.java
@@ -1,27 +1,28 @@
 package cc.polyfrost.oneconfig.internal.config.core;
 
 import cc.polyfrost.oneconfig.config.core.OneKeyBind;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.InputEvent;
+import cc.polyfrost.oneconfig.events.event.KeyInputEvent;
+import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
 
 import java.util.ArrayList;
 
 public class KeyBindHandler {
-    private static final ArrayList<OneKeyBind> keyBinds = new ArrayList<>();
+    public static final KeyBindHandler INSTANCE = new KeyBindHandler();
+    private final ArrayList<OneKeyBind> keyBinds = new ArrayList<>();
 
-    @SubscribeEvent
-    public void onKeyPressed(InputEvent.KeyInputEvent event) {
+    @Subscribe
+    private void onKeyPressed(KeyInputEvent event) {
         for (OneKeyBind keyBind : keyBinds) {
             if (keyBind.isActive()) keyBind.run();
         }
     }
 
-    public static void addKeyBind(OneKeyBind keyBind) {
+    public void addKeyBind(OneKeyBind keyBind) {
         if (keyBind == null) return;
         keyBinds.add(keyBind);
     }
 
-    public static void clearKeyBinds() {
+    public void clearKeyBinds() {
         keyBinds.clear();
     }
 }
-- 
cgit