diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java index 8945c70..38812ee 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java @@ -44,56 +44,56 @@ public class GuiHandler implements IGuiHandler { public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { switch (ID) { case GUIID_WEATHER_CONTROLLER: - TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileWeatherController) { - return new ContainerWeatherController(player.inventory, (TileWeatherController) te); + TileEntity weatherController = world.getTileEntity(x, y, z); + if (weatherController instanceof TileWeatherController) { + return new ContainerWeatherController(player.inventory, (TileWeatherController) weatherController); } break; case GUIID_SUN_DIAL: - TileEntity te1 = world.getTileEntity(x, y, z); - if (te1 != null && te1 instanceof TileSunDial) { - return new ContainerSunDial(player.inventory, (TileSunDial) te1); + TileEntity sunDial = world.getTileEntity(x, y, z); + if (sunDial instanceof TileSunDial) { + return new ContainerSunDial(player.inventory, (TileSunDial) sunDial); } break; case GUIID_GRINDER: - TileEntity te2 = world.getTileEntity(x, y, z); - if (te2 != null && te2 instanceof TileGrinder) { - return new ContainerGrinder(player.inventory, (TileGrinder) te2); + TileEntity grinder = world.getTileEntity(x, y, z); + if (grinder instanceof TileGrinder) { + return new ContainerGrinder(player.inventory, (TileGrinder) grinder); } break; case GUIID_PLAYERDETECTOR: TileEntity detector = world.getTileEntity(x, y, z); - if (detector != null && detector instanceof TilePlayerDetectorAdvanced) { + if (detector instanceof TilePlayerDetectorAdvanced) { return new ContainerPlayerDetector(player.inventory, (TilePlayerDetectorAdvanced) detector); } break; case GUIID_ENERGY_INFUSER: TileEntity infuser = world.getTileEntity(x, y, z); - if (infuser != null && infuser instanceof TileEnergyInfuser) { + if (infuser instanceof TileEnergyInfuser) { return new ContainerEnergyInfuser(player.inventory, (TileEnergyInfuser) infuser); } break; case GUIID_GENERATOR: TileEntity generator = world.getTileEntity(x, y, z); - if (generator != null && generator instanceof TileGenerator) { + if (generator instanceof TileGenerator) { return new ContainerGenerator(player.inventory, (TileGenerator) generator); } break; case GUIID_DISSENCHANTER: TileEntity dissenchanter = world.getTileEntity(x, y, z); - if (dissenchanter != null && dissenchanter instanceof TileDissEnchanter) { + if (dissenchanter instanceof TileDissEnchanter) { return new ContainerDissEnchanter(player.inventory, (TileDissEnchanter) dissenchanter); } break; case GUIID_DRACONIC_CHEST: TileEntity containerChest = world.getTileEntity(x, y, z); - if (containerChest != null && containerChest instanceof TileDraconiumChest) { + if (containerChest instanceof TileDraconiumChest) { return new ContainerDraconiumChest(player.inventory, (TileDraconiumChest) containerChest); } break; case GUIID_REACTOR: TileEntity reactor = world.getTileEntity(x, y, z); - if (reactor != null && reactor instanceof TileReactorCore) { + if (reactor instanceof TileReactorCore) { return new ContainerReactor(player, (TileReactorCore) reactor); } break; @@ -101,17 +101,10 @@ public class GuiHandler implements IGuiHandler { return new ContainerAdvTool(player.inventory, new InventoryTool(player, null)); case GUIID_UPGRADE_MODIFIER: TileEntity containerTemp = world.getTileEntity(x, y, z); - if (containerTemp != null && containerTemp instanceof TileUpgradeModifier) { + if (containerTemp instanceof TileUpgradeModifier) { return new ContainerUpgradeModifier(player.inventory, (TileUpgradeModifier) containerTemp); } break; - - // case GUIID_CONTAINER_TEMPLATE: - // TileEntity containerTemp = world.getTileEntity(x, y, z); - // if (containerTemp != null && containerTemp instanceof TileContainerTemplate) { - // return new ContainerTemplate(player.inventory, (TileContainerTemplate) containerTemp); - // } - // break; } return null; @@ -121,45 +114,46 @@ public class GuiHandler implements IGuiHandler { public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { switch (ID) { case GUIID_WEATHER_CONTROLLER: - TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileWeatherController) { - return new GUIWeatherController(player.inventory, (TileWeatherController) te); + TileEntity weatherController = world.getTileEntity(x, y, z); + if (weatherController instanceof TileWeatherController) { + return new GUIWeatherController(player.inventory, (TileWeatherController) weatherController); } break; case GUIID_SUN_DIAL: - TileEntity te1 = world.getTileEntity(x, y, z); - if (te1 != null && te1 instanceof TileSunDial) { - return new GUISunDial(player.inventory, (TileSunDial) te1); + TileEntity sunDial = world.getTileEntity(x, y, z); + if (sunDial instanceof TileSunDial) { + return new GUISunDial(player.inventory, (TileSunDial) sunDial); } break; case GUIID_TELEPORTER: return new GUITeleporter(player); case GUIID_GRINDER: - TileEntity te2 = world.getTileEntity(x, y, z); - if (te2 != null && te2 instanceof TileGrinder) { - return new GUIGrinder(player.inventory, (TileGrinder) te2); + TileEntity grinder = world.getTileEntity(x, y, z); + if (grinder instanceof TileGrinder) { + return new GUIGrinder(player.inventory, (TileGrinder) grinder); } break; case GUIID_PARTICLEGEN: - TileEntity gen = world.getTileEntity(x, y, z); - return (gen != null && gen instanceof TileParticleGenerator) - ? new GUIParticleGenerator((TileParticleGenerator) gen, player) - : null; + TileEntity particleGenerator = world.getTileEntity(x, y, z); + if (particleGenerator instanceof TileParticleGenerator) { + return new GUIParticleGenerator((TileParticleGenerator) particleGenerator, player); + } + break; case GUIID_PLAYERDETECTOR: TileEntity detector = world.getTileEntity(x, y, z); - if (detector != null && detector instanceof TilePlayerDetectorAdvanced) { + if (detector instanceof TilePlayerDetectorAdvanced) { return new GUIPlayerDetector(player.inventory, (TilePlayerDetectorAdvanced) detector); } break; case GUIID_ENERGY_INFUSER: TileEntity infuser = world.getTileEntity(x, y, z); - if (infuser != null && infuser instanceof TileEnergyInfuser) { + if (infuser instanceof TileEnergyInfuser) { return new GUIEnergyInfuser(player.inventory, (TileEnergyInfuser) infuser); } break; case GUIID_GENERATOR: TileEntity generator = world.getTileEntity(x, y, z); - if (generator != null && generator instanceof TileGenerator) { + if (generator instanceof TileGenerator) { return new GUIGenerator(player.inventory, (TileGenerator) generator); } break; @@ -167,21 +161,20 @@ public class GuiHandler implements IGuiHandler { return new GUIManual(); case GUIID_DISSENCHANTER: TileEntity dissenchanter = world.getTileEntity(x, y, z); - if (dissenchanter != null && dissenchanter instanceof TileDissEnchanter) { + if (dissenchanter instanceof TileDissEnchanter) { return new GUIDissEnchanter(player.inventory, (TileDissEnchanter) dissenchanter); } break; case GUIID_DRACONIC_CHEST: TileEntity containerChest = world.getTileEntity(x, y, z); - if (containerChest != null && containerChest instanceof TileDraconiumChest) { + if (containerChest instanceof TileDraconiumChest) { return new GUIDraconiumChest(player.inventory, (TileDraconiumChest) containerChest); } break; case GUIID_REACTOR: TileEntity reactor = world.getTileEntity(x, y, z); - if (reactor != null && reactor instanceof TileReactorCore) { + if (reactor instanceof TileReactorCore) { return new GUIReactor( - player, (TileReactorCore) reactor, new ContainerReactor(player, (TileReactorCore) reactor)); } @@ -191,25 +184,20 @@ public class GuiHandler implements IGuiHandler { player, new ContainerAdvTool(player.inventory, new InventoryTool(player, null))); case GUIID_FLOW_GATE: - return world.getTileEntity(x, y, z) instanceof TileGate - ? new GUIFlowGate((TileGate) world.getTileEntity(x, y, z)) - : null; + TileEntity gate = world.getTileEntity(x, y, z); + if (gate instanceof TileGate) { + return new GUIFlowGate((TileGate) world.getTileEntity(x, y, z)); + } + break; case GUIID_UPGRADE_MODIFIER: TileEntity containerTemp = world.getTileEntity(x, y, z); - if (containerTemp != null && containerTemp instanceof TileUpgradeModifier) { + if (containerTemp instanceof TileUpgradeModifier) { return new GUIUpgradeModifier( player.inventory, (TileUpgradeModifier) containerTemp, new ContainerUpgradeModifier(player.inventory, (TileUpgradeModifier) containerTemp)); } break; - - // case GUIID_CONTAINER_TEMPLATE: - // TileEntity containerTemp = world.getTileEntity(x, y, z); - // if (containerTemp != null && containerTemp instanceof TileContainerTemplate) { - // return new GUIContainerTemplate(player.inventory, (TileContainerTemplate) containerTemp); - // } - // break; } return null;