Fix Fabric not loading properly + semi-fix keybinds not working

Polyfrost · Jan 27, 2025 · 34df51f · 34df51f
1 parent 0890614
commit 34df51f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/modules/ui/src/main/kotlin/org/polyfrost/oneconfig/api/ui/v1/keybind/KeybindManager.kt b/modules/ui/src/main/kotlin/org/polyfrost/oneconfig/api/ui/v1/keybind/KeybindManager.kt
@@ -61,7 +61,7 @@ object KeybindManager {
         }.register()
         eventHandler { (screen): ScreenOpenEvent ->
             if (screen == null) keyBinder.release()
-        }
+        }.register()
 
         val m = Int2IntMap(8)
         m[UKeyboard.KEY_LSHIFT] = KeyModifiers.LSHIFT.value.toInt()

diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java b/versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java
@@ -74,20 +74,22 @@ public List<String> getMixins() {
             }
         } else {
             // fabric specific
+            mixins.add("Mixin_ModernEntrypoint");
             mixins.add("fabric.Mixin_LoadShaderInvoker");
             mixins.add("fabric.Mixin_ChatReceiveEvent_Fabric");
-            if (version < 11300) {
+            if (version <= 11300) {
                 // legacy fabric
                 mixins.add("commands.Mixin_IncludeCommandSuggestions");
+                mixins.add("Mixin_ExecuteCommandsFromScreen");
             }
+
             if (version > 12000) {
                 mixins.add("hypixel.Mixin_CaptureHypixelPayloads");
             }
         }
 
         // Inter-loader mixins
         if (version >= 11600) {
-            mixins.add("Mixin_ModernEntrypoint");
             mixins.add("commands.Mixin_AppendCustomCommands");
 
             if (version < 11900) {

diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_ModernEntrypoint.java b/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_ModernEntrypoint.java
@@ -1,15 +1,15 @@
 package org.polyfrost.oneconfig.internal.mixin;
 
-//#if MC >= 1.16.5
-//$$ import net.minecraft.client.Minecraft;
+//#if FABRIC
+//$$ import net.minecraft.client.MinecraftClient;
 //$$ import org.polyfrost.oneconfig.internal.OneConfig;
 //$$ import org.spongepowered.asm.mixin.Mixin;
 //$$ import org.spongepowered.asm.mixin.Unique;
 //$$ import org.spongepowered.asm.mixin.injection.At;
 //$$ import org.spongepowered.asm.mixin.injection.Inject;
 //$$ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 //$$
-//$$ @Mixin(Minecraft.class)
+//$$ @Mixin(MinecraftClient.class)
 //$$ public class Mixin_ModernEntrypoint {
 //$$
 //$$     @Unique