diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 705e261c5..f43000c5b 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -317,7 +317,6 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(CustomItems.shortLamp), new ItemShortLampRenderer()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(CustomItems.tallLamp), new ItemTallLampRenderer()); } - Minecraft mc = Minecraft.getMinecraft(); NPCButton = new KeyBinding("NPC Inventory", Keyboard.KEY_N, "key.categories.customnpc"); SpecialKey = new KeyBinding("key.customnpcs.special", Keyboard.KEY_B, "key.categories.customnpc"); @@ -673,9 +672,7 @@ public class ClientProxy extends CommonProxy { if (!player.worldObj.isRemote || !(guiscreen instanceof GuiScreen)) return; - if (guiscreen != null) { - minecraft.displayGuiScreen((GuiScreen) guiscreen); - } + minecraft.displayGuiScreen((GuiScreen) guiscreen); } @@ -770,8 +767,7 @@ public class ClientProxy extends CommonProxy { if (location == null) return; TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager(); - if (location != null) - texturemanager.bindTexture((ResourceLocation) location); + texturemanager.bindTexture((ResourceLocation) location); } catch (NullPointerException ex) { } catch (ReportedException ex) { diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java index 0afa7d867..b2cc6f99e 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java @@ -127,7 +127,6 @@ public class GuiNpcMobSpawnerMounter extends GuiNPCInterface implements IGuiData return; } - ArrayList list = new ArrayList(); this.list = ClientCloneController.Instance.getClones(activeTab); scroll.setList(getSearchList()); } diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java index 9c13af815..5291c41cd 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java @@ -81,8 +81,6 @@ public class GuiNpcMobSpawnerSelector extends SubGuiInterface implements IGuiDat return; } - ArrayList list = new ArrayList(); - this.list = new ArrayList(ClientCloneController.Instance.getClones(activeTab)); scroll.setList(getSearchList()); }