From b2b13d932802f344c43e8e3bf64619d7dd04b6a1 Mon Sep 17 00:00:00 2001 From: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Date: Tue, 20 Sep 2022 19:42:57 +0300 Subject: [PATCH 1/3] FixLokiText --- .../botania/common/item/relic/ItemLokiRing.java | 13 +++++++++---- .../botania/common/network/PacketLokiToggleAck.java | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index aab4e1e40..04299fd96 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -62,6 +62,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC private static final String TAG_Y_ORIGIN = "yOrigin"; private static final String TAG_Z_ORIGIN = "zOrigin"; private static final String TAG_MODE = "mode"; + private static boolean mode = true; public ItemLokiRing() { super(LibItemNames.LOKI_RING); @@ -142,7 +143,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } public static void toggleMode(ItemStack stack) { - stack.stackTagCompound.setBoolean(TAG_MODE,!stack.stackTagCompound.getBoolean(TAG_MODE)); + stack.stackTagCompound.setBoolean(TAG_MODE, !isRingEnabled(stack)); } @SideOnly(Side.CLIENT) public static void renderHUDNotification(){ @@ -151,9 +152,13 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC GTNHLib.proxy.printMessageAboveHotbar(text, 60, true, true); } public static String getLokiModeText(ItemStack stack){ - return EnumChatFormatting.GOLD + StatCollector.translateToLocal("item.botania:lokiRing.name") + " " + (isRingEnabled(stack) ? - EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.lokiOn") : - EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.lokiOff")); + String text = EnumChatFormatting.GOLD + StatCollector.translateToLocal("item.botania:lokiRing.name") + " "; + if (isRingEnabled(stack)) { + text = text + EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.lokiOn"); + } else { + text = text + EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.lokiOff"); + } + return text; } public static boolean isRingEnabled (final ItemStack stack){ return stack.stackTagCompound.getBoolean(TAG_MODE); diff --git a/src/main/java/vazkii/botania/common/network/PacketLokiToggleAck.java b/src/main/java/vazkii/botania/common/network/PacketLokiToggleAck.java index 6f2fb3dcc..90065cf80 100644 --- a/src/main/java/vazkii/botania/common/network/PacketLokiToggleAck.java +++ b/src/main/java/vazkii/botania/common/network/PacketLokiToggleAck.java @@ -29,6 +29,7 @@ public class PacketLokiToggleAck implements IMessage, IMessageHandler Date: Tue, 20 Sep 2022 23:24:30 +0300 Subject: [PATCH 2/3] remove unneeded variable --- src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 04299fd96..a5e2ec44f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -62,7 +62,6 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC private static final String TAG_Y_ORIGIN = "yOrigin"; private static final String TAG_Z_ORIGIN = "zOrigin"; private static final String TAG_MODE = "mode"; - private static boolean mode = true; public ItemLokiRing() { super(LibItemNames.LOKI_RING); From 0c87c31d1d6af5c560b59401cf62cac44af93a53 Mon Sep 17 00:00:00 2001 From: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> Date: Tue, 20 Sep 2022 23:37:10 +0300 Subject: [PATCH 3/3] revert to old text get method --- .../vazkii/botania/common/item/relic/ItemLokiRing.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index a5e2ec44f..4aef0a159 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -151,13 +151,9 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC GTNHLib.proxy.printMessageAboveHotbar(text, 60, true, true); } public static String getLokiModeText(ItemStack stack){ - String text = EnumChatFormatting.GOLD + StatCollector.translateToLocal("item.botania:lokiRing.name") + " "; - if (isRingEnabled(stack)) { - text = text + EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.lokiOn"); - } else { - text = text + EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.lokiOff"); - } - return text; + return EnumChatFormatting.GOLD + StatCollector.translateToLocal("item.botania:lokiRing.name") + " " + (isRingEnabled(stack) ? + EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.lokiOn") : + EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.lokiOff")); } public static boolean isRingEnabled (final ItemStack stack){ return stack.stackTagCompound.getBoolean(TAG_MODE);