From b1584926656db241bf2bb768fff82790f5da9500 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 18 Aug 2014 19:23:26 +0800 Subject: [PATCH] #878 Keyboard shortcut to change Yeta Wrench modes --- resources/assets/enderio/lang/en_US.lang | 4 +- .../java/crazypants/enderio/ClientProxy.java | 2 +- .../item/{darksteel => }/KeyTracker.java | 37 +++++++++++++++++-- .../enderio/item/darksteel/SoundDetector.java | 8 ++++ 4 files changed, 45 insertions(+), 6 deletions(-) rename src/main/java/crazypants/enderio/item/{darksteel => }/KeyTracker.java (75%) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 32d18e39..64c34c1e 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -346,8 +346,8 @@ item.itemYetaWrench.name=Yeta Wrench item.itemYetaWrench.tooltip.detailed.line1=Hides conduit facades when held item.itemYetaWrench.tooltip.detailed.line2=Shift-Click to break machines item.itemYetaWrench.tooltip.detailed.line3=and conduits instantly -item.itemYetaWrench.tooltip.detailed.line4=Use Shift-Mouse Wheel to render -item.itemYetaWrench.tooltip.detailed.line5=a single conduit type +item.itemYetaWrench.tooltip.detailed.line4=Use Shift-Mouse Wheel or 'Y' to +item.itemYetaWrench.tooltip.detailed.line5=render a single conduit type item.itemMagnet.name=Electromagnet item.itemMagnet.tooltip.detailed.line1=Pulls nearby item towards you diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 331ff142..ad91e849 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -40,9 +40,9 @@ import crazypants.enderio.config.Config; import crazypants.enderio.enderface.EnderIoRenderer; import crazypants.enderio.enderface.TileEnderIO; import crazypants.enderio.gui.TooltipAddera; +import crazypants.enderio.item.KeyTracker; import crazypants.enderio.item.YetaWrenchOverlayRenderer; import crazypants.enderio.item.YetaWrenchTickHandler; -import crazypants.enderio.item.darksteel.KeyTracker; import crazypants.enderio.item.darksteel.PoweredItemRenderer; import crazypants.enderio.item.darksteel.SoundDetector; import crazypants.enderio.item.darksteel.SoundEntity; diff --git a/src/main/java/crazypants/enderio/item/darksteel/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java similarity index 75% rename from src/main/java/crazypants/enderio/item/darksteel/KeyTracker.java rename to src/main/java/crazypants/enderio/item/KeyTracker.java index 65027f00..baa024b1 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -1,4 +1,4 @@ -package crazypants.enderio.item.darksteel; +package crazypants.enderio.item; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; @@ -14,6 +14,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.ConduitDisplayMode; +import crazypants.enderio.item.darksteel.DarkSteelController; +import crazypants.enderio.item.darksteel.PacketGlideState; +import crazypants.enderio.item.darksteel.SoundDetector; +import crazypants.enderio.item.darksteel.SoundDetectorUpgrade; import crazypants.enderio.network.PacketHandler; import crazypants.util.Lang; @@ -34,6 +39,9 @@ public class KeyTracker { private KeyBinding nightVisionKey; private boolean isNightVisionActive = false; + private KeyBinding yetaWrenchMode; + + public KeyTracker() { glideKey = new KeyBinding("Glider Toggle", Keyboard.KEY_G, "Dark Steel Armor"); ClientRegistry.registerKeyBinding(glideKey); @@ -41,6 +49,9 @@ public class KeyTracker { ClientRegistry.registerKeyBinding(soundDetectorKey); nightVisionKey = new KeyBinding("Night Vision", Keyboard.KEY_P, "Dark Steel Armor"); ClientRegistry.registerKeyBinding(nightVisionKey); + + yetaWrenchMode = new KeyBinding("Yeta Wrench Mode", Keyboard.KEY_Y, "Tools"); + ClientRegistry.registerKeyBinding(yetaWrenchMode); } @SubscribeEvent @@ -48,11 +59,31 @@ public class KeyTracker { handleGlide(); handleSoundDetector(); handleNightVision(); + handleYetaWrench(); + } + + private void handleYetaWrench() { + if(!yetaWrenchMode.isPressed()) { + return; + } + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + ItemStack equipped = player.getCurrentEquippedItem(); + if(equipped == null || equipped.getItem() != EnderIO.itemYetaWench) { + return; + } + + ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(equipped); + if(curMode == null) { + curMode = ConduitDisplayMode.ALL; + } + ConduitDisplayMode newMode = curMode.next(); + ConduitDisplayMode.setDisplayMode(equipped, newMode); + PacketHandler.INSTANCE.sendToServer(new YetaWrenchPacketProcessor(player.inventory.currentItem, newMode)); } private void handleSoundDetector() { if(!isSoundDetectorUpgradeEquipped(Minecraft.getMinecraft().thePlayer)) { - SoundDetector.instance.enabled = false; + SoundDetector.instance.setEnabled(false); return; } if(soundDetectorKey.getIsKeyPressed()) { @@ -64,7 +95,7 @@ public class KeyTracker { message = Lang.localize("darksteel.upgrade.sound.disabled"); } Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new ChatComponentTranslation(message)); - SoundDetector.instance.enabled = isSoundDectorActive; + SoundDetector.instance.setEnabled(isSoundDectorActive); } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java index e2817d1f..b5b19e38 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundDetector.java @@ -104,6 +104,14 @@ public class SoundDetector { } + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + private static class SoundSource { Vector3d pos;