From d4d5cbfabc5a3d36e9b2097792e13dab685658f7 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sat, 11 Sep 2021 01:30:08 +0300
Subject: Use vanilla translation key for "hotbar"
---
.../io/github/cottonmc/cotton/gui/impl/client/NarrationMessages.java | 2 +-
src/main/java/io/github/cottonmc/cotton/gui/widget/WPlayerInvPanel.java | 2 +-
src/main/resources/assets/libgui/lang/en_us.json | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/impl/client/NarrationMessages.java b/src/main/java/io/github/cottonmc/cotton/gui/impl/client/NarrationMessages.java
index bc9ee48..d76dba1 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/impl/client/NarrationMessages.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/impl/client/NarrationMessages.java
@@ -6,7 +6,6 @@ import net.minecraft.text.TranslatableText;
public final class NarrationMessages {
public static final String ITEM_SLOT_TITLE_KEY = "widget.libgui.item_slot.narration.title";
public static final String LABELED_SLIDER_TITLE_KEY = "widget.libgui.labeled_slider.narration.title";
- public static final Text PLAYER_INVENTORY_HOTBAR = new TranslatableText("widget.libgui.player_inventory.narration.hotbar");
public static final Text SCROLL_BAR_TITLE = new TranslatableText("widget.libgui.scroll_bar.narration.title");
public static final String SLIDER_MESSAGE_KEY = "widget.libgui.slider.narration.title";
public static final Text SLIDER_USAGE = new TranslatableText("widget.libgui.slider.narration.usage");
@@ -25,5 +24,6 @@ public final class NarrationMessages {
public static final Text COMPONENT_LIST_USAGE = new TranslatableText("narration.component_list.usage");
public static final Text INVENTORY = new TranslatableText("container.inventory");
public static final String SCREEN_POSITION_KEY = "narrator.position.screen";
+ public static final Text HOTBAR = new TranslatableText("options.attack.hotbar");
}
}
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WPlayerInvPanel.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WPlayerInvPanel.java
index af4a159..d0fd001 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WPlayerInvPanel.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WPlayerInvPanel.java
@@ -59,7 +59,7 @@ public class WPlayerInvPanel extends WPlainPanel {
hotbar = new WItemSlot(playerInventory, 0, 9, 1, false) {
@Override
protected Text getNarrationName() {
- return NarrationMessages.PLAYER_INVENTORY_HOTBAR;
+ return NarrationMessages.Vanilla.HOTBAR;
}
};
this.add(inv, 0, y);
diff --git a/src/main/resources/assets/libgui/lang/en_us.json b/src/main/resources/assets/libgui/lang/en_us.json
index 4f0f9a1..b325b70 100644
--- a/src/main/resources/assets/libgui/lang/en_us.json
+++ b/src/main/resources/assets/libgui/lang/en_us.json
@@ -3,7 +3,6 @@
"option.libgui.darkmode": "Dark Mode",
"widget.libgui.item_slot.narration.title": "Item slot %s out of %s",
"widget.libgui.labeled_slider.narration.title": "%s slider: at %s between %s and %s",
- "widget.libgui.player_inventory.narration.hotbar": "Hotbar",
"widget.libgui.scroll_bar.narration.title": "Scroll bar",
"widget.libgui.slider.narration.title": "Slider: at %s between %s and %s",
"widget.libgui.slider.narration.usage": "Move by dragging or with arrow keys",
--
cgit