chore: proper keybind handling and better input blocking system

src/main/java/dev/cigarette/Cigarette.java

@@ -7,6 +7,7 @@
 import dev.cigarette.config.Config;
 import dev.cigarette.config.FileSystem;
 import dev.cigarette.events.Events;
+import dev.cigarette.gui.CigaretteScreen;
 import dev.cigarette.gui.hud.notification.NotificationDisplay;
 import dev.cigarette.lib.ChatLogger;
 import net.fabricmc.api.ModInitializer;
@@ -37,6 +38,7 @@ public class Cigarette implements ModInitializer {
     public static final Identifier LOGO_IDENTIFIER = Identifier.of("cigarette", "icon.png");
     public static final boolean IN_DEV_ENVIRONMENT = FabricLoader.getInstance().isDevelopmentEnvironment();
     public static Config CONFIG = Config.construct();
+    public static CigaretteScreen SCREEN = new CigaretteScreen();
     public static BedwarsAgent BEDWARS_AGENT = new BedwarsAgent(DevWidget.bedwarsAgent);
     public static MurderMysteryAgent MURDER_MYSTERY_AGENT = new MurderMysteryAgent(DevWidget.murderMysteryAgent);
     public static ZombiesAgent ZOMBIES_AGENT = new ZombiesAgent(DevWidget.zombiesAgent);

src/main/java/dev/cigarette/gui/CigaretteScreen.java

@@ -90,7 +90,7 @@ public class CigaretteScreen extends Screen {
      */
     public static @Nullable KeybindWidget bindingKey = null;
 
-    protected CigaretteScreen() {
+    public CigaretteScreen() {
         super(Text.literal("Cigarette Client"));
     }
 

src/main/java/dev/cigarette/gui/widget/KeybindWidget.java

@@ -2,32 +2,25 @@
 
 import dev.cigarette.Cigarette;
 import dev.cigarette.gui.CigaretteScreen;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import dev.cigarette.helper.KeybindHelper;
+import dev.cigarette.helper.keybind.VirtualKeybind;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.Objects;
-import java.util.UUID;
 import java.util.function.Consumer;
 
 /**
  * A widget that lets the user bind a key.
  */
 public class KeybindWidget extends BaseWidget<Integer> {
-    /**
-     * The internal Minecraft KeyBinding.
-     */
-    private final KeyBinding keyBinding;
-    /**
-     * The KeyBindings actual key for rendering and configuration.
-     */
-    private InputUtil.Key utilKey;
+    private final VirtualKeybind keyBinding = new VirtualKeybind(GLFW.GLFW_KEY_UNKNOWN);
+    private InputUtil.Key utilKey = InputUtil.UNKNOWN_KEY;
 
     /**
      * Creates a widget that stores a keybind and allows it to be configured.
@@ -37,9 +30,7 @@ public class KeybindWidget extends BaseWidget<Integer> {
      */
     public KeybindWidget(String message, @Nullable String tooltip) {
         super(message, tooltip);
-        this.utilKey = InputUtil.UNKNOWN_KEY;
-        this.keyBinding = new KeyBinding(UUID.randomUUID().toString(), GLFW.GLFW_KEY_UNKNOWN, "cigarette.null");
-        KeyBindingHelper.registerKeyBinding(this.keyBinding);
+        KeybindHelper.registerVirtualKey(this.keyBinding);
     }
 
     /**
@@ -50,26 +41,19 @@ public KeybindWidget(String message, @Nullable String tooltip) {
      */
     public KeybindWidget withDefaultKey(int key) {
         utilKey = InputUtil.fromKeyCode(key, 0);
-        keyBinding.setBoundKey(utilKey);
+        keyBinding.setDefaultKey(key);
+        keyBinding.setKey(key);
         super.withDefault(key);
         return this;
     }
 
-    /**
-     * Update the stored key of this widget from an input event.
-     *
-     * @param key The new key to set to this widget
-     */
-    public void setBoundKey(@Nullable InputUtil.Key key) {
-        utilKey = key == null ? InputUtil.UNKNOWN_KEY : key;
-        keyBinding.setBoundKey(utilKey);
-        this.setRawState(utilKey.getCode());
+    public void setBoundKey(int key) {
+        utilKey = key == GLFW.GLFW_KEY_UNKNOWN ? InputUtil.UNKNOWN_KEY : InputUtil.fromKeyCode(key, 0);
+        keyBinding.setKey(key);
+        this.setRawState(key);
     }
 
-    /**
-     * {@return the internal Minecraft KeyBinding}
-     */
-    public KeyBinding getKeybind() {
+    public VirtualKeybind getKeybind() {
         return this.keyBinding;
     }
 
@@ -143,12 +127,9 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
     public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
         if (!isBinding()) return false;
         if (keyCode == GLFW.GLFW_KEY_ESCAPE || keyCode == GLFW.GLFW_KEY_RIGHT_SHIFT) {
-            this.setBoundKey(null);
+            this.setBoundKey(GLFW.GLFW_KEY_UNKNOWN);
         } else {
-            InputUtil.Key key = InputUtil.fromKeyCode(keyCode, scanCode);
-            String keyName = key.getLocalizedText().getLiteralString();
-            if (keyName == null) return true;
-            this.setBoundKey(key);
+            this.setBoundKey(keyCode);
         }
         clearBinding();
         return true;

src/main/java/dev/cigarette/gui/widget/ToggleKeybindWidget.java

@@ -2,7 +2,6 @@
 
 import dev.cigarette.module.BaseModule;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.option.KeyBinding;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
@@ -44,13 +43,6 @@ public ToggleKeybindWidget withDefaultKey(int keyCode) {
         return this;
     }
 
-    /**
-     * {@return the internal Minecraft KeyBinding}
-     */
-    public KeyBinding getKeybind() {
-        return this.widget.getKeybind();
-    }
-
     /**
      * Generator for modules using this as a top-level widget.
      *