[1.6.4] Fix crash when trying to register more than one keybinding.

Legacy-Fabric · Jul 2, 2024 · 281301e · 281301e
1 parent c49e800
commit 281301e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 3 deletions.
diff --git a/....12.2/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java b/....12.2/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java
@@ -30,6 +30,7 @@ public class KeybindingTest implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
 		KeyBinding keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("api.keybinding.testTranslationKey", Keyboard.KEY_F, "key.categories.lftesting"));
+		KeyBinding keyBinding2 = KeyBindingHelper.registerKeyBinding(new KeyBinding("api.keybinding.testTranslationKey2", Keyboard.KEY_G, "key.categories.lftesting"));
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
 			if (keyBinding.wasPressed()) {
 				System.out.printf("The key %s was pressed%n", Keyboard.getKeyName(keyBinding.getCode()));

diff --git a/...1.6.4/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java b/...1.6.4/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java
@@ -30,6 +30,7 @@ public class KeybindingTest implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
 		KeyBinding keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("api.keybinding.testTranslationKey", Keyboard.KEY_F));
+		KeyBinding keyBinding2 = KeyBindingHelper.registerKeyBinding(new KeyBinding("api.keybinding.testTranslationKey2", Keyboard.KEY_G));
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
 			if (keyBinding.wasPressed()) {
 				System.out.printf("The key %s was pressed%n", Keyboard.getKeyName(keyBinding.code));

diff --git a/....7.10/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java b/....7.10/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java
@@ -30,6 +30,7 @@ public class KeybindingTest implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
 		KeyBinding keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("api.keybinding.testTranslationKey", Keyboard.KEY_F, "key.categories.lftesting"));
+		KeyBinding keyBinding2 = KeyBindingHelper.registerKeyBinding(new KeyBinding("api.keybinding.testTranslationKey2", Keyboard.KEY_G, "key.categories.lftesting"));
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
 			if (keyBinding.wasPressed()) {
 				System.out.printf("The key %s was pressed%n", Keyboard.getKeyName(keyBinding.getCode()));

diff --git a/...1.8.9/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java b/...1.8.9/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java
@@ -30,6 +30,7 @@ public class KeybindingTest implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
 		KeyBinding keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("api.keybinding.testTranslationKey", Keyboard.KEY_F, "key.categories.lftesting"));
+		KeyBinding keyBinding2 = KeyBindingHelper.registerKeyBinding(new KeyBinding("api.keybinding.testTranslationKey2", Keyboard.KEY_G, "key.categories.lftesting"));
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
 			if (keyBinding.wasPressed()) {
 				System.out.printf("The key %s was pressed%n", Keyboard.getKeyName(keyBinding.getCode()));

diff --git a/legacy-fabric-keybindings-api-v1/common/build.gradle b/legacy-fabric-keybindings-api-v1/common/build.gradle
@@ -0,0 +1,3 @@
+loom {
+	accessWidenerPath = file("src/main/resources/legacy-fabric-keybinding-api-v1-common.accesswidener")
+}
diff --git a/.../src/main/java/net/legacyfabric/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java b/.../src/main/java/net/legacyfabric/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java
@@ -35,9 +35,9 @@ private KeyBindingRegistryImpl() {
 	public static KeyBinding registerKeyBinding(KeyBinding binding) {
 		for (KeyBinding existingKeyBindings : moddedKeyBindings) {
 			if (existingKeyBindings == binding) {
-				throw new RuntimeException("Attempted to register same key binding twice " + binding.getTranslationKey() + "!");
-			} else if (existingKeyBindings.getTranslationKey().equals(binding.getTranslationKey())) {
-				throw new RuntimeException("Attempted to register two key bindings with equal ID: " + binding.getTranslationKey() + "!");
+				throw new RuntimeException("Attempted to register same key binding twice " + binding.translationKey + "!");
+			} else if (existingKeyBindings.translationKey.equals(binding.translationKey)) {
+				throw new RuntimeException("Attempted to register two key bindings with equal ID: " + binding.translationKey + "!");
 			}
 		}
 

diff --git a/legacy-fabric-keybindings-api-v1/common/src/main/resources/fabric.mod.json b/legacy-fabric-keybindings-api-v1/common/src/main/resources/fabric.mod.json
@@ -21,6 +21,7 @@
   "mixins": [
     "legacy-fabric-keybinding-api-v1-common.mixins.json"
   ],
+  "accessWidener": "legacy-fabric-keybinding-api-v1-common.accesswidener",
   "description": "Hooks that help adding keybindings",
   "custom": {
     "modmenu": {

diff --git a/...ngs-api-v1/common/src/main/resources/legacy-fabric-keybinding-api-v1-common.accesswidener b/...ngs-api-v1/common/src/main/resources/legacy-fabric-keybinding-api-v1-common.accesswidener
@@ -0,0 +1,3 @@
+accessWidener	v1	named
+
+accessible field net/minecraft/client/option/KeyBinding translationKey Ljava/lang/String;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		accessWidener v1 named

		accessible field net/minecraft/client/option/KeyBinding translationKey Ljava/lang/String;