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 --- YWD/src/main/java/fyresmodjam/ClientProxy.java | 137 ++++++++----------------- 1 file changed, 40 insertions(+), 97 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/ClientProxy.java') diff --git a/YWD/src/main/java/fyresmodjam/ClientProxy.java b/YWD/src/main/java/fyresmodjam/ClientProxy.java index 6bc688a..37650fa 100755 --- a/YWD/src/main/java/fyresmodjam/ClientProxy.java +++ b/YWD/src/main/java/fyresmodjam/ClientProxy.java @@ -42,65 +42,40 @@ public class ClientProxy extends CommonProxy { @SubscribeEvent public void guiRenderEvent(RenderGameOverlayEvent.Post event) { if (event.type == RenderGameOverlayEvent.ElementType.HOTBAR) { - MovingObjectPosition mouse = Minecraft - .getMinecraft().objectMouseOver; + MovingObjectPosition mouse = Minecraft.getMinecraft().objectMouseOver; World world = Minecraft.getMinecraft().theWorld; - EntityClientPlayerMP thePlayer = Minecraft - .getMinecraft().thePlayer; - - FontRenderer fontRenderer = Minecraft - .getMinecraft().fontRenderer; - - int halfedWidth = event.resolution.getScaledWidth() - / 2; - if (mouse != null && world != null - && mouse.typeOfHit == MovingObjectType.BLOCK) { - TileEntity te = world.getTileEntity( - mouse.blockX, mouse.blockY, - mouse.blockZ); - Block id = world.getBlock(mouse.blockX, - mouse.blockY, - mouse.blockZ); - - if (id == ModjamMod.blockPillar - || (id == ModjamMod.blockTrap - && te != null - && te instanceof TileEntityTrap - && ((TileEntityTrap) te).placedBy != null)) { + EntityClientPlayerMP thePlayer = Minecraft.getMinecraft().thePlayer; + + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + + int halfedWidth = event.resolution.getScaledWidth() / 2; + if (mouse != null && world != null && mouse.typeOfHit == MovingObjectType.BLOCK) { + TileEntity te = world.getTileEntity(mouse.blockX, mouse.blockY, mouse.blockZ); + Block id = world.getBlock(mouse.blockX, mouse.blockY, mouse.blockZ); + + if (id == ModjamMod.blockPillar || (id == ModjamMod.blockTrap && te != null + && te instanceof TileEntityTrap && ((TileEntityTrap) te).placedBy != null)) { TileEntityTrap tileEntityTrap = null; - if(te instanceof TileEntityTrap) + if (te instanceof TileEntityTrap) tileEntityTrap = (TileEntityTrap) te; if (tileEntityTrap != null && tileEntityTrap.placedBy != null) { - String key = Keyboard - .getKeyName(FyresKeyHandler.examine - .getKeyCode()); - String string = "Press " - + key - + " to Examine"; - - if (thePlayer != null - && tileEntityTrap.placedBy - .equals(thePlayer - .getCommandSenderName())) { + String key = Keyboard.getKeyName(FyresKeyHandler.examine.getKeyCode()); + String string = "Press " + key + " to Examine"; + + if (thePlayer != null && tileEntityTrap.placedBy.equals(thePlayer.getCommandSenderName())) { if (thePlayer.isSneaking()) string = "Use to disarm (Stand to toggle setting)"; else string = "Use to toggle setting (Sneak to disarm)"; } - fontRenderer.drawStringWithShadow( - string, - halfedWidth - (fontRenderer - .getStringWidth(string) - / 2), - event.resolution.getScaledHeight() - / 2 - + 16, - Color.WHITE.getRGB()); + fontRenderer.drawStringWithShadow(string, + halfedWidth - (fontRenderer.getStringWidth(string) / 2), + event.resolution.getScaledHeight() / 2 + 16, Color.WHITE.getRGB()); } } } @@ -109,29 +84,15 @@ public class ClientProxy extends CommonProxy { EntityPlayer player = thePlayer; if (BlessingUtils.hasBlessing(player)) { - if (BlessingUtils.hasBlessing( - player, - "BlessingBerserker")) { - if (!EntityStatHelper - .hasStat(player, "BlessingCounter")) { - EntityStatHelper.giveStat( - player, - "BlessingCounter", - 0); + if (BlessingUtils.hasBlessing(player, "BlessingBerserker")) { + if (!EntityStatHelper.hasStat(player, "BlessingCounter")) { + EntityStatHelper.giveStat(player, "BlessingCounter", 0); } - String string = EntityStatHelper - .getStat(player, "BlessingCounter"); - fontRenderer.drawStringWithShadow( - string, - halfedWidth - (fontRenderer - .getStringWidth(string) - / 2), - event.resolution.getScaledHeight() - - 48 - + (player.capabilities.isCreativeMode - ? 16 - : 0), + String string = EntityStatHelper.getStat(player, "BlessingCounter"); + fontRenderer.drawStringWithShadow(string, + halfedWidth - (fontRenderer.getStringWidth(string) / 2), + event.resolution.getScaledHeight() - 48 + (player.capabilities.isCreativeMode ? 16 : 0), Color.RED.getRGB()); } } @@ -144,56 +105,38 @@ public class ClientProxy extends CommonProxy { ClientTickHandler clientHandler = new ClientTickHandler(); FMLCommonHandler.instance().bus().register(clientHandler); - FMLCommonHandler.instance().bus() - .register(new FyresKeyHandler()); - - ClientRegistry.bindTileEntitySpecialRenderer( - TileEntityPillar.class, - new TileEntityPillarRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer( - TileEntityTrap.class, - new TileEntityTrapRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer( - TileEntityCrystal.class, - new TileEntityCrystalRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer( - TileEntityCrystalStand.class, + FMLCommonHandler.instance().bus().register(new FyresKeyHandler()); + + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPillar.class, new TileEntityPillarRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTrap.class, new TileEntityTrapRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCrystal.class, new TileEntityCrystalRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCrystalStand.class, new TileEntityCrystalStandRenderer()); - RenderingRegistry.registerEntityRenderingHandler( - EntityMysteryPotion.class, - new RenderMysteryPotion( - ModjamMod.mysteryPotion)); + RenderingRegistry.registerEntityRenderingHandler(EntityMysteryPotion.class, + new RenderMysteryPotion(ModjamMod.mysteryPotion)); MinecraftForge.EVENT_BUS.register(this); } @Override public void sendPlayerMessage(String message) { - NewPacketHandler.SEND_MESSAGE.data = new Object[] { - message - }; + NewPacketHandler.SEND_MESSAGE.data = new Object[] { message }; - NewPacketHandler.SEND_MESSAGE.executeClient( - Minecraft.getMinecraft().thePlayer); + NewPacketHandler.SEND_MESSAGE.executeClient(Minecraft.getMinecraft().thePlayer); } public void loadFromConfig(Configuration config) { ConfigData.loadFromConfig(config); - ConfigData.examineKey = config - .get("Keybindings", "examine_key", - ConfigData.examineKey) + ConfigData.examineKey = config.get("Keybindings", "examine_key", ConfigData.examineKey) .getInt(ConfigData.examineKey); - ConfigData.blessingKey = config - .get("Keybindings", "blessing_key", - ConfigData.blessingKey) + ConfigData.blessingKey = config.get("Keybindings", "blessing_key", ConfigData.blessingKey) .getInt(ConfigData.blessingKey); FyresKeyHandler.examine.setKeyCode(ConfigData.examineKey); - FyresKeyHandler.activateBlessing - .setKeyCode(ConfigData.blessingKey); + FyresKeyHandler.activateBlessing.setKeyCode(ConfigData.blessingKey); } } -- cgit v1.2.3