Keybinding 1.16 compile fixes

Mysticpasta1 · Jun 12, 2020 · e16a977 · e16a977
1 parent 3fa9f7c
commit e16a977
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...g-api-v1/src/main/java/net/fabricmc/fabric/api/client/keybinding/v1/KeyBindingHelper.java b/...g-api-v1/src/main/java/net/fabricmc/fabric/api/client/keybinding/v1/KeyBindingHelper.java
@@ -52,7 +52,7 @@ public static KeyBinding registerKeyBinding(KeyBinding keyBinding) {
 	 * @param keyBinding the keybinding
 	 * @return configured KeyCode
 	 */
-	public static InputUtil.KeyCode getBoundKeyOf(KeyBinding keyBinding) {
-		return ((KeyCodeAccessor) keyBinding).getKeyCode();
+	public static InputUtil.Key getBoundKeyOf(KeyBinding keyBinding) {
+		return ((KeyCodeAccessor) keyBinding).getBoundKey();
 	}
 }
diff --git a/...i-v1/src/main/java/net/fabricmc/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java b/...i-v1/src/main/java/net/fabricmc/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java
@@ -61,8 +61,8 @@ public static KeyBinding registerKeyBinding(KeyBinding binding) {
 		for (KeyBinding existingKeyBindings : moddedKeyBindings) {
 			if (existingKeyBindings == binding) {
 				throw null;
-			} else if (existingKeyBindings.getId().equals(binding.getId())) {
-				throw new RuntimeException("Attempted to register two key bindings with equal ID: " + binding.getId() + "!");
+			} else if (existingKeyBindings.getTranslationKey().equals(binding.getTranslationKey())) {
+				throw new RuntimeException("Attempted to register two key bindings with equal ID: " + binding.getTranslationKey() + "!");
 			}
 		}
 

diff --git a/...g-api-v1/src/testmod/java/net/fabricmc/fabric/test/client/keybinding/KeyBindingsTest.java b/...g-api-v1/src/testmod/java/net/fabricmc/fabric/test/client/keybinding/KeyBindingsTest.java
@@ -36,15 +36,15 @@ public void onInitializeClient() {
 
 		ClientTickCallback.EVENT.register(client -> {
 			while (binding1.wasPressed()) {
-				client.player.sendMessage(new LiteralText("Key 1 was pressed!"));
+				client.player.sendMessage(new LiteralText("Key 1 was pressed!"), false);
 			}
 
 			while (binding2.wasPressed()) {
-				client.player.sendMessage(new LiteralText("Key 2 was pressed!"));
+				client.player.sendMessage(new LiteralText("Key 2 was pressed!"), false);
 			}
 
 			if (stickyBinding.isPressed()) {
-				client.player.sendMessage(new LiteralText("Sticky Key was pressed!"));
+				client.player.sendMessage(new LiteralText("Sticky Key was pressed!"), false);
 			}
 		});
 	}