Fix allkeys mixin

Author: IThundxr

changelog.md

@@ -1,12 +1,8 @@
 ------------------------------------------------------
-Steam 'n' Rails 1.6.4
+Steam 'n' Rails 1.6.3
 ------------------------------------------------------
-Additions
-
 Fixes
-
-Removals
-
+- Crash on forge due to keybinds mixin
 ------------------------------------------------------
 Steam 'n' Rails 1.6.2
 ------------------------------------------------------

common/src/main/resources/railways-common.mixins.json

@@ -30,7 +30,6 @@
     "MixinAbstractContainerMenu",
     "MixinAbstractMinecart",
     "MixinAbstractMinecart_Type",
-    "MixinAllKeys",
     "MixinBezierConnection",
     "MixinBlazeBurnerInteractionBehaviour",
     "MixinBlockBehaviour",

common/src/main/java/com/railwayteam/railways/mixin/MixinAllKeys.java fabric/src/main/java/com/railwayteam/railways/fabric/mixin/AllKeysMixin.java

@@ -1,4 +1,4 @@
-package com.railwayteam.railways.mixin;
+package com.railwayteam.railways.fabric.mixin;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import com.railwayteam.railways.registry.CRKeys;
@@ -9,7 +9,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(AllKeys.class)
-public class MixinAllKeys {
+public class AllKeysMixin {
     @Inject(method = "register", at = @At(value = "INVOKE", target = "Lnet/fabricmc/fabric/api/client/keybinding/v1/KeyBindingHelper;registerKeyBinding(Lnet/minecraft/client/KeyMapping;)Lnet/minecraft/client/KeyMapping;"))
     private static void railways$addCreateKeysToNonConflictSet(CallbackInfo ci, @Local AllKeys key) {
         CRKeys.NON_CONFLICTING_KEYMAPPINGS.add(key.getKeybind());

fabric/src/main/resources/railways.mixins.json

@@ -13,6 +13,7 @@
     "client.TrainHUDMixin"
   ],
   "mixins": [
+    "AllKeysMixin",
     "ContainerLevelAccessMixin",
     "DetectorRailBlockMixin",
     "EnderManMixin",

forge/src/main/java/com/railwayteam/railways/forge/mixin/AllKeysMixin.java

@@ -0,0 +1,18 @@
+package com.railwayteam.railways.forge.mixin;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import com.railwayteam.railways.registry.CRKeys;
+import com.simibubi.create.AllKeys;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(AllKeys.class)
+public class AllKeysMixin {
+    @Inject(method = "register", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/event/RegisterKeyMappingsEvent;register(Lnet/minecraft/client/KeyMapping;)V"))
+    private static void railways$addCreateKeysToNonConflictSet(CallbackInfo ci, @Local AllKeys key) {
+        CRKeys.NON_CONFLICTING_KEYMAPPINGS.add(key.getKeybind());
+    }
+}
+

forge/src/main/resources/railways.mixins.json

@@ -11,11 +11,12 @@
     "client.TrainHUDMixin"
   ],
   "mixins": [
-    "MixinLootDataManager",
+    "AllKeysMixin",
     "ChunkMapAccessor",
     "ChunkMapAccessor$TrackedEntityAccessor",
     "ContainerLevelAccessMixin",
     "FluidNetworkMixin",
+    "MixinLootDataManager",
     "MountedFluidStorageMixin",
     "MountedStorageManagerMixin",
     "RollingModeMixin",

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx3G
 
 # Mod Info
 archives_base_name = Steam_Rails
-mod_version = 1.6.4
+mod_version = 1.6.3
 maven_group = com.railwayteam.railways
 
 minecraft_version = 1.20.1