From 31231db459fd71f0bff28ff04bddffb7a751a65d Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 19 Nov 2015 16:42:30 -0800 Subject: [PATCH] minor cleanup --- src/main/java/forestry/energy/GuiHandlerEnergy.java | 4 +--- src/main/java/forestry/farming/GuiHandlerFarming.java | 4 +--- src/main/java/forestry/farming/circuits/CircuitFarmLogic.java | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/energy/GuiHandlerEnergy.java b/src/main/java/forestry/energy/GuiHandlerEnergy.java index 3544d67ba..c79d4b111 100755 --- a/src/main/java/forestry/energy/GuiHandlerEnergy.java +++ b/src/main/java/forestry/energy/GuiHandlerEnergy.java @@ -81,9 +81,7 @@ public class GuiHandlerEnergy extends GuiHandlerBase { return new ContainerEnginePeat(player.inventory, TileUtil.getTile(world, x, y, z, TileEnginePeat.class)); case EngineElectricGUI: - TileEngineElectric tile = TileUtil.getTile(world, x, y, z, TileEngineElectric.class); - Proxies.net.sendToPlayer(new PacketSocketUpdate(tile), player); - return new ContainerEngineElectric(player.inventory, tile); + return new ContainerEngineElectric(player.inventory, TileUtil.getTile(world, x, y, z, TileEngineElectric.class)); case GeneratorGUI: return new ContainerGenerator(player.inventory, TileUtil.getTile(world, x, y, z, TileGenerator.class)); diff --git a/src/main/java/forestry/farming/GuiHandlerFarming.java b/src/main/java/forestry/farming/GuiHandlerFarming.java index a38a25845..d086c25fc 100755 --- a/src/main/java/forestry/farming/GuiHandlerFarming.java +++ b/src/main/java/forestry/farming/GuiHandlerFarming.java @@ -38,9 +38,7 @@ public class GuiHandlerFarming extends GuiHandlerBase { switch (GuiId.values()[id]) { case MultiFarmGUI: - TileFarm tile = TileUtil.getTile(world, x, y, z, TileFarm.class); - Proxies.net.sendToPlayer(new PacketSocketUpdate(tile), player); - return new ContainerFarm(player.inventory, tile); + return new ContainerFarm(player.inventory, TileUtil.getTile(world, x, y, z, TileFarm.class)); default: return null; diff --git a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java index f54117ba1..cc402c35a 100755 --- a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java +++ b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java @@ -53,7 +53,7 @@ public class CircuitFarmLogic extends Circuit { IFarmLogic logic; try { - logic = logicClass.getConstructor(new Class[]{IFarmHousing.class}).newInstance(housing); + logic = logicClass.getConstructor(IFarmHousing.class).newInstance(housing); } catch (Exception ex) { throw new RuntimeException("Failed to instantiate logic of class " + logicClass.getName() + ": " + ex.getMessage()); }