From 3f41027325378875b7cba4cd15008a2731788447 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 7 Mar 2015 21:08:28 -0500 Subject: [PATCH] Started work on the new configuration interfaces, separated the transporter configuration from general side configuration, reorganized GUI elements into their own package --- .../java/mekanism/client/ClientProxy.java | 3 + .../gui/GuiAdvancedElectricMachine.java | 17 +- .../client/gui/GuiAmbientAccumulator.java | 6 +- .../mekanism/client/gui/GuiChanceMachine.java | 17 +- .../client/gui/GuiChemicalCrystallizer.java | 20 +- .../gui/GuiChemicalDissolutionChamber.java | 19 +- .../client/gui/GuiChemicalInfuser.java | 18 +- .../gui/GuiChemicalInjectionChamber.java | 3 +- .../client/gui/GuiChemicalOxidizer.java | 19 +- .../client/gui/GuiChemicalWasher.java | 24 ++- .../java/mekanism/client/gui/GuiCombiner.java | 3 +- .../mekanism/client/gui/GuiConfigTypeTab.java | 5 - .../mekanism/client/gui/GuiConfiguration.java | 7 +- .../java/mekanism/client/gui/GuiCrusher.java | 3 +- .../mekanism/client/gui/GuiDictionary.java | 2 +- .../mekanism/client/gui/GuiDigitalMiner.java | 12 +- .../mekanism/client/gui/GuiDynamicTank.java | 2 +- .../client/gui/GuiElectricMachine.java | 17 +- .../mekanism/client/gui/GuiElectricPump.java | 11 +- .../client/gui/GuiElectrolyticSeparator.java | 22 ++- .../client/gui/GuiEnergizedSmelter.java | 3 +- .../mekanism/client/gui/GuiEnergyCube.java | 12 +- .../client/gui/GuiEnrichmentChamber.java | 3 +- .../java/mekanism/client/gui/GuiFactory.java | 8 +- .../client/gui/GuiFluidicPlenisher.java | 11 +- .../client/gui/GuiInductionMatrix.java | 3 +- .../client/gui/GuiLaserAmplifier.java | 6 +- .../mekanism/client/gui/GuiMatrixStats.java | 9 +- .../java/mekanism/client/gui/GuiMekanism.java | 1 + .../client/gui/GuiMetallurgicInfuser.java | 17 +- .../client/gui/GuiOsmiumCompressor.java | 3 +- src/main/java/mekanism/client/gui/GuiPRC.java | 23 ++- .../mekanism/client/gui/GuiPortableTank.java | 10 +- .../client/gui/GuiPrecisionSawmill.java | 3 +- .../client/gui/GuiPurificationChamber.java | 3 +- .../client/gui/GuiRedstoneControl.java | 3 +- .../client/gui/GuiRotaryCondensentrator.java | 21 +- .../client/gui/GuiSeismicVibrator.java | 7 +- .../client/gui/GuiSolarNeutronActivator.java | 14 +- .../mekanism/client/gui/GuiTeleporter.java | 7 +- .../client/gui/GuiTransporterConfig.java | 186 ++++++++++++++++++ .../client/gui/{ => element}/GuiBucketIO.java | 5 +- .../client/gui/element/GuiConfigTypeTab.java | 5 + .../{ => element}/GuiConfigurationTab.java | 7 +- .../{ => element}/GuiContainerEditMode.java | 8 +- .../client/gui/{ => element}/GuiElement.java | 29 ++- .../gui/{ => element}/GuiEnergyGauge.java | 5 +- .../gui/{ => element}/GuiEnergyInfo.java | 5 +- .../gui/{ => element}/GuiFluidGauge.java | 4 +- .../client/gui/{ => element}/GuiGasGauge.java | 4 +- .../client/gui/{ => element}/GuiGauge.java | 3 +- .../gui/{ => element}/GuiMatrixTab.java | 3 +- .../gui/{ => element}/GuiNumberGauge.java | 4 +- .../client/gui/{ => element}/GuiPowerBar.java | 3 +- .../client/gui/{ => element}/GuiProgress.java | 5 +- .../client/gui/{ => element}/GuiRateBar.java | 3 +- .../gui/{ => element}/GuiRecipeType.java | 5 +- .../gui/{ => element}/GuiScrollList.java | 8 +- .../client/gui/{ => element}/GuiSlot.java | 5 +- .../gui/{ => element}/GuiSortingTab.java | 5 +- .../gui/element/GuiTransporterConfigTab.java | 81 ++++++++ .../gui/{ => element}/GuiUpgradeTab.java | 5 +- .../gui/{ => element}/GuiVisualsTab.java | 3 +- .../nei/AdvancedMachineRecipeHandler.java | 20 +- .../client/nei/BaseRecipeHandler.java | 5 +- .../nei/ChanceMachineRecipeHandler.java | 20 +- ...ChemicalInjectionChamberRecipeHandler.java | 3 +- .../nei/ChemicalOxidizerRecipeHandler.java | 18 +- .../client/nei/CombinerRecipeHandler.java | 3 +- .../client/nei/CrusherRecipeHandler.java | 2 +- .../ElectrolyticSeparatorRecipeHandler.java | 24 +-- .../client/nei/ElementBoundHandler.java | 4 +- .../nei/EnrichmentChamberRecipeHandler.java | 2 +- .../client/nei/MachineRecipeHandler.java | 20 +- .../nei/MetallurgicInfuserRecipeHandler.java | 20 +- .../nei/OsmiumCompressorRecipeHandler.java | 3 +- .../mekanism/client/nei/PRCRecipeHandler.java | 24 +-- .../nei/PrecisionSawmillRecipeHandler.java | 2 +- .../nei/PurificationChamberRecipeHandler.java | 3 +- .../tileentity/RenderConfigurableMachine.java | 29 --- .../java/mekanism/common/CommonProxy.java | 3 +- .../java/mekanism/common/base/IEjector.java | 5 - .../mekanism/common/block/BlockMachine.java | 4 - .../common/item/ItemBlockMachine.java | 3 +- .../network/PacketConfigurationUpdate.java | 18 +- .../tile/component/TileComponentConfig.java | 17 ++ .../tile/component/TileComponentEjector.java | 26 +-- .../client/gui/GuiBioGenerator.java | 13 +- .../generators/client/gui/GuiFuelTab.java | 4 +- .../client/gui/GuiGasGenerator.java | 19 +- .../client/gui/GuiHeatGenerator.java | 19 +- .../generators/client/gui/GuiHeatTab.java | 4 +- .../client/gui/GuiNeutronCapture.java | 13 +- .../client/gui/GuiReactorController.java | 9 +- .../generators/client/gui/GuiReactorFuel.java | 16 +- .../generators/client/gui/GuiReactorHeat.java | 25 ++- .../client/gui/GuiReactorStats.java | 5 +- .../client/gui/GuiSolarGenerator.java | 13 +- .../generators/client/gui/GuiStatTab.java | 4 +- .../generators/client/gui/GuiWindTurbine.java | 13 +- .../assets/mekanism/gui/GuiConfiguration.png | Bin 4694 -> 4308 bytes .../mekanism/gui/GuiTransporterConfig.png | Bin 0 -> 4310 bytes .../gui/elements/GuiTransporterConfigTab.png | Bin 0 -> 3551 bytes .../resources/assets/mekanism/lang/en_US.lang | 2 + 104 files changed, 773 insertions(+), 452 deletions(-) delete mode 100644 src/main/java/mekanism/client/gui/GuiConfigTypeTab.java create mode 100644 src/main/java/mekanism/client/gui/GuiTransporterConfig.java rename src/main/java/mekanism/client/gui/{ => element}/GuiBucketIO.java (95%) create mode 100644 src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java rename src/main/java/mekanism/client/gui/{ => element}/GuiConfigurationTab.java (95%) rename src/main/java/mekanism/client/gui/{ => element}/GuiContainerEditMode.java (93%) rename src/main/java/mekanism/client/gui/{ => element}/GuiElement.java (81%) rename src/main/java/mekanism/client/gui/{ => element}/GuiEnergyGauge.java (94%) rename src/main/java/mekanism/client/gui/{ => element}/GuiEnergyInfo.java (94%) rename src/main/java/mekanism/client/gui/{ => element}/GuiFluidGauge.java (95%) rename src/main/java/mekanism/client/gui/{ => element}/GuiGasGauge.java (95%) rename src/main/java/mekanism/client/gui/{ => element}/GuiGauge.java (97%) rename src/main/java/mekanism/client/gui/{ => element}/GuiMatrixTab.java (97%) rename src/main/java/mekanism/client/gui/{ => element}/GuiNumberGauge.java (91%) rename src/main/java/mekanism/client/gui/{ => element}/GuiPowerBar.java (97%) rename src/main/java/mekanism/client/gui/{ => element}/GuiProgress.java (97%) rename src/main/java/mekanism/client/gui/{ => element}/GuiRateBar.java (96%) rename src/main/java/mekanism/client/gui/{ => element}/GuiRecipeType.java (95%) rename src/main/java/mekanism/client/gui/{ => element}/GuiScrollList.java (94%) rename src/main/java/mekanism/client/gui/{ => element}/GuiSlot.java (97%) rename src/main/java/mekanism/client/gui/{ => element}/GuiSortingTab.java (96%) create mode 100644 src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java rename src/main/java/mekanism/client/gui/{ => element}/GuiUpgradeTab.java (96%) rename src/main/java/mekanism/client/gui/{ => element}/GuiVisualsTab.java (96%) create mode 100644 src/main/resources/assets/mekanism/gui/GuiTransporterConfig.png create mode 100644 src/main/resources/assets/mekanism/gui/elements/GuiTransporterConfigTab.png diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 26b64efdc..75e57920a 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -56,6 +56,7 @@ import mekanism.client.gui.GuiSeismicVibrator; import mekanism.client.gui.GuiSolarEvaporationController; import mekanism.client.gui.GuiSolarNeutronActivator; import mekanism.client.gui.GuiTeleporter; +import mekanism.client.gui.GuiTransporterConfig; import mekanism.client.gui.GuiUpgradeManagement; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.RenderGlowPanel; @@ -506,6 +507,8 @@ public class ClientProxy extends CommonProxy return new GuiInductionMatrix(player.inventory, (TileEntityInductionCasing)tileEntity); case 50: return new GuiMatrixStats(player.inventory, (TileEntityInductionCasing)tileEntity); + case 51: + return new GuiTransporterConfig(player, (ISideConfiguration)tileEntity); } return null; diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index ee36dcb6f..338f03be5 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -4,16 +4,21 @@ import java.util.List; import mekanism.api.gas.GasStack; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiConfigurationTab; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java index 2dfb212fe..0d27d689e 100644 --- a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java +++ b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java @@ -1,13 +1,13 @@ package mekanism.client.gui; import mekanism.api.gas.GasTank; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiGauge.Type; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.EntityPlayer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index 0f0a2b6d4..71e853ec9 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -3,15 +3,20 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiConfigurationTab; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerChanceMachine; import mekanism.common.tile.TileEntityChanceMachine; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 0d298228a..262c9cf98 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -8,12 +8,20 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; import mekanism.api.gas.OreGas; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiConfigurationTab; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalCrystallizer; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index ab4c26511..56b113d5c 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -4,17 +4,22 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerChemicalDissolutionChamber; import mekanism.common.tile.TileEntityChemicalDissolutionChamber; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index f1e8ba214..6a667a5af 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -6,12 +6,18 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalInfuser; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java index 336519fcc..49ad53994 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index 6265bdb6e..a303b7037 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -4,17 +4,22 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index 929c49c60..84ac10efe 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -6,14 +6,22 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiGauge.Type; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiBucketIO; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalWasher; diff --git a/src/main/java/mekanism/client/gui/GuiCombiner.java b/src/main/java/mekanism/client/gui/GuiCombiner.java index 3dba41e96..70dad2b1c 100644 --- a/src/main/java/mekanism/client/gui/GuiCombiner.java +++ b/src/main/java/mekanism/client/gui/GuiCombiner.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiConfigTypeTab.java b/src/main/java/mekanism/client/gui/GuiConfigTypeTab.java deleted file mode 100644 index 3bf683b89..000000000 --- a/src/main/java/mekanism/client/gui/GuiConfigTypeTab.java +++ /dev/null @@ -1,5 +0,0 @@ -package mekanism.client.gui; - -public class GuiConfigTypeTab { - -} diff --git a/src/main/java/mekanism/client/gui/GuiConfiguration.java b/src/main/java/mekanism/client/gui/GuiConfiguration.java index 7581b7d98..ab57397b0 100644 --- a/src/main/java/mekanism/client/gui/GuiConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiConfiguration.java @@ -157,8 +157,9 @@ public class GuiConfiguration extends GuiMekanism int xAxis = (mouseX - (width - xSize) / 2); int yAxis = (mouseY - (height - ySize) / 2); - fontRendererObj.drawString(MekanismUtils.localize("gui.configuration"), 60, 5, 0x404040); - fontRendererObj.drawString(MekanismUtils.localize("gui.eject") + ": " + (configurable.getEjector().isEjecting() ? "On" : "Off"), 53, 17, 0x00CD00); + String title = MekanismUtils.localize("gui.configuration.side"); + fontRendererObj.drawString(title, fontRendererObj.getStringWidth(title)/2, 5, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.eject") + ": " + (configurable.getConfig().isEjecting(TransmissionType.ITEM) ? "On" : "Off"), 53, 17, 0x00CD00); fontRendererObj.drawString(MekanismUtils.localize("gui.input") + " (" + (configurable.getEjector().hasStrictInput() ? "On" : "Off") + ")", 18, 81, 0x787878); fontRendererObj.drawString(MekanismUtils.localize("gui.output"), 72, 68, 0x787878); @@ -263,7 +264,7 @@ public class GuiConfiguration extends GuiMekanism if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) { SoundHandler.playSound("gui.button.press"); - Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.EJECT, Coord4D.get(tile), 0, 0, null)); + Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.EJECT, Coord4D.get(tile), 0, 0, TransmissionType.ITEM)); } if(xAxis >= 156 && xAxis <= 170 && yAxis >= 21 && yAxis <= 35) diff --git a/src/main/java/mekanism/client/gui/GuiCrusher.java b/src/main/java/mekanism/client/gui/GuiCrusher.java index a7f330323..0283f3aa8 100644 --- a/src/main/java/mekanism/client/gui/GuiCrusher.java +++ b/src/main/java/mekanism/client/gui/GuiCrusher.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiDictionary.java b/src/main/java/mekanism/client/gui/GuiDictionary.java index 2bc672fe3..a02d86fd3 100644 --- a/src/main/java/mekanism/client/gui/GuiDictionary.java +++ b/src/main/java/mekanism/client/gui/GuiDictionary.java @@ -1,10 +1,10 @@ package mekanism.client.gui; +import mekanism.client.gui.element.GuiScrollList; import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerDictionary; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 059781b39..3dc0960e0 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -6,9 +6,14 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiVisualsTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; @@ -20,7 +25,6 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index dc7b171f2..10a568021 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import mekanism.client.gui.element.GuiContainerEditMode; import mekanism.client.render.MekanismRenderer; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.container.ContainerDynamicTank; @@ -7,7 +8,6 @@ import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 2384751fa..9914404b9 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -3,15 +3,20 @@ package mekanism.client.gui; import java.util.List; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiConfigurationTab; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 725b3c376..be01fe1fe 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -1,8 +1,13 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerElectricPump; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index ac5370bcc..dcce2b2e4 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -7,13 +7,21 @@ import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; diff --git a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java index 67b68591a..b5857c959 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java +++ b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index e83ea40ab..d356d691d 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -4,15 +4,17 @@ import java.util.List; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyGauge.IEnergyInfoHandler; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyGauge; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerEnergyCube; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java index acc4aeb06..3df82f662 100644 --- a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java +++ b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityElectricMachine; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 341122ed0..b509a078b 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -4,13 +4,17 @@ import java.util.List; import mekanism.api.gas.GasStack; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiConfigurationTab; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiRecipeType; +import mekanism.client.gui.element.GuiSortingTab; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.common.Tier.FactoryTier; import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index fa6c66051..c07414ae5 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -1,14 +1,17 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerFluidicPlenisher; import mekanism.common.tile.TileEntityFluidicPlenisher; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java index a1c56b4d0..ac6bb3550 100644 --- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java +++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java @@ -1,6 +1,7 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiMatrixTab.MatrixTab; +import mekanism.client.gui.element.GuiMatrixTab; +import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerInductionMatrix; import mekanism.common.tile.TileEntityInductionCasing; diff --git a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java index 0a2b4ddc7..52eccdc8d 100644 --- a/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java +++ b/src/main/java/mekanism/client/gui/GuiLaserAmplifier.java @@ -3,8 +3,9 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; -import mekanism.client.gui.GuiGauge.Type; -import mekanism.client.gui.GuiNumberGauge.INumberInfoHandler; +import mekanism.client.gui.element.GuiNumberGauge; +import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiNumberGauge.INumberInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerLaserAmplifier; @@ -12,7 +13,6 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java index 2f431a912..1d453220c 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java +++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java @@ -1,9 +1,12 @@ package mekanism.client.gui; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.client.gui.GuiEnergyGauge.IEnergyInfoHandler; -import mekanism.client.gui.GuiMatrixTab.MatrixTab; -import mekanism.client.gui.GuiRateBar.IRateInfoHandler; +import mekanism.client.gui.element.GuiEnergyGauge; +import mekanism.client.gui.element.GuiMatrixTab; +import mekanism.client.gui.element.GuiRateBar; +import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; +import mekanism.client.gui.element.GuiMatrixTab.MatrixTab; +import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index ef92e504a..f5d5d81dd 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Set; import mekanism.api.transmitters.TransmissionType; +import mekanism.client.gui.element.GuiElement; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index c4ca7aad3..48c1e1204 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -5,11 +5,17 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiConfigurationTab; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; @@ -17,7 +23,6 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java index fdd5abced..bd17dfa1e 100644 --- a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java +++ b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java index e51444ff1..d5dd9cc9c 100644 --- a/src/main/java/mekanism/client/gui/GuiPRC.java +++ b/src/main/java/mekanism/client/gui/GuiPRC.java @@ -4,13 +4,22 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiConfigurationTab; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerPRC; import mekanism.common.tile.TileEntityPRC; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiPortableTank.java b/src/main/java/mekanism/client/gui/GuiPortableTank.java index be9976b61..b5f384327 100644 --- a/src/main/java/mekanism/client/gui/GuiPortableTank.java +++ b/src/main/java/mekanism/client/gui/GuiPortableTank.java @@ -1,13 +1,15 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiContainerEditMode; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerPortableTank; import mekanism.common.tile.TileEntityPortableTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java index 01f10ca94..1b521b90b 100644 --- a/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java +++ b/src/main/java/mekanism/client/gui/GuiPrecisionSawmill.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityChanceMachine; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java index 0b4ad0774..c33d40407 100644 --- a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java +++ b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java @@ -1,8 +1,7 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.tile.TileEntityAdvancedElectricMachine; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java index 2bcfef375..9659fc3e4 100644 --- a/src/main/java/mekanism/client/gui/GuiRedstoneControl.java +++ b/src/main/java/mekanism/client/gui/GuiRedstoneControl.java @@ -1,6 +1,7 @@ package mekanism.client.gui; import mekanism.api.Coord4D; +import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; @@ -8,10 +9,8 @@ import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.network.PacketRedstoneControl.RedstoneControlMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import codechicken.lib.vec.Rectangle4i; public class GuiRedstoneControl extends GuiElement diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java index fc00b53b8..70baf84fa 100644 --- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -6,13 +6,20 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index fe2f6c580..500de1676 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -1,12 +1,13 @@ package mekanism.client.gui; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java index 1aa773369..951bceaf6 100644 --- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java @@ -1,11 +1,15 @@ package mekanism.client.gui; import mekanism.api.gas.GasTank; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiTeleporter.java b/src/main/java/mekanism/client/gui/GuiTeleporter.java index 68780c280..b440659f3 100644 --- a/src/main/java/mekanism/client/gui/GuiTeleporter.java +++ b/src/main/java/mekanism/client/gui/GuiTeleporter.java @@ -5,8 +5,10 @@ import java.util.ArrayList; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.Coord4D; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerTeleporter; @@ -15,6 +17,7 @@ import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java new file mode 100644 index 000000000..2ea191892 --- /dev/null +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -0,0 +1,186 @@ +package mekanism.client.gui; + +import java.util.HashMap; +import java.util.Map; + +import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.api.transmitters.TransmissionType; +import mekanism.client.gui.GuiConfiguration.GuiPos; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.SideData; +import mekanism.common.base.ISideConfiguration; +import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; +import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiTransporterConfig extends GuiMekanism +{ + public Map slotPosMap = new HashMap(); + + public ISideConfiguration configurable; + + public GuiTransporterConfig(EntityPlayer player, ISideConfiguration tile) + { + super(new ContainerNull(player, (TileEntityContainerBlock)tile)); + + ySize = 95; + + configurable = tile; + + slotPosMap.put(0, new GuiPos(54, 64)); + slotPosMap.put(1, new GuiPos(54, 34)); + slotPosMap.put(2, new GuiPos(54, 49)); + slotPosMap.put(3, new GuiPos(39, 64)); + slotPosMap.put(4, new GuiPos(39, 49)); + slotPosMap.put(5, new GuiPos(69, 49)); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiTransporterConfig.png")); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176 + 14, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176 + 14, 14, 14, 14); + } + + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176 + 28, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + 6, guiHeight + 6, 176 + 28, 14, 14, 14); + } + + for(int i = 0; i < slotPosMap.size(); i++) + { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + int x = slotPosMap.get(i).xPos; + int y = slotPosMap.get(i).yPos; + + SideData data = configurable.getConfig().getOutput(TransmissionType.ITEM, i); + + if(data.color != EnumColor.GREY) + { + GL11.glColor4f(data.color.getColor(0), data.color.getColor(1), data.color.getColor(2), 1); + } + + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 0, 14, 14); + } + else { + drawTexturedModalRect(guiWidth + x, guiHeight + y, 176, 14, 14, 14); + } + } + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + String title = MekanismUtils.localize("gui.configuration.transporter"); + fontRendererObj.drawString(title, fontRendererObj.getStringWidth(title)/2, 14, 0x404040); + + for(int i = 0; i < slotPosMap.size(); i++) + { + int x = slotPosMap.get(i).xPos; + int y = slotPosMap.get(i).yPos; + + EnumColor color = configurable.getEjector().getInputColor(ForgeDirection.getOrientation(i)); + + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + drawCreativeTabHoveringText(color != null ? color.getName() : MekanismUtils.localize("gui.none"), xAxis, yAxis); + } + } + + if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) + { + drawCreativeTabHoveringText(MekanismUtils.localize("gui.configuration.strictInput"), xAxis, yAxis); + } + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + TileEntity tile = (TileEntity)configurable; + + if(button == 0) + { + if(xAxis >= 6 && xAxis <= 20 && yAxis >= 6 && yAxis <= 20) + { + int guiId = MachineType.get(tile.getBlockType(), tile.getBlockMetadata()).guiId; + SoundHandler.playSound("gui.button.press"); + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tile), guiId)); + } + + if(xAxis >= 156 && xAxis <= 170 && yAxis >= 6 && yAxis <= 20) + { + SoundHandler.playSound("gui.button.press"); + Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.STRICT_INPUT, Coord4D.get(tile), 0, 0, null)); + } + } + + if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) && button == 0) + { + button = 2; + } + + for(int i = 0; i < slotPosMap.size(); i++) + { + int x = slotPosMap.get(i).xPos; + int y = slotPosMap.get(i).yPos; + + if(xAxis >= x && xAxis <= x+14 && yAxis >= y && yAxis <= y+14) + { + SoundHandler.playSound("gui.button.press"); + Mekanism.packetHandler.sendToServer(new ConfigurationUpdateMessage(ConfigurationPacket.INPUT_COLOR, Coord4D.get(tile), button, i, null)); + } + } + } +} diff --git a/src/main/java/mekanism/client/gui/GuiBucketIO.java b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java similarity index 95% rename from src/main/java/mekanism/client/gui/GuiBucketIO.java rename to src/main/java/mekanism/client/gui/element/GuiBucketIO.java index aa047f665..79774736c 100644 --- a/src/main/java/mekanism/client/gui/GuiBucketIO.java +++ b/src/main/java/mekanism/client/gui/element/GuiBucketIO.java @@ -1,12 +1,11 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java new file mode 100644 index 000000000..b50311fd4 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiConfigTypeTab.java @@ -0,0 +1,5 @@ +package mekanism.client.gui.element; + +public class GuiConfigTypeTab { + +} diff --git a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java b/src/main/java/mekanism/client/gui/element/GuiConfigurationTab.java similarity index 95% rename from src/main/java/mekanism/client/gui/GuiConfigurationTab.java rename to src/main/java/mekanism/client/gui/element/GuiConfigurationTab.java index 08a7efbee..5733dd8e5 100644 --- a/src/main/java/mekanism/client/gui/GuiConfigurationTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiConfigurationTab.java @@ -1,23 +1,22 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import mekanism.api.Coord4D; +import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) public class GuiConfigurationTab extends GuiElement { - TileEntity tileEntity; + public TileEntity tileEntity; public GuiConfigurationTab(IGuiWrapper gui, TileEntity tile, ResourceLocation def) { diff --git a/src/main/java/mekanism/client/gui/GuiContainerEditMode.java b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java similarity index 93% rename from src/main/java/mekanism/client/gui/GuiContainerEditMode.java rename to src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java index 805558bd9..ffa6032c4 100644 --- a/src/main/java/mekanism/client/gui/GuiContainerEditMode.java +++ b/src/main/java/mekanism/client/gui/element/GuiContainerEditMode.java @@ -1,6 +1,7 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import mekanism.api.Coord4D; +import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.base.IFluidContainerManager; @@ -8,12 +9,13 @@ import mekanism.common.network.PacketContainerEditMode.ContainerEditModeMessage; import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +@SideOnly(Side.CLIENT) public class GuiContainerEditMode extends GuiElement { TileEntity tileEntity; diff --git a/src/main/java/mekanism/client/gui/GuiElement.java b/src/main/java/mekanism/client/gui/element/GuiElement.java similarity index 81% rename from src/main/java/mekanism/client/gui/GuiElement.java rename to src/main/java/mekanism/client/gui/element/GuiElement.java index 627e74001..3ede9eeb8 100644 --- a/src/main/java/mekanism/client/gui/GuiElement.java +++ b/src/main/java/mekanism/client/gui/element/GuiElement.java @@ -1,25 +1,24 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import java.util.List; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.ObfuscatedNames; import mekanism.common.util.MekanismUtils; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import codechicken.lib.vec.Rectangle4i; - @SideOnly(Side.CLIENT) public abstract class GuiElement { - protected static Minecraft mc = Minecraft.getMinecraft(); + public static Minecraft mc = Minecraft.getMinecraft(); - protected ResourceLocation RESOURCE; + public ResourceLocation RESOURCE; public IGuiWrapper guiObj; @@ -32,17 +31,17 @@ public abstract class GuiElement defaultLocation = def; } - protected void displayTooltip(String s, int xAxis, int yAxis) + public void displayTooltip(String s, int xAxis, int yAxis) { guiObj.displayTooltip(s, xAxis, yAxis); } - protected void displayTooltips(List list, int xAxis, int yAxis) + public void displayTooltips(List list, int xAxis, int yAxis) { guiObj.displayTooltips(list, xAxis, yAxis); } - protected void offsetX(int xSize) + public void offsetX(int xSize) { if(guiObj instanceof GuiContainer) { @@ -55,7 +54,7 @@ public abstract class GuiElement } } - protected void offsetY(int ySize) + public void offsetY(int ySize) { if(guiObj instanceof GuiContainer) { @@ -68,7 +67,7 @@ public abstract class GuiElement } } - protected void offsetLeft(int guiLeft) + public void offsetLeft(int guiLeft) { if(guiObj instanceof GuiContainer) { @@ -82,7 +81,7 @@ public abstract class GuiElement } } - protected void offsetTop(int guiTop) + public void offsetTop(int guiTop) { if(guiObj instanceof GuiContainer) { @@ -95,14 +94,14 @@ public abstract class GuiElement } } - protected FontRenderer getFontRenderer() + public FontRenderer getFontRenderer() { return guiObj.getFont(); } - protected void mouseClickMove(int mouseX, int mouseY, int button, long ticks) {} + public void mouseClickMove(int mouseX, int mouseY, int button, long ticks) {} - protected void mouseMovedOrUp(int x, int y, int type) {} + public void mouseMovedOrUp(int x, int y, int type) {} public abstract Rectangle4i getBounds(int guiWidth, int guiHeight); diff --git a/src/main/java/mekanism/client/gui/GuiEnergyGauge.java b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java similarity index 94% rename from src/main/java/mekanism/client/gui/GuiEnergyGauge.java rename to src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java index e361e79c7..0d9a9134f 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyGauge.java @@ -1,12 +1,11 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; import mekanism.common.util.MekanismUtils; - import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import codechicken.lib.vec.Rectangle4i; public class GuiEnergyGauge extends GuiGauge diff --git a/src/main/java/mekanism/client/gui/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java similarity index 94% rename from src/main/java/mekanism/client/gui/GuiEnergyInfo.java rename to src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index 5feb2a503..d51ed1d9e 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -1,14 +1,13 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import java.util.List; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java similarity index 95% rename from src/main/java/mekanism/client/gui/GuiFluidGauge.java rename to src/main/java/mekanism/client/gui/element/GuiFluidGauge.java index c6caa1573..b9bd8d562 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java @@ -1,6 +1,8 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import mekanism.api.Coord4D; +import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.Mekanism; import mekanism.common.base.IDropperHandler; import mekanism.common.item.ItemGaugeDropper; diff --git a/src/main/java/mekanism/client/gui/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java similarity index 95% rename from src/main/java/mekanism/client/gui/GuiGasGauge.java rename to src/main/java/mekanism/client/gui/element/GuiGasGauge.java index db17633c7..841eff9c2 100644 --- a/src/main/java/mekanism/client/gui/GuiGasGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java @@ -1,10 +1,12 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import java.util.Arrays; import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; +import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.Mekanism; import mekanism.common.base.IDropperHandler; import mekanism.common.item.ItemGaugeDropper; diff --git a/src/main/java/mekanism/client/gui/GuiGauge.java b/src/main/java/mekanism/client/gui/element/GuiGauge.java similarity index 97% rename from src/main/java/mekanism/client/gui/GuiGauge.java rename to src/main/java/mekanism/client/gui/element/GuiGauge.java index 11c106eee..c92bf1d79 100644 --- a/src/main/java/mekanism/client/gui/GuiGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiGauge.java @@ -1,5 +1,6 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; +import mekanism.client.gui.IGuiWrapper; import mekanism.client.render.MekanismRenderer; import mekanism.common.base.IDropperHandler; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiMatrixTab.java b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java similarity index 97% rename from src/main/java/mekanism/client/gui/GuiMatrixTab.java rename to src/main/java/mekanism/client/gui/element/GuiMatrixTab.java index 87eb3ac37..65c8f9031 100644 --- a/src/main/java/mekanism/client/gui/GuiMatrixTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiMatrixTab.java @@ -1,6 +1,7 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import mekanism.api.Coord4D; +import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; diff --git a/src/main/java/mekanism/client/gui/GuiNumberGauge.java b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java similarity index 91% rename from src/main/java/mekanism/client/gui/GuiNumberGauge.java rename to src/main/java/mekanism/client/gui/element/GuiNumberGauge.java index 42c8c82ee..0210d8aa9 100644 --- a/src/main/java/mekanism/client/gui/GuiNumberGauge.java +++ b/src/main/java/mekanism/client/gui/element/GuiNumberGauge.java @@ -1,8 +1,8 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; +import mekanism.client.gui.IGuiWrapper; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; - import static java.lang.Math.min; public class GuiNumberGauge extends GuiGauge diff --git a/src/main/java/mekanism/client/gui/GuiPowerBar.java b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java similarity index 97% rename from src/main/java/mekanism/client/gui/GuiPowerBar.java rename to src/main/java/mekanism/client/gui/element/GuiPowerBar.java index d541f60ce..8ba61a3fb 100644 --- a/src/main/java/mekanism/client/gui/GuiPowerBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiPowerBar.java @@ -1,5 +1,6 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/client/gui/GuiProgress.java b/src/main/java/mekanism/client/gui/element/GuiProgress.java similarity index 97% rename from src/main/java/mekanism/client/gui/GuiProgress.java rename to src/main/java/mekanism/client/gui/element/GuiProgress.java index 9b01e183e..cc03c0ae0 100644 --- a/src/main/java/mekanism/client/gui/GuiProgress.java +++ b/src/main/java/mekanism/client/gui/element/GuiProgress.java @@ -1,12 +1,11 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/GuiRateBar.java b/src/main/java/mekanism/client/gui/element/GuiRateBar.java similarity index 96% rename from src/main/java/mekanism/client/gui/GuiRateBar.java rename to src/main/java/mekanism/client/gui/element/GuiRateBar.java index 888901c71..e6c1d450b 100644 --- a/src/main/java/mekanism/client/gui/GuiRateBar.java +++ b/src/main/java/mekanism/client/gui/element/GuiRateBar.java @@ -1,5 +1,6 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/client/gui/GuiRecipeType.java b/src/main/java/mekanism/client/gui/element/GuiRecipeType.java similarity index 95% rename from src/main/java/mekanism/client/gui/GuiRecipeType.java rename to src/main/java/mekanism/client/gui/element/GuiRecipeType.java index 79fc0fad1..45217ecc0 100644 --- a/src/main/java/mekanism/client/gui/GuiRecipeType.java +++ b/src/main/java/mekanism/client/gui/element/GuiRecipeType.java @@ -1,11 +1,10 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.util.ResourceLocation; - import codechicken.lib.vec.Rectangle4i; public class GuiRecipeType extends GuiElement diff --git a/src/main/java/mekanism/client/gui/GuiScrollList.java b/src/main/java/mekanism/client/gui/element/GuiScrollList.java similarity index 94% rename from src/main/java/mekanism/client/gui/GuiScrollList.java rename to src/main/java/mekanism/client/gui/element/GuiScrollList.java index 279b3692f..b67a1e3ce 100644 --- a/src/main/java/mekanism/client/gui/GuiScrollList.java +++ b/src/main/java/mekanism/client/gui/element/GuiScrollList.java @@ -1,11 +1,11 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import java.util.ArrayList; import java.util.List; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -168,7 +168,7 @@ public class GuiScrollList extends GuiElement } @Override - protected void mouseClickMove(int xAxis, int yAxis, int button, long ticks) + public void mouseClickMove(int xAxis, int yAxis, int button, long ticks) { super.mouseClickMove(xAxis, yAxis, button, ticks); @@ -179,7 +179,7 @@ public class GuiScrollList extends GuiElement } @Override - protected void mouseMovedOrUp(int xAxis, int yAxis, int type) + public void mouseMovedOrUp(int xAxis, int yAxis, int type) { super.mouseMovedOrUp(xAxis, yAxis, type); diff --git a/src/main/java/mekanism/client/gui/GuiSlot.java b/src/main/java/mekanism/client/gui/element/GuiSlot.java similarity index 97% rename from src/main/java/mekanism/client/gui/GuiSlot.java rename to src/main/java/mekanism/client/gui/element/GuiSlot.java index a01dce7e0..c3c8af31d 100644 --- a/src/main/java/mekanism/client/gui/GuiSlot.java +++ b/src/main/java/mekanism/client/gui/element/GuiSlot.java @@ -1,10 +1,9 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; +import mekanism.client.gui.IGuiWrapper; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.util.ResourceLocation; - import codechicken.lib.vec.Rectangle4i; public class GuiSlot extends GuiElement diff --git a/src/main/java/mekanism/client/gui/GuiSortingTab.java b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java similarity index 96% rename from src/main/java/mekanism/client/gui/GuiSortingTab.java rename to src/main/java/mekanism/client/gui/element/GuiSortingTab.java index d3b3c581c..62fd761d9 100644 --- a/src/main/java/mekanism/client/gui/GuiSortingTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSortingTab.java @@ -1,19 +1,18 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java new file mode 100644 index 000000000..d8437c999 --- /dev/null +++ b/src/main/java/mekanism/client/gui/element/GuiTransporterConfigTab.java @@ -0,0 +1,81 @@ +package mekanism.client.gui.element; + +import mekanism.api.Coord4D; +import mekanism.client.gui.IGuiWrapper; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import codechicken.lib.vec.Rectangle4i; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiTransporterConfigTab extends GuiElement +{ + public TileEntity tileEntity; + public int yAxis; + + public GuiTransporterConfigTab(IGuiWrapper gui, int y, TileEntity tile, ResourceLocation def) + { + super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiTransporterConfigTab.png"), gui, def); + + tileEntity = tile; + } + + @Override + public Rectangle4i getBounds(int guiWidth, int guiHeight) + { + return new Rectangle4i(guiWidth - 26, guiHeight + yAxis, 26, 26); + } + + @Override + public void renderBackground(int xAxis, int yAxis, int guiWidth, int guiHeight) + { + mc.renderEngine.bindTexture(RESOURCE); + + guiObj.drawTexturedRect(guiWidth - 26, guiHeight + yAxis, 0, 0, 26, 26); + + if(xAxis >= -21 && xAxis <= -3 && yAxis >= yAxis+4 && yAxis <= yAxis+22) + { + guiObj.drawTexturedRect(guiWidth - 21, guiHeight + yAxis+4, 26, 0, 18, 18); + } + else { + guiObj.drawTexturedRect(guiWidth - 21, guiHeight + yAxis+4, 26, 18, 18, 18); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void renderForeground(int xAxis, int yAxis) + { + mc.renderEngine.bindTexture(RESOURCE); + + if(xAxis >= -21 && xAxis <= -3 && yAxis >= yAxis+4 && yAxis <= yAxis+22) + { + displayTooltip(MekanismUtils.localize("gui.configuration"), xAxis, yAxis); + } + + mc.renderEngine.bindTexture(defaultLocation); + } + + @Override + public void preMouseClicked(int xAxis, int yAxis, int button) {} + + @Override + public void mouseClicked(int xAxis, int yAxis, int button) + { + if(button == 0) + { + if(xAxis >= -21 && xAxis <= -3 && yAxis >= yAxis+4 && yAxis <= yAxis+22) + { + Mekanism.packetHandler.sendToServer(new SimpleGuiMessage(Coord4D.get(tileEntity), 51)); + SoundHandler.playSound("gui.button.press"); + } + } + } +} diff --git a/src/main/java/mekanism/client/gui/GuiUpgradeTab.java b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java similarity index 96% rename from src/main/java/mekanism/client/gui/GuiUpgradeTab.java rename to src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java index 4b3002d35..99f4595cb 100644 --- a/src/main/java/mekanism/client/gui/GuiUpgradeTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiUpgradeTab.java @@ -1,15 +1,14 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; import mekanism.api.Coord4D; +import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; - import codechicken.lib.vec.Rectangle4i; public class GuiUpgradeTab extends GuiElement diff --git a/src/main/java/mekanism/client/gui/GuiVisualsTab.java b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java similarity index 96% rename from src/main/java/mekanism/client/gui/GuiVisualsTab.java rename to src/main/java/mekanism/client/gui/element/GuiVisualsTab.java index 16a109950..0123ef594 100644 --- a/src/main/java/mekanism/client/gui/GuiVisualsTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiVisualsTab.java @@ -1,5 +1,6 @@ -package mekanism.client.gui; +package mekanism.client.gui.element; +import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java index 0ed00778c..e93a2c995 100644 --- a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java @@ -6,21 +6,20 @@ import java.util.List; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiElement; -import mekanism.client.gui.GuiPowerBar; -import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.GuiProgress; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -32,7 +31,6 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; - import static codechicken.lib.gui.GuiDraw.changeTexture; import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; diff --git a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java index 64ad74355..878e01077 100644 --- a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/BaseRecipeHandler.java @@ -5,18 +5,15 @@ import java.util.List; import java.util.Set; import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; +import mekanism.client.gui.element.GuiElement; import mekanism.client.render.MekanismRenderer; - import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; - import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; - import static codechicken.lib.gui.GuiDraw.changeTexture; import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import static codechicken.lib.gui.GuiDraw.gui; diff --git a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java index 65b71fc46..8ceda4b9a 100644 --- a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java @@ -3,20 +3,19 @@ package mekanism.client.nei; import java.awt.*; import java.util.Collection; -import mekanism.client.gui.GuiElement; -import mekanism.client.gui.GuiPowerBar; -import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.GuiProgress; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.recipe.machines.ChanceMachineRecipe; import mekanism.common.recipe.outputs.ChanceOutput; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -24,7 +23,6 @@ import org.lwjgl.opengl.GL11; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; - import static codechicken.lib.gui.GuiDraw.changeTexture; import static codechicken.lib.gui.GuiDraw.drawString; import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 030f3fa5d..33d71f97d 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -8,11 +8,10 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiChemicalInjectionChamber; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.InjectionRecipe; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java index a19484197..1bae72cd3 100644 --- a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java @@ -10,15 +10,15 @@ import java.util.List; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalOxidizer; -import mekanism.client.gui.GuiElement; -import mekanism.client.gui.GuiGasGauge; -import mekanism.client.gui.GuiGauge; -import mekanism.client.gui.GuiProgress; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.OxidationRecipe; diff --git a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java index 639fd9cc3..632030535 100644 --- a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java @@ -6,11 +6,10 @@ import java.util.List; import mekanism.api.gas.Gas; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiCombiner; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CombinerRecipe; import mekanism.common.util.MekanismUtils; - import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java index 5ca25f628..d6bebc443 100644 --- a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java @@ -3,7 +3,7 @@ package mekanism.client.nei; import java.util.Collection; import mekanism.client.gui.GuiCrusher; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CrusherRecipe; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index fe06f747f..445a06500 100644 --- a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -11,18 +11,18 @@ import java.util.Map; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElectrolyticSeparator; -import mekanism.client.gui.GuiElement; -import mekanism.client.gui.GuiFluidGauge; -import mekanism.client.gui.GuiGasGauge; -import mekanism.client.gui.GuiGauge; -import mekanism.client.gui.GuiPowerBar; -import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.GuiProgress; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.FluidInput; diff --git a/src/main/java/mekanism/client/nei/ElementBoundHandler.java b/src/main/java/mekanism/client/nei/ElementBoundHandler.java index 1b5016abf..e0b455704 100644 --- a/src/main/java/mekanism/client/nei/ElementBoundHandler.java +++ b/src/main/java/mekanism/client/nei/ElementBoundHandler.java @@ -1,10 +1,8 @@ package mekanism.client.nei; -import mekanism.client.gui.GuiElement; import mekanism.client.gui.GuiMekanism; - +import mekanism.client.gui.element.GuiElement; import net.minecraft.client.gui.inventory.GuiContainer; - import codechicken.lib.vec.Rectangle4i; import codechicken.nei.api.INEIGuiAdapter; diff --git a/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java index 8769e6c44..5a40ca74e 100644 --- a/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java @@ -3,7 +3,7 @@ package mekanism.client.nei; import java.util.Collection; import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.EnrichmentRecipe; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java index 68a1c4a6c..daff7b57b 100644 --- a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MachineRecipeHandler.java @@ -3,19 +3,18 @@ package mekanism.client.nei; import java.awt.*; import java.util.Collection; -import mekanism.client.gui.GuiElement; -import mekanism.client.gui.GuiPowerBar; -import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.GuiProgress; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -23,7 +22,6 @@ import org.lwjgl.opengl.GL11; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; - import static codechicken.lib.gui.GuiDraw.changeTexture; import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; diff --git a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java index d3cf6eca4..07dbff5af 100644 --- a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java @@ -9,21 +9,20 @@ import java.util.Map; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; -import mekanism.client.gui.GuiElement; import mekanism.client.gui.GuiMetallurgicInfuser; -import mekanism.client.gui.GuiPowerBar; -import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.GuiProgress; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; - import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -31,7 +30,6 @@ import org.lwjgl.opengl.GL11; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; - import static codechicken.lib.gui.GuiDraw.changeTexture; import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; diff --git a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java index f47607644..0665ae7ae 100644 --- a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java @@ -6,12 +6,11 @@ import java.util.List; import mekanism.api.gas.Gas; import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiOsmiumCompressor; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.OsmiumCompressorRecipe; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.ItemStack; public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java index 83822dc4f..7c4bc1de1 100644 --- a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java @@ -11,19 +11,19 @@ import java.util.Map.Entry; import java.util.Set; import mekanism.api.gas.GasStack; -import mekanism.client.gui.GuiElement; -import mekanism.client.gui.GuiFluidGauge; -import mekanism.client.gui.GuiGasGauge; -import mekanism.client.gui.GuiGauge; import mekanism.client.gui.GuiPRC; -import mekanism.client.gui.GuiPowerBar; -import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler; -import mekanism.client.gui.GuiProgress; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiElement; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.PressurizedInput; diff --git a/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java b/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java index 97d384edb..5f282315c 100644 --- a/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java @@ -3,7 +3,7 @@ package mekanism.client.nei; import java.util.Collection; import mekanism.client.gui.GuiPrecisionSawmill; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.SawmillRecipe; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index 6e7a20467..528d5fe1f 100644 --- a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -7,12 +7,11 @@ import java.util.List; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.gui.GuiPurificationChamber; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.PurificationRecipe; import mekanism.common.util.MekanismUtils; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 4fb89ae0a..3dcdc84db 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -10,7 +10,6 @@ import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; -import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -210,32 +209,4 @@ public class RenderConfigurableMachine extends TileEntitySpecialRenderer return display; } - - public static class OverlayRenderData - { - public EnumColor color; - public TransmissionType type; - - public OverlayRenderData(EnumColor c, TransmissionType t) - { - color = c; - type = t; - } - - @Override - public boolean equals(Object data) - { - return data instanceof OverlayRenderData && ((OverlayRenderData)data).color == color && - ((OverlayRenderData)data).type == type; - } - - @Override - public int hashCode() - { - int code = 1; - code = 31 * code + color.ordinal(); - code = 31 * code + type.ordinal(); - return code; - } - } } \ No newline at end of file diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 301887e04..4a7839acf 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -50,7 +50,6 @@ import mekanism.common.inventory.container.ContainerSolarEvaporationController; import mekanism.common.inventory.container.ContainerSolarNeutronActivator; import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.inventory.container.ContainerUpgradeManagement; -import mekanism.common.recipe.MekanismRecipe; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; @@ -497,6 +496,8 @@ public class CommonProxy return new ContainerInductionMatrix(player.inventory, (TileEntityInductionCasing)tileEntity); case 50: return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); + case 51: + return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); } return null; diff --git a/src/main/java/mekanism/common/base/IEjector.java b/src/main/java/mekanism/common/base/IEjector.java index 3f961de6b..164a23bb3 100644 --- a/src/main/java/mekanism/common/base/IEjector.java +++ b/src/main/java/mekanism/common/base/IEjector.java @@ -1,7 +1,6 @@ package mekanism.common.base; import mekanism.api.EnumColor; - import net.minecraftforge.common.util.ForgeDirection; public interface IEjector @@ -16,10 +15,6 @@ public interface IEjector public void setInputColor(ForgeDirection side, EnumColor color); - public boolean isEjecting(); - - public void setEjecting(boolean eject); - public boolean hasStrictInput(); public void setStrictInput(boolean strict); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 6dc6ee712..cb96cf69c 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -901,10 +901,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer { ISideConfiguration config = (ISideConfiguration)tileEntity; - itemStack.stackTagCompound.setBoolean("hasSideData", true); - - itemStack.stackTagCompound.setBoolean("ejecting", config.getEjector().isEjecting()); - config.getConfig().write(itemStack.stackTagCompound); } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 83bca485d..5b5f03c33 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -274,9 +274,8 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { ISideConfiguration config = (ISideConfiguration)tileEntity; - if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("hasSideData")) + if(stack.stackTagCompound != null && stack.stackTagCompound.hasKey("sideDataStored")) { - config.getEjector().setEjecting(stack.stackTagCompound.getBoolean("ejecting")); config.getConfig().read(stack.stackTagCompound); } } diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index 18745d918..4e09cb1b2 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -37,7 +37,7 @@ public class PacketConfigurationUpdate implements IMessageHandler sideConfigs = new HashMap(); public Map> sideOutputs = new HashMap>(); + public Map ejecting = new HashMap(); public List transmissions = new ArrayList(); @@ -33,6 +34,7 @@ public class TileComponentConfig implements ITileComponent for(TransmissionType transmission : types) { sideOutputs.put(transmission.ordinal(), new ArrayList()); + ejecting.put(transmission.ordinal(), false); } tile.components.add(this); @@ -84,6 +86,7 @@ public class TileComponentConfig implements ITileComponent for(TransmissionType type : transmissions) { sideConfigs.put(type.ordinal(), nbtTags.getByteArray("config" + type.ordinal())); + ejecting.put(type.ordinal(), nbtTags.getBoolean("ejecting" + type.ordinal())); } } } @@ -94,6 +97,7 @@ public class TileComponentConfig implements ITileComponent for(TransmissionType type : transmissions) { dataStream.readBytes(sideConfigs.get(type.ordinal())); + ejecting.put(type.ordinal(), dataStream.readBoolean()); } } @@ -103,6 +107,7 @@ public class TileComponentConfig implements ITileComponent for(TransmissionType type : transmissions) { nbtTags.setByteArray("config" + type.ordinal(), sideConfigs.get(type.ordinal())); + nbtTags.setBoolean("ejecting" + type.ordinal(), ejecting.get(type.ordinal())); } nbtTags.setBoolean("sideDataStored", true); @@ -114,6 +119,18 @@ public class TileComponentConfig implements ITileComponent for(TransmissionType type : transmissions) { data.add(sideConfigs.get(type.ordinal())); + data.add(ejecting.get(type.ordinal())); } } + + public boolean isEjecting(TransmissionType type) + { + return ejecting.get(type); + } + + public void setEjecting(TransmissionType type, boolean eject) + { + ejecting.put(type.ordinal(), eject); + MekanismUtils.saveChunk(tileEntity); + } } diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index f51e34d4e..7a592b49b 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -30,8 +30,6 @@ public class TileComponentEjector implements ITileComponent, IEjector public boolean strictInput; - public boolean ejecting; - public EnumColor outputColor; public EnumColor[] inputColors = new EnumColor[] {null, null, null, null, null, null}; @@ -84,7 +82,7 @@ public class TileComponentEjector implements ITileComponent, IEjector @Override public void onOutput() { - if(!ejecting || tileEntity.getWorldObj().isRemote) + if(!getEjecting(TransmissionType.ITEM) || tileEntity.getWorldObj().isRemote) { return; } @@ -150,19 +148,6 @@ public class TileComponentEjector implements ITileComponent, IEjector tickDelay = 20; } - @Override - public boolean isEjecting() - { - return ejecting; - } - - @Override - public void setEjecting(boolean eject) - { - ejecting = eject; - MekanismUtils.saveChunk(tileEntity); - } - @Override public boolean hasStrictInput() { @@ -205,7 +190,6 @@ public class TileComponentEjector implements ITileComponent, IEjector @Override public void read(NBTTagCompound nbtTags) { - ejecting = nbtTags.getBoolean("ejecting"); strictInput = nbtTags.getBoolean("strictInput"); if(nbtTags.hasKey("ejectColor")) @@ -238,7 +222,6 @@ public class TileComponentEjector implements ITileComponent, IEjector @Override public void read(ByteBuf dataStream) { - ejecting = dataStream.readBoolean(); strictInput = dataStream.readBoolean(); int c = dataStream.readInt(); @@ -268,7 +251,6 @@ public class TileComponentEjector implements ITileComponent, IEjector @Override public void write(NBTTagCompound nbtTags) { - nbtTags.setBoolean("ejecting", ejecting); nbtTags.setBoolean("strictInput", strictInput); if(outputColor != null) @@ -296,7 +278,6 @@ public class TileComponentEjector implements ITileComponent, IEjector @Override public void write(ArrayList data) { - data.add(ejecting); data.add(strictInput); if(outputColor != null) @@ -318,4 +299,9 @@ public class TileComponentEjector implements ITileComponent, IEjector } } } + + private boolean getEjecting(TransmissionType type) + { + return ((ISideConfiguration)tileEntity).getConfig().isEjecting(type); + } } diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 54560afd2..89ad90c60 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -4,19 +4,18 @@ import java.util.List; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiRedstoneControl; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java b/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java index 15e065862..2d8e097d5 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiFuelTab.java @@ -1,19 +1,17 @@ package mekanism.generators.client.gui; import mekanism.api.Coord4D; -import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; +import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index cc5c7ec82..c1f611668 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -4,22 +4,21 @@ import java.util.List; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiGasGauge; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiGauge.Type; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiRedstoneControl; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerGasGenerator; import mekanism.generators.common.tile.TileEntityGasGenerator; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index c461486ad..40c093dab 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -4,22 +4,21 @@ import java.util.List; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiFluidGauge; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiGauge.Type; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiRedstoneControl; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidTank; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java b/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java index 4e4d5ad37..e37763465 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatTab.java @@ -1,19 +1,17 @@ package mekanism.generators.client.gui; import mekanism.api.Coord4D; -import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; +import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java index c0da03fd4..258500c1b 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java +++ b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java @@ -3,19 +3,18 @@ package mekanism.generators.client.gui; import java.util.List; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiRedstoneControl; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerNeutronCapture; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 36e556e70..541950c58 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -4,16 +4,15 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorController; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 99410ce10..3800d7092 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -6,15 +6,15 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.gas.GasTank; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiGasGauge; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiGauge.Type; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiProgress; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiGasGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index dbef204ab..592ff7b33 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -6,19 +6,19 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyGauge; -import mekanism.client.gui.GuiEnergyGauge.IEnergyInfoHandler; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiFluidGauge; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiGauge.Type; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiNumberGauge; -import mekanism.client.gui.GuiNumberGauge.INumberInfoHandler; -import mekanism.client.gui.GuiProgress; -import mekanism.client.gui.GuiProgress.IProgressInfoHandler; -import mekanism.client.gui.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiEnergyGauge; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiFluidGauge; +import mekanism.client.gui.element.GuiNumberGauge; +import mekanism.client.gui.element.GuiProgress; +import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler; +import mekanism.client.gui.element.GuiGauge.Type; +import mekanism.client.gui.element.GuiNumberGauge.INumberInfoHandler; +import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; +import mekanism.client.gui.element.GuiProgress.ProgressBar; import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.util.MekanismUtils; @@ -26,7 +26,6 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; - import net.minecraft.block.BlockStaticLiquid; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.IIcon; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java index 3c3e93ecb..599a9e456 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java @@ -7,8 +7,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; import mekanism.client.sound.SoundHandler; import mekanism.common.inventory.container.ContainerNull; @@ -17,7 +17,6 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 038ef9033..998237282 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -3,19 +3,18 @@ package mekanism.generators.client.gui; import java.util.List; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiRedstoneControl; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/client/gui/GuiStatTab.java b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java index 6290da58a..52a804e2c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiStatTab.java +++ b/src/main/java/mekanism/generators/client/gui/GuiStatTab.java @@ -1,19 +1,17 @@ package mekanism.generators.client.gui; import mekanism.api.Coord4D; -import mekanism.client.gui.GuiElement; import mekanism.client.gui.IGuiWrapper; +import mekanism.client.gui.element.GuiElement; import mekanism.client.sound.SoundHandler; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.network.PacketGeneratorsGui.GeneratorsGuiMessage; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import codechicken.lib.vec.Rectangle4i; @SideOnly(Side.CLIENT) diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java index 4d87b92ae..0bac20d34 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java @@ -6,19 +6,18 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.generators; import mekanism.api.util.ListUtils; -import mekanism.client.gui.GuiEnergyInfo; -import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiRedstoneControl; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotOverlay; -import mekanism.client.gui.GuiSlot.SlotType; +import mekanism.client.gui.element.GuiEnergyInfo; +import mekanism.client.gui.element.GuiPowerBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; +import mekanism.client.gui.element.GuiSlot.SlotOverlay; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerWindTurbine; import mekanism.generators.common.tile.TileEntityWindTurbine; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/resources/assets/mekanism/gui/GuiConfiguration.png b/src/main/resources/assets/mekanism/gui/GuiConfiguration.png index 1d6f943537434104577b72ae9e8cdb4af1100ac5..8e676bdd1c88ee2f5342d08787ae28667557e162 100644 GIT binary patch literal 4308 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 literal 4694 zcmeHL={FnN*G__zR?UQ}Cg#%CP)bQjw0cc7Peq8*QYBg%vlvPTQdLDKVF zw`y+GtWC|tP!bU#zuZ6I{qU~!etFmWeL8!c^Xz9m``Krmwbx0ovM@S%{M2y(0C3X8 z*w6+50J1|MfE&zSP=Uo>005_)&$Vk-CfBaPtODZ9gyW}& z6J#tq{6(d35_DecZ{L0E%|r;t4(L7&;OU*yTccW>pfb=KT&7UyFi}y@LK?yIVn}&S zw4A#Ye5G~VOSRz^nnS!d^_RWBWV4J{N=^BzTY-bWRFeZ5)LHy089}@2u5mXHG7FkK z8~GDv&(ZAK6A(Y@c294aeL`0@ncRxzq9-#(B0-^0>)n!9IPC0_5gJ`CG7FyNiWq)S zbi(}LUXXgkY4NIIs{Gp9UfIh(g1m)lK0snN9q6^=p35o4y|z9-Z~g2v#g)E8zYlO& zjGyVNaens=B%6GjP}Dykb1Vi?Ti#mC)jy)Et&u18$IQ{!zoNuovf{my^@+oa@8E99 zy-Jvt^v`L~KECGQza{#_OnZh`6r#($!o3A2$GKXvA(Jn2W=7VrVDYeVM60gqBKY)_ z>vtQE`uq-~WkW+*3$Y6xq!Ls32dnIhX(nfBDCe5qo}$8~)3Vu?BR?KdiM}N~ljwSvu!*7LJsOts<4`_?oZ758}hvx z}b-zUFY(rC1n85ug%IO+MMOh+Ndj!yltIw~?3f zjpxBBwz{9@4y0Dh$TQf6;n0{p`$0uRI8^%-t3vw}94*5V8@{uHZ~_E``bnM>X1^m8 z6GH>LP#|T-6)#7U0Q`KvIT0jU3F%ZFnvRbYRQt#L!El*-)T3yFtIuPZ0F8Spfhien zv}2sourhq{ZFAn?cmb~b7G-X?H5K?=YPc`$o88{-?hVJRjg?g#-#RwPv27_c{NBJ+ zQE7|UQsS5DkjA?S9d;+ak;1jt2n|$RIVCu|yBkhgPnWk$x+ksX72DL*M8BgaF1|@% z9hJB+>A#cl-Z{AX$)mx_P0?*%L`YHL{(j#0jGi;;^HuBCBZhBx&e2w%Mgn{?KeEyg zq( z7@wS05)Sysu^3-7*4$> z7aJFN#N3ZtH~~=+(Y`->exxJ06H(mtEyVX>!%a7(xy8OegM_2@aAv2aTd^0ouMgkd z(-T}JFdE}5A+q-+r~QFi{$-^N0<_hpjPhVRA&2Gf9`V#=-gVVloxVdZ#Z-f+24~_B zrme4EA+Hc{2ffLRt&4Eo2~pX6cN@w@!WM@=2>WagG1yVk)UG9LrbKT&%9M| ztRyBI1Z;=vW<6`RNGw~ORZ2|bmI*VQW-!K5Xn7j}>9b)2jn3Apu{_*eEm6wq%eE#7 z(iVcN@&o&}POh#MV%lR3{NMvJ`D!|BV6FyrUgbi8IX)aEmt<%2>azK?zYhJNFCgG> zY9Vq~gQM6HmF-E&$qv^U7!&~!d7kg=DYvctn0jFly-n_3#lkB1GvOf{?$j}_AmGPH zea8VIn$hjd<6R$f-L$kD@H1Io1T)C`k(&h!uWrK8*a7pvlIi6>z1TB+E=h9jDfPa8 zn#MEd2)(4+Q8s*5WPaFVLH+;AX@)UdK6U`9G)n8uw0bsNU#9@8HSfIJ&DB2WxtUu7% z>UBD)o6P1dq0^?Q9_`a!o}T%Nnq+dgfvHf{ANbsXy=cQHHODBKDz~vZbu|?)iES0M zD&A~o;c?GlqXC7~(BI?-erap#>aF~8fO-HItSowGa46&M2Z0_GRJXZCow8DhBR#|) ztDKA2ycaO|INjsU9eIp{USVTn=$o%+1C$i>3K=haRWWZ4tUBUWzhMM zt!~h1!5p%O&KQx4a8?jvyPrx1*J+=xD2?Pr$i=AVmIhXXwl8$hpP+ASj>02xI^n5> zM?Sb#+L%kUl0S+iC)O9+;`aNs*aE!Xa&{yR5R^88esOXiGtTN%B$##>XB=JYgwZp?`2nF^fOVs%*GLD$VT_|HtaEU z>ke@(MPP9aJ+Hb~iP#vmM3mDQDMn{XDwxSad&~LB4%Do|HdO*MFn8m3GD81T4u|%@ zRvza|ptY#?IROp?*tKg$RLqO!oOvFcHfM4Q3nm5)crt54=fQC03p1mRUM3w9r`%rM z(%$ZN39|Wl+qrerC;>=lja=f({Sy|As(yeJWy zX(K3w^-m=O_F@gFZjVr@a2w2BcpGF0U6rqMj4qE3vqG`7nzGFRO>!iSOCa@L@*{Lw z=nu=9N0+6HYvK&DaLa!`Emew6JYen&mbL7^z~k4rsPWq!9Q>!JHL+`B<;uZU5pl1O zrXqqNsE9bmG_7uS_j|q8Hs^pb>}2j;{nws9iFUddh;t{N8xA4r&WJ&RvP2+|O`8Oo zjgC^qtbbwx@i%#OY96J<(OXhdp&@L{p*OpKP_!OkY6Z=tS`;?!Ivbdz-A|Gb(A)02KCJ{9FkYUP}*;ArvMa6%FC;Gy22i|b^Uw}l=uPgaE-Pxo?_>3 zqxDn@cLQ!!Ae0RK63wVrm|I^+9&#BsAw2Fkr*mmC8;vv@coWoH1^8`MdnOP{cPibS ztn=+=w@~koN|3z&yp*IgZ1Mb^k*S=o^ive>KrM{i%ip#!^k`sS8cP+Kua7;yyw&Q# zE0xnE(INiaPG<(>DFqvCTcboQ*~ZYG+=C4{0eNz3o>~xjY9TKHlai&eNN+B=n1M68 zQi?-v?xiZA`a`^a4egEpBy_g((t|VWf!gi5_B=2?J_wBVg{%= zjv>&vdII2TQ;VPqpk{-xN$w6v2)V@nw-js$g#_L8SA2zB`j;Pi6^_hpis2lZwvdY* zIAILPLc|BhARn^TG-Vlsve;sDqq!-7*hO~!LwE|Ot||Lt}8wa)v@de z8*>RbuC``0ek3R^0|WAQRwZ_PWZP5|6;FZ2N`r(t1WuQ6e`}86{67H|TDoH}7=|wC z*O~5qTl*ue-9RH`;fZ*cH)#XE<=8L} zKnEouU2|C>4ebLLfgnz90T?m{@ZaFSCj7s@3GTt1NBjVWfo$OGp-1fhB7n(t3&V=5 H?vMTh@CN`e diff --git a/src/main/resources/assets/mekanism/gui/GuiTransporterConfig.png b/src/main/resources/assets/mekanism/gui/GuiTransporterConfig.png new file mode 100644 index 0000000000000000000000000000000000000000..146bfcfd092db1e774a98b537b60c098c023e390 GIT binary patch literal 4310 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/gui/elements/GuiTransporterConfigTab.png b/src/main/resources/assets/mekanism/gui/elements/GuiTransporterConfigTab.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf10494d72096c3534b69e8a7c0a2d479dc44e2 GIT binary patch literal 3551 zcmeH~`#;l*AICqNxlD73C7oX$x}!X*I!kiyv8 zT?7EoK?DI3Vh6)Jx+)L=MAm|BZCx<7wg{K#h``{m001!0%yg$kOuHRHJ&N!yKZ+`Q z`B+*Zz0uwE^6TU9`aUsCUd4h9{Pm}=I^_em!{M$IrmseCx)XWe2pC@^rCD4hJI)3U zd&g^D0kvXWtre&m<(9Xm&^PjU_i7>=8eKcC^tI{l}p{%d<(Ccbk0rO;!v68Bcx$EM;t`(%0PmpweXujJw zKD8YN<0#!DsXOZ}!pR>KF5FouzB=MXc6JdCnM9agT2EMC*!ZcH^`j$;>J!^PCW~tb zeT{i%px*V9e@qLfu-@6{t(h5TfZljgoLK&!?E$l+ORj7L{ZV@e|9-Vg*NsmEt@fMI z@t>_~9y|>toBd^(s(6@DGisAFr;g4KjH&Z|n7EYra+qScs^|FgQu5KI=bEeMA{nE7 zgAWsBar0A)kRhzsi$EWi;J)r-U+EaxalIC|S*u5Oon?LK)rrc!cD>)eG1a0k8(lGe ze8fhOdtI#M;p-euxNZHPPmdRu491{ltw=im9vW+?DG2CPwoCfuvF7PAzaH4?8LuXg zQB`&ttV=oaf~$y#Bf(|tBH@=ul~<($R^nMHJyGw9r0OP~n4AqB`hIxzPohCw{ZoIV7f0NjH6wbv8RqaS-9t6OfcN94Qouzmw6XdF|7g3He~J6Z7H~X`1HKs+fER z0hO=7I>dSt9ecTO`VNNg#`oY~;5+es_{aRe=SE`rnD$?j)V(uGsm!_SoaNMn%T%L3 zI(%FWD>7OyCtyCDH?VKC?|n}k)04tnA5j@wrdzbdy@}Hkd)nPerSe{yH{QD>;v}jN zXPu^J-f~l58#?0f!2as=m~;y^{M5UrMGB*c^u*r7QT9qf?fJxZ@!RU{bFUmr1x1oK zG87tP5JhK9Ydu2ii&jmn%P8?apo6Rgw8HC5hC+_%YC<3E0LiEnnW zT+|<4L^QDxl)qK0-fro=L7j)QaFS&M4s-+1+csohsuj5{*X+ov7K}Vtcl+l{~hKG8Nt9Vp?i=yc!*%Mb*Th zfN5s*iyO5R>FXinFPAbSCbiJtU|=XP_yNbJcN%*y7MAXOGV^V)Fa*u}37g=V;#7JV z1rA$!IIJVwU7a2;a0f%kvR>oORyw$FbA`LSB+Bb8WE(1^KwSKGuc}nZdE%y<;7wtM zpAl9=JGC4n2?Cc&67;(r6g#7seGb!=wD!cURfkFyC5=yvDy>m+KI1Y3uVh%KyO)&Q zdd2C(DX0XeGgT{+uwMX?xTW4?1l)>Q@NCSr!fB5#v}5(K=t+i;bXvNHaArHoL@9GB z0($~oCW7}7>86K$5v}5+1f&boVuhD9J5d&Oqp9R&w(4oD4bt#qASWT|8x{8NR5n`< zk~{&fH{ISuW*p5-Hh%AEb@MdbZ2;D_v)7|VV@xGPx!gs^8|8$j+N7Yjz@1_#Gs&0u z-*2>3F9+wZLLA*g0jAQ4A>v}KU?5u_^L*jipfS#Sv^OP=H zRps&Q+>>Q>L5XLSsj2rlTCx^6fknp=FyzdUc@tn(8$GgPZMhUw+c2YzC5}6bS_$WN z2R{%!P@2wSxq>icnT#{}f0(e(Rt_ol@TnH;8 zv2Xd9nR7G~+}nxe<5z z1CdLy;FS!`Z65h<%~@R4?T`b3e=pmDA@=u;q|EmP{vrdC=LZm1!QGi{sMIKaHtP(t>b?wPQ;YmMl8OcB_-2rWXN`8$i9Qdr!cS?Zr=4=g<1D!(gda+RMxzs+X(QcBzGpzD2Ki} zEjbJd=D$2AG5%H}VpCXrl6Yb&fR{g{0gN5v_kE|uGSrFC!VJQ;upq%1N!Q%#Ces{8Ku<^V1U-|NEPXGV_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index fc4298f99..7bf85ced0 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -447,6 +447,8 @@ gui.solarEvaporationController.short=Solar E. Controller gui.dictionary.noKey=No key. gui.configuration=Configuration +gui.configuration.side=Side Configuration +gui.configuration.transporter=Transporter Configuration gui.configuration.strictInput=Strict Input gui.rotaryCondensentrator.toggleOperation=Toggle operation