From 730711c6e23b92f9332be1ce6e643cc0585a4483 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Tue, 21 Jul 2020 02:35:29 +0800
Subject: [PATCH] Fix getBoundKey() recursion (#896)
* Fix getBoundKey() recursion
Signed-off-by: shedaniel <daniel@shedaniel.me>
* Change to underscore
Signed-off-by: shedaniel <daniel@shedaniel.me>
---
fabric-key-binding-api-v1/build.gradle | 2 +-
.../fabric/api/client/keybinding/v1/KeyBindingHelper.java | 2 +-
.../fabric/mixin/client/keybinding/KeyCodeAccessor.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fabric-key-binding-api-v1/build.gradle b/fabric-key-binding-api-v1/build.gradle
index 9ae9bb153..33f229170 100644
--- a/fabric-key-binding-api-v1/build.gradle
+++ b/fabric-key-binding-api-v1/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-key-binding-api-v1"
-version = getSubprojectVersion(project, "1.0.0")
+version = getSubprojectVersion(project, "1.0.1")
dependencies {
testmodCompile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-key-binding-api-v1/src/main/java/net/fabricmc/fabric/api/client/keybinding/v1/KeyBindingHelper.java b/fabric-key-binding-api-v1/src/main/java/net/fabricmc/fabric/api/client/keybinding/v1/KeyBindingHelper.java
index f3f3917b8..fc0d69e67 100644
--- a/fabric-key-binding-api-v1/src/main/java/net/fabricmc/fabric/api/client/keybinding/v1/KeyBindingHelper.java
+++ b/fabric-key-binding-api-v1/src/main/java/net/fabricmc/fabric/api/client/keybinding/v1/KeyBindingHelper.java
@@ -53,6 +53,6 @@ public final class KeyBindingHelper {
* @return configured KeyCode
*/
public static InputUtil.Key getBoundKeyOf(KeyBinding keyBinding) {
- return ((KeyCodeAccessor) keyBinding).getBoundKey();
+ return ((KeyCodeAccessor) keyBinding).fabric_getBoundKey();
}
}
diff --git a/fabric-key-binding-api-v1/src/main/java/net/fabricmc/fabric/mixin/client/keybinding/KeyCodeAccessor.java b/fabric-key-binding-api-v1/src/main/java/net/fabricmc/fabric/mixin/client/keybinding/KeyCodeAccessor.java
index 37c9740d3..591534632 100644
--- a/fabric-key-binding-api-v1/src/main/java/net/fabricmc/fabric/mixin/client/keybinding/KeyCodeAccessor.java
+++ b/fabric-key-binding-api-v1/src/main/java/net/fabricmc/fabric/mixin/client/keybinding/KeyCodeAccessor.java
@@ -24,6 +24,6 @@ import net.minecraft.client.util.InputUtil;
@Mixin(KeyBinding.class)
public interface KeyCodeAccessor {
- @Accessor
- InputUtil.Key getBoundKey();
+ @Accessor("boundKey")
+ InputUtil.Key fabric_getBoundKey();
}