From cf60696c68b05948e45b6e0e431c9130c72b6429 Mon Sep 17 00:00:00 2001 From: LewisSaber Date: Thu, 21 Sep 2023 16:46:57 +0300 Subject: [PATCH] Add keybind to clear selected blocks also stop selected blocks from drawing with ring turned off --- .../client/core/handler/KeyHandler.java | 12 +++++- .../common/item/relic/ItemLokiRing.java | 30 +++++++++++--- .../botania/common/network/PacketHandler.java | 2 + .../common/network/PacketLokiClear.java | 35 ++++++++++++++++ .../common/network/PacketLokiClearAck.java | 40 +++++++++++++++++++ .../resources/assets/botania/lang/en_US.lang | 3 ++ .../resources/assets/botania/lang/ru_RU.lang | 2 + 7 files changed, 117 insertions(+), 7 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/network/PacketLokiClear.java create mode 100644 src/main/java/vazkii/botania/common/network/PacketLokiClearAck.java 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 3e94fb258..d70c27c5b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java @@ -2,6 +2,7 @@ package vazkii.botania.client.core.handler; 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; @@ -15,11 +16,14 @@ 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(keyToggleRingOfLokiBreaking); + ClientRegistry.registerKeyBinding(keyRingOfLokiClear); + } @SideOnly(Side.CLIENT) @@ -35,6 +39,9 @@ public class KeyHandler { if(keyToggleRingOfLokiBreaking.isPressed()){ toggleRingLokiBreaking(); } + if(keyRingOfLokiClear.isPressed()){ + ringOfLokiClear(); + } } private static void toggleRingLoki() { @@ -44,4 +51,7 @@ public class KeyHandler { 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/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 0bad79f55..82e9552e3 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -70,7 +70,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC private boolean recursion = false; public static enum HUD_MESSAGE { - MODE, BREAKING + MODE, BREAKING, CLEAR } public ItemLokiRing() { @@ -122,12 +122,12 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC if (heldItemStack == null && event.action == Action.RIGHT_CLICK_BLOCK && player.isSneaking() && isRingEnabled(lokiRing)) { if(originCoords.posY == -1 && lookPos != null) { setOriginPos(lokiRing, lookPos.blockX, lookPos.blockY, lookPos.blockZ); - setCursorList(lokiRing, null); + clearCursors(lokiRing); if(player instanceof EntityPlayerMP) PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); } else if(lookPos != null) { if(originCoords.posX == lookPos.blockX && originCoords.posY == lookPos.blockY && originCoords.posZ == lookPos.blockZ) { - setOriginPos(lokiRing, 0, -1, 0); + clearMasterCursor(lokiRing); if(player instanceof EntityPlayerMP) PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, slot), (EntityPlayerMP) player); } else { @@ -215,6 +215,9 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC case BREAKING: text = getLokiBreakingModeText(getLokiRing(mc.thePlayer)); break; + case CLEAR: + text = getLokiCearText(getLokiRing(mc.thePlayer)); + break; default: return; @@ -222,6 +225,7 @@ 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") : @@ -235,6 +239,11 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.lokiOff")); } + public static String getLokiCearText(ItemStack stack){ + return EnumChatFormatting.GOLD + StatCollector.translateToLocal("botaniamisc.lokiClear") ; + + } + public static boolean isRingEnabled (final ItemStack stack){ return stack.stackTagCompound.getBoolean(TAG_MODE); } @@ -275,13 +284,15 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC @Override public void onUnequipped(ItemStack stack, EntityLivingBase player) { - setCursorList(stack, null); + clearCursors(stack); } + @Override @SideOnly(Side.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { - if(getLokiRing(player) != stack) + ItemStack lokiRing = getLokiRing(player); + if(lokiRing != stack || !isRingEnabled(lokiRing) ) return null; MovingObjectPosition lookPos = Minecraft.getMinecraft().objectMouseOver; @@ -310,7 +321,14 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC @Override public ChunkCoordinates getSourceWireframe(EntityPlayer player, ItemStack stack) { - return getLokiRing(player) == stack ? getOriginPos(stack) : null; + return getLokiRing(player) == stack && isRingEnabled(stack) ? getOriginPos(stack) : null; + } + + public static void clearCursors(ItemStack stack){ + setCursorList(stack, null); + } + public static void clearMasterCursor(ItemStack stack){ + setOriginPos(stack, 0, -1, 0); } public static ItemStack getLokiRing(EntityPlayer player) { diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 07fae5982..2c332c1e8 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -17,5 +17,7 @@ public class PacketHandler { 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); } } diff --git a/src/main/java/vazkii/botania/common/network/PacketLokiClear.java b/src/main/java/vazkii/botania/common/network/PacketLokiClear.java new file mode 100644 index 000000000..da1146a5f --- /dev/null +++ b/src/main/java/vazkii/botania/common/network/PacketLokiClear.java @@ -0,0 +1,35 @@ +package vazkii.botania.common.network; + +import io.netty.buffer.ByteBuf; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import vazkii.botania.common.item.relic.ItemLokiRing; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class PacketLokiClear implements IMessage, IMessageHandler { + @Override + public void fromBytes(ByteBuf byteBuf) { + // not needed + } + + @Override + public void toBytes(ByteBuf byteBuf) { + // not needed + } + + @Override + public IMessage onMessage(PacketLokiClear message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + final ItemStack aRing = ItemLokiRing.getLokiRing(player); + if (aRing != null) { + ItemLokiRing.clearCursors(aRing); + ItemLokiRing.clearMasterCursor(aRing); + PacketLokiClearAck ackMessage = new PacketLokiClearAck(); + PacketHandler.INSTANCE.sendTo(ackMessage, player); + } + return null; + } +} diff --git a/src/main/java/vazkii/botania/common/network/PacketLokiClearAck.java b/src/main/java/vazkii/botania/common/network/PacketLokiClearAck.java new file mode 100644 index 000000000..bf54f2797 --- /dev/null +++ b/src/main/java/vazkii/botania/common/network/PacketLokiClearAck.java @@ -0,0 +1,40 @@ +package vazkii.botania.common.network; + +import io.netty.buffer.ByteBuf; + +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import vazkii.botania.common.item.relic.ItemLokiRing; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class PacketLokiClearAck implements IMessage, IMessageHandler { + + public boolean state; + + @Override + public void fromBytes(ByteBuf byteBuf) { + state = byteBuf.readBoolean(); + } + + @Override + public void toBytes(ByteBuf byteBuf) { + byteBuf.writeBoolean(state); + } + + @SideOnly(Side.CLIENT) + @Override + public IMessage onMessage(PacketLokiClearAck message, MessageContext ctx) { + Minecraft mc = Minecraft.getMinecraft(); + final ItemStack aRing = ItemLokiRing.getLokiRing(mc.thePlayer) ; + if (aRing != null) { + + ItemLokiRing.renderHUDNotification(ItemLokiRing.HUD_MESSAGE.CLEAR); + } + + 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 23ee0c60d..eef35ba4e 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -157,9 +157,12 @@ botaniamisc.enterToView=^ Press ENTER to view ^ botaniamisc.keyCategory=Botania botaniamisc.toggleLoki=Toggle Ring of Loki botaniamisc.toggleLokiBreaking=Toggle Ring of Loki Breaking +botaniamisc.ringOfLokiClear=Clear Ring of Loki Selection botaniamisc.lokiOn=On botaniamisc.lokiOff=Off botaniamisc.breaking=Breaking +botaniamisc.lokiClear=Successfully cleared all selection + # 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 803cf2029..89850460d 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -157,9 +157,11 @@ botaniamisc.enterToView=^ Нажмите ENTER для просмотра ^ botaniamisc.keyCategory=Botania botaniamisc.toggleLoki=Переключение режимов Кольца Локи botaniamisc.toggleLokiBreaking=Переключение режимов ломания Кольца Локи +botaniamisc.ringOfLokiClear=Очистить выделения для кольца локи botaniamisc.lokiOn=Вкл. botaniamisc.lokiOff=Выкл. botaniamisc.breaking=Ломание +botaniamisc.lokiClear=Успешно удален все выделения # NEI INTEGRATION botania.nei.brewery=Ботаническая зельеварка