diff --git a/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java b/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java index b45339409..d5eb42038 100644 --- a/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java @@ -4,7 +4,6 @@ import net.minecraft.client.settings.KeyBinding; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketLokiClear; import vazkii.botania.common.network.PacketLokiToggle; -import vazkii.botania.common.network.PacketLokiToggleBreaking; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -15,13 +14,11 @@ import cpw.mods.fml.relauncher.SideOnly; public class KeyHandler { private static final KeyBinding keyToggleRingOfLoki= new KeyBinding("botaniamisc.toggleLoki", 0, "botaniamisc.keyCategory"); - private static final KeyBinding keyToggleRingOfLokiBreaking= new KeyBinding("botaniamisc.toggleLokiBreaking", 0, "botaniamisc.keyCategory"); private static final KeyBinding keyRingOfLokiClear= new KeyBinding("botaniamisc.ringOfLokiClear", 0, "botaniamisc.keyCategory"); public KeyHandler() { FMLCommonHandler.instance().bus().register(this); ClientRegistry.registerKeyBinding(keyToggleRingOfLoki); - ClientRegistry.registerKeyBinding(keyToggleRingOfLokiBreaking); ClientRegistry.registerKeyBinding(keyRingOfLokiClear); } @@ -35,9 +32,6 @@ public class KeyHandler { if (keyToggleRingOfLoki.isPressed()){ toggleRingLoki(); } - if(keyToggleRingOfLokiBreaking.isPressed()){ - toggleRingLokiBreaking(); - } if(keyRingOfLokiClear.isPressed()){ ringOfLokiClear(); } @@ -47,10 +41,6 @@ public class KeyHandler { PacketHandler.INSTANCE.sendToServer(new PacketLokiToggle()); } - private static void toggleRingLokiBreaking() { - PacketHandler.INSTANCE.sendToServer(new PacketLokiToggleBreaking()); - } - private static void ringOfLokiClear() { PacketHandler.INSTANCE.sendToServer(new PacketLokiClear()); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 403c947d1..2ad0612ac 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -106,7 +106,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), par3List); } - void addStringToTooltip(String s, List tooltip) { + public void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } 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 5fcd5bd2e..5672fb6bc 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -225,18 +225,19 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC GTNHLib.proxy.printMessageAboveHotbar(text, 60, true, true); } + + public static String getOnOffString(boolean state){ + return state ? EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.lokiOn") : + EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.lokiOff"); + } 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")); + return EnumChatFormatting.GOLD + StatCollector.translateToLocal("item.botania:lokiRing.name") + " " + getOnOffString(isRingEnabled(stack)); } public static String getLokiBreakingModeText(ItemStack stack){ return EnumChatFormatting.GOLD + StatCollector.translateToLocal("item.botania:lokiRing.name") + " "+ - StatCollector.translateToLocal("botaniamisc.breaking") + " " + (isRingBreakingEnabled(stack) ? - EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.lokiOn") : - EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.lokiOff")); + StatCollector.translateToLocal("botaniamisc.breaking") + " " + getOnOffString(isRingBreakingEnabled(stack)); } public static String getLokiCearText(ItemStack stack){ @@ -286,6 +287,19 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC clearCursors(stack); } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiDescription"), list); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiDescription2"), list); + addStringToTooltip("", list); + addStringToTooltip(EnumChatFormatting.WHITE +StatCollector.translateToLocal("botaniamisc.lokiCurrent"), list); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiState") + ": " + getOnOffString(isRingEnabled(stack)), list); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.breaking") + ": " + getOnOffString(isRingBreakingEnabled(stack)), list); + addStringToTooltip("", list); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiToggleDescription") + " " + getOnOffString(true) + EnumChatFormatting.RESET + "/"+ getOnOffString(false), list); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiBreakingDescription") + " " + getOnOffString(true) + EnumChatFormatting.RESET+"/" + getOnOffString(false), list); + super.addInformation(stack, player, list, adv); + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 2c332c1e8..61b9eb7e3 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -15,9 +15,8 @@ public class PacketHandler { public static void initPackets() { INSTANCE.registerMessage(PacketLokiToggle.class, PacketLokiToggle.class, 1, Side.SERVER); INSTANCE.registerMessage(PacketLokiToggleAck.class, PacketLokiToggleAck.class, 2, Side.CLIENT); - INSTANCE.registerMessage(PacketLokiToggleBreaking.class, PacketLokiToggleBreaking.class, 3, Side.SERVER); - INSTANCE.registerMessage(PacketLokiToggleBreakingAck.class, PacketLokiToggleBreakingAck.class, 4, Side.CLIENT); - INSTANCE.registerMessage(PacketLokiClear.class, PacketLokiClear.class, 5, Side.SERVER); - INSTANCE.registerMessage(PacketLokiClearAck.class, PacketLokiClearAck.class, 6, Side.CLIENT); + INSTANCE.registerMessage(PacketLokiToggleBreakingAck.class, PacketLokiToggleBreakingAck.class, 3, Side.CLIENT); + INSTANCE.registerMessage(PacketLokiClear.class, PacketLokiClear.class, 4, Side.SERVER); + INSTANCE.registerMessage(PacketLokiClearAck.class, PacketLokiClearAck.class, 5, Side.CLIENT); } } diff --git a/src/main/java/vazkii/botania/common/network/PacketLokiToggle.java b/src/main/java/vazkii/botania/common/network/PacketLokiToggle.java index f791a2e4b..a3afff837 100644 --- a/src/main/java/vazkii/botania/common/network/PacketLokiToggle.java +++ b/src/main/java/vazkii/botania/common/network/PacketLokiToggle.java @@ -25,12 +25,24 @@ public class PacketLokiToggle implements IMessage, IMessageHandler { - @Override - public void fromBytes(ByteBuf byteBuf) { - // not needed - } - - @Override - public void toBytes(ByteBuf byteBuf) { - // not needed - } - - @Override - public IMessage onMessage(PacketLokiToggleBreaking message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - final ItemStack aRing = ItemLokiRing.getLokiRing(player); - if (aRing != null) { - boolean ringState = !ItemLokiRing.isRingBreakingEnabled(aRing); - ItemLokiRing.setBreakingMode(aRing, ringState); - PacketLokiToggleBreakingAck ackMessage = new PacketLokiToggleBreakingAck(); - ackMessage.state = ringState; - PacketHandler.INSTANCE.sendTo(ackMessage, player); - } - return null; - } -} diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 0a421e6c3..dd1b31b63 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -155,13 +155,20 @@ botaniamisc.altarRefill1=add back the last recipe botaniamisc.santaweaveInfo=Manaweave, changed up for the &cs&fe&ca&fs&co&fn botaniamisc.enterToView=^ Press ENTER to view ^ botaniamisc.keyCategory=Botania -botaniamisc.toggleLoki=Toggle Ring of Loki -botaniamisc.toggleLokiBreaking=Toggle Ring of Loki Breaking + +#LOKI +botaniamisc.toggleLoki=Ring of Loki Switch Key botaniamisc.ringOfLokiClear=Clear Ring of Loki Selection botaniamisc.lokiOn=On botaniamisc.lokiOff=Off botaniamisc.breaking=Breaking botaniamisc.lokiClear=Successfully cleared all selection +botaniamisc.lokiDescription=Builder's wand but §c§oC§6§oo§e§oo§a§ol§9§oe§1§or +botaniamisc.lokiDescription2=Can Place/Interact/Break with multiple blocks at once! +botaniamisc.lokiToggleDescription=Mode Switch Key to turn ring +botaniamisc.lokiBreakingDescription=Mode Switch Key + Shift to toggle breaking +botaniamisc.lokiCurrent=Current +botaniamisc.lokiState=Ring # NEI INTEGRATION botania.nei.brewery=Botanical Brewery diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 89850460d..452e83f05 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -156,7 +156,6 @@ botaniamisc.santaweaveInfo=Манаткань изменилась из-за &c botaniamisc.enterToView=^ Нажмите ENTER для просмотра ^ botaniamisc.keyCategory=Botania botaniamisc.toggleLoki=Переключение режимов Кольца Локи -botaniamisc.toggleLokiBreaking=Переключение режимов ломания Кольца Локи botaniamisc.ringOfLokiClear=Очистить выделения для кольца локи botaniamisc.lokiOn=Вкл. botaniamisc.lokiOff=Выкл.