Port fabric-key-mapping-api-v1

Author: Su5eD

fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/impl/client/keymapping/FabricKeyMappingImpl.java

@@ -0,0 +1,15 @@
+package net.fabricmc.fabric.impl.client.keymapping;
+
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
+
+import net.fabricmc.api.ClientModInitializer;
+
+public class FabricKeyMappingImpl implements ClientModInitializer {
+    @Override
+    public void onInitializeClient() {
+        IEventBus bus = ModLoadingContext.get().getActiveContainer().getEventBus();
+        bus.addListener(RegisterKeyMappingsEvent.class, KeyMappingRegistryImpl::process);
+    }
+}

fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/impl/client/keymapping/KeyMappingRegistryImpl.java

@@ -18,20 +18,20 @@
 
 import java.util.List;
 
-import com.google.common.collect.Lists;
 import it.unimi.dsi.fastutil.objects.ReferenceArrayList;
+import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 
 import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
 
 public final class KeyMappingRegistryImpl {
 	private static final List<KeyMapping> MODDED_KEY_BINDINGS = new ReferenceArrayList<>(); // ArrayList with identity based comparisons for contains/remove/indexOf etc., required for correctly handling duplicate keybinds
+	private static boolean processed;
 
 	private KeyMappingRegistryImpl() {
 	}
 
 	public static KeyMapping registerKeyMapping(KeyMapping binding) {
-		if (Minecraft.getInstance().options != null) {
+		if (processed) {
 			throw new IllegalStateException("GameOptions has already been initialised");
 		}
 
@@ -51,10 +51,8 @@ public static KeyMapping registerKeyMapping(KeyMapping binding) {
 	 * Processes the keymappings array for our modded ones by first removing existing modded keymappings and readding them,
 	 * we can make sure that there are no duplicates this way.
 	 */
-	public static KeyMapping[] process(KeyMapping[] keysAll) {
-		List<KeyMapping> newKeysAll = Lists.newArrayList(keysAll);
-		newKeysAll.removeAll(MODDED_KEY_BINDINGS);
-		newKeysAll.addAll(MODDED_KEY_BINDINGS);
-		return newKeysAll.toArray(new KeyMapping[0]);
+	public static void process(RegisterKeyMappingsEvent event) {
+		MODDED_KEY_BINDINGS.forEach(event::register);
+		processed = true;
 	}
 }

fabric-key-mapping-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/keymapping/OptionsMixin.java

@@ -3,7 +3,6 @@
   "package": "net.fabricmc.fabric.mixin.client.keymapping",
   "compatibilityLevel": "JAVA_25",
   "client": [
-    "OptionsMixin",
     "KeyMappingAccessor",
     "KeyMappingCategoryMixin"
   ],

fabric-key-mapping-api-v1/src/client/resources/fabric-key-mapping-api-v1.mixins.json

@@ -24,5 +24,10 @@
   ],
   "custom": {
     "fabric-api:module-lifecycle": "stable"
+  },
+  "entrypoints": {
+    "client": [
+      "net.fabricmc.fabric.impl.client.keymapping.FabricKeyMappingImpl"
+    ]
   }
 }

fabric-key-mapping-api-v1/src/client/resources/fabric.mod.json

@@ -54,7 +54,7 @@ include("fabric-debug-api-v1")
 include("fabric-game-rule-api-v1")
 include("fabric-gametest-api-v1")
 //include 'fabric-item-api-v1'
-//include 'fabric-key-mapping-api-v1'
+include("fabric-key-mapping-api-v1")
 include("fabric-lifecycle-events-v1")
 include("fabric-loot-api-v3")
 //include 'fabric-menu-api-v1'