From 739950e98ea28bca585d0fb741864c6610c311d1 Mon Sep 17 00:00:00 2001 From: KrLite <68179735+KrLite@users.noreply.github.com> Date: Sat, 13 Jan 2024 12:12:26 +0800 Subject: [PATCH] yep --- src/main/java/net/krlite/taptab/TapTab.java | 10 ++++++++-- .../net/krlite/taptab/mixin/KeyBindingEntryMixin.java | 5 +++-- src/main/resources/assets/taptab/lang/en_us.json | 7 +++++-- src/main/resources/assets/taptab/lang/zh_cn.json | 7 +++++-- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/krlite/taptab/TapTab.java b/src/main/java/net/krlite/taptab/TapTab.java index 83fdfdc..d18b53c 100644 --- a/src/main/java/net/krlite/taptab/TapTab.java +++ b/src/main/java/net/krlite/taptab/TapTab.java @@ -26,14 +26,20 @@ public class TapTab implements ModInitializer { InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_UNKNOWN, "key." + ID + ".category", - () -> Tooltip.of(Text.of("test")) + () -> Tooltip.of(Text.translatable( + "key." + ID + ".unbound.tooltip", + Text.translatable(MinecraftClient.getInstance().options.playerListKey.getTranslationKey()) + )) )); public static final KeyBinding REVERSE_MODIFIER = KeyBindingHelper.registerKeyBinding(new TooltipKeyBinding( "key." + ID + ".reverse_modifier", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_UNKNOWN, "key." + ID + ".category", - () -> Tooltip.of(Text.of("test")) + () -> Tooltip.of(Text.translatable( + "key." + ID + ".unbound.tooltip", + Text.translatable(MinecraftClient.getInstance().options.sneakKey.getTranslationKey()) + )) )); public static final KeyBinding SLOT_MODIFIER = KeyBindingHelper.registerKeyBinding(new KeyBinding( "key." + ID + ".slot_modifier", diff --git a/src/main/java/net/krlite/taptab/mixin/KeyBindingEntryMixin.java b/src/main/java/net/krlite/taptab/mixin/KeyBindingEntryMixin.java index 4f451a3..c8e8f5f 100644 --- a/src/main/java/net/krlite/taptab/mixin/KeyBindingEntryMixin.java +++ b/src/main/java/net/krlite/taptab/mixin/KeyBindingEntryMixin.java @@ -19,11 +19,12 @@ public class KeyBindingEntryMixin { method = "update", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/gui/widget/ButtonWidget;setTooltip(Lnet/minecraft/client/gui/tooltip/Tooltip;)V" + target = "Lnet/minecraft/client/gui/widget/ButtonWidget;setTooltip(Lnet/minecraft/client/gui/tooltip/Tooltip;)V", + ordinal = 1 ) ) private void appendTooltip(ButtonWidget buttonWidget, Tooltip tooltip) { - if (binding instanceof TooltipKeyBinding tooltipKeyBinding && tooltip == null) { + if (binding instanceof TooltipKeyBinding tooltipKeyBinding) { buttonWidget.setTooltip(tooltipKeyBinding.tooltipSupplier().get()); } } diff --git a/src/main/resources/assets/taptab/lang/en_us.json b/src/main/resources/assets/taptab/lang/en_us.json index 2ffb427..1561a00 100644 --- a/src/main/resources/assets/taptab/lang/en_us.json +++ b/src/main/resources/assets/taptab/lang/en_us.json @@ -1,6 +1,9 @@ { "key.taptab.category" : "Tap Tab", + "key.taptab.cycle" : "Cycle Hotbar to the Above Line", - "key.taptab.reverse_modifier": "Modifier: Cycle in Reverse Order", - "key.taptab.slot_modifier" : "Modifier: Cycle Only Main Hand" + "key.taptab.reverse_modifier": "Holding: Cycle in Reverse Order", + "key.taptab.slot_modifier" : "Holding: Cycle Only Main Hand", + + "key.taptab.unbound.tooltip" : "§7Stay unbound to use key §r[%s]" } diff --git a/src/main/resources/assets/taptab/lang/zh_cn.json b/src/main/resources/assets/taptab/lang/zh_cn.json index f5f71f8..ac646e6 100644 --- a/src/main/resources/assets/taptab/lang/zh_cn.json +++ b/src/main/resources/assets/taptab/lang/zh_cn.json @@ -1,6 +1,9 @@ { "key.taptab.category" : "Tap Tab", + "key.taptab.cycle" : "循环快捷栏到上方一行", - "key.taptab.reverse_modifier": "修饰键:反方向循环", - "key.taptab.slot_modifier" : "修饰键:只循环主手物品" + "key.taptab.reverse_modifier": "按住:反转循环方向", + "key.taptab.slot_modifier" : "按住:只循环主手物品", + + "key.taptab.unbound.tooltip" : "§7保持未绑定以使用按键 §r[%s]" }