Use Forge API to catch keybindings

Asek3 · Sep 5, 2023 · 4524b21 · 4524b21
1 parent a96e7a1
commit 4524b21
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 34 deletions.
diff --git a/src/main/java/net/coderbot/iris/Iris.java b/src/main/java/net/coderbot/iris/Iris.java
@@ -18,6 +18,8 @@
 import java.util.zip.ZipError;
 import java.util.zip.ZipException;
 
+import net.minecraftforge.client.event.InputEvent;
+import net.minecraftforge.common.MinecraftForge;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
@@ -98,6 +100,8 @@ public class Iris {
 	public Iris() {
 		try {
 			FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInitializeClient);
+
+			MinecraftForge.EVENT_BUS.addListener(this::onKeyInput);
 		}catch(Exception ignored) {}
 	}
 
@@ -143,6 +147,10 @@ public void onInitializeClient(final FMLClientSetupEvent event) {
 		ClientRegistry.registerKeyBinding(shaderpackScreenKeybind);
 	}
 
+	public void onKeyInput(InputEvent.KeyInputEvent event) {
+		handleKeybinds(Minecraft.getInstance());
+	}
+
 	/**
 	 * Called once RenderSystem#initRenderer has completed. This means that we can safely access OpenGL.
 	 */

diff --git a/src/main/java/net/coderbot/iris/mixin/MixinMinecraft_Keybinds.java b/src/main/java/net/coderbot/iris/mixin/MixinMinecraft_Keybinds.java
diff --git a/src/main/resources/mixins.oculus.json b/src/main/resources/mixins.oculus.json
@@ -28,7 +28,6 @@
     "MixinItemBlockRenderTypes",
     "MixinItemInHandRenderer",
     "MixinLevelRenderer",
-    "MixinMinecraft_Keybinds",
     "MixinMinecraft_Images",
     "MixinMinecraft_PipelineManagement",
     "MixinModelViewBobbing",