Merge branch 'refs/heads/1.21' into 1.20.6

# Conflicts: # gradle.properties
najoan125 · Sep 28, 2024 · e34acb0 · e34acb0
2 parents 32e3b46 + a0b556f
commit e34acb0
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 106 deletions.
diff --git a/common/src/main/java/com/hyfata/najoan/koreanpatch/client/KeyBinds.java b/common/src/main/java/com/hyfata/najoan/koreanpatch/client/KeyBinds.java
@@ -1,13 +1,14 @@
 package com.hyfata.najoan.koreanpatch.client;
 
-import com.hyfata.najoan.koreanpatch.util.minecraft.KeyMappingUtil;
 import com.mojang.blaze3d.platform.InputConstants;
 import com.sun.jna.Platform;
 import net.minecraft.client.KeyMapping;
 import org.lwjgl.glfw.GLFW;
 
+import java.util.ArrayList;
+
 public class KeyBinds {
-    private static KeyMapping langBinding, imeBinding;
+    private static final ArrayList<KeyMapping> keyMappings = new ArrayList<>();
 
     public static void register() {
         int keycode;
@@ -17,26 +18,32 @@ public static void register() {
             keycode = GLFW.GLFW_KEY_LEFT_CONTROL;
         }
 
-        langBinding = KeyMappingUtil.registerKeyMapping(new KeyMapping(
+        // 0: lang binding
+        keyMappings.add(new KeyMapping(
                 "key.koreanpatch.toggle_langtype",
                 InputConstants.Type.KEYSYM,
                 keycode,
                 "key.categories.koreanpatch"
         ));
 
-        imeBinding = KeyMappingUtil.registerKeyMapping(new KeyMapping(
+        // 1: ime binding
+        keyMappings.add(new KeyMapping(
                 "key.koreanpatch.toggle_ime",
                 InputConstants.Type.KEYSYM,
                 GLFW.GLFW_KEY_I,
                 "key.categories.koreanpatch"
         ));
     }
 
+    public static ArrayList<KeyMapping> getKeyMappings() {
+        return keyMappings;
+    }
+
     public static KeyMapping getLangBinding() {
-        return langBinding;
+        return keyMappings.getFirst();
     }
 
     public static KeyMapping getImeBinding() {
-        return imeBinding;
+        return keyMappings.get(1);
     }
 }
diff --git a/common/src/main/java/com/hyfata/najoan/koreanpatch/mixin/OptionsMixin.java b/common/src/main/java/com/hyfata/najoan/koreanpatch/mixin/OptionsMixin.java
diff --git a/common/src/main/java/com/hyfata/najoan/koreanpatch/mixin/accessor/KeyMappingAccessor.java b/common/src/main/java/com/hyfata/najoan/koreanpatch/mixin/accessor/KeyMappingAccessor.java
diff --git a/common/src/main/java/com/hyfata/najoan/koreanpatch/mixin/accessor/OptionsAccessor.java b/common/src/main/java/com/hyfata/najoan/koreanpatch/mixin/accessor/OptionsAccessor.java
diff --git a/common/src/main/java/com/hyfata/najoan/koreanpatch/util/minecraft/KeyMappingUtil.java b/common/src/main/java/com/hyfata/najoan/koreanpatch/util/minecraft/KeyMappingUtil.java
diff --git a/common/src/main/resources/koreanpatch.mixins.json b/common/src/main/resources/koreanpatch.mixins.json
@@ -8,15 +8,12 @@
   "client": [
     "EditBoxMixin",
     "KeyboardHandlerMixin",
-    "OptionsMixin",
     "TextFieldHelperMixin",
     "accessor.BookEditScreenDisplayCacheAccessor",
     "accessor.CommandSuggestionsAccessor",
     "accessor.CreateWorldScreenGameTabAccessor",
     "accessor.CreativeModeInventoryScreenInvoker",
     "accessor.EditBoxAccessor",
-    "accessor.KeyMappingAccessor",
-    "accessor.OptionsAccessor",
     "accessor.TabNavigationBarInvoker",
     "indicator.AnvilScreenMixin",
     "indicator.BookEditScreenMixin",

diff --git a/fabric/src/main/java/com/hyfata/najoan/koreanpatch/client/KoreanPatchFabric.java b/fabric/src/main/java/com/hyfata/najoan/koreanpatch/client/KoreanPatchFabric.java
@@ -3,13 +3,16 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.minecraft.client.KeyMapping;
 
 public class KoreanPatchFabric implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
         KoreanPatchClient.init();
+        registerKeys();
         registerEvents();
     }
 
@@ -18,4 +21,10 @@ public void registerEvents() {
         ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> EventListener.afterScreenChange());
         ClientTickEvents.END_CLIENT_TICK.register(client -> EventListener.onClientTick());
     }
+
+    public void registerKeys() {
+        for (KeyMapping key : KeyBinds.getKeyMappings()) {
+            KeyBindingHelper.registerKeyBinding(key);
+        }
+    }
 }
diff --git a/forge/src/main/java/com/hyfata/najoan/koreanpatch/client/KoreanPatchForge.java b/forge/src/main/java/com/hyfata/najoan/koreanpatch/client/KoreanPatchForge.java
@@ -1,5 +1,6 @@
 package com.hyfata.najoan.koreanpatch.client;
 
+import net.minecraft.client.KeyMapping;
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
@@ -39,8 +40,9 @@ public static void registerEvents(IEventBus bus) {
 
     @SubscribeEvent
     public void registerKeys(RegisterKeyMappingsEvent event) {
-        event.register(KeyBinds.getImeBinding());
-        event.register(KeyBinds.getLangBinding());
+        for (KeyMapping key : KeyBinds.getKeyMappings()) {
+            event.register(key);
+        }
 	}
 
     @SubscribeEvent

diff --git a/neoforge/src/main/java/com/hyfata/najoan/koreanpatch/client/KoreanPatchNeoForge.java b/neoforge/src/main/java/com/hyfata/najoan/koreanpatch/client/KoreanPatchNeoForge.java
@@ -1,5 +1,6 @@
 package com.hyfata.najoan.koreanpatch.client;
 
+import net.minecraft.client.KeyMapping;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
@@ -29,8 +30,9 @@ public void registerEvents(IEventBus bus) {
 
     @SubscribeEvent
     public void registerKeys(RegisterKeyMappingsEvent event) {
-        event.register(KeyBinds.getImeBinding());
-        event.register(KeyBinds.getLangBinding());
+        for (KeyMapping key : KeyBinds.getKeyMappings()) {
+            event.register(key);
+        }
 	}
 
     @SubscribeEvent