From f3aa12483dfdc171103477859cc4ce56bc336580 Mon Sep 17 00:00:00 2001 From: Wilhelm Schuster Date: Thu, 15 Jun 2023 23:19:57 +0200 Subject: [PATCH] Expand the tooltips for the time manipulation action buttons (#392) --- src/main/java/codechicken/nei/LayoutManager.java | 14 +++++++++----- src/main/resources/assets/nei/lang/en_US.lang | 4 ++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java index 3f7db40d..162e99be 100644 --- a/src/main/java/codechicken/nei/LayoutManager.java +++ b/src/main/java/codechicken/nei/LayoutManager.java @@ -531,8 +531,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH } @Override - public String getButtonTip() { - return getTimeTip(NEIActions.timeZones[zone], state); + public void addTooltips(List tooltip) { + addTimeTip(NEIActions.timeZones[zone], state, tooltip); } }; } @@ -565,9 +565,13 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH return translate("inventory." + name + "." + sfx); } - private static String getTimeTip(String name, int state) { - String sfx = (state & 0x3) == 2 ? "enable" : "set"; - return translate("inventory." + name + "." + sfx); + private static void addTimeTip(String name, int state, List tooltip) { + if ((state & 0x3) == 2) { + tooltip.add(translate("inventory." + name + ".enable")); + } else { + tooltip.add(translate("inventory." + name + ".set")); + tooltip.add(EnumChatFormatting.GRAY + translate("inventory." + name + ".disable")); + } } private static boolean handleDisabledButtonPress(String ident, boolean rightclick) { diff --git a/src/main/resources/assets/nei/lang/en_US.lang b/src/main/resources/assets/nei/lang/en_US.lang index b8ade610..3eb88b9a 100644 --- a/src/main/resources/assets/nei/lang/en_US.lang +++ b/src/main/resources/assets/nei/lang/en_US.lang @@ -44,12 +44,16 @@ nei.inventory.magnet.enable=Enable magnet mode nei.inventory.magnet.1=Turn magnet mode on nei.inventory.magnet.0=Turn magnet mode off nei.inventory.dawn.enable=Enable dawn-noon +nei.inventory.dawn.disable=Right-click: Disable dawn-noon phase nei.inventory.dawn.set=Set time to dawn nei.inventory.noon.enable=Enable noon-dusk +nei.inventory.noon.disable=Right-click: Disable noon-dusk phase nei.inventory.noon.set=Set time to noon nei.inventory.dusk.enable=Enable dusk-midnight +nei.inventory.dusk.disable=Right-click: Disable dusk-midnight phase nei.inventory.dusk.set=Set time to dusk nei.inventory.midnight.enable=Enable midnight-dawn +nei.inventory.midnight.disable=Right-click: Disable midnight-dawn phase nei.inventory.midnight.set=Set time to midnight nei.inventory.heal=Heal the player nei.inventory.current.gamemode.0=Current gamemode: survival