From c918a1b6d8008773e9beebb48ba1a770405aee20 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 19:54:41 -0400 Subject: Bulk update back to sanity --- .../java/fyresmodjam/handlers/FyresKeyHandler.java | 216 ++++++++------------- 1 file changed, 76 insertions(+), 140 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java') diff --git a/YWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java b/YWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java index 4b3dd35..55cb2ed 100755 --- a/YWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java +++ b/YWD/src/main/java/fyresmodjam/handlers/FyresKeyHandler.java @@ -16,21 +16,16 @@ import fyresmodjam.tileentities.TileEntityTrap; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; public class FyresKeyHandler { - public static KeyBinding examine = new KeyBinding( - "Examine", Keyboard.KEY_X, "YWD"); - public static KeyBinding activateBlessing = new KeyBinding( - "Activate Blessing", Keyboard.KEY_K, "YWD"); + public static KeyBinding examine = new KeyBinding("Examine", Keyboard.KEY_X, "YWD"); + public static KeyBinding activateBlessing = new KeyBinding("Activate Blessing", Keyboard.KEY_K, "YWD"); - public static KeyBinding[] keyBindings = new KeyBinding[] { - examine, activateBlessing - }; + public static KeyBinding[] keyBindings = new KeyBinding[] { examine, activateBlessing }; public FyresKeyHandler() { for (KeyBinding k : keyBindings) { @@ -46,143 +41,84 @@ public class FyresKeyHandler { if (player != null) { if (examine.isPressed()) { - if (minecraft.objectMouseOver != null) { - - MovingObjectPosition o = minecraft.objectMouseOver; - - if (o.typeOfHit == MovingObjectType.BLOCK) { - int x = minecraft.objectMouseOver.blockX; - int y = minecraft.objectMouseOver.blockY; - int z = minecraft.objectMouseOver.blockZ; - - if (minecraft.theWorld - .getBlock(x, y, z) == ModjamMod.blockPillar - && (minecraft.theWorld - .getBlockMetadata( - x, - y, - z) - % 2) == 1) { - y--; - } - - TileEntity te = minecraft.theWorld - .getTileEntity(x, - y, - z); - - if (te != null && te instanceof TileEntityPillar) { - Blessing bless = BlessingUtils - .getBlessingInstance( - ((TileEntityPillar) te).blessing); - - String s = "@\u00A7e " - + bless.customName() - + "\n" - + bless.description() - + "."; - - for (String s2 : s - .split("@")) { - - NewPacketHandler.SEND_MESSAGE.data = new Object[] { - s2 - }; - NewPacketHandler.SEND_MESSAGE - .executeClient(Minecraft - .getMinecraft().thePlayer); - } - - } else if (te != null - && te instanceof TileEntityTrap) { - String placedBy = ((TileEntityTrap) te).placedBy; - - String s = (placedBy != null - ? "\u00A7eThis " + ItemTrap.names[te - .getBlockMetadata() - % BlockTrap.trapTypes] - .toLowerCase() - + " was placed by " - + (placedBy.equals( - player.getCommandSenderName()) - ? "you" - : placedBy) - + "." - : "\u00A7eThis " + ItemTrap.names[te - .getBlockMetadata() - % BlockTrap.trapTypes] - .toLowerCase() - + " doesn't seem to have been placed by anyone."); - s += " \u00A7eTrap is set to " - + TileEntityTrap.settings[((TileEntityTrap) te).setting] - + "."; - - NewPacketHandler.SEND_MESSAGE.data = new Object[] { - s - }; - NewPacketHandler.SEND_MESSAGE - .executeClient(Minecraft - .getMinecraft().thePlayer); - } else { - ItemStack stack = new ItemStack( - minecraft.theWorld - .getBlock(x, y, z), - 1, - minecraft.theWorld - .getBlockMetadata( - x, - y, - z)); - - if (stack.getItem() != null) { - String name = stack - .getDisplayName() - .toLowerCase(); - - NewPacketHandler.SEND_MESSAGE.data = new Object[] { - "\u00A7eIt's a " + name - + (!name.contains( - "block") ? " block." - : ".") - }; - NewPacketHandler.SEND_MESSAGE - .executeClient(Minecraft - .getMinecraft().thePlayer); - } - } - } else if (o.typeOfHit == MovingObjectType.ENTITY - && o.entityHit != null) { - NewPacketHandler.EXAMINE_MOB - .sendToServer(o.entityHit.dimension, - o.entityHit.getEntityId()); - } - } + doExamine(minecraft, player); } if (activateBlessing.isPressed()) { - String blessing = player - .getEntityData() - .getString("Blessing"); - - if (blessing != null) { - FMLLog.info("Triggering blessing"); - - if (minecraft.objectMouseOver != null) { - MovingObjectPosition o = minecraft.objectMouseOver; - if (o.typeOfHit == MovingObjectType.BLOCK) { - NewPacketHandler.ACTIVATE_BLESSING - .sendToServer(minecraft.objectMouseOver.blockX, - minecraft.objectMouseOver.blockY, - minecraft.objectMouseOver.blockZ); - } - } else { - NewPacketHandler.ACTIVATE_BLESSING - .sendToServer(player.chunkCoordX, - player.chunkCoordY, - player.chunkCoordZ); - } + doActivateBlessing(minecraft, player); + } + } + } + } + + private void doActivateBlessing(Minecraft minecraft, EntityPlayer player) { + String blessing = player.getEntityData().getString("Blessing"); + + if (blessing != null) { + FMLLog.info("Triggering blessing"); + + if (minecraft.objectMouseOver != null) { + MovingObjectPosition o = minecraft.objectMouseOver; + if (o.typeOfHit == MovingObjectType.BLOCK) { + NewPacketHandler.ACTIVATE_BLESSING.sendToServer(minecraft.objectMouseOver.blockX, + minecraft.objectMouseOver.blockY, minecraft.objectMouseOver.blockZ); + } + } else { + NewPacketHandler.ACTIVATE_BLESSING.sendToServer(player.chunkCoordX, player.chunkCoordY, + player.chunkCoordZ); + } + } + } + + private void doExamine(Minecraft minecraft, EntityPlayer player) { + if (minecraft.objectMouseOver != null) { + MovingObjectPosition o = minecraft.objectMouseOver; + + if (o.typeOfHit == MovingObjectType.BLOCK) { + int x = minecraft.objectMouseOver.blockX; + int y = minecraft.objectMouseOver.blockY; + int z = minecraft.objectMouseOver.blockZ; + + if (minecraft.theWorld.getBlock(x, y, z) == ModjamMod.blockPillar + && (minecraft.theWorld.getBlockMetadata(x, y, z) % 2) == 1) { + y--; + } + + TileEntity te = minecraft.theWorld.getTileEntity(x, y, z); + + if (te != null && te instanceof TileEntityPillar) { + Blessing bless = BlessingUtils.getBlessingInstance(((TileEntityPillar) te).blessing); + + String s = "@\u00A7e " + bless.customName() + "\n" + bless.description() + "."; + + for (String s2 : s.split("@")) { + + NewPacketHandler.SEND_MESSAGE.data = new Object[] { s2 }; + NewPacketHandler.SEND_MESSAGE.executeClient(Minecraft.getMinecraft().thePlayer); } + + } else if (te != null && te instanceof TileEntityTrap) { + String placedBy = ((TileEntityTrap) te).placedBy; + + String s = (placedBy != null + ? "\u00A7eThis " + ItemTrap.names[te.getBlockMetadata() % BlockTrap.trapTypes].toLowerCase() + + " was placed by " + + (placedBy.equals(player.getCommandSenderName()) ? "you" : placedBy) + "." + : "\u00A7eThis " + ItemTrap.names[te.getBlockMetadata() % BlockTrap.trapTypes].toLowerCase() + + " doesn't seem to have been placed by anyone."); + s += " \u00A7eTrap is set to " + TileEntityTrap.settings[((TileEntityTrap) te).setting] + "."; + + NewPacketHandler.SEND_MESSAGE.data = new Object[] { s }; + NewPacketHandler.SEND_MESSAGE.executeClient(Minecraft.getMinecraft().thePlayer); + } else { + String name = minecraft.theWorld.getBlock(x, y, z).getLocalizedName().toLowerCase(); + + NewPacketHandler.SEND_MESSAGE.data = new Object[] { + "\u00A7eIt's a " + name + (!name.contains("block") ? " block." : ".") }; + NewPacketHandler.SEND_MESSAGE.executeClient(Minecraft.getMinecraft().thePlayer); } + } else if (o.typeOfHit == MovingObjectType.ENTITY && o.entityHit != null) { + NewPacketHandler.EXAMINE_MOB.sendToServer(o.entityHit.dimension, o.entityHit.getEntityId()); } } } -- cgit v1.2.3