From 6af0b1abd76ebf0b12c69b8e5c5ef2281c75e720 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 26 Aug 2013 18:49:32 -0400 Subject: [PATCH] Screw it, package organization (sorry, that's an API update) --- common/mekanism/api/IStorageTank.java | 2 + common/mekanism/api/RecipeHelper.java | 1 + .../{ => energy}/EnergizedItemManager.java | 2 +- .../api/{ => energy}/ICableOutputter.java | 2 +- .../api/{ => energy}/IEnergizedItem.java | 2 +- .../{ => energy}/IStrictEnergyAcceptor.java | 2 +- .../{ => energy}/IStrictEnergyStorage.java | 2 +- common/mekanism/api/{ => gas}/EnumGas.java | 2 +- common/mekanism/api/{ => gas}/GasNetwork.java | 5 +- .../api/{ => gas}/GasTransmission.java | 6 +- .../mekanism/api/{ => gas}/IGasAcceptor.java | 2 +- .../mekanism/api/{ => gas}/IGasStorage.java | 2 +- .../api/{ => gas}/IGasTransmitter.java | 3 +- .../api/{ => gas}/ITubeConnection.java | 2 +- .../api/{ => infuse}/InfuseObject.java | 2 +- .../api/{ => infuse}/InfuseRegistry.java | 2 +- .../mekanism/api/{ => infuse}/InfuseType.java | 2 +- .../api/{ => infuse}/InfusionInput.java | 2 +- .../api/{ => infuse}/InfusionOutput.java | 2 +- .../{ => transmitters}/DynamicNetwork.java | 3 +- .../api/{ => transmitters}/ITransmitter.java | 2 +- .../ITransmitterNetwork.java | 2 +- .../{ => transmitters}/TransmissionType.java | 3 +- .../TransmitterNetworkRegistry.java | 2 +- .../client/ClientPlayerTickHandler.java | 4 +- common/mekanism/client/ClientProxy.java | 101 ++++++++++++------ .../mekanism/client/EnergyClientUpdate.java | 6 +- common/mekanism/client/FluidClientUpdate.java | 6 +- common/mekanism/client/GasClientUpdate.java | 8 +- .../mekanism/client/ItemRenderingHandler.java | 7 +- .../client/MachineRenderingHandler.java | 6 +- .../mekanism/client/ThreadClientUpdate.java | 2 +- common/mekanism/client/ThreadTankSparkle.java | 3 +- ....java => TransmitterRenderingHandler.java} | 3 +- .../{ => gui}/GuiAdvancedElectricMachine.java | 6 +- .../client/{ => gui}/GuiCombiner.java | 4 +- .../client/{ => gui}/GuiControlPanel.java | 4 +- .../mekanism/client/{ => gui}/GuiCredits.java | 3 +- .../mekanism/client/{ => gui}/GuiCrusher.java | 4 +- .../client/{ => gui}/GuiDynamicTank.java | 7 +- .../client/{ => gui}/GuiElectricChest.java | 9 +- .../client/{ => gui}/GuiElectricMachine.java | 6 +- .../client/{ => gui}/GuiElectricPump.java | 7 +- .../mekanism/client/{ => gui}/GuiElement.java | 2 +- .../client/{ => gui}/GuiEnergizedSmelter.java | 4 +- .../client/{ => gui}/GuiEnergyCube.java | 6 +- .../{ => gui}/GuiEnrichmentChamber.java | 4 +- .../mekanism/client/{ => gui}/GuiFactory.java | 6 +- .../mekanism/client/{ => gui}/GuiGasTank.java | 6 +- .../client/{ => gui}/GuiMekanism.java | 2 +- .../{ => gui}/GuiMetallurgicInfuser.java | 7 +- .../client/{ => gui}/GuiOsmiumCompressor.java | 4 +- .../client/{ => gui}/GuiPasswordEnter.java | 7 +- .../client/{ => gui}/GuiPasswordModify.java | 5 +- .../{ => gui}/GuiPortableTeleporter.java | 5 +- .../{ => gui}/GuiPurificationChamber.java | 4 +- .../client/{ => gui}/GuiRedstoneControl.java | 2 +- .../client/{ => gui}/GuiRobitCrafting.java | 4 +- .../client/{ => gui}/GuiRobitInventory.java | 5 +- .../client/{ => gui}/GuiRobitMain.java | 5 +- .../client/{ => gui}/GuiRobitRepair.java | 4 +- .../client/{ => gui}/GuiRobitSmelting.java | 5 +- .../client/{ => gui}/GuiStopwatch.java | 2 +- .../client/{ => gui}/GuiTeleporter.java | 8 +- .../{ => gui}/GuiTheoreticalElementizer.java | 4 +- .../{ => gui}/GuiUpgradeManagement.java | 2 +- .../client/{ => gui}/GuiWeatherOrb.java | 2 +- .../{ => model}/ModelBoxSelectiveFace.java | 2 +- .../client/{ => model}/ModelChargepad.java | 2 +- .../client/{ => model}/ModelElectricPump.java | 2 +- .../{ => model}/ModelMetallurgicInfuser.java | 2 +- .../ModelRendererSelectiveFace.java | 4 +- .../client/{ => model}/ModelRobit.java | 4 +- .../ModelTheoreticalElementizer.java | 2 +- .../client/{ => model}/ModelTransmitter.java | 2 +- .../nei/AdvancedMachineRecipeHandler.java | 2 +- .../nei/CombinerRecipeHandler.java | 5 +- .../nei/CrusherRecipeHandler.java | 4 +- .../nei/EnrichmentChamberRecipeHandler.java | 4 +- .../nei/MachineRecipeHandler.java | 2 +- .../nei/MekanismRecipeHandler.java | 4 +- .../nei/MetallurgicInfuserRecipeHandler.java | 15 ++- .../{ => client}/nei/NEIMekanismConfig.java | 14 +-- .../nei/OsmiumCompressorRecipeHandler.java | 5 +- .../nei/PurificationChamberRecipeHandler.java | 4 +- .../client/{ => render}/RenderChargepad.java | 6 +- .../RenderConfigurableMachine.java | 5 +- .../{ => render}/RenderDynamicTank.java | 5 +- .../{ => render}/RenderElectricChest.java | 4 +- .../{ => render}/RenderElectricPump.java | 6 +- .../RenderLogisticalTransporter.java | 5 +- .../{ => render}/RenderMechanicalPipe.java | 6 +- .../RenderMetallurgicInfuser.java | 5 +- .../{ => render}/RenderObsidianTNT.java | 2 +- .../{ => render}/RenderPressurizedTube.java | 14 +-- .../client/{ => render}/RenderRobit.java | 3 +- .../RenderTheoreticalElementizer.java | 5 +- .../{ => render}/RenderTickHandler.java | 2 +- .../{ => render}/RenderUniversalCable.java | 6 +- common/mekanism/common/CableUtils.java | 8 +- common/mekanism/common/ChargeUtils.java | 5 +- .../common/CommonPlayerTickHandler.java | 1 + common/mekanism/common/CommonProxy.java | 39 +++++++ .../common/CommonWorldTickHandler.java | 1 + common/mekanism/common/DynamicFluidTank.java | 1 + common/mekanism/common/EnergyNetwork.java | 8 +- common/mekanism/common/EntityRobit.java | 7 +- common/mekanism/common/FluidNetwork.java | 10 +- common/mekanism/common/IUpgradeTile.java | 2 +- common/mekanism/common/InventoryNetwork.java | 6 +- common/mekanism/common/Mekanism.java | 46 ++++++-- common/mekanism/common/MekanismRecipe.java | 2 +- common/mekanism/common/MekanismUtils.java | 5 + common/mekanism/common/PipeUtils.java | 4 +- common/mekanism/common/RecipeHandler.java | 4 +- .../mekanism/common/TankUpdateProtocol.java | 2 + ...mponent.java => TileComponentUpgrade.java} | 5 +- common/mekanism/common/TransporterUtils.java | 4 +- .../common/{ => block}/BlockBasic.java | 7 +- .../common/{ => block}/BlockBounding.java | 4 +- .../common/{ => block}/BlockEnergyCube.java | 11 +- .../common/{ => block}/BlockGasTank.java | 7 +- .../common/{ => block}/BlockMachine.java | 34 +++++- .../common/{ => block}/BlockObsidianTNT.java | 4 +- .../mekanism/common/{ => block}/BlockOre.java | 3 +- .../common/{ => block}/BlockTransmitter.java | 16 ++- .../InventoryElectricChest.java | 4 +- .../ContainerAdvancedElectricMachine.java | 13 ++- .../container}/ContainerDynamicTank.java | 4 +- .../container}/ContainerElectricChest.java | 9 +- .../container}/ContainerElectricMachine.java | 11 +- .../container}/ContainerElectricPump.java | 8 +- .../container}/ContainerEnergyCube.java | 9 +- .../container}/ContainerFactory.java | 15 ++- .../container}/ContainerGasTank.java | 6 +- .../ContainerMetallurgicInfuser.java | 15 ++- .../container}/ContainerRobitCrafting.java | 2 +- .../container}/ContainerRobitInventory.java | 3 +- .../container}/ContainerRobitMain.java | 6 +- .../container}/ContainerRobitRepair.java | 2 +- .../container}/ContainerRobitSmelting.java | 3 +- .../container}/ContainerTeleporter.java | 7 +- .../slot}/SlotElectricChest.java | 3 +- .../{ => inventory/slot}/SlotEnergy.java | 3 +- .../slot}/SlotMachineUpgrade.java | 3 +- .../{ => inventory/slot}/SlotOutput.java | 2 +- .../{ => inventory/slot}/SlotStorageTank.java | 4 +- .../{ => item}/ItemAtomicDisassembler.java | 2 +- .../common/{ => item}/ItemBlockBasic.java | 2 +- .../{ => item}/ItemBlockEnergyCube.java | 10 +- .../common/{ => item}/ItemBlockMachine.java | 19 +++- .../common/{ => item}/ItemBlockOre.java | 2 +- .../{ => item}/ItemBlockTransmitter.java | 2 +- .../mekanism/common/{ => item}/ItemClump.java | 3 +- .../common/{ => item}/ItemConfigurator.java | 12 ++- .../common/{ => item}/ItemDirtyDust.java | 3 +- .../mekanism/common/{ => item}/ItemDust.java | 3 +- .../common/{ => item}/ItemElectricBow.java | 2 +- .../common/{ => item}/ItemEnergized.java | 5 +- .../mekanism/common/{ => item}/ItemIngot.java | 3 +- .../common/{ => item}/ItemMachineUpgrade.java | 4 +- .../common/{ => item}/ItemMekanism.java | 3 +- .../common/{ => item}/ItemNetworkReader.java | 7 +- .../{ => item}/ItemPortableTeleporter.java | 3 +- .../mekanism/common/{ => item}/ItemRobit.java | 5 +- .../common/{ => item}/ItemStopwatch.java | 3 +- .../common/{ => item}/ItemStorageTank.java | 5 +- .../common/{ => item}/ItemWeatherOrb.java | 3 +- .../network/PacketConfiguratorState.java | 2 +- .../common/network/PacketDataRequest.java | 2 +- .../common/network/PacketDigitUpdate.java | 2 +- .../network/PacketElectricBowState.java | 2 +- .../common/network/PacketElectricChest.java | 6 +- .../network/PacketPortableTeleport.java | 2 +- .../common/network/PacketRemoveUpgrade.java | 2 +- .../common/network/PacketStatusUpdate.java | 2 +- .../PacketTransmitterTransferUpdate.java | 2 +- .../TileEntityAdvancedElectricMachine.java | 11 +- .../TileEntityAdvancedFactory.java | 4 +- .../TileEntityBasicBlock.java | 5 +- .../TileEntityBasicMachine.java | 17 ++- .../TileEntityBoundingBlock.java | 4 +- .../{ => tileentity}/TileEntityChargepad.java | 13 ++- .../{ => tileentity}/TileEntityCombiner.java | 5 +- .../TileEntityContainerBlock.java | 3 +- .../TileEntityControlPanel.java | 4 +- .../{ => tileentity}/TileEntityCrusher.java | 6 +- .../TileEntityDynamicTank.java | 7 +- .../TileEntityDynamicValve.java | 3 +- .../TileEntityElectricBlock.java | 6 +- .../TileEntityElectricChest.java | 6 +- .../TileEntityElectricMachine.java | 9 +- .../TileEntityElectricPump.java | 11 +- .../TileEntityEliteFactory.java | 4 +- .../TileEntityEnergizedSmelter.java | 5 +- .../TileEntityEnergyCube.java | 15 ++- .../TileEntityEnrichmentChamber.java | 5 +- .../{ => tileentity}/TileEntityFactory.java | 22 +++- .../{ => tileentity}/TileEntityGasTank.java | 15 +-- .../TileEntityLogisticalTransporter.java | 10 +- .../TileEntityMechanicalPipe.java | 10 +- .../TileEntityMetallurgicInfuser.java | 30 ++++-- .../TileEntityOsmiumCompressor.java | 5 +- .../TileEntityPressurizedTube.java | 17 +-- .../TileEntityPurificationChamber.java | 14 +-- .../TileEntityTeleporter.java | 11 +- .../TileEntityTheoreticalElementizer.java | 5 +- .../TileEntityTransmitter.java | 6 +- .../TileEntityUniversalCable.java | 9 +- .../client/BlockRenderingHandler.java | 8 +- .../client/GeneratorsClientProxy.java | 26 +++-- .../client/{ => gui}/GuiBioGenerator.java | 10 +- .../{ => gui}/GuiElectrolyticSeparator.java | 9 +- .../client/{ => gui}/GuiHeatGenerator.java | 10 +- .../{ => gui}/GuiHydrogenGenerator.java | 10 +- .../client/{ => gui}/GuiSolarGenerator.java | 10 +- .../client/{ => gui}/GuiWindTurbine.java | 10 +- .../ModelAdvancedSolarGenerator.java | 2 +- .../client/{ => model}/ModelBioGenerator.java | 2 +- .../ModelElectrolyticSeparator.java | 2 +- .../{ => model}/ModelHeatGenerator.java | 2 +- .../{ => model}/ModelHydrogenGenerator.java | 2 +- .../client/{ => model}/ModelWindTurbine.java | 2 +- .../RenderAdvancedSolarGenerator.java | 5 +- .../{ => render}/RenderBioGenerator.java | 5 +- .../RenderElectrolyticSeparator.java | 7 +- .../{ => render}/RenderHeatGenerator.java | 5 +- .../{ => render}/RenderHydrogenGenerator.java | 5 +- .../{ => render}/RenderWindTurbine.java | 5 +- .../common/GeneratorsCommonProxy.java | 13 +++ .../generators/common/ItemBlockGenerator.java | 6 +- .../generators/common/MekanismGenerators.java | 10 +- .../common/{ => block}/BlockGenerator.java | 16 ++- .../container}/ContainerBioGenerator.java | 5 +- .../ContainerElectrolyticSeparator.java | 9 +- .../container}/ContainerHeatGenerator.java | 5 +- .../ContainerHydrogenGenerator.java | 7 +- .../container}/ContainerSolarGenerator.java | 5 +- .../container}/ContainerWindTurbine.java | 5 +- .../PacketElectrolyticSeparatorParticle.java | 2 +- .../TileEntityAdvancedSolarGenerator.java | 3 +- .../TileEntityBioGenerator.java | 3 +- .../TileEntityElectrolyticSeparator.java | 21 ++-- .../{ => tileentity}/TileEntityGenerator.java | 9 +- .../TileEntityHeatGenerator.java | 4 +- .../TileEntityHydrogenGenerator.java | 12 ++- .../TileEntitySolarGenerator.java | 6 +- .../TileEntityWindTurbine.java | 3 +- .../mekanism/tools/common/MekanismTools.java | 7 ++ .../{common => item}/ItemMekanismArmor.java | 2 +- .../{common => item}/ItemMekanismAxe.java | 2 +- .../{common => item}/ItemMekanismHoe.java | 4 +- .../{common => item}/ItemMekanismPaxel.java | 2 +- .../{common => item}/ItemMekanismPickaxe.java | 2 +- .../{common => item}/ItemMekanismShovel.java | 2 +- .../{common => item}/ItemMekanismSword.java | 2 +- .../{common => item}/ItemMekanismTool.java | 2 +- 257 files changed, 1061 insertions(+), 554 deletions(-) rename common/mekanism/api/{ => energy}/EnergizedItemManager.java (98%) rename common/mekanism/api/{ => energy}/ICableOutputter.java (93%) rename common/mekanism/api/{ => energy}/IEnergizedItem.java (98%) rename common/mekanism/api/{ => energy}/IStrictEnergyAcceptor.java (95%) rename common/mekanism/api/{ => energy}/IStrictEnergyStorage.java (95%) rename common/mekanism/api/{ => gas}/EnumGas.java (96%) rename common/mekanism/api/{ => gas}/GasNetwork.java (96%) rename common/mekanism/api/{ => gas}/GasTransmission.java (96%) rename common/mekanism/api/{ => gas}/IGasAcceptor.java (95%) rename common/mekanism/api/{ => gas}/IGasStorage.java (97%) rename common/mekanism/api/{ => gas}/IGasTransmitter.java (70%) rename common/mekanism/api/{ => gas}/ITubeConnection.java (93%) rename common/mekanism/api/{ => infuse}/InfuseObject.java (93%) rename common/mekanism/api/{ => infuse}/InfuseRegistry.java (99%) rename common/mekanism/api/{ => infuse}/InfuseType.java (95%) rename common/mekanism/api/{ => infuse}/InfusionInput.java (96%) rename common/mekanism/api/{ => infuse}/InfusionOutput.java (96%) rename common/mekanism/api/{ => transmitters}/DynamicNetwork.java (99%) rename common/mekanism/api/{ => transmitters}/ITransmitter.java (97%) rename common/mekanism/api/{ => transmitters}/ITransmitterNetwork.java (94%) rename common/mekanism/api/{ => transmitters}/TransmissionType.java (92%) rename common/mekanism/api/{ => transmitters}/TransmitterNetworkRegistry.java (98%) rename common/mekanism/client/{TransmitterRenderer.java => TransmitterRenderingHandler.java} (94%) rename common/mekanism/client/{ => gui}/GuiAdvancedElectricMachine.java (93%) rename common/mekanism/client/{ => gui}/GuiCombiner.java (77%) rename common/mekanism/client/{ => gui}/GuiControlPanel.java (98%) rename common/mekanism/client/{ => gui}/GuiCredits.java (98%) rename common/mekanism/client/{ => gui}/GuiCrusher.java (78%) rename common/mekanism/client/{ => gui}/GuiDynamicTank.java (94%) rename common/mekanism/client/{ => gui}/GuiElectricChest.java (96%) rename common/mekanism/client/{ => gui}/GuiElectricMachine.java (93%) rename common/mekanism/client/{ => gui}/GuiElectricPump.java (95%) rename common/mekanism/client/{ => gui}/GuiElement.java (98%) rename common/mekanism/client/{ => gui}/GuiEnergizedSmelter.java (79%) rename common/mekanism/client/{ => gui}/GuiEnergyCube.java (94%) rename common/mekanism/client/{ => gui}/GuiEnrichmentChamber.java (79%) rename common/mekanism/client/{ => gui}/GuiFactory.java (96%) rename common/mekanism/client/{ => gui}/GuiGasTank.java (93%) rename common/mekanism/client/{ => gui}/GuiMekanism.java (98%) rename common/mekanism/client/{ => gui}/GuiMetallurgicInfuser.java (95%) rename common/mekanism/client/{ => gui}/GuiOsmiumCompressor.java (78%) rename common/mekanism/client/{ => gui}/GuiPasswordEnter.java (97%) rename common/mekanism/client/{ => gui}/GuiPasswordModify.java (98%) rename common/mekanism/client/{ => gui}/GuiPortableTeleporter.java (98%) rename common/mekanism/client/{ => gui}/GuiPurificationChamber.java (78%) rename common/mekanism/client/{ => gui}/GuiRedstoneControl.java (98%) rename common/mekanism/client/{ => gui}/GuiRobitCrafting.java (97%) rename common/mekanism/client/{ => gui}/GuiRobitInventory.java (97%) rename common/mekanism/client/{ => gui}/GuiRobitMain.java (99%) rename common/mekanism/client/{ => gui}/GuiRobitRepair.java (99%) rename common/mekanism/client/{ => gui}/GuiRobitSmelting.java (98%) rename common/mekanism/client/{ => gui}/GuiStopwatch.java (99%) rename common/mekanism/client/{ => gui}/GuiTeleporter.java (97%) rename common/mekanism/client/{ => gui}/GuiTheoreticalElementizer.java (91%) rename common/mekanism/client/{ => gui}/GuiUpgradeManagement.java (98%) rename common/mekanism/client/{ => gui}/GuiWeatherOrb.java (99%) rename common/mekanism/client/{ => model}/ModelBoxSelectiveFace.java (99%) rename common/mekanism/client/{ => model}/ModelChargepad.java (98%) rename common/mekanism/client/{ => model}/ModelElectricPump.java (99%) rename common/mekanism/client/{ => model}/ModelMetallurgicInfuser.java (99%) rename common/mekanism/client/{ => model}/ModelRendererSelectiveFace.java (98%) rename common/mekanism/client/{ => model}/ModelRobit.java (98%) rename common/mekanism/client/{ => model}/ModelTheoreticalElementizer.java (99%) rename common/mekanism/client/{ => model}/ModelTransmitter.java (99%) rename common/mekanism/{ => client}/nei/AdvancedMachineRecipeHandler.java (99%) rename common/mekanism/{ => client}/nei/CombinerRecipeHandler.java (91%) rename common/mekanism/{ => client}/nei/CrusherRecipeHandler.java (89%) rename common/mekanism/{ => client}/nei/EnrichmentChamberRecipeHandler.java (89%) rename common/mekanism/{ => client}/nei/MachineRecipeHandler.java (98%) rename common/mekanism/{ => client}/nei/MekanismRecipeHandler.java (98%) rename common/mekanism/{ => client}/nei/MetallurgicInfuserRecipeHandler.java (94%) rename common/mekanism/{ => client}/nei/NEIMekanismConfig.java (84%) rename common/mekanism/{ => client}/nei/OsmiumCompressorRecipeHandler.java (91%) rename common/mekanism/{ => client}/nei/PurificationChamberRecipeHandler.java (91%) rename common/mekanism/client/{ => render}/RenderChargepad.java (90%) rename common/mekanism/client/{ => render}/RenderConfigurableMachine.java (98%) rename common/mekanism/client/{ => render}/RenderDynamicTank.java (98%) rename common/mekanism/client/{ => render}/RenderElectricChest.java (95%) rename common/mekanism/client/{ => render}/RenderElectricPump.java (88%) rename common/mekanism/client/{ => render}/RenderLogisticalTransporter.java (90%) rename common/mekanism/client/{ => render}/RenderMechanicalPipe.java (97%) rename common/mekanism/client/{ => render}/RenderMetallurgicInfuser.java (90%) rename common/mekanism/client/{ => render}/RenderObsidianTNT.java (98%) rename common/mekanism/client/{ => render}/RenderPressurizedTube.java (95%) rename common/mekanism/client/{ => render}/RenderRobit.java (88%) rename common/mekanism/client/{ => render}/RenderTheoreticalElementizer.java (90%) rename common/mekanism/client/{ => render}/RenderTickHandler.java (98%) rename common/mekanism/client/{ => render}/RenderUniversalCable.java (97%) rename common/mekanism/common/{UpgradeTileComponent.java => TileComponentUpgrade.java} (93%) rename common/mekanism/common/{ => block}/BlockBasic.java (97%) rename common/mekanism/common/{ => block}/BlockBounding.java (96%) rename common/mekanism/common/{ => block}/BlockEnergyCube.java (96%) rename common/mekanism/common/{ => block}/BlockGasTank.java (96%) rename common/mekanism/common/{ => block}/BlockMachine.java (94%) rename common/mekanism/common/{ => block}/BlockObsidianTNT.java (97%) rename common/mekanism/common/{ => block}/BlockOre.java (94%) rename common/mekanism/common/{ => block}/BlockTransmitter.java (93%) rename common/mekanism/common/{ => inventory}/InventoryElectricChest.java (94%) rename common/mekanism/common/{ => inventory/container}/ContainerAdvancedElectricMachine.java (91%) rename common/mekanism/common/{ => inventory/container}/ContainerDynamicTank.java (95%) rename common/mekanism/common/{ => inventory/container}/ContainerElectricChest.java (92%) rename common/mekanism/common/{ => inventory/container}/ContainerElectricMachine.java (91%) rename common/mekanism/common/{ => inventory/container}/ContainerElectricPump.java (93%) rename common/mekanism/common/{ => inventory/container}/ContainerEnergyCube.java (94%) rename common/mekanism/common/{ => inventory/container}/ContainerFactory.java (93%) rename common/mekanism/common/{ => inventory/container}/ContainerGasTank.java (95%) rename common/mekanism/common/{ => inventory/container}/ContainerMetallurgicInfuser.java (90%) rename common/mekanism/common/{ => inventory/container}/ContainerRobitCrafting.java (91%) rename common/mekanism/common/{ => inventory/container}/ContainerRobitInventory.java (96%) rename common/mekanism/common/{ => inventory/container}/ContainerRobitMain.java (87%) rename common/mekanism/common/{ => inventory/container}/ContainerRobitRepair.java (91%) rename common/mekanism/common/{ => inventory/container}/ContainerRobitSmelting.java (98%) rename common/mekanism/common/{ => inventory/container}/ContainerTeleporter.java (92%) rename common/mekanism/common/{ => inventory/slot}/SlotElectricChest.java (90%) rename common/mekanism/common/{ => inventory/slot}/SlotEnergy.java (90%) rename common/mekanism/common/{ => inventory/slot}/SlotMachineUpgrade.java (82%) rename common/mekanism/common/{ => inventory/slot}/SlotOutput.java (89%) rename common/mekanism/common/{ => inventory/slot}/SlotStorageTank.java (91%) rename common/mekanism/common/{ => item}/ItemAtomicDisassembler.java (99%) rename common/mekanism/common/{ => item}/ItemBlockBasic.java (98%) rename common/mekanism/common/{ => item}/ItemBlockEnergyCube.java (96%) rename common/mekanism/common/{ => item}/ItemBlockMachine.java (96%) rename common/mekanism/common/{ => item}/ItemBlockOre.java (98%) rename common/mekanism/common/{ => item}/ItemBlockTransmitter.java (98%) rename common/mekanism/common/{ => item}/ItemClump.java (94%) rename common/mekanism/common/{ => item}/ItemConfigurator.java (94%) rename common/mekanism/common/{ => item}/ItemDirtyDust.java (94%) rename common/mekanism/common/{ => item}/ItemDust.java (94%) rename common/mekanism/common/{ => item}/ItemElectricBow.java (99%) rename common/mekanism/common/{ => item}/ItemEnergized.java (98%) rename common/mekanism/common/{ => item}/ItemIngot.java (94%) rename common/mekanism/common/{ => item}/ItemMachineUpgrade.java (76%) rename common/mekanism/common/{ => item}/ItemMekanism.java (85%) rename common/mekanism/common/{ => item}/ItemNetworkReader.java (93%) rename common/mekanism/common/{ => item}/ItemPortableTeleporter.java (97%) rename common/mekanism/common/{ => item}/ItemRobit.java (95%) rename common/mekanism/common/{ => item}/ItemStopwatch.java (93%) rename common/mekanism/common/{ => item}/ItemStorageTank.java (98%) rename common/mekanism/common/{ => item}/ItemWeatherOrb.java (93%) rename common/mekanism/common/{ => tileentity}/TileEntityAdvancedElectricMachine.java (96%) rename common/mekanism/common/{ => tileentity}/TileEntityAdvancedFactory.java (88%) rename common/mekanism/common/{ => tileentity}/TileEntityBasicBlock.java (95%) rename common/mekanism/common/{ => tileentity}/TileEntityBasicMachine.java (94%) rename common/mekanism/common/{ => tileentity}/TileEntityBoundingBlock.java (94%) rename common/mekanism/common/{ => tileentity}/TileEntityChargepad.java (95%) rename common/mekanism/common/{ => tileentity}/TileEntityCombiner.java (86%) rename common/mekanism/common/{ => tileentity}/TileEntityContainerBlock.java (98%) rename common/mekanism/common/{ => tileentity}/TileEntityControlPanel.java (94%) rename common/mekanism/common/{ => tileentity}/TileEntityCrusher.java (80%) rename common/mekanism/common/{ => tileentity}/TileEntityDynamicTank.java (98%) rename common/mekanism/common/{ => tileentity}/TileEntityDynamicValve.java (95%) rename common/mekanism/common/{ => tileentity}/TileEntityElectricBlock.java (97%) rename common/mekanism/common/{ => tileentity}/TileEntityElectricChest.java (96%) rename common/mekanism/common/{ => tileentity}/TileEntityElectricMachine.java (94%) rename common/mekanism/common/{ => tileentity}/TileEntityElectricPump.java (98%) rename common/mekanism/common/{ => tileentity}/TileEntityEliteFactory.java (88%) rename common/mekanism/common/{ => tileentity}/TileEntityEnergizedSmelter.java (90%) rename common/mekanism/common/{ => tileentity}/TileEntityEnergyCube.java (96%) rename common/mekanism/common/{ => tileentity}/TileEntityEnrichmentChamber.java (82%) rename common/mekanism/common/{ => tileentity}/TileEntityFactory.java (95%) rename common/mekanism/common/{ => tileentity}/TileEntityGasTank.java (95%) rename common/mekanism/common/{ => tileentity}/TileEntityLogisticalTransporter.java (93%) rename common/mekanism/common/{ => tileentity}/TileEntityMechanicalPipe.java (95%) rename common/mekanism/common/{ => tileentity}/TileEntityMetallurgicInfuser.java (94%) rename common/mekanism/common/{ => tileentity}/TileEntityOsmiumCompressor.java (87%) rename common/mekanism/common/{ => tileentity}/TileEntityPressurizedTube.java (90%) rename common/mekanism/common/{ => tileentity}/TileEntityPurificationChamber.java (91%) rename common/mekanism/common/{ => tileentity}/TileEntityTeleporter.java (97%) rename common/mekanism/common/{ => tileentity}/TileEntityTheoreticalElementizer.java (93%) rename common/mekanism/common/{ => tileentity}/TileEntityTransmitter.java (86%) rename common/mekanism/common/{ => tileentity}/TileEntityUniversalCable.java (94%) rename common/mekanism/generators/client/{ => gui}/GuiBioGenerator.java (90%) rename common/mekanism/generators/client/{ => gui}/GuiElectrolyticSeparator.java (95%) rename common/mekanism/generators/client/{ => gui}/GuiHeatGenerator.java (91%) rename common/mekanism/generators/client/{ => gui}/GuiHydrogenGenerator.java (90%) rename common/mekanism/generators/client/{ => gui}/GuiSolarGenerator.java (90%) rename common/mekanism/generators/client/{ => gui}/GuiWindTurbine.java (91%) rename common/mekanism/generators/client/{ => model}/ModelAdvancedSolarGenerator.java (99%) rename common/mekanism/generators/client/{ => model}/ModelBioGenerator.java (99%) rename common/mekanism/generators/client/{ => model}/ModelElectrolyticSeparator.java (99%) rename common/mekanism/generators/client/{ => model}/ModelHeatGenerator.java (99%) rename common/mekanism/generators/client/{ => model}/ModelHydrogenGenerator.java (99%) rename common/mekanism/generators/client/{ => model}/ModelWindTurbine.java (99%) rename common/mekanism/generators/client/{ => render}/RenderAdvancedSolarGenerator.java (88%) rename common/mekanism/generators/client/{ => render}/RenderBioGenerator.java (89%) rename common/mekanism/generators/client/{ => render}/RenderElectrolyticSeparator.java (87%) rename common/mekanism/generators/client/{ => render}/RenderHeatGenerator.java (88%) rename common/mekanism/generators/client/{ => render}/RenderHydrogenGenerator.java (88%) rename common/mekanism/generators/client/{ => render}/RenderWindTurbine.java (90%) rename common/mekanism/generators/common/{ => block}/BlockGenerator.java (95%) rename common/mekanism/generators/common/{ => inventory/container}/ContainerBioGenerator.java (95%) rename common/mekanism/generators/common/{ => inventory/container}/ContainerElectrolyticSeparator.java (94%) rename common/mekanism/generators/common/{ => inventory/container}/ContainerHeatGenerator.java (95%) rename common/mekanism/generators/common/{ => inventory/container}/ContainerHydrogenGenerator.java (94%) rename common/mekanism/generators/common/{ => inventory/container}/ContainerSolarGenerator.java (94%) rename common/mekanism/generators/common/{ => inventory/container}/ContainerWindTurbine.java (94%) rename common/mekanism/generators/common/{ => tileentity}/TileEntityAdvancedSolarGenerator.java (90%) rename common/mekanism/generators/common/{ => tileentity}/TileEntityBioGenerator.java (98%) rename common/mekanism/generators/common/{ => tileentity}/TileEntityElectrolyticSeparator.java (97%) rename common/mekanism/generators/common/{ => tileentity}/TileEntityGenerator.java (97%) rename common/mekanism/generators/common/{ => tileentity}/TileEntityHeatGenerator.java (98%) rename common/mekanism/generators/common/{ => tileentity}/TileEntityHydrogenGenerator.java (96%) rename common/mekanism/generators/common/{ => tileentity}/TileEntitySolarGenerator.java (95%) rename common/mekanism/generators/common/{ => tileentity}/TileEntityWindTurbine.java (96%) rename common/mekanism/tools/{common => item}/ItemMekanismArmor.java (97%) rename common/mekanism/tools/{common => item}/ItemMekanismAxe.java (96%) rename common/mekanism/tools/{common => item}/ItemMekanismHoe.java (97%) rename common/mekanism/tools/{common => item}/ItemMekanismPaxel.java (98%) rename common/mekanism/tools/{common => item}/ItemMekanismPickaxe.java (98%) rename common/mekanism/tools/{common => item}/ItemMekanismShovel.java (96%) rename common/mekanism/tools/{common => item}/ItemMekanismSword.java (96%) rename common/mekanism/tools/{common => item}/ItemMekanismTool.java (96%) diff --git a/common/mekanism/api/IStorageTank.java b/common/mekanism/api/IStorageTank.java index 7d1b41e39..4026f1f25 100644 --- a/common/mekanism/api/IStorageTank.java +++ b/common/mekanism/api/IStorageTank.java @@ -1,5 +1,7 @@ package mekanism.api; +import mekanism.api.gas.EnumGas; +import mekanism.api.gas.IGasStorage; import net.minecraft.item.ItemStack; /** diff --git a/common/mekanism/api/RecipeHelper.java b/common/mekanism/api/RecipeHelper.java index a40123799..26895c31a 100644 --- a/common/mekanism/api/RecipeHelper.java +++ b/common/mekanism/api/RecipeHelper.java @@ -2,6 +2,7 @@ package mekanism.api; import java.lang.reflect.Method; +import mekanism.api.infuse.InfusionInput; import net.minecraft.item.ItemStack; /** diff --git a/common/mekanism/api/EnergizedItemManager.java b/common/mekanism/api/energy/EnergizedItemManager.java similarity index 98% rename from common/mekanism/api/EnergizedItemManager.java rename to common/mekanism/api/energy/EnergizedItemManager.java index 8e28f60dd..254760923 100644 --- a/common/mekanism/api/EnergizedItemManager.java +++ b/common/mekanism/api/energy/EnergizedItemManager.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.energy; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/api/ICableOutputter.java b/common/mekanism/api/energy/ICableOutputter.java similarity index 93% rename from common/mekanism/api/ICableOutputter.java rename to common/mekanism/api/energy/ICableOutputter.java index dcd639865..fedda2b9f 100644 --- a/common/mekanism/api/ICableOutputter.java +++ b/common/mekanism/api/energy/ICableOutputter.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.energy; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/api/IEnergizedItem.java b/common/mekanism/api/energy/IEnergizedItem.java similarity index 98% rename from common/mekanism/api/IEnergizedItem.java rename to common/mekanism/api/energy/IEnergizedItem.java index 344fd0961..2e90ed9be 100644 --- a/common/mekanism/api/IEnergizedItem.java +++ b/common/mekanism/api/energy/IEnergizedItem.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.energy; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/api/IStrictEnergyAcceptor.java b/common/mekanism/api/energy/IStrictEnergyAcceptor.java similarity index 95% rename from common/mekanism/api/IStrictEnergyAcceptor.java rename to common/mekanism/api/energy/IStrictEnergyAcceptor.java index 7c9fd1e09..77ed8da94 100644 --- a/common/mekanism/api/IStrictEnergyAcceptor.java +++ b/common/mekanism/api/energy/IStrictEnergyAcceptor.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.energy; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/api/IStrictEnergyStorage.java b/common/mekanism/api/energy/IStrictEnergyStorage.java similarity index 95% rename from common/mekanism/api/IStrictEnergyStorage.java rename to common/mekanism/api/energy/IStrictEnergyStorage.java index 1f7fc8a66..5b538aa3f 100644 --- a/common/mekanism/api/IStrictEnergyStorage.java +++ b/common/mekanism/api/energy/IStrictEnergyStorage.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.energy; /** * Mekanism-specific energy storage for TileEntities, already implemented in IStrictEnergyAcceptor. diff --git a/common/mekanism/api/EnumGas.java b/common/mekanism/api/gas/EnumGas.java similarity index 96% rename from common/mekanism/api/EnumGas.java rename to common/mekanism/api/gas/EnumGas.java index 5a78b24e4..dbc8a1c1f 100644 --- a/common/mekanism/api/EnumGas.java +++ b/common/mekanism/api/gas/EnumGas.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.gas; import net.minecraft.util.Icon; import net.minecraft.util.ResourceLocation; diff --git a/common/mekanism/api/GasNetwork.java b/common/mekanism/api/gas/GasNetwork.java similarity index 96% rename from common/mekanism/api/GasNetwork.java rename to common/mekanism/api/gas/GasNetwork.java index 3f7577208..96ee66603 100644 --- a/common/mekanism/api/GasNetwork.java +++ b/common/mekanism/api/gas/GasNetwork.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.gas; import java.util.Arrays; import java.util.Collection; @@ -8,6 +8,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import mekanism.api.transmitters.DynamicNetwork; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; diff --git a/common/mekanism/api/GasTransmission.java b/common/mekanism/api/gas/GasTransmission.java similarity index 96% rename from common/mekanism/api/GasTransmission.java rename to common/mekanism/api/gas/GasTransmission.java index ecaf5aa19..91488244e 100644 --- a/common/mekanism/api/GasTransmission.java +++ b/common/mekanism/api/gas/GasTransmission.java @@ -1,7 +1,11 @@ -package mekanism.api; +package mekanism.api.gas; import java.util.HashSet; import java.util.Set; + +import mekanism.api.Object3D; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/api/IGasAcceptor.java b/common/mekanism/api/gas/IGasAcceptor.java similarity index 95% rename from common/mekanism/api/IGasAcceptor.java rename to common/mekanism/api/gas/IGasAcceptor.java index 368797d06..8eb570f84 100644 --- a/common/mekanism/api/IGasAcceptor.java +++ b/common/mekanism/api/gas/IGasAcceptor.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.gas; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/api/IGasStorage.java b/common/mekanism/api/gas/IGasStorage.java similarity index 97% rename from common/mekanism/api/IGasStorage.java rename to common/mekanism/api/gas/IGasStorage.java index e85ff471e..76e2fb126 100644 --- a/common/mekanism/api/IGasStorage.java +++ b/common/mekanism/api/gas/IGasStorage.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.gas; /** * Implement this if your tile entity can store some form of gas. If you want your item to store gas, implement IStorageTank diff --git a/common/mekanism/api/IGasTransmitter.java b/common/mekanism/api/gas/IGasTransmitter.java similarity index 70% rename from common/mekanism/api/IGasTransmitter.java rename to common/mekanism/api/gas/IGasTransmitter.java index 8cef22933..454f4e2c4 100644 --- a/common/mekanism/api/IGasTransmitter.java +++ b/common/mekanism/api/gas/IGasTransmitter.java @@ -1,5 +1,6 @@ -package mekanism.api; +package mekanism.api.gas; +import mekanism.api.transmitters.ITransmitter; import net.minecraft.tileentity.TileEntity; public interface IGasTransmitter extends ITransmitter diff --git a/common/mekanism/api/ITubeConnection.java b/common/mekanism/api/gas/ITubeConnection.java similarity index 93% rename from common/mekanism/api/ITubeConnection.java rename to common/mekanism/api/gas/ITubeConnection.java index 7c6c4bd65..044a6dc8f 100644 --- a/common/mekanism/api/ITubeConnection.java +++ b/common/mekanism/api/gas/ITubeConnection.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.gas; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/api/InfuseObject.java b/common/mekanism/api/infuse/InfuseObject.java similarity index 93% rename from common/mekanism/api/InfuseObject.java rename to common/mekanism/api/infuse/InfuseObject.java index 4b084452b..bfd114744 100644 --- a/common/mekanism/api/InfuseObject.java +++ b/common/mekanism/api/infuse/InfuseObject.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.infuse; /** * InfuseObject - an object associated with an ItemStack that can modify a Metallurgic Infuser's internal infuse. diff --git a/common/mekanism/api/InfuseRegistry.java b/common/mekanism/api/infuse/InfuseRegistry.java similarity index 99% rename from common/mekanism/api/InfuseRegistry.java rename to common/mekanism/api/infuse/InfuseRegistry.java index 9a791c6b1..8a82ca0f1 100644 --- a/common/mekanism/api/InfuseRegistry.java +++ b/common/mekanism/api/infuse/InfuseRegistry.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.infuse; import java.util.HashMap; import java.util.Map; diff --git a/common/mekanism/api/InfuseType.java b/common/mekanism/api/infuse/InfuseType.java similarity index 95% rename from common/mekanism/api/InfuseType.java rename to common/mekanism/api/infuse/InfuseType.java index 8edb1b7a2..b8ed86809 100644 --- a/common/mekanism/api/InfuseType.java +++ b/common/mekanism/api/infuse/InfuseType.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.infuse; import net.minecraft.util.ResourceLocation; diff --git a/common/mekanism/api/InfusionInput.java b/common/mekanism/api/infuse/InfusionInput.java similarity index 96% rename from common/mekanism/api/InfusionInput.java rename to common/mekanism/api/infuse/InfusionInput.java index 1daf90a13..e8324c022 100644 --- a/common/mekanism/api/InfusionInput.java +++ b/common/mekanism/api/infuse/InfusionInput.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.infuse; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/api/InfusionOutput.java b/common/mekanism/api/infuse/InfusionOutput.java similarity index 96% rename from common/mekanism/api/InfusionOutput.java rename to common/mekanism/api/infuse/InfusionOutput.java index 6e992ec66..6d8722345 100644 --- a/common/mekanism/api/InfusionOutput.java +++ b/common/mekanism/api/infuse/InfusionOutput.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.infuse; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/api/DynamicNetwork.java b/common/mekanism/api/transmitters/DynamicNetwork.java similarity index 99% rename from common/mekanism/api/DynamicNetwork.java rename to common/mekanism/api/transmitters/DynamicNetwork.java index 08c7a3f4f..023ec44b7 100644 --- a/common/mekanism/api/DynamicNetwork.java +++ b/common/mekanism/api/transmitters/DynamicNetwork.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.transmitters; import java.util.ArrayList; import java.util.Arrays; @@ -10,6 +10,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import mekanism.api.Object3D; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/api/ITransmitter.java b/common/mekanism/api/transmitters/ITransmitter.java similarity index 97% rename from common/mekanism/api/ITransmitter.java rename to common/mekanism/api/transmitters/ITransmitter.java index c8801a557..e1e7f5479 100644 --- a/common/mekanism/api/ITransmitter.java +++ b/common/mekanism/api/transmitters/ITransmitter.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.transmitters; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/api/ITransmitterNetwork.java b/common/mekanism/api/transmitters/ITransmitterNetwork.java similarity index 94% rename from common/mekanism/api/ITransmitterNetwork.java rename to common/mekanism/api/transmitters/ITransmitterNetwork.java index d0cb53069..5e7d1cd8e 100644 --- a/common/mekanism/api/ITransmitterNetwork.java +++ b/common/mekanism/api/transmitters/ITransmitterNetwork.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.transmitters; import java.util.Set; diff --git a/common/mekanism/api/TransmissionType.java b/common/mekanism/api/transmitters/TransmissionType.java similarity index 92% rename from common/mekanism/api/TransmissionType.java rename to common/mekanism/api/transmitters/TransmissionType.java index 9ae38c601..a190f5b81 100644 --- a/common/mekanism/api/TransmissionType.java +++ b/common/mekanism/api/transmitters/TransmissionType.java @@ -1,5 +1,6 @@ -package mekanism.api; +package mekanism.api.transmitters; +import mekanism.api.gas.IGasTransmitter; import net.minecraft.tileentity.TileEntity; public enum TransmissionType diff --git a/common/mekanism/api/TransmitterNetworkRegistry.java b/common/mekanism/api/transmitters/TransmitterNetworkRegistry.java similarity index 98% rename from common/mekanism/api/TransmitterNetworkRegistry.java rename to common/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 84705da41..88f3fd2a6 100644 --- a/common/mekanism/api/TransmitterNetworkRegistry.java +++ b/common/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.transmitters; import java.util.EnumSet; import java.util.HashSet; diff --git a/common/mekanism/client/ClientPlayerTickHandler.java b/common/mekanism/client/ClientPlayerTickHandler.java index e018db39b..8018ed88b 100644 --- a/common/mekanism/client/ClientPlayerTickHandler.java +++ b/common/mekanism/client/ClientPlayerTickHandler.java @@ -3,10 +3,10 @@ package mekanism.client; import java.util.EnumSet; import mekanism.api.EnumColor; -import mekanism.common.ItemConfigurator; -import mekanism.common.ItemElectricBow; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.item.ItemConfigurator; +import mekanism.common.item.ItemElectricBow; import mekanism.common.network.PacketConfiguratorState; import mekanism.common.network.PacketElectricBowState; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index 2033253c8..d3010b427 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -4,42 +4,83 @@ package mekanism.client; import java.io.File; import java.util.HashMap; -import mekanism.api.EnumGas; +import mekanism.api.gas.EnumGas; +import mekanism.client.gui.GuiCombiner; +import mekanism.client.gui.GuiControlPanel; +import mekanism.client.gui.GuiCredits; +import mekanism.client.gui.GuiCrusher; +import mekanism.client.gui.GuiDynamicTank; +import mekanism.client.gui.GuiElectricChest; +import mekanism.client.gui.GuiElectricPump; +import mekanism.client.gui.GuiEnergizedSmelter; +import mekanism.client.gui.GuiEnergyCube; +import mekanism.client.gui.GuiEnrichmentChamber; +import mekanism.client.gui.GuiFactory; +import mekanism.client.gui.GuiGasTank; +import mekanism.client.gui.GuiMetallurgicInfuser; +import mekanism.client.gui.GuiOsmiumCompressor; +import mekanism.client.gui.GuiPasswordEnter; +import mekanism.client.gui.GuiPasswordModify; +import mekanism.client.gui.GuiPortableTeleporter; +import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.GuiRobitCrafting; +import mekanism.client.gui.GuiRobitInventory; +import mekanism.client.gui.GuiRobitMain; +import mekanism.client.gui.GuiRobitRepair; +import mekanism.client.gui.GuiRobitSmelting; +import mekanism.client.gui.GuiStopwatch; +import mekanism.client.gui.GuiTeleporter; +import mekanism.client.gui.GuiTheoreticalElementizer; +import mekanism.client.gui.GuiWeatherOrb; +import mekanism.client.render.RenderChargepad; +import mekanism.client.render.RenderConfigurableMachine; +import mekanism.client.render.RenderDynamicTank; +import mekanism.client.render.RenderElectricChest; +import mekanism.client.render.RenderElectricPump; +import mekanism.client.render.RenderLogisticalTransporter; +import mekanism.client.render.RenderMechanicalPipe; +import mekanism.client.render.RenderMetallurgicInfuser; +import mekanism.client.render.RenderObsidianTNT; +import mekanism.client.render.RenderPressurizedTube; +import mekanism.client.render.RenderRobit; +import mekanism.client.render.RenderTheoreticalElementizer; +import mekanism.client.render.RenderTickHandler; +import mekanism.client.render.RenderUniversalCable; import mekanism.common.CommonProxy; import mekanism.common.EntityObsidianTNT; import mekanism.common.EntityRobit; import mekanism.common.IElectricChest; -import mekanism.common.InventoryElectricChest; -import mekanism.common.ItemPortableTeleporter; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.common.TileEntityAdvancedElectricMachine; -import mekanism.common.TileEntityAdvancedFactory; -import mekanism.common.TileEntityChargepad; -import mekanism.common.TileEntityCombiner; -import mekanism.common.TileEntityControlPanel; -import mekanism.common.TileEntityCrusher; -import mekanism.common.TileEntityDynamicTank; -import mekanism.common.TileEntityDynamicValve; -import mekanism.common.TileEntityElectricChest; -import mekanism.common.TileEntityElectricMachine; -import mekanism.common.TileEntityElectricPump; -import mekanism.common.TileEntityEliteFactory; -import mekanism.common.TileEntityEnergizedSmelter; -import mekanism.common.TileEntityEnergyCube; -import mekanism.common.TileEntityEnrichmentChamber; -import mekanism.common.TileEntityFactory; -import mekanism.common.TileEntityGasTank; -import mekanism.common.TileEntityLogisticalTransporter; -import mekanism.common.TileEntityMechanicalPipe; -import mekanism.common.TileEntityMetallurgicInfuser; -import mekanism.common.TileEntityOsmiumCompressor; -import mekanism.common.TileEntityPressurizedTube; -import mekanism.common.TileEntityPurificationChamber; -import mekanism.common.TileEntityTeleporter; -import mekanism.common.TileEntityTheoreticalElementizer; -import mekanism.common.TileEntityUniversalCable; +import mekanism.common.inventory.InventoryElectricChest; +import mekanism.common.item.ItemPortableTeleporter; +import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.tileentity.TileEntityAdvancedFactory; +import mekanism.common.tileentity.TileEntityChargepad; +import mekanism.common.tileentity.TileEntityCombiner; +import mekanism.common.tileentity.TileEntityControlPanel; +import mekanism.common.tileentity.TileEntityCrusher; +import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tileentity.TileEntityDynamicValve; +import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tileentity.TileEntityElectricMachine; +import mekanism.common.tileentity.TileEntityElectricPump; +import mekanism.common.tileentity.TileEntityEliteFactory; +import mekanism.common.tileentity.TileEntityEnergizedSmelter; +import mekanism.common.tileentity.TileEntityEnergyCube; +import mekanism.common.tileentity.TileEntityEnrichmentChamber; +import mekanism.common.tileentity.TileEntityFactory; +import mekanism.common.tileentity.TileEntityGasTank; +import mekanism.common.tileentity.TileEntityLogisticalTransporter; +import mekanism.common.tileentity.TileEntityMechanicalPipe; +import mekanism.common.tileentity.TileEntityMetallurgicInfuser; +import mekanism.common.tileentity.TileEntityOsmiumCompressor; +import mekanism.common.tileentity.TileEntityPressurizedTube; +import mekanism.common.tileentity.TileEntityPurificationChamber; +import mekanism.common.tileentity.TileEntityTeleporter; +import mekanism.common.tileentity.TileEntityTheoreticalElementizer; +import mekanism.common.tileentity.TileEntityUniversalCable; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; @@ -205,7 +246,7 @@ public class ClientProxy extends CommonProxy //Register block handlers RenderingRegistry.registerBlockHandler(new MachineRenderingHandler()); - RenderingRegistry.registerBlockHandler(new TransmitterRenderer()); + RenderingRegistry.registerBlockHandler(new TransmitterRenderingHandler()); RenderingRegistry.registerBlockHandler(new BasicRenderingHandler()); if(!EnumGas.HYDROGEN.hasTexture()) diff --git a/common/mekanism/client/EnergyClientUpdate.java b/common/mekanism/client/EnergyClientUpdate.java index 7a8eb6737..600e02309 100644 --- a/common/mekanism/client/EnergyClientUpdate.java +++ b/common/mekanism/client/EnergyClientUpdate.java @@ -2,10 +2,10 @@ package mekanism.client; import java.util.List; -import mekanism.api.DynamicNetwork.NetworkFinder; +import mekanism.api.transmitters.TransmissionType; +import mekanism.api.transmitters.DynamicNetwork.NetworkFinder; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; -import mekanism.common.TileEntityUniversalCable; +import mekanism.common.tileentity.TileEntityUniversalCable; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/mekanism/client/FluidClientUpdate.java b/common/mekanism/client/FluidClientUpdate.java index 98c2f65bc..63b765293 100644 --- a/common/mekanism/client/FluidClientUpdate.java +++ b/common/mekanism/client/FluidClientUpdate.java @@ -2,10 +2,10 @@ package mekanism.client; import java.util.List; -import mekanism.api.DynamicNetwork.NetworkFinder; +import mekanism.api.transmitters.TransmissionType; +import mekanism.api.transmitters.DynamicNetwork.NetworkFinder; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; -import mekanism.common.TileEntityMechanicalPipe; +import mekanism.common.tileentity.TileEntityMechanicalPipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; diff --git a/common/mekanism/client/GasClientUpdate.java b/common/mekanism/client/GasClientUpdate.java index 2338cb78e..a659ec054 100644 --- a/common/mekanism/client/GasClientUpdate.java +++ b/common/mekanism/client/GasClientUpdate.java @@ -2,11 +2,11 @@ package mekanism.client; import java.util.List; -import mekanism.api.DynamicNetwork.NetworkFinder; -import mekanism.api.EnumGas; +import mekanism.api.gas.EnumGas; +import mekanism.api.transmitters.TransmissionType; +import mekanism.api.transmitters.DynamicNetwork.NetworkFinder; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; -import mekanism.common.TileEntityPressurizedTube; +import mekanism.common.tileentity.TileEntityPressurizedTube; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/mekanism/client/ItemRenderingHandler.java b/common/mekanism/client/ItemRenderingHandler.java index 4ade90dc3..fbd9e0dd1 100644 --- a/common/mekanism/client/ItemRenderingHandler.java +++ b/common/mekanism/client/ItemRenderingHandler.java @@ -1,14 +1,15 @@ package mekanism.client; -import mekanism.common.BlockMachine.MachineType; +import mekanism.client.model.ModelRobit; import mekanism.common.IElectricChest; import mekanism.common.IEnergyCube; -import mekanism.common.ItemBlockMachine; -import mekanism.common.ItemRobit; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.item.ItemBlockMachine; +import mekanism.common.item.ItemRobit; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; diff --git a/common/mekanism/client/MachineRenderingHandler.java b/common/mekanism/client/MachineRenderingHandler.java index 97f3bd9cc..b46d31cba 100644 --- a/common/mekanism/client/MachineRenderingHandler.java +++ b/common/mekanism/client/MachineRenderingHandler.java @@ -1,7 +1,11 @@ package mekanism.client; -import mekanism.common.BlockMachine.MachineType; +import mekanism.client.model.ModelChargepad; +import mekanism.client.model.ModelElectricPump; +import mekanism.client.model.ModelMetallurgicInfuser; +import mekanism.client.model.ModelTheoreticalElementizer; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import net.minecraft.block.Block; diff --git a/common/mekanism/client/ThreadClientUpdate.java b/common/mekanism/client/ThreadClientUpdate.java index fb8fa0f93..859613dce 100644 --- a/common/mekanism/client/ThreadClientUpdate.java +++ b/common/mekanism/client/ThreadClientUpdate.java @@ -8,7 +8,7 @@ import java.net.URL; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - +import mekanism.client.gui.GuiCredits; import mekanism.common.Mekanism; /** diff --git a/common/mekanism/client/ThreadTankSparkle.java b/common/mekanism/client/ThreadTankSparkle.java index 7ce07a271..bb824cabf 100644 --- a/common/mekanism/client/ThreadTankSparkle.java +++ b/common/mekanism/client/ThreadTankSparkle.java @@ -6,10 +6,9 @@ import java.util.Set; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import mekanism.api.Object3D; import mekanism.common.Mekanism; -import mekanism.common.TileEntityDynamicTank; +import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/client/TransmitterRenderer.java b/common/mekanism/client/TransmitterRenderingHandler.java similarity index 94% rename from common/mekanism/client/TransmitterRenderer.java rename to common/mekanism/client/TransmitterRenderingHandler.java index 78276e1b1..8bbf124fc 100644 --- a/common/mekanism/client/TransmitterRenderer.java +++ b/common/mekanism/client/TransmitterRenderingHandler.java @@ -1,5 +1,6 @@ package mekanism.client; +import mekanism.client.model.ModelTransmitter; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.block.Block; @@ -15,7 +16,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class TransmitterRenderer implements ISimpleBlockRenderingHandler +public class TransmitterRenderingHandler implements ISimpleBlockRenderingHandler { public ModelTransmitter transmitter = new ModelTransmitter(); diff --git a/common/mekanism/client/GuiAdvancedElectricMachine.java b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java similarity index 93% rename from common/mekanism/client/GuiAdvancedElectricMachine.java rename to common/mekanism/client/gui/GuiAdvancedElectricMachine.java index d5d214bed..76e8b0cee 100644 --- a/common/mekanism/client/GuiAdvancedElectricMachine.java +++ b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -1,7 +1,7 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerAdvancedElectricMachine; -import mekanism.common.TileEntityAdvancedElectricMachine; +import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; +import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/client/GuiCombiner.java b/common/mekanism/client/gui/GuiCombiner.java similarity index 77% rename from common/mekanism/client/GuiCombiner.java rename to common/mekanism/client/gui/GuiCombiner.java index 9e0a1aa68..d6deb8b2a 100644 --- a/common/mekanism/client/GuiCombiner.java +++ b/common/mekanism/client/gui/GuiCombiner.java @@ -1,8 +1,8 @@ -package mekanism.client; +package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.TileEntityAdvancedElectricMachine; +import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/GuiControlPanel.java b/common/mekanism/client/gui/GuiControlPanel.java similarity index 98% rename from common/mekanism/client/GuiControlPanel.java rename to common/mekanism/client/gui/GuiControlPanel.java index 6dfe10e01..2477a6a37 100644 --- a/common/mekanism/client/GuiControlPanel.java +++ b/common/mekanism/client/gui/GuiControlPanel.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.gui; import mekanism.api.EnumColor; import mekanism.api.IAccessibleGui; @@ -7,8 +7,8 @@ import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileEntityControlPanel; import mekanism.common.network.PacketControlPanel; +import mekanism.common.tileentity.TileEntityControlPanel; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; diff --git a/common/mekanism/client/GuiCredits.java b/common/mekanism/client/gui/GuiCredits.java similarity index 98% rename from common/mekanism/client/GuiCredits.java rename to common/mekanism/client/gui/GuiCredits.java index afcaebe80..03b736090 100644 --- a/common/mekanism/client/GuiCredits.java +++ b/common/mekanism/client/gui/GuiCredits.java @@ -1,6 +1,7 @@ -package mekanism.client; +package mekanism.client.gui; import mekanism.api.EnumColor; +import mekanism.client.ThreadClientUpdate; import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; diff --git a/common/mekanism/client/GuiCrusher.java b/common/mekanism/client/gui/GuiCrusher.java similarity index 78% rename from common/mekanism/client/GuiCrusher.java rename to common/mekanism/client/gui/GuiCrusher.java index eeb1b0528..3b7167490 100644 --- a/common/mekanism/client/GuiCrusher.java +++ b/common/mekanism/client/gui/GuiCrusher.java @@ -1,8 +1,8 @@ -package mekanism.client; +package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.TileEntityElectricMachine; +import mekanism.common.tileentity.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/GuiDynamicTank.java b/common/mekanism/client/gui/GuiDynamicTank.java similarity index 94% rename from common/mekanism/client/GuiDynamicTank.java rename to common/mekanism/client/gui/GuiDynamicTank.java index a62209df5..f44ad8dca 100644 --- a/common/mekanism/client/GuiDynamicTank.java +++ b/common/mekanism/client/gui/GuiDynamicTank.java @@ -1,9 +1,10 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerDynamicTank; +import mekanism.client.MekanismRenderer; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.common.TileEntityDynamicTank; +import mekanism.common.inventory.container.ContainerDynamicTank; +import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidRegistry; diff --git a/common/mekanism/client/GuiElectricChest.java b/common/mekanism/client/gui/GuiElectricChest.java similarity index 96% rename from common/mekanism/client/GuiElectricChest.java rename to common/mekanism/client/gui/GuiElectricChest.java index eff123ce9..09efb48d8 100644 --- a/common/mekanism/client/GuiElectricChest.java +++ b/common/mekanism/client/gui/GuiElectricChest.java @@ -1,18 +1,18 @@ -package mekanism.client; +package mekanism.client.gui; import mekanism.api.EnumColor; -import mekanism.api.IEnergizedItem; import mekanism.api.Object3D; -import mekanism.common.ContainerElectricChest; +import mekanism.api.energy.IEnergizedItem; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileEntityElectricChest; +import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.tileentity.TileEntityElectricChest; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -23,7 +23,6 @@ import org.lwjgl.opengl.GL11; import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/client/GuiElectricMachine.java b/common/mekanism/client/gui/GuiElectricMachine.java similarity index 93% rename from common/mekanism/client/GuiElectricMachine.java rename to common/mekanism/client/gui/GuiElectricMachine.java index 7ac7dc7d8..422fe3b2c 100644 --- a/common/mekanism/client/GuiElectricMachine.java +++ b/common/mekanism/client/gui/GuiElectricMachine.java @@ -1,7 +1,7 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerElectricMachine; -import mekanism.common.TileEntityElectricMachine; +import mekanism.common.inventory.container.ContainerElectricMachine; +import mekanism.common.tileentity.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/client/GuiElectricPump.java b/common/mekanism/client/gui/GuiElectricPump.java similarity index 95% rename from common/mekanism/client/GuiElectricPump.java rename to common/mekanism/client/gui/GuiElectricPump.java index bb9d86cc0..ffaae8ad3 100644 --- a/common/mekanism/client/GuiElectricPump.java +++ b/common/mekanism/client/gui/GuiElectricPump.java @@ -1,9 +1,10 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerElectricPump; +import mekanism.client.MekanismRenderer; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.common.TileEntityElectricPump; +import mekanism.common.inventory.container.ContainerElectricPump; +import mekanism.common.tileentity.TileEntityElectricPump; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidRegistry; diff --git a/common/mekanism/client/GuiElement.java b/common/mekanism/client/gui/GuiElement.java similarity index 98% rename from common/mekanism/client/GuiElement.java rename to common/mekanism/client/gui/GuiElement.java index 4b2fc0e38..5acb158b7 100644 --- a/common/mekanism/client/GuiElement.java +++ b/common/mekanism/client/gui/GuiElement.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.gui; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/common/mekanism/client/GuiEnergizedSmelter.java b/common/mekanism/client/gui/GuiEnergizedSmelter.java similarity index 79% rename from common/mekanism/client/GuiEnergizedSmelter.java rename to common/mekanism/client/gui/GuiEnergizedSmelter.java index 66a4c7b43..634c2d89c 100644 --- a/common/mekanism/client/GuiEnergizedSmelter.java +++ b/common/mekanism/client/gui/GuiEnergizedSmelter.java @@ -1,8 +1,8 @@ -package mekanism.client; +package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.TileEntityElectricMachine; +import mekanism.common.tileentity.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/GuiEnergyCube.java b/common/mekanism/client/gui/GuiEnergyCube.java similarity index 94% rename from common/mekanism/client/GuiEnergyCube.java rename to common/mekanism/client/gui/GuiEnergyCube.java index d871cdc3e..0b36cd558 100644 --- a/common/mekanism/client/GuiEnergyCube.java +++ b/common/mekanism/client/gui/GuiEnergyCube.java @@ -1,9 +1,9 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerEnergyCube; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.common.TileEntityEnergyCube; +import mekanism.common.inventory.container.ContainerEnergyCube; +import mekanism.common.tileentity.TileEntityEnergyCube; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; diff --git a/common/mekanism/client/GuiEnrichmentChamber.java b/common/mekanism/client/gui/GuiEnrichmentChamber.java similarity index 79% rename from common/mekanism/client/GuiEnrichmentChamber.java rename to common/mekanism/client/gui/GuiEnrichmentChamber.java index 163f4571b..4a979f319 100644 --- a/common/mekanism/client/GuiEnrichmentChamber.java +++ b/common/mekanism/client/gui/GuiEnrichmentChamber.java @@ -1,8 +1,8 @@ -package mekanism.client; +package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.TileEntityElectricMachine; +import mekanism.common.tileentity.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/GuiFactory.java b/common/mekanism/client/gui/GuiFactory.java similarity index 96% rename from common/mekanism/client/GuiFactory.java rename to common/mekanism/client/gui/GuiFactory.java index ba64885ab..a6134f03a 100644 --- a/common/mekanism/client/GuiFactory.java +++ b/common/mekanism/client/gui/GuiFactory.java @@ -1,9 +1,9 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerFactory; import mekanism.common.IFactory.RecipeType; import mekanism.common.Tier.FactoryTier; -import mekanism.common.TileEntityFactory; +import mekanism.common.inventory.container.ContainerFactory; +import mekanism.common.tileentity.TileEntityFactory; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/client/GuiGasTank.java b/common/mekanism/client/gui/GuiGasTank.java similarity index 93% rename from common/mekanism/client/GuiGasTank.java rename to common/mekanism/client/gui/GuiGasTank.java index 561823e31..9fd4dd760 100644 --- a/common/mekanism/client/GuiGasTank.java +++ b/common/mekanism/client/gui/GuiGasTank.java @@ -1,9 +1,9 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerGasTank; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.common.TileEntityGasTank; +import mekanism.common.inventory.container.ContainerGasTank; +import mekanism.common.tileentity.TileEntityGasTank; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; diff --git a/common/mekanism/client/GuiMekanism.java b/common/mekanism/client/gui/GuiMekanism.java similarity index 98% rename from common/mekanism/client/GuiMekanism.java rename to common/mekanism/client/gui/GuiMekanism.java index d5fa4a5fb..a66822fb6 100644 --- a/common/mekanism/client/GuiMekanism.java +++ b/common/mekanism/client/gui/GuiMekanism.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.gui; import java.util.HashSet; import java.util.Set; diff --git a/common/mekanism/client/GuiMetallurgicInfuser.java b/common/mekanism/client/gui/GuiMetallurgicInfuser.java similarity index 95% rename from common/mekanism/client/GuiMetallurgicInfuser.java rename to common/mekanism/client/gui/GuiMetallurgicInfuser.java index 99a3b5778..207548809 100644 --- a/common/mekanism/client/GuiMetallurgicInfuser.java +++ b/common/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -1,18 +1,19 @@ -package mekanism.client; +package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Object3D; -import mekanism.common.ContainerMetallurgicInfuser; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileEntityMetallurgicInfuser; +import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.network.PacketRemoveUpgrade; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tileentity.TileEntityMetallurgicInfuser; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; import universalelectricity.core.electricity.ElectricityDisplay; diff --git a/common/mekanism/client/GuiOsmiumCompressor.java b/common/mekanism/client/gui/GuiOsmiumCompressor.java similarity index 78% rename from common/mekanism/client/GuiOsmiumCompressor.java rename to common/mekanism/client/gui/GuiOsmiumCompressor.java index e6fb7038b..d06c4b5cb 100644 --- a/common/mekanism/client/GuiOsmiumCompressor.java +++ b/common/mekanism/client/gui/GuiOsmiumCompressor.java @@ -1,8 +1,8 @@ -package mekanism.client; +package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.TileEntityAdvancedElectricMachine; +import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/GuiPasswordEnter.java b/common/mekanism/client/gui/GuiPasswordEnter.java similarity index 97% rename from common/mekanism/client/GuiPasswordEnter.java rename to common/mekanism/client/gui/GuiPasswordEnter.java index 4345377fc..840ddef38 100644 --- a/common/mekanism/client/GuiPasswordEnter.java +++ b/common/mekanism/client/gui/GuiPasswordEnter.java @@ -1,20 +1,21 @@ -package mekanism.client; +package mekanism.client.gui; import mekanism.api.EnumColor; -import mekanism.api.IEnergizedItem; import mekanism.api.Object3D; +import mekanism.api.energy.IEnergizedItem; import mekanism.common.IElectricChest; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileEntityElectricChest; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.tileentity.TileEntityElectricChest; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; + import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/client/GuiPasswordModify.java b/common/mekanism/client/gui/GuiPasswordModify.java similarity index 98% rename from common/mekanism/client/GuiPasswordModify.java rename to common/mekanism/client/gui/GuiPasswordModify.java index f84219f37..17e67da0d 100644 --- a/common/mekanism/client/GuiPasswordModify.java +++ b/common/mekanism/client/gui/GuiPasswordModify.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.gui; import mekanism.api.EnumColor; import mekanism.api.Object3D; @@ -7,13 +7,14 @@ import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileEntityElectricChest; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.tileentity.TileEntityElectricChest; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.ItemStack; + import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/client/GuiPortableTeleporter.java b/common/mekanism/client/gui/GuiPortableTeleporter.java similarity index 98% rename from common/mekanism/client/GuiPortableTeleporter.java rename to common/mekanism/client/gui/GuiPortableTeleporter.java index 7d3c2c2ce..f9835723f 100644 --- a/common/mekanism/client/GuiPortableTeleporter.java +++ b/common/mekanism/client/gui/GuiPortableTeleporter.java @@ -1,16 +1,17 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ItemPortableTeleporter; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketDigitUpdate; import mekanism.common.network.PacketPortableTeleport; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; diff --git a/common/mekanism/client/GuiPurificationChamber.java b/common/mekanism/client/gui/GuiPurificationChamber.java similarity index 78% rename from common/mekanism/client/GuiPurificationChamber.java rename to common/mekanism/client/gui/GuiPurificationChamber.java index f399e2dd2..fbd133a21 100644 --- a/common/mekanism/client/GuiPurificationChamber.java +++ b/common/mekanism/client/gui/GuiPurificationChamber.java @@ -1,8 +1,8 @@ -package mekanism.client; +package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.TileEntityAdvancedElectricMachine; +import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/GuiRedstoneControl.java b/common/mekanism/client/gui/GuiRedstoneControl.java similarity index 98% rename from common/mekanism/client/GuiRedstoneControl.java rename to common/mekanism/client/gui/GuiRedstoneControl.java index 219f3be51..671e809fb 100644 --- a/common/mekanism/client/GuiRedstoneControl.java +++ b/common/mekanism/client/gui/GuiRedstoneControl.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.gui; import java.lang.reflect.Method; diff --git a/common/mekanism/client/GuiRobitCrafting.java b/common/mekanism/client/gui/GuiRobitCrafting.java similarity index 97% rename from common/mekanism/client/GuiRobitCrafting.java rename to common/mekanism/client/gui/GuiRobitCrafting.java index b7f820769..2264a62b9 100644 --- a/common/mekanism/client/GuiRobitCrafting.java +++ b/common/mekanism/client/gui/GuiRobitCrafting.java @@ -1,11 +1,11 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerRobitCrafting; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.inventory.container.ContainerRobitCrafting; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/common/mekanism/client/GuiRobitInventory.java b/common/mekanism/client/gui/GuiRobitInventory.java similarity index 97% rename from common/mekanism/client/GuiRobitInventory.java rename to common/mekanism/client/gui/GuiRobitInventory.java index 2dab79827..804ef7c5e 100644 --- a/common/mekanism/client/GuiRobitInventory.java +++ b/common/mekanism/client/gui/GuiRobitInventory.java @@ -1,16 +1,17 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerRobitInventory; import mekanism.common.EntityRobit; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.inventory.container.ContainerRobitInventory; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; diff --git a/common/mekanism/client/GuiRobitMain.java b/common/mekanism/client/gui/GuiRobitMain.java similarity index 99% rename from common/mekanism/client/GuiRobitMain.java rename to common/mekanism/client/gui/GuiRobitMain.java index 403e50260..53b8d314d 100644 --- a/common/mekanism/client/GuiRobitMain.java +++ b/common/mekanism/client/gui/GuiRobitMain.java @@ -1,18 +1,19 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerRobitMain; import mekanism.common.EntityRobit; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/client/GuiRobitRepair.java b/common/mekanism/client/gui/GuiRobitRepair.java similarity index 99% rename from common/mekanism/client/GuiRobitRepair.java rename to common/mekanism/client/gui/GuiRobitRepair.java index 17f5c2161..849b130aa 100644 --- a/common/mekanism/client/GuiRobitRepair.java +++ b/common/mekanism/client/gui/GuiRobitRepair.java @@ -1,13 +1,13 @@ -package mekanism.client; +package mekanism.client.gui; import java.util.List; -import mekanism.common.ContainerRobitRepair; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; import net.minecraft.client.gui.GuiTextField; diff --git a/common/mekanism/client/GuiRobitSmelting.java b/common/mekanism/client/gui/GuiRobitSmelting.java similarity index 98% rename from common/mekanism/client/GuiRobitSmelting.java rename to common/mekanism/client/gui/GuiRobitSmelting.java index 0a8a13113..6a57edd98 100644 --- a/common/mekanism/client/GuiRobitSmelting.java +++ b/common/mekanism/client/gui/GuiRobitSmelting.java @@ -1,16 +1,17 @@ -package mekanism.client; +package mekanism.client.gui; -import mekanism.common.ContainerRobitSmelting; import mekanism.common.EntityRobit; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; public class GuiRobitSmelting extends GuiContainer diff --git a/common/mekanism/client/GuiStopwatch.java b/common/mekanism/client/gui/GuiStopwatch.java similarity index 99% rename from common/mekanism/client/GuiStopwatch.java rename to common/mekanism/client/gui/GuiStopwatch.java index e5c97742b..86849d88a 100644 --- a/common/mekanism/client/GuiStopwatch.java +++ b/common/mekanism/client/gui/GuiStopwatch.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.gui; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; diff --git a/common/mekanism/client/GuiTeleporter.java b/common/mekanism/client/gui/GuiTeleporter.java similarity index 97% rename from common/mekanism/client/GuiTeleporter.java rename to common/mekanism/client/gui/GuiTeleporter.java index 0c317c397..1ad2c4cef 100644 --- a/common/mekanism/client/GuiTeleporter.java +++ b/common/mekanism/client/gui/GuiTeleporter.java @@ -1,22 +1,22 @@ -package mekanism.client; +package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Object3D; -import mekanism.common.ContainerTeleporter; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; -import mekanism.common.TileEntityTeleporter; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tileentity.TileEntityTeleporter; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/client/GuiTheoreticalElementizer.java b/common/mekanism/client/gui/GuiTheoreticalElementizer.java similarity index 91% rename from common/mekanism/client/GuiTheoreticalElementizer.java rename to common/mekanism/client/gui/GuiTheoreticalElementizer.java index d71790a85..0347325af 100644 --- a/common/mekanism/client/GuiTheoreticalElementizer.java +++ b/common/mekanism/client/gui/GuiTheoreticalElementizer.java @@ -1,10 +1,10 @@ -package mekanism.client; +package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.EnumColor; import mekanism.common.MekanismUtils; -import mekanism.common.TileEntityTheoreticalElementizer; +import mekanism.common.tileentity.TileEntityTheoreticalElementizer; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/GuiUpgradeManagement.java b/common/mekanism/client/gui/GuiUpgradeManagement.java similarity index 98% rename from common/mekanism/client/GuiUpgradeManagement.java rename to common/mekanism/client/gui/GuiUpgradeManagement.java index 3d30243f3..b861f50ae 100644 --- a/common/mekanism/client/GuiUpgradeManagement.java +++ b/common/mekanism/client/gui/GuiUpgradeManagement.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.gui; import mekanism.api.Object3D; import mekanism.common.IUpgradeTile; diff --git a/common/mekanism/client/GuiWeatherOrb.java b/common/mekanism/client/gui/GuiWeatherOrb.java similarity index 99% rename from common/mekanism/client/GuiWeatherOrb.java rename to common/mekanism/client/gui/GuiWeatherOrb.java index 6a3ac8ae1..b5037af02 100644 --- a/common/mekanism/client/GuiWeatherOrb.java +++ b/common/mekanism/client/gui/GuiWeatherOrb.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.gui; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; diff --git a/common/mekanism/client/ModelBoxSelectiveFace.java b/common/mekanism/client/model/ModelBoxSelectiveFace.java similarity index 99% rename from common/mekanism/client/ModelBoxSelectiveFace.java rename to common/mekanism/client/model/ModelBoxSelectiveFace.java index c6e0c58b1..5f096010a 100644 --- a/common/mekanism/client/ModelBoxSelectiveFace.java +++ b/common/mekanism/client/model/ModelBoxSelectiveFace.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/client/ModelChargepad.java b/common/mekanism/client/model/ModelChargepad.java similarity index 98% rename from common/mekanism/client/ModelChargepad.java rename to common/mekanism/client/model/ModelChargepad.java index d33590158..35915496f 100644 --- a/common/mekanism/client/ModelChargepad.java +++ b/common/mekanism/client/model/ModelChargepad.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/client/ModelElectricPump.java b/common/mekanism/client/model/ModelElectricPump.java similarity index 99% rename from common/mekanism/client/ModelElectricPump.java rename to common/mekanism/client/model/ModelElectricPump.java index 91b30dd0b..b58e7dc23 100644 --- a/common/mekanism/client/ModelElectricPump.java +++ b/common/mekanism/client/model/ModelElectricPump.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/client/ModelMetallurgicInfuser.java b/common/mekanism/client/model/ModelMetallurgicInfuser.java similarity index 99% rename from common/mekanism/client/ModelMetallurgicInfuser.java rename to common/mekanism/client/model/ModelMetallurgicInfuser.java index 97ec0ab18..83bfb1b58 100644 --- a/common/mekanism/client/ModelMetallurgicInfuser.java +++ b/common/mekanism/client/model/ModelMetallurgicInfuser.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/client/ModelRendererSelectiveFace.java b/common/mekanism/client/model/ModelRendererSelectiveFace.java similarity index 98% rename from common/mekanism/client/ModelRendererSelectiveFace.java rename to common/mekanism/client/model/ModelRendererSelectiveFace.java index c5935ceb1..1b09ee40a 100644 --- a/common/mekanism/client/ModelRendererSelectiveFace.java +++ b/common/mekanism/client/model/ModelRendererSelectiveFace.java @@ -1,12 +1,14 @@ -package mekanism.client; +package mekanism.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import mekanism.client.MekanismRenderer; import mekanism.client.MekanismRenderer.BooleanArray; import mekanism.client.MekanismRenderer.DisplayInteger; import net.minecraft.client.model.ModelBase; diff --git a/common/mekanism/client/ModelRobit.java b/common/mekanism/client/model/ModelRobit.java similarity index 98% rename from common/mekanism/client/ModelRobit.java rename to common/mekanism/client/model/ModelRobit.java index 0637303da..b408dd963 100644 --- a/common/mekanism/client/ModelRobit.java +++ b/common/mekanism/client/model/ModelRobit.java @@ -1,10 +1,10 @@ -package mekanism.client; +package mekanism.client.model; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - +import mekanism.client.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/common/mekanism/client/ModelTheoreticalElementizer.java b/common/mekanism/client/model/ModelTheoreticalElementizer.java similarity index 99% rename from common/mekanism/client/ModelTheoreticalElementizer.java rename to common/mekanism/client/model/ModelTheoreticalElementizer.java index 68dd6bd9c..45bfef0bd 100644 --- a/common/mekanism/client/ModelTheoreticalElementizer.java +++ b/common/mekanism/client/model/ModelTheoreticalElementizer.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/client/ModelTransmitter.java b/common/mekanism/client/model/ModelTransmitter.java similarity index 99% rename from common/mekanism/client/ModelTransmitter.java rename to common/mekanism/client/model/ModelTransmitter.java index 33c030493..2264d56bb 100644 --- a/common/mekanism/client/ModelTransmitter.java +++ b/common/mekanism/client/model/ModelTransmitter.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.entity.Entity; diff --git a/common/mekanism/nei/AdvancedMachineRecipeHandler.java b/common/mekanism/client/nei/AdvancedMachineRecipeHandler.java similarity index 99% rename from common/mekanism/nei/AdvancedMachineRecipeHandler.java rename to common/mekanism/client/nei/AdvancedMachineRecipeHandler.java index 4f85b77d6..3e799723c 100644 --- a/common/mekanism/nei/AdvancedMachineRecipeHandler.java +++ b/common/mekanism/client/nei/AdvancedMachineRecipeHandler.java @@ -1,4 +1,4 @@ -package mekanism.nei; +package mekanism.client.nei; import java.awt.Rectangle; import java.util.Map; diff --git a/common/mekanism/nei/CombinerRecipeHandler.java b/common/mekanism/client/nei/CombinerRecipeHandler.java similarity index 91% rename from common/mekanism/nei/CombinerRecipeHandler.java rename to common/mekanism/client/nei/CombinerRecipeHandler.java index e516ac473..1cd00556c 100644 --- a/common/mekanism/nei/CombinerRecipeHandler.java +++ b/common/mekanism/client/nei/CombinerRecipeHandler.java @@ -1,11 +1,10 @@ -package mekanism.nei; +package mekanism.client.nei; import java.util.Set; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; - -import mekanism.client.GuiCombiner; +import mekanism.client.gui.GuiCombiner; import mekanism.common.RecipeHandler.Recipe; public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler diff --git a/common/mekanism/nei/CrusherRecipeHandler.java b/common/mekanism/client/nei/CrusherRecipeHandler.java similarity index 89% rename from common/mekanism/nei/CrusherRecipeHandler.java rename to common/mekanism/client/nei/CrusherRecipeHandler.java index efea2671b..7a4322335 100644 --- a/common/mekanism/nei/CrusherRecipeHandler.java +++ b/common/mekanism/client/nei/CrusherRecipeHandler.java @@ -1,8 +1,8 @@ -package mekanism.nei; +package mekanism.client.nei; import java.util.Set; -import mekanism.client.GuiCrusher; +import mekanism.client.gui.GuiCrusher; import mekanism.common.RecipeHandler.Recipe; public class CrusherRecipeHandler extends MachineRecipeHandler diff --git a/common/mekanism/nei/EnrichmentChamberRecipeHandler.java b/common/mekanism/client/nei/EnrichmentChamberRecipeHandler.java similarity index 89% rename from common/mekanism/nei/EnrichmentChamberRecipeHandler.java rename to common/mekanism/client/nei/EnrichmentChamberRecipeHandler.java index 24e94375b..3d398230e 100644 --- a/common/mekanism/nei/EnrichmentChamberRecipeHandler.java +++ b/common/mekanism/client/nei/EnrichmentChamberRecipeHandler.java @@ -1,8 +1,8 @@ -package mekanism.nei; +package mekanism.client.nei; import java.util.Set; -import mekanism.client.GuiEnrichmentChamber; +import mekanism.client.gui.GuiEnrichmentChamber; import mekanism.common.RecipeHandler.Recipe; public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler diff --git a/common/mekanism/nei/MachineRecipeHandler.java b/common/mekanism/client/nei/MachineRecipeHandler.java similarity index 98% rename from common/mekanism/nei/MachineRecipeHandler.java rename to common/mekanism/client/nei/MachineRecipeHandler.java index 041a82e00..e7f48b0d3 100644 --- a/common/mekanism/nei/MachineRecipeHandler.java +++ b/common/mekanism/client/nei/MachineRecipeHandler.java @@ -1,4 +1,4 @@ -package mekanism.nei; +package mekanism.client.nei; import java.awt.Rectangle; import java.util.Map; diff --git a/common/mekanism/nei/MekanismRecipeHandler.java b/common/mekanism/client/nei/MekanismRecipeHandler.java similarity index 98% rename from common/mekanism/nei/MekanismRecipeHandler.java rename to common/mekanism/client/nei/MekanismRecipeHandler.java index cb3d5a130..e45b30fe4 100644 --- a/common/mekanism/nei/MekanismRecipeHandler.java +++ b/common/mekanism/client/nei/MekanismRecipeHandler.java @@ -1,10 +1,10 @@ -package mekanism.nei; +package mekanism.client.nei; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import mekanism.api.IEnergizedItem; +import mekanism.api.energy.IEnergizedItem; import mekanism.common.IEnergyCube; import mekanism.common.IFactory; import mekanism.common.MekanismRecipe; diff --git a/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java b/common/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java similarity index 94% rename from common/mekanism/nei/MetallurgicInfuserRecipeHandler.java rename to common/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java index 62b99c1e4..6bc89fba6 100644 --- a/common/mekanism/nei/MetallurgicInfuserRecipeHandler.java +++ b/common/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java @@ -1,16 +1,16 @@ -package mekanism.nei; +package mekanism.client.nei; import java.awt.Rectangle; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.InfuseObject; -import mekanism.api.InfuseRegistry; -import mekanism.api.InfuseType; -import mekanism.api.InfusionInput; -import mekanism.api.InfusionOutput; -import mekanism.client.GuiMetallurgicInfuser; +import mekanism.api.infuse.InfuseObject; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.api.infuse.InfuseType; +import mekanism.api.infuse.InfusionInput; +import mekanism.api.infuse.InfusionOutput; +import mekanism.client.gui.GuiMetallurgicInfuser; import mekanism.common.RecipeHandler.Recipe; import net.minecraft.item.ItemStack; @@ -19,7 +19,6 @@ import org.lwjgl.opengl.GL11; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; - import static codechicken.core.gui.GuiDraw.*; public class MetallurgicInfuserRecipeHandler extends TemplateRecipeHandler diff --git a/common/mekanism/nei/NEIMekanismConfig.java b/common/mekanism/client/nei/NEIMekanismConfig.java similarity index 84% rename from common/mekanism/nei/NEIMekanismConfig.java rename to common/mekanism/client/nei/NEIMekanismConfig.java index 02ce32432..7e398a00d 100644 --- a/common/mekanism/nei/NEIMekanismConfig.java +++ b/common/mekanism/client/nei/NEIMekanismConfig.java @@ -1,11 +1,11 @@ -package mekanism.nei; +package mekanism.client.nei; -import mekanism.client.GuiCombiner; -import mekanism.client.GuiCrusher; -import mekanism.client.GuiEnrichmentChamber; -import mekanism.client.GuiMetallurgicInfuser; -import mekanism.client.GuiOsmiumCompressor; -import mekanism.client.GuiPurificationChamber; +import mekanism.client.gui.GuiCombiner; +import mekanism.client.gui.GuiCrusher; +import mekanism.client.gui.GuiEnrichmentChamber; +import mekanism.client.gui.GuiMetallurgicInfuser; +import mekanism.client.gui.GuiOsmiumCompressor; +import mekanism.client.gui.GuiPurificationChamber; import mekanism.common.Mekanism; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; diff --git a/common/mekanism/nei/OsmiumCompressorRecipeHandler.java b/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java similarity index 91% rename from common/mekanism/nei/OsmiumCompressorRecipeHandler.java rename to common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java index 73ad32336..670cf4341 100644 --- a/common/mekanism/nei/OsmiumCompressorRecipeHandler.java +++ b/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java @@ -1,10 +1,9 @@ -package mekanism.nei; +package mekanism.client.nei; import java.util.Set; import net.minecraft.item.ItemStack; - -import mekanism.client.GuiOsmiumCompressor; +import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.common.Mekanism; import mekanism.common.RecipeHandler.Recipe; diff --git a/common/mekanism/nei/PurificationChamberRecipeHandler.java b/common/mekanism/client/nei/PurificationChamberRecipeHandler.java similarity index 91% rename from common/mekanism/nei/PurificationChamberRecipeHandler.java rename to common/mekanism/client/nei/PurificationChamberRecipeHandler.java index e598c032c..e05caa08f 100644 --- a/common/mekanism/nei/PurificationChamberRecipeHandler.java +++ b/common/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -1,8 +1,8 @@ -package mekanism.nei; +package mekanism.client.nei; import java.util.Set; -import mekanism.client.GuiPurificationChamber; +import mekanism.client.gui.GuiPurificationChamber; import mekanism.common.RecipeHandler.Recipe; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/client/RenderChargepad.java b/common/mekanism/client/render/RenderChargepad.java similarity index 90% rename from common/mekanism/client/RenderChargepad.java rename to common/mekanism/client/render/RenderChargepad.java index 45c72a3e4..c541dfba5 100644 --- a/common/mekanism/client/RenderChargepad.java +++ b/common/mekanism/client/render/RenderChargepad.java @@ -1,13 +1,13 @@ -package mekanism.client; +package mekanism.client.render; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - +import mekanism.client.model.ModelChargepad; import mekanism.common.MekanismUtils; -import mekanism.common.TileEntityChargepad; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.tileentity.TileEntityChargepad; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/client/RenderConfigurableMachine.java b/common/mekanism/client/render/RenderConfigurableMachine.java similarity index 98% rename from common/mekanism/client/RenderConfigurableMachine.java rename to common/mekanism/client/render/RenderConfigurableMachine.java index be859c3a3..fc73bb089 100644 --- a/common/mekanism/client/RenderConfigurableMachine.java +++ b/common/mekanism/client/render/RenderConfigurableMachine.java @@ -1,15 +1,16 @@ -package mekanism.client; +package mekanism.client.render; import java.util.HashMap; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; import mekanism.api.Object3D; +import mekanism.client.MekanismRenderer; import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.Model3D; -import mekanism.common.ItemConfigurator; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.item.ItemConfigurator; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; diff --git a/common/mekanism/client/RenderDynamicTank.java b/common/mekanism/client/render/RenderDynamicTank.java similarity index 98% rename from common/mekanism/client/RenderDynamicTank.java rename to common/mekanism/client/render/RenderDynamicTank.java index 620cc9d2f..f86d671ea 100644 --- a/common/mekanism/client/RenderDynamicTank.java +++ b/common/mekanism/client/render/RenderDynamicTank.java @@ -1,13 +1,14 @@ -package mekanism.client; +package mekanism.client.render; import java.util.HashMap; import java.util.Map; import mekanism.api.Object3D; +import mekanism.client.MekanismRenderer; import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.Model3D; import mekanism.common.SynchronizedTankData.ValveData; -import mekanism.common.TileEntityDynamicTank; +import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraft.block.Block; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; diff --git a/common/mekanism/client/RenderElectricChest.java b/common/mekanism/client/render/RenderElectricChest.java similarity index 95% rename from common/mekanism/client/RenderElectricChest.java rename to common/mekanism/client/render/RenderElectricChest.java index 94526223b..b0afcd674 100644 --- a/common/mekanism/client/RenderElectricChest.java +++ b/common/mekanism/client/render/RenderElectricChest.java @@ -1,8 +1,8 @@ -package mekanism.client; +package mekanism.client.render; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.common.TileEntityElectricChest; +import mekanism.common.tileentity.TileEntityElectricChest; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/client/RenderElectricPump.java b/common/mekanism/client/render/RenderElectricPump.java similarity index 88% rename from common/mekanism/client/RenderElectricPump.java rename to common/mekanism/client/render/RenderElectricPump.java index 901b4a5dd..fe35a697a 100644 --- a/common/mekanism/client/RenderElectricPump.java +++ b/common/mekanism/client/render/RenderElectricPump.java @@ -1,13 +1,13 @@ -package mekanism.client; +package mekanism.client.render; import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - +import mekanism.client.model.ModelElectricPump; import mekanism.common.MekanismUtils; -import mekanism.common.TileEntityElectricPump; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.tileentity.TileEntityElectricPump; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/client/RenderLogisticalTransporter.java b/common/mekanism/client/render/RenderLogisticalTransporter.java similarity index 90% rename from common/mekanism/client/RenderLogisticalTransporter.java rename to common/mekanism/client/render/RenderLogisticalTransporter.java index 7a02c5227..49b35777f 100644 --- a/common/mekanism/client/RenderLogisticalTransporter.java +++ b/common/mekanism/client/render/RenderLogisticalTransporter.java @@ -1,8 +1,9 @@ -package mekanism.client; +package mekanism.client.render; +import mekanism.client.model.ModelTransmitter; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.common.TileEntityLogisticalTransporter; +import mekanism.common.tileentity.TileEntityLogisticalTransporter; import mekanism.common.TransporterUtils; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/client/RenderMechanicalPipe.java b/common/mekanism/client/render/RenderMechanicalPipe.java similarity index 97% rename from common/mekanism/client/RenderMechanicalPipe.java rename to common/mekanism/client/render/RenderMechanicalPipe.java index 60e615090..1f4d3ec70 100644 --- a/common/mekanism/client/RenderMechanicalPipe.java +++ b/common/mekanism/client/render/RenderMechanicalPipe.java @@ -1,13 +1,15 @@ -package mekanism.client; +package mekanism.client.render; import java.util.HashMap; +import mekanism.client.MekanismRenderer; import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.Model3D; +import mekanism.client.model.ModelTransmitter; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.tileentity.TileEntityMechanicalPipe; import mekanism.common.PipeUtils; -import mekanism.common.TileEntityMechanicalPipe; import net.minecraft.block.Block; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/client/RenderMetallurgicInfuser.java b/common/mekanism/client/render/RenderMetallurgicInfuser.java similarity index 90% rename from common/mekanism/client/RenderMetallurgicInfuser.java rename to common/mekanism/client/render/RenderMetallurgicInfuser.java index fe127bc23..102dea887 100644 --- a/common/mekanism/client/RenderMetallurgicInfuser.java +++ b/common/mekanism/client/render/RenderMetallurgicInfuser.java @@ -1,8 +1,9 @@ -package mekanism.client; +package mekanism.client.render; +import mekanism.client.model.ModelMetallurgicInfuser; import mekanism.common.MekanismUtils; -import mekanism.common.TileEntityMetallurgicInfuser; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.tileentity.TileEntityMetallurgicInfuser; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/client/RenderObsidianTNT.java b/common/mekanism/client/render/RenderObsidianTNT.java similarity index 98% rename from common/mekanism/client/RenderObsidianTNT.java rename to common/mekanism/client/render/RenderObsidianTNT.java index c1a03a481..3a0f2900f 100644 --- a/common/mekanism/client/RenderObsidianTNT.java +++ b/common/mekanism/client/render/RenderObsidianTNT.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.render; import mekanism.common.EntityObsidianTNT; import mekanism.common.Mekanism; diff --git a/common/mekanism/client/RenderPressurizedTube.java b/common/mekanism/client/render/RenderPressurizedTube.java similarity index 95% rename from common/mekanism/client/RenderPressurizedTube.java rename to common/mekanism/client/render/RenderPressurizedTube.java index 4c8e1e2b6..cd67ab13e 100644 --- a/common/mekanism/client/RenderPressurizedTube.java +++ b/common/mekanism/client/render/RenderPressurizedTube.java @@ -1,19 +1,21 @@ -package mekanism.client; +package mekanism.client.render; import java.util.Arrays; import java.util.HashMap; -import mekanism.api.EnumGas; -import mekanism.api.GasTransmission; -import mekanism.api.ITubeConnection; import mekanism.api.Object3D; +import mekanism.api.gas.EnumGas; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.ITubeConnection; +import mekanism.client.MekanismRenderer; import mekanism.client.MekanismRenderer.BooleanArray; import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.Model3D; +import mekanism.client.model.ModelTransmitter; import mekanism.common.MekanismUtils; -import mekanism.common.TileEntityGasTank; -import mekanism.common.TileEntityPressurizedTube; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.tileentity.TileEntityGasTank; +import mekanism.common.tileentity.TileEntityPressurizedTube; import net.minecraft.block.Block; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/client/RenderRobit.java b/common/mekanism/client/render/RenderRobit.java similarity index 88% rename from common/mekanism/client/RenderRobit.java rename to common/mekanism/client/render/RenderRobit.java index 609e8167d..a3745b995 100644 --- a/common/mekanism/client/RenderRobit.java +++ b/common/mekanism/client/render/RenderRobit.java @@ -1,5 +1,6 @@ -package mekanism.client; +package mekanism.client.render; +import mekanism.client.model.ModelRobit; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; import net.minecraft.client.renderer.entity.RenderLiving; diff --git a/common/mekanism/client/RenderTheoreticalElementizer.java b/common/mekanism/client/render/RenderTheoreticalElementizer.java similarity index 90% rename from common/mekanism/client/RenderTheoreticalElementizer.java rename to common/mekanism/client/render/RenderTheoreticalElementizer.java index 4a8d8346f..7768fef97 100644 --- a/common/mekanism/client/RenderTheoreticalElementizer.java +++ b/common/mekanism/client/render/RenderTheoreticalElementizer.java @@ -1,8 +1,9 @@ -package mekanism.client; +package mekanism.client.render; +import mekanism.client.model.ModelTheoreticalElementizer; import mekanism.common.MekanismUtils; -import mekanism.common.TileEntityTheoreticalElementizer; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.tileentity.TileEntityTheoreticalElementizer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/client/RenderTickHandler.java b/common/mekanism/client/render/RenderTickHandler.java similarity index 98% rename from common/mekanism/client/RenderTickHandler.java rename to common/mekanism/client/render/RenderTickHandler.java index 43ed1b5de..604b88025 100644 --- a/common/mekanism/client/RenderTickHandler.java +++ b/common/mekanism/client/render/RenderTickHandler.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.render; import java.util.EnumSet; diff --git a/common/mekanism/client/RenderUniversalCable.java b/common/mekanism/client/render/RenderUniversalCable.java similarity index 97% rename from common/mekanism/client/RenderUniversalCable.java rename to common/mekanism/client/render/RenderUniversalCable.java index fb92b980d..7c787fe72 100644 --- a/common/mekanism/client/RenderUniversalCable.java +++ b/common/mekanism/client/render/RenderUniversalCable.java @@ -1,16 +1,18 @@ -package mekanism.client; +package mekanism.client.render; import java.util.HashMap; import java.util.Map; +import mekanism.client.MekanismRenderer; import mekanism.client.MekanismRenderer.BooleanArray; import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.Model3D; +import mekanism.client.model.ModelTransmitter; import mekanism.common.CableUtils; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; -import mekanism.common.TileEntityUniversalCable; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.tileentity.TileEntityUniversalCable; import net.minecraft.block.Block; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/CableUtils.java b/common/mekanism/common/CableUtils.java index da5f239cb..2d61d9fb2 100644 --- a/common/mekanism/common/CableUtils.java +++ b/common/mekanism/common/CableUtils.java @@ -9,11 +9,11 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import mekanism.api.ICableOutputter; -import mekanism.api.IStrictEnergyAcceptor; -import mekanism.api.ITransmitter; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.energy.ICableOutputter; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.block.IElectrical; diff --git a/common/mekanism/common/ChargeUtils.java b/common/mekanism/common/ChargeUtils.java index 4e8ce8ee5..092bbf74e 100644 --- a/common/mekanism/common/ChargeUtils.java +++ b/common/mekanism/common/ChargeUtils.java @@ -2,8 +2,9 @@ package mekanism.common; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; -import mekanism.api.EnergizedItemManager; -import mekanism.api.IEnergizedItem; +import mekanism.api.energy.EnergizedItemManager; +import mekanism.api.energy.IEnergizedItem; +import mekanism.common.tileentity.TileEntityElectricBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import thermalexpansion.api.item.IChargeableItem; diff --git a/common/mekanism/common/CommonPlayerTickHandler.java b/common/mekanism/common/CommonPlayerTickHandler.java index 2a8149fd7..4e48ac7ba 100644 --- a/common/mekanism/common/CommonPlayerTickHandler.java +++ b/common/mekanism/common/CommonPlayerTickHandler.java @@ -3,6 +3,7 @@ package mekanism.common; import java.util.EnumSet; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketStatusUpdate; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java index be577e307..d111bc92c 100644 --- a/common/mekanism/common/CommonProxy.java +++ b/common/mekanism/common/CommonProxy.java @@ -2,6 +2,45 @@ package mekanism.common; import java.io.File; +import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; +import mekanism.common.inventory.container.ContainerDynamicTank; +import mekanism.common.inventory.container.ContainerElectricMachine; +import mekanism.common.inventory.container.ContainerElectricPump; +import mekanism.common.inventory.container.ContainerEnergyCube; +import mekanism.common.inventory.container.ContainerFactory; +import mekanism.common.inventory.container.ContainerGasTank; +import mekanism.common.inventory.container.ContainerMetallurgicInfuser; +import mekanism.common.inventory.container.ContainerRobitCrafting; +import mekanism.common.inventory.container.ContainerRobitInventory; +import mekanism.common.inventory.container.ContainerRobitMain; +import mekanism.common.inventory.container.ContainerRobitRepair; +import mekanism.common.inventory.container.ContainerRobitSmelting; +import mekanism.common.inventory.container.ContainerTeleporter; +import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.tileentity.TileEntityAdvancedFactory; +import mekanism.common.tileentity.TileEntityChargepad; +import mekanism.common.tileentity.TileEntityCombiner; +import mekanism.common.tileentity.TileEntityCrusher; +import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tileentity.TileEntityDynamicValve; +import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tileentity.TileEntityElectricMachine; +import mekanism.common.tileentity.TileEntityElectricPump; +import mekanism.common.tileentity.TileEntityEliteFactory; +import mekanism.common.tileentity.TileEntityEnergizedSmelter; +import mekanism.common.tileentity.TileEntityEnergyCube; +import mekanism.common.tileentity.TileEntityEnrichmentChamber; +import mekanism.common.tileentity.TileEntityFactory; +import mekanism.common.tileentity.TileEntityGasTank; +import mekanism.common.tileentity.TileEntityLogisticalTransporter; +import mekanism.common.tileentity.TileEntityMechanicalPipe; +import mekanism.common.tileentity.TileEntityMetallurgicInfuser; +import mekanism.common.tileentity.TileEntityOsmiumCompressor; +import mekanism.common.tileentity.TileEntityPressurizedTube; +import mekanism.common.tileentity.TileEntityPurificationChamber; +import mekanism.common.tileentity.TileEntityTeleporter; +import mekanism.common.tileentity.TileEntityTheoreticalElementizer; +import mekanism.common.tileentity.TileEntityUniversalCable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/CommonWorldTickHandler.java b/common/mekanism/common/CommonWorldTickHandler.java index 3f49e3922..ea0ae62f9 100644 --- a/common/mekanism/common/CommonWorldTickHandler.java +++ b/common/mekanism/common/CommonWorldTickHandler.java @@ -7,6 +7,7 @@ import java.util.HashSet; import java.util.Map; import mekanism.api.Object3D; +import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import cpw.mods.fml.common.ITickHandler; diff --git a/common/mekanism/common/DynamicFluidTank.java b/common/mekanism/common/DynamicFluidTank.java index 87b5e58bd..37657f379 100644 --- a/common/mekanism/common/DynamicFluidTank.java +++ b/common/mekanism/common/DynamicFluidTank.java @@ -2,6 +2,7 @@ package mekanism.common; import mekanism.api.Object3D; import mekanism.common.SynchronizedTankData.ValveData; +import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidTank; diff --git a/common/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java index 6f8d1b8a7..b252c3906 100644 --- a/common/mekanism/common/EnergyNetwork.java +++ b/common/mekanism/common/EnergyNetwork.java @@ -11,11 +11,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import mekanism.api.DynamicNetwork; -import mekanism.api.IStrictEnergyAcceptor; -import mekanism.api.ITransmitter; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.transmitters.DynamicNetwork; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; diff --git a/common/mekanism/common/EntityRobit.java b/common/mekanism/common/EntityRobit.java index 4f6fb4dfe..adcf04a52 100644 --- a/common/mekanism/common/EntityRobit.java +++ b/common/mekanism/common/EntityRobit.java @@ -7,9 +7,12 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; -import mekanism.api.EnergizedItemManager; -import mekanism.api.IEnergizedItem; import mekanism.api.Object3D; +import mekanism.api.energy.EnergizedItemManager; +import mekanism.api.energy.IEnergizedItem; +import mekanism.common.item.ItemConfigurator; +import mekanism.common.item.ItemRobit; +import mekanism.common.tileentity.TileEntityChargepad; import micdoodle8.mods.galacticraft.API.IEntityBreathable; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/common/mekanism/common/FluidNetwork.java b/common/mekanism/common/FluidNetwork.java index c337ab978..ee975e897 100644 --- a/common/mekanism/common/FluidNetwork.java +++ b/common/mekanism/common/FluidNetwork.java @@ -9,10 +9,10 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import mekanism.api.DynamicNetwork; -import mekanism.api.ITransmitter; -import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.transmitters.DynamicNetwork; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; +import mekanism.common.tileentity.TileEntityMechanicalPipe; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; @@ -156,7 +156,7 @@ public class FluidNetwork extends DynamicNetwork for(ITransmitter pipe : iterPipes) { - if(pipe instanceof TileEntityMechanicalPipe && ((TileEntityMechanicalPipe) pipe).isActive) continue; + if(pipe instanceof TileEntityMechanicalPipe && ((TileEntityMechanicalPipe)pipe).isActive) continue; IFluidHandler[] acceptors = PipeUtils.getConnectedAcceptors((TileEntity)pipe); for(IFluidHandler acceptor : acceptors) diff --git a/common/mekanism/common/IUpgradeTile.java b/common/mekanism/common/IUpgradeTile.java index 7708d6031..3dabadd36 100644 --- a/common/mekanism/common/IUpgradeTile.java +++ b/common/mekanism/common/IUpgradeTile.java @@ -4,5 +4,5 @@ import mekanism.api.IUpgradeManagement; public interface IUpgradeTile extends IUpgradeManagement { - public UpgradeTileComponent getComponent(); + public TileComponentUpgrade getComponent(); } diff --git a/common/mekanism/common/InventoryNetwork.java b/common/mekanism/common/InventoryNetwork.java index 168666959..48e31598d 100644 --- a/common/mekanism/common/InventoryNetwork.java +++ b/common/mekanism/common/InventoryNetwork.java @@ -7,10 +7,10 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import mekanism.api.DynamicNetwork; -import mekanism.api.ITransmitter; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.transmitters.DynamicNetwork; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 32d5e4543..2e266ac4a 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -9,13 +9,13 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import mekanism.api.GasNetwork.GasTransferEvent; -import mekanism.api.InfuseObject; -import mekanism.api.InfuseRegistry; -import mekanism.api.InfuseType; -import mekanism.api.InfusionInput; +import mekanism.api.gas.GasNetwork.GasTransferEvent; +import mekanism.api.infuse.InfuseObject; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.api.infuse.InfuseType; +import mekanism.api.infuse.InfusionInput; +import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.api.Object3D; -import mekanism.api.TransmitterNetworkRegistry; import mekanism.client.SoundHandler; import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.FluidNetwork.FluidTransferEvent; @@ -24,6 +24,35 @@ import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; +import mekanism.common.block.BlockBasic; +import mekanism.common.block.BlockBounding; +import mekanism.common.block.BlockEnergyCube; +import mekanism.common.block.BlockGasTank; +import mekanism.common.block.BlockMachine; +import mekanism.common.block.BlockObsidianTNT; +import mekanism.common.block.BlockOre; +import mekanism.common.block.BlockTransmitter; +import mekanism.common.item.ItemAtomicDisassembler; +import mekanism.common.item.ItemBlockBasic; +import mekanism.common.item.ItemBlockEnergyCube; +import mekanism.common.item.ItemBlockMachine; +import mekanism.common.item.ItemBlockOre; +import mekanism.common.item.ItemBlockTransmitter; +import mekanism.common.item.ItemClump; +import mekanism.common.item.ItemConfigurator; +import mekanism.common.item.ItemDirtyDust; +import mekanism.common.item.ItemDust; +import mekanism.common.item.ItemElectricBow; +import mekanism.common.item.ItemEnergized; +import mekanism.common.item.ItemIngot; +import mekanism.common.item.ItemMachineUpgrade; +import mekanism.common.item.ItemMekanism; +import mekanism.common.item.ItemNetworkReader; +import mekanism.common.item.ItemPortableTeleporter; +import mekanism.common.item.ItemRobit; +import mekanism.common.item.ItemStopwatch; +import mekanism.common.item.ItemStorageTank; +import mekanism.common.item.ItemWeatherOrb; import mekanism.common.network.PacketConfiguratorState; import mekanism.common.network.PacketControlPanel; import mekanism.common.network.PacketDataRequest; @@ -41,6 +70,11 @@ import mekanism.common.network.PacketTime; import mekanism.common.network.PacketTransmitterTransferUpdate; import mekanism.common.network.PacketTransmitterTransferUpdate.TransmitterTransferType; import mekanism.common.network.PacketWeather; +import mekanism.common.tileentity.TileEntityBoundingBlock; +import mekanism.common.tileentity.TileEntityControlPanel; +import mekanism.common.tileentity.TileEntityEnergyCube; +import mekanism.common.tileentity.TileEntityGasTank; +import mekanism.common.tileentity.TileEntityTeleporter; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/MekanismRecipe.java b/common/mekanism/common/MekanismRecipe.java index d861bf324..72d8a8d55 100644 --- a/common/mekanism/common/MekanismRecipe.java +++ b/common/mekanism/common/MekanismRecipe.java @@ -3,8 +3,8 @@ package mekanism.common; import java.util.ArrayList; import java.util.HashMap; -import mekanism.api.IEnergizedItem; import mekanism.api.IUpgradeManagement; +import mekanism.api.energy.IEnergizedItem; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; diff --git a/common/mekanism/common/MekanismUtils.java b/common/mekanism/common/MekanismUtils.java index 01dc4e6a9..d30e0482a 100644 --- a/common/mekanism/common/MekanismUtils.java +++ b/common/mekanism/common/MekanismUtils.java @@ -19,8 +19,13 @@ import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; +import mekanism.common.inventory.container.ContainerElectricChest; +import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.tileentity.TileEntityBoundingBlock; +import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tileentity.TileEntityElectricChest; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/common/mekanism/common/PipeUtils.java b/common/mekanism/common/PipeUtils.java index 392414412..9a87697d4 100644 --- a/common/mekanism/common/PipeUtils.java +++ b/common/mekanism/common/PipeUtils.java @@ -2,9 +2,9 @@ package mekanism.common; import java.util.Arrays; -import mekanism.api.ITransmitter; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; diff --git a/common/mekanism/common/RecipeHandler.java b/common/mekanism/common/RecipeHandler.java index 145c0cb93..597f7c9e5 100644 --- a/common/mekanism/common/RecipeHandler.java +++ b/common/mekanism/common/RecipeHandler.java @@ -3,8 +3,8 @@ package mekanism.common; import java.util.HashMap; import java.util.Map; -import mekanism.api.InfusionInput; -import mekanism.api.InfusionOutput; +import mekanism.api.infuse.InfusionInput; +import mekanism.api.infuse.InfusionOutput; import net.minecraft.item.ItemStack; /** diff --git a/common/mekanism/common/TankUpdateProtocol.java b/common/mekanism/common/TankUpdateProtocol.java index e35adad22..1070f0eae 100644 --- a/common/mekanism/common/TankUpdateProtocol.java +++ b/common/mekanism/common/TankUpdateProtocol.java @@ -5,6 +5,8 @@ import java.util.Set; import mekanism.api.Object3D; import mekanism.common.SynchronizedTankData.ValveData; +import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tileentity.TileEntityDynamicValve; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/common/UpgradeTileComponent.java b/common/mekanism/common/TileComponentUpgrade.java similarity index 93% rename from common/mekanism/common/UpgradeTileComponent.java rename to common/mekanism/common/TileComponentUpgrade.java index 867fb6b42..a7aa3fbba 100644 --- a/common/mekanism/common/UpgradeTileComponent.java +++ b/common/mekanism/common/TileComponentUpgrade.java @@ -2,12 +2,13 @@ package mekanism.common; import java.util.ArrayList; +import mekanism.common.tileentity.TileEntityContainerBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import com.google.common.io.ByteArrayDataInput; -public class UpgradeTileComponent implements ITileComponent +public class TileComponentUpgrade implements ITileComponent { /** How long it takes this machine to install an upgrade. */ public static int UPGRADE_TICKS_REQUIRED = 40; @@ -27,7 +28,7 @@ public class UpgradeTileComponent implements ITileComponent /** TileEntity implementing this component. */ public TileEntityContainerBlock tileEntity; - public UpgradeTileComponent(TileEntityContainerBlock tile, int slot) + public TileComponentUpgrade(TileEntityContainerBlock tile, int slot) { tileEntity = tile; upgradeSlot = slot; diff --git a/common/mekanism/common/TransporterUtils.java b/common/mekanism/common/TransporterUtils.java index f1a8e9971..17cd97f5a 100644 --- a/common/mekanism/common/TransporterUtils.java +++ b/common/mekanism/common/TransporterUtils.java @@ -2,9 +2,9 @@ package mekanism.common; import java.util.Arrays; -import mekanism.api.ITransmitter; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/BlockBasic.java b/common/mekanism/common/block/BlockBasic.java similarity index 97% rename from common/mekanism/common/BlockBasic.java rename to common/mekanism/common/block/BlockBasic.java index 859919bf6..a53165e4f 100644 --- a/common/mekanism/common/BlockBasic.java +++ b/common/mekanism/common/block/BlockBasic.java @@ -1,12 +1,17 @@ -package mekanism.common; +package mekanism.common.block; import java.util.ArrayList; import java.util.List; import mekanism.api.Object3D; import mekanism.client.ClientProxy; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tileentity.TileEntityControlPanel; +import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tileentity.TileEntityDynamicValve; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/BlockBounding.java b/common/mekanism/common/block/BlockBounding.java similarity index 96% rename from common/mekanism/common/BlockBounding.java rename to common/mekanism/common/block/BlockBounding.java index 683e1877d..6a2ff345b 100644 --- a/common/mekanism/common/BlockBounding.java +++ b/common/mekanism/common/block/BlockBounding.java @@ -1,10 +1,10 @@ -package mekanism.common; +package mekanism.common.block; import java.util.Random; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - +import mekanism.common.tileentity.TileEntityBoundingBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/BlockEnergyCube.java b/common/mekanism/common/block/BlockEnergyCube.java similarity index 96% rename from common/mekanism/common/BlockEnergyCube.java rename to common/mekanism/common/block/BlockEnergyCube.java index e35d9017f..93e822965 100644 --- a/common/mekanism/common/BlockEnergyCube.java +++ b/common/mekanism/common/block/BlockEnergyCube.java @@ -1,10 +1,17 @@ -package mekanism.common; +package mekanism.common.block; import java.util.List; import java.util.Random; -import mekanism.api.IEnergizedItem; +import mekanism.api.energy.IEnergizedItem; +import mekanism.common.IEnergyCube; +import mekanism.common.ISustainedInventory; +import mekanism.common.Mekanism; +import mekanism.common.Tier; import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.item.ItemBlockEnergyCube; +import mekanism.common.tileentity.TileEntityBasicBlock; +import mekanism.common.tileentity.TileEntityEnergyCube; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/BlockGasTank.java b/common/mekanism/common/block/BlockGasTank.java similarity index 96% rename from common/mekanism/common/BlockGasTank.java rename to common/mekanism/common/block/BlockGasTank.java index 40e6a0a4e..05b4953d1 100644 --- a/common/mekanism/common/BlockGasTank.java +++ b/common/mekanism/common/block/BlockGasTank.java @@ -1,7 +1,12 @@ -package mekanism.common; +package mekanism.common.block; import java.util.Random; +import mekanism.common.Mekanism; +import mekanism.common.tileentity.TileEntityBasicBlock; +import mekanism.common.tileentity.TileEntityContainerBlock; +import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.common.tileentity.TileEntityGasTank; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java similarity index 94% rename from common/mekanism/common/BlockMachine.java rename to common/mekanism/common/block/BlockMachine.java index 51dcb2161..67c56d231 100644 --- a/common/mekanism/common/BlockMachine.java +++ b/common/mekanism/common/block/BlockMachine.java @@ -1,16 +1,46 @@ -package mekanism.common; +package mekanism.common.block; import java.util.List; import java.util.Random; -import mekanism.api.IEnergizedItem; import mekanism.api.IUpgradeManagement; import mekanism.api.Object3D; +import mekanism.api.energy.IEnergizedItem; import mekanism.client.ClientProxy; +import mekanism.common.IActiveState; +import mekanism.common.IBoundingBlock; +import mekanism.common.IElectricChest; +import mekanism.common.IFactory; +import mekanism.common.ISpecialBounds; +import mekanism.common.ISustainedInventory; +import mekanism.common.ISustainedTank; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.PacketHandler; +import mekanism.common.Tier; import mekanism.common.IFactory.RecipeType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.Tier.FactoryTier; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.tileentity.TileEntityAdvancedFactory; +import mekanism.common.tileentity.TileEntityBasicBlock; +import mekanism.common.tileentity.TileEntityChargepad; +import mekanism.common.tileentity.TileEntityCombiner; +import mekanism.common.tileentity.TileEntityContainerBlock; +import mekanism.common.tileentity.TileEntityCrusher; +import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tileentity.TileEntityElectricPump; +import mekanism.common.tileentity.TileEntityEliteFactory; +import mekanism.common.tileentity.TileEntityEnergizedSmelter; +import mekanism.common.tileentity.TileEntityEnrichmentChamber; +import mekanism.common.tileentity.TileEntityFactory; +import mekanism.common.tileentity.TileEntityMetallurgicInfuser; +import mekanism.common.tileentity.TileEntityOsmiumCompressor; +import mekanism.common.tileentity.TileEntityPurificationChamber; +import mekanism.common.tileentity.TileEntityTeleporter; +import mekanism.common.tileentity.TileEntityTheoreticalElementizer; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/common/mekanism/common/BlockObsidianTNT.java b/common/mekanism/common/block/BlockObsidianTNT.java similarity index 97% rename from common/mekanism/common/BlockObsidianTNT.java rename to common/mekanism/common/block/BlockObsidianTNT.java index 907db1fc6..20f9605ee 100644 --- a/common/mekanism/common/BlockObsidianTNT.java +++ b/common/mekanism/common/block/BlockObsidianTNT.java @@ -1,5 +1,7 @@ -package mekanism.common; +package mekanism.common.block; +import mekanism.common.EntityObsidianTNT; +import mekanism.common.Mekanism; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/BlockOre.java b/common/mekanism/common/block/BlockOre.java similarity index 94% rename from common/mekanism/common/BlockOre.java rename to common/mekanism/common/block/BlockOre.java index d559ee5c2..717dde07d 100644 --- a/common/mekanism/common/BlockOre.java +++ b/common/mekanism/common/block/BlockOre.java @@ -1,7 +1,8 @@ -package mekanism.common; +package mekanism.common.block; import java.util.List; +import mekanism.common.Mekanism; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/BlockTransmitter.java b/common/mekanism/common/block/BlockTransmitter.java similarity index 93% rename from common/mekanism/common/BlockTransmitter.java rename to common/mekanism/common/block/BlockTransmitter.java index 66525f8b4..12810457f 100644 --- a/common/mekanism/common/BlockTransmitter.java +++ b/common/mekanism/common/block/BlockTransmitter.java @@ -1,12 +1,20 @@ -package mekanism.common; +package mekanism.common.block; import java.util.Arrays; import java.util.List; -import mekanism.api.GasTransmission; -import mekanism.api.ITransmitter; -import mekanism.api.ITubeConnection; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.ITubeConnection; +import mekanism.api.transmitters.ITransmitter; import mekanism.client.ClientProxy; +import mekanism.common.CableUtils; +import mekanism.common.Mekanism; +import mekanism.common.PipeUtils; +import mekanism.common.TransporterUtils; +import mekanism.common.tileentity.TileEntityLogisticalTransporter; +import mekanism.common.tileentity.TileEntityMechanicalPipe; +import mekanism.common.tileentity.TileEntityPressurizedTube; +import mekanism.common.tileentity.TileEntityUniversalCable; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/InventoryElectricChest.java b/common/mekanism/common/inventory/InventoryElectricChest.java similarity index 94% rename from common/mekanism/common/InventoryElectricChest.java rename to common/mekanism/common/inventory/InventoryElectricChest.java index 4cac46d14..5f1eee2b6 100644 --- a/common/mekanism/common/InventoryElectricChest.java +++ b/common/mekanism/common/inventory/InventoryElectricChest.java @@ -1,5 +1,7 @@ -package mekanism.common; +package mekanism.common.inventory; +import mekanism.common.IElectricChest; +import mekanism.common.ISustainedInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryBasic; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ContainerAdvancedElectricMachine.java b/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java similarity index 91% rename from common/mekanism/common/ContainerAdvancedElectricMachine.java rename to common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 05cb3b649..2ac050a4b 100644 --- a/common/mekanism/common/ContainerAdvancedElectricMachine.java +++ b/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -1,7 +1,16 @@ -package mekanism.common; +package mekanism.common.inventory.container; import mekanism.api.IStorageTank; -import mekanism.common.SlotEnergy.SlotDischarge; +import mekanism.common.ChargeUtils; +import mekanism.common.Mekanism; +import mekanism.common.RecipeHandler; +import mekanism.common.inventory.slot.SlotEnergy; +import mekanism.common.inventory.slot.SlotMachineUpgrade; +import mekanism.common.inventory.slot.SlotOutput; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.item.ItemMachineUpgrade; +import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.tileentity.TileEntityPurificationChamber; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerDynamicTank.java b/common/mekanism/common/inventory/container/ContainerDynamicTank.java similarity index 95% rename from common/mekanism/common/ContainerDynamicTank.java rename to common/mekanism/common/inventory/container/ContainerDynamicTank.java index 403d0cd83..ceffbf64a 100644 --- a/common/mekanism/common/ContainerDynamicTank.java +++ b/common/mekanism/common/inventory/container/ContainerDynamicTank.java @@ -1,5 +1,7 @@ -package mekanism.common; +package mekanism.common.inventory.container; +import mekanism.common.inventory.slot.SlotOutput; +import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerElectricChest.java b/common/mekanism/common/inventory/container/ContainerElectricChest.java similarity index 92% rename from common/mekanism/common/ContainerElectricChest.java rename to common/mekanism/common/inventory/container/ContainerElectricChest.java index 4c6ab1220..53d676a8e 100644 --- a/common/mekanism/common/ContainerElectricChest.java +++ b/common/mekanism/common/inventory/container/ContainerElectricChest.java @@ -1,6 +1,11 @@ -package mekanism.common; +package mekanism.common.inventory.container; -import mekanism.common.SlotEnergy.SlotDischarge; +import mekanism.common.ChargeUtils; +import mekanism.common.IElectricChest; +import mekanism.common.inventory.slot.SlotElectricChest; +import mekanism.common.inventory.slot.SlotEnergy; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.tileentity.TileEntityElectricChest; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerElectricMachine.java b/common/mekanism/common/inventory/container/ContainerElectricMachine.java similarity index 91% rename from common/mekanism/common/ContainerElectricMachine.java rename to common/mekanism/common/inventory/container/ContainerElectricMachine.java index 3912d627f..d3eb8df92 100644 --- a/common/mekanism/common/ContainerElectricMachine.java +++ b/common/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -1,6 +1,13 @@ -package mekanism.common; +package mekanism.common.inventory.container; -import mekanism.common.SlotEnergy.SlotDischarge; +import mekanism.common.ChargeUtils; +import mekanism.common.RecipeHandler; +import mekanism.common.inventory.slot.SlotEnergy; +import mekanism.common.inventory.slot.SlotMachineUpgrade; +import mekanism.common.inventory.slot.SlotOutput; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.item.ItemMachineUpgrade; +import mekanism.common.tileentity.TileEntityElectricMachine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerElectricPump.java b/common/mekanism/common/inventory/container/ContainerElectricPump.java similarity index 93% rename from common/mekanism/common/ContainerElectricPump.java rename to common/mekanism/common/inventory/container/ContainerElectricPump.java index 44161cc38..2641af982 100644 --- a/common/mekanism/common/ContainerElectricPump.java +++ b/common/mekanism/common/inventory/container/ContainerElectricPump.java @@ -1,6 +1,10 @@ -package mekanism.common; +package mekanism.common.inventory.container; -import mekanism.common.SlotEnergy.SlotDischarge; +import mekanism.common.ChargeUtils; +import mekanism.common.inventory.slot.SlotEnergy; +import mekanism.common.inventory.slot.SlotOutput; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.tileentity.TileEntityElectricPump; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerEnergyCube.java b/common/mekanism/common/inventory/container/ContainerEnergyCube.java similarity index 94% rename from common/mekanism/common/ContainerEnergyCube.java rename to common/mekanism/common/inventory/container/ContainerEnergyCube.java index 7fff951a8..15b3dfc55 100644 --- a/common/mekanism/common/ContainerEnergyCube.java +++ b/common/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -1,8 +1,11 @@ -package mekanism.common; +package mekanism.common.inventory.container; import ic2.api.item.IElectricItem; -import mekanism.common.SlotEnergy.SlotCharge; -import mekanism.common.SlotEnergy.SlotDischarge; +import mekanism.common.ChargeUtils; +import mekanism.common.inventory.slot.SlotEnergy; +import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.tileentity.TileEntityEnergyCube; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerFactory.java b/common/mekanism/common/inventory/container/ContainerFactory.java similarity index 93% rename from common/mekanism/common/ContainerFactory.java rename to common/mekanism/common/inventory/container/ContainerFactory.java index c5d3b511a..0157ce16b 100644 --- a/common/mekanism/common/ContainerFactory.java +++ b/common/mekanism/common/inventory/container/ContainerFactory.java @@ -1,9 +1,18 @@ -package mekanism.common; +package mekanism.common.inventory.container; -import mekanism.common.BlockMachine.MachineType; +import mekanism.common.ChargeUtils; +import mekanism.common.IFactory; +import mekanism.common.Tier; import mekanism.common.IFactory.RecipeType; -import mekanism.common.SlotEnergy.SlotDischarge; import mekanism.common.Tier.FactoryTier; +import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.inventory.slot.SlotEnergy; +import mekanism.common.inventory.slot.SlotMachineUpgrade; +import mekanism.common.inventory.slot.SlotOutput; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.item.ItemBlockMachine; +import mekanism.common.item.ItemMachineUpgrade; +import mekanism.common.tileentity.TileEntityFactory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerGasTank.java b/common/mekanism/common/inventory/container/ContainerGasTank.java similarity index 95% rename from common/mekanism/common/ContainerGasTank.java rename to common/mekanism/common/inventory/container/ContainerGasTank.java index b706442eb..a5e238f8f 100644 --- a/common/mekanism/common/ContainerGasTank.java +++ b/common/mekanism/common/inventory/container/ContainerGasTank.java @@ -1,7 +1,9 @@ -package mekanism.common; +package mekanism.common.inventory.container; -import mekanism.api.EnumGas; import mekanism.api.IStorageTank; +import mekanism.api.gas.EnumGas; +import mekanism.common.inventory.slot.SlotStorageTank; +import mekanism.common.tileentity.TileEntityGasTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerMetallurgicInfuser.java b/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java similarity index 90% rename from common/mekanism/common/ContainerMetallurgicInfuser.java rename to common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index a6798e258..73a00af9f 100644 --- a/common/mekanism/common/ContainerMetallurgicInfuser.java +++ b/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -1,9 +1,16 @@ -package mekanism.common; +package mekanism.common.inventory.container; -import mekanism.api.InfuseRegistry; -import mekanism.api.InfusionInput; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.api.infuse.InfusionInput; +import mekanism.common.ChargeUtils; +import mekanism.common.RecipeHandler; import mekanism.common.RecipeHandler.Recipe; -import mekanism.common.SlotEnergy.SlotDischarge; +import mekanism.common.inventory.slot.SlotEnergy; +import mekanism.common.inventory.slot.SlotMachineUpgrade; +import mekanism.common.inventory.slot.SlotOutput; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.item.ItemMachineUpgrade; +import mekanism.common.tileentity.TileEntityMetallurgicInfuser; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerRobitCrafting.java b/common/mekanism/common/inventory/container/ContainerRobitCrafting.java similarity index 91% rename from common/mekanism/common/ContainerRobitCrafting.java rename to common/mekanism/common/inventory/container/ContainerRobitCrafting.java index f5add4ae2..5c268ac2b 100644 --- a/common/mekanism/common/ContainerRobitCrafting.java +++ b/common/mekanism/common/inventory/container/ContainerRobitCrafting.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.inventory.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/ContainerRobitInventory.java b/common/mekanism/common/inventory/container/ContainerRobitInventory.java similarity index 96% rename from common/mekanism/common/ContainerRobitInventory.java rename to common/mekanism/common/inventory/container/ContainerRobitInventory.java index 408100196..c53a86454 100644 --- a/common/mekanism/common/ContainerRobitInventory.java +++ b/common/mekanism/common/inventory/container/ContainerRobitInventory.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.inventory.container; +import mekanism.common.EntityRobit; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerRobitMain.java b/common/mekanism/common/inventory/container/ContainerRobitMain.java similarity index 87% rename from common/mekanism/common/ContainerRobitMain.java rename to common/mekanism/common/inventory/container/ContainerRobitMain.java index 9cb30230d..1664ac8f0 100644 --- a/common/mekanism/common/ContainerRobitMain.java +++ b/common/mekanism/common/inventory/container/ContainerRobitMain.java @@ -1,6 +1,8 @@ -package mekanism.common; +package mekanism.common.inventory.container; -import mekanism.common.SlotEnergy.SlotDischarge; +import mekanism.common.EntityRobit; +import mekanism.common.inventory.slot.SlotEnergy; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerRobitRepair.java b/common/mekanism/common/inventory/container/ContainerRobitRepair.java similarity index 91% rename from common/mekanism/common/ContainerRobitRepair.java rename to common/mekanism/common/inventory/container/ContainerRobitRepair.java index f4bf03991..50bdd0e25 100644 --- a/common/mekanism/common/ContainerRobitRepair.java +++ b/common/mekanism/common/inventory/container/ContainerRobitRepair.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.inventory.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/ContainerRobitSmelting.java b/common/mekanism/common/inventory/container/ContainerRobitSmelting.java similarity index 98% rename from common/mekanism/common/ContainerRobitSmelting.java rename to common/mekanism/common/inventory/container/ContainerRobitSmelting.java index a85289f16..801c9f523 100644 --- a/common/mekanism/common/ContainerRobitSmelting.java +++ b/common/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.inventory.container; +import mekanism.common.EntityRobit; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/ContainerTeleporter.java b/common/mekanism/common/inventory/container/ContainerTeleporter.java similarity index 92% rename from common/mekanism/common/ContainerTeleporter.java rename to common/mekanism/common/inventory/container/ContainerTeleporter.java index e55021c14..0ca38c53a 100644 --- a/common/mekanism/common/ContainerTeleporter.java +++ b/common/mekanism/common/inventory/container/ContainerTeleporter.java @@ -1,6 +1,9 @@ -package mekanism.common; +package mekanism.common.inventory.container; -import mekanism.common.SlotEnergy.SlotDischarge; +import mekanism.common.ChargeUtils; +import mekanism.common.inventory.slot.SlotEnergy; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.tileentity.TileEntityTeleporter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/SlotElectricChest.java b/common/mekanism/common/inventory/slot/SlotElectricChest.java similarity index 90% rename from common/mekanism/common/SlotElectricChest.java rename to common/mekanism/common/inventory/slot/SlotElectricChest.java index f78328a55..b16eab745 100644 --- a/common/mekanism/common/SlotElectricChest.java +++ b/common/mekanism/common/inventory/slot/SlotElectricChest.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.inventory.slot; +import mekanism.common.IElectricChest; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/mekanism/common/SlotEnergy.java b/common/mekanism/common/inventory/slot/SlotEnergy.java similarity index 90% rename from common/mekanism/common/SlotEnergy.java rename to common/mekanism/common/inventory/slot/SlotEnergy.java index 4e031a11d..485fd98ce 100644 --- a/common/mekanism/common/SlotEnergy.java +++ b/common/mekanism/common/inventory/slot/SlotEnergy.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.inventory.slot; +import mekanism.common.ChargeUtils; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/SlotMachineUpgrade.java b/common/mekanism/common/inventory/slot/SlotMachineUpgrade.java similarity index 82% rename from common/mekanism/common/SlotMachineUpgrade.java rename to common/mekanism/common/inventory/slot/SlotMachineUpgrade.java index e3876ebed..0a8504406 100644 --- a/common/mekanism/common/SlotMachineUpgrade.java +++ b/common/mekanism/common/inventory/slot/SlotMachineUpgrade.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.inventory.slot; +import mekanism.common.item.ItemMachineUpgrade; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/SlotOutput.java b/common/mekanism/common/inventory/slot/SlotOutput.java similarity index 89% rename from common/mekanism/common/SlotOutput.java rename to common/mekanism/common/inventory/slot/SlotOutput.java index 74bde764d..4f342f8c0 100644 --- a/common/mekanism/common/SlotOutput.java +++ b/common/mekanism/common/inventory/slot/SlotOutput.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.inventory.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/common/mekanism/common/SlotStorageTank.java b/common/mekanism/common/inventory/slot/SlotStorageTank.java similarity index 91% rename from common/mekanism/common/SlotStorageTank.java rename to common/mekanism/common/inventory/slot/SlotStorageTank.java index cc7f694df..b09614a34 100644 --- a/common/mekanism/common/SlotStorageTank.java +++ b/common/mekanism/common/inventory/slot/SlotStorageTank.java @@ -1,7 +1,7 @@ -package mekanism.common; +package mekanism.common.inventory.slot; -import mekanism.api.EnumGas; import mekanism.api.IStorageTank; +import mekanism.api.gas.EnumGas; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ItemAtomicDisassembler.java b/common/mekanism/common/item/ItemAtomicDisassembler.java similarity index 99% rename from common/mekanism/common/ItemAtomicDisassembler.java rename to common/mekanism/common/item/ItemAtomicDisassembler.java index e37fc88f3..45c3f4e93 100644 --- a/common/mekanism/common/ItemAtomicDisassembler.java +++ b/common/mekanism/common/item/ItemAtomicDisassembler.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; diff --git a/common/mekanism/common/ItemBlockBasic.java b/common/mekanism/common/item/ItemBlockBasic.java similarity index 98% rename from common/mekanism/common/ItemBlockBasic.java rename to common/mekanism/common/item/ItemBlockBasic.java index c9f243bf7..327efe785 100644 --- a/common/mekanism/common/ItemBlockBasic.java +++ b/common/mekanism/common/item/ItemBlockBasic.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.item; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/common/mekanism/common/ItemBlockEnergyCube.java b/common/mekanism/common/item/ItemBlockEnergyCube.java similarity index 96% rename from common/mekanism/common/ItemBlockEnergyCube.java rename to common/mekanism/common/item/ItemBlockEnergyCube.java index 5ab657acc..eec8319e0 100644 --- a/common/mekanism/common/ItemBlockEnergyCube.java +++ b/common/mekanism/common/item/ItemBlockEnergyCube.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.item; import ic2.api.item.ICustomElectricItem; @@ -6,11 +6,17 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.IEnergizedItem; import mekanism.api.Object3D; +import mekanism.api.energy.IEnergizedItem; +import mekanism.common.IEnergyCube; +import mekanism.common.ISustainedInventory; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.Tier; import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tileentity.TileEntityEnergyCube; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/common/mekanism/common/ItemBlockMachine.java b/common/mekanism/common/item/ItemBlockMachine.java similarity index 96% rename from common/mekanism/common/ItemBlockMachine.java rename to common/mekanism/common/item/ItemBlockMachine.java index 92a35b4e2..62af9bd92 100644 --- a/common/mekanism/common/ItemBlockMachine.java +++ b/common/mekanism/common/item/ItemBlockMachine.java @@ -1,16 +1,29 @@ -package mekanism.common; +package mekanism.common.item; import ic2.api.item.ICustomElectricItem; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.IEnergizedItem; import mekanism.api.IUpgradeManagement; -import mekanism.common.BlockMachine.MachineType; +import mekanism.api.energy.IEnergizedItem; +import mekanism.common.IElectricChest; +import mekanism.common.IFactory; +import mekanism.common.ISustainedInventory; +import mekanism.common.ISustainedTank; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.PacketHandler; +import mekanism.common.IFactory.RecipeType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.block.BlockMachine; +import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; +import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tileentity.TileEntityFactory; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/common/mekanism/common/ItemBlockOre.java b/common/mekanism/common/item/ItemBlockOre.java similarity index 98% rename from common/mekanism/common/ItemBlockOre.java rename to common/mekanism/common/item/ItemBlockOre.java index 068c61171..2bbe83b48 100644 --- a/common/mekanism/common/ItemBlockOre.java +++ b/common/mekanism/common/item/ItemBlockOre.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; diff --git a/common/mekanism/common/ItemBlockTransmitter.java b/common/mekanism/common/item/ItemBlockTransmitter.java similarity index 98% rename from common/mekanism/common/ItemBlockTransmitter.java rename to common/mekanism/common/item/ItemBlockTransmitter.java index 6351f2de4..9b6acc2b0 100644 --- a/common/mekanism/common/ItemBlockTransmitter.java +++ b/common/mekanism/common/item/ItemBlockTransmitter.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; diff --git a/common/mekanism/common/ItemClump.java b/common/mekanism/common/item/ItemClump.java similarity index 94% rename from common/mekanism/common/ItemClump.java rename to common/mekanism/common/item/ItemClump.java index 8dc3a633a..7df17fe54 100644 --- a/common/mekanism/common/ItemClump.java +++ b/common/mekanism/common/item/ItemClump.java @@ -1,7 +1,8 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; +import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ItemConfigurator.java b/common/mekanism/common/item/ItemConfigurator.java similarity index 94% rename from common/mekanism/common/ItemConfigurator.java rename to common/mekanism/common/item/ItemConfigurator.java index df524ba6b..ed6239cf5 100644 --- a/common/mekanism/common/ItemConfigurator.java +++ b/common/mekanism/common/item/ItemConfigurator.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.item; import java.util.ArrayList; import java.util.List; @@ -6,10 +6,18 @@ import java.util.Random; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; -import mekanism.api.ITransmitter; import mekanism.api.Object3D; +import mekanism.api.transmitters.ITransmitter; +import mekanism.common.MekanismUtils; +import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tileentity.TileEntityBasicBlock; +import mekanism.common.tileentity.TileEntityContainerBlock; +import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tileentity.TileEntityElectricPump; +import mekanism.common.tileentity.TileEntityLogisticalTransporter; +import mekanism.common.tileentity.TileEntityMechanicalPipe; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ItemDirtyDust.java b/common/mekanism/common/item/ItemDirtyDust.java similarity index 94% rename from common/mekanism/common/ItemDirtyDust.java rename to common/mekanism/common/item/ItemDirtyDust.java index e40ee94c7..6ed68799f 100644 --- a/common/mekanism/common/ItemDirtyDust.java +++ b/common/mekanism/common/item/ItemDirtyDust.java @@ -1,7 +1,8 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; +import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ItemDust.java b/common/mekanism/common/item/ItemDust.java similarity index 94% rename from common/mekanism/common/ItemDust.java rename to common/mekanism/common/item/ItemDust.java index bb937cd7e..c0688806b 100644 --- a/common/mekanism/common/ItemDust.java +++ b/common/mekanism/common/item/ItemDust.java @@ -1,7 +1,8 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; +import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ItemElectricBow.java b/common/mekanism/common/item/ItemElectricBow.java similarity index 99% rename from common/mekanism/common/ItemElectricBow.java rename to common/mekanism/common/item/ItemElectricBow.java index 015731248..6a1c0acb9 100644 --- a/common/mekanism/common/ItemElectricBow.java +++ b/common/mekanism/common/item/ItemElectricBow.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; diff --git a/common/mekanism/common/ItemEnergized.java b/common/mekanism/common/item/ItemEnergized.java similarity index 98% rename from common/mekanism/common/ItemEnergized.java rename to common/mekanism/common/item/ItemEnergized.java index 391b22faf..dc30d0fa8 100644 --- a/common/mekanism/common/ItemEnergized.java +++ b/common/mekanism/common/item/ItemEnergized.java @@ -1,11 +1,12 @@ -package mekanism.common; +package mekanism.common.item; import ic2.api.item.ICustomElectricItem; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.IEnergizedItem; +import mekanism.api.energy.IEnergizedItem; +import mekanism.common.Mekanism; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ItemIngot.java b/common/mekanism/common/item/ItemIngot.java similarity index 94% rename from common/mekanism/common/ItemIngot.java rename to common/mekanism/common/item/ItemIngot.java index dc7bde91e..033776a96 100644 --- a/common/mekanism/common/ItemIngot.java +++ b/common/mekanism/common/item/ItemIngot.java @@ -1,7 +1,8 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; +import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ItemMachineUpgrade.java b/common/mekanism/common/item/ItemMachineUpgrade.java similarity index 76% rename from common/mekanism/common/ItemMachineUpgrade.java rename to common/mekanism/common/item/ItemMachineUpgrade.java index 57c2de4b1..b645c3e58 100644 --- a/common/mekanism/common/ItemMachineUpgrade.java +++ b/common/mekanism/common/item/ItemMachineUpgrade.java @@ -1,4 +1,6 @@ -package mekanism.common; +package mekanism.common.item; + +import mekanism.common.Mekanism; public class ItemMachineUpgrade extends ItemMekanism diff --git a/common/mekanism/common/ItemMekanism.java b/common/mekanism/common/item/ItemMekanism.java similarity index 85% rename from common/mekanism/common/ItemMekanism.java rename to common/mekanism/common/item/ItemMekanism.java index 80b27cb4c..51fe5d123 100644 --- a/common/mekanism/common/ItemMekanism.java +++ b/common/mekanism/common/item/ItemMekanism.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.item; +import mekanism.common.Mekanism; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; diff --git a/common/mekanism/common/ItemNetworkReader.java b/common/mekanism/common/item/ItemNetworkReader.java similarity index 93% rename from common/mekanism/common/ItemNetworkReader.java rename to common/mekanism/common/item/ItemNetworkReader.java index 8df3d4d14..c0134b4f2 100644 --- a/common/mekanism/common/ItemNetworkReader.java +++ b/common/mekanism/common/item/ItemNetworkReader.java @@ -1,8 +1,9 @@ -package mekanism.common; +package mekanism.common.item; import mekanism.api.EnumColor; -import mekanism.api.ITransmitter; -import mekanism.api.TransmitterNetworkRegistry; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmitterNetworkRegistry; +import mekanism.common.Mekanism; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/ItemPortableTeleporter.java b/common/mekanism/common/item/ItemPortableTeleporter.java similarity index 97% rename from common/mekanism/common/ItemPortableTeleporter.java rename to common/mekanism/common/item/ItemPortableTeleporter.java index 8c12a64aa..fe28353e0 100644 --- a/common/mekanism/common/ItemPortableTeleporter.java +++ b/common/mekanism/common/item/ItemPortableTeleporter.java @@ -1,7 +1,8 @@ -package mekanism.common; +package mekanism.common.item; import mekanism.api.EnumColor; import mekanism.api.Object3D; +import mekanism.common.Mekanism; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ItemRobit.java b/common/mekanism/common/item/ItemRobit.java similarity index 95% rename from common/mekanism/common/ItemRobit.java rename to common/mekanism/common/item/ItemRobit.java index 98e2ea96c..30538da5a 100644 --- a/common/mekanism/common/ItemRobit.java +++ b/common/mekanism/common/item/ItemRobit.java @@ -1,9 +1,12 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; import mekanism.api.Object3D; +import mekanism.common.EntityRobit; +import mekanism.common.ISustainedInventory; +import mekanism.common.tileentity.TileEntityChargepad; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/ItemStopwatch.java b/common/mekanism/common/item/ItemStopwatch.java similarity index 93% rename from common/mekanism/common/ItemStopwatch.java rename to common/mekanism/common/item/ItemStopwatch.java index 66fe13a6b..693bf24b7 100644 --- a/common/mekanism/common/ItemStopwatch.java +++ b/common/mekanism/common/item/ItemStopwatch.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.item; +import mekanism.common.Mekanism; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/ItemStorageTank.java b/common/mekanism/common/item/ItemStorageTank.java similarity index 98% rename from common/mekanism/common/ItemStorageTank.java rename to common/mekanism/common/item/ItemStorageTank.java index c244936c1..2530f8d7f 100644 --- a/common/mekanism/common/ItemStorageTank.java +++ b/common/mekanism/common/item/ItemStorageTank.java @@ -1,9 +1,10 @@ -package mekanism.common; +package mekanism.common.item; import java.util.List; -import mekanism.api.EnumGas; import mekanism.api.IStorageTank; +import mekanism.api.gas.EnumGas; +import mekanism.common.Mekanism; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/ItemWeatherOrb.java b/common/mekanism/common/item/ItemWeatherOrb.java similarity index 93% rename from common/mekanism/common/ItemWeatherOrb.java rename to common/mekanism/common/item/ItemWeatherOrb.java index 219779ff9..feaa6361f 100644 --- a/common/mekanism/common/ItemWeatherOrb.java +++ b/common/mekanism/common/item/ItemWeatherOrb.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.item; +import mekanism.common.Mekanism; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/network/PacketConfiguratorState.java b/common/mekanism/common/network/PacketConfiguratorState.java index b52ac307b..d3753a863 100644 --- a/common/mekanism/common/network/PacketConfiguratorState.java +++ b/common/mekanism/common/network/PacketConfiguratorState.java @@ -2,7 +2,7 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.common.ItemConfigurator; +import mekanism.common.item.ItemConfigurator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketDataRequest.java b/common/mekanism/common/network/PacketDataRequest.java index 2445e8674..f4730a3c8 100644 --- a/common/mekanism/common/network/PacketDataRequest.java +++ b/common/mekanism/common/network/PacketDataRequest.java @@ -7,7 +7,7 @@ import mekanism.api.Object3D; import mekanism.common.ITileNetwork; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileEntityDynamicTank; +import mekanism.common.tileentity.TileEntityDynamicTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketDigitUpdate.java b/common/mekanism/common/network/PacketDigitUpdate.java index 418f22cdd..fa41b1fae 100644 --- a/common/mekanism/common/network/PacketDigitUpdate.java +++ b/common/mekanism/common/network/PacketDigitUpdate.java @@ -2,7 +2,7 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.common.ItemPortableTeleporter; +import mekanism.common.item.ItemPortableTeleporter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketElectricBowState.java b/common/mekanism/common/network/PacketElectricBowState.java index 38f749bc1..52444f0bc 100644 --- a/common/mekanism/common/network/PacketElectricBowState.java +++ b/common/mekanism/common/network/PacketElectricBowState.java @@ -2,7 +2,7 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.common.ItemElectricBow; +import mekanism.common.item.ItemElectricBow; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketElectricChest.java b/common/mekanism/common/network/PacketElectricChest.java index e5984eaab..2ca454522 100644 --- a/common/mekanism/common/network/PacketElectricChest.java +++ b/common/mekanism/common/network/PacketElectricChest.java @@ -2,13 +2,13 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.api.IEnergizedItem; import mekanism.api.Object3D; +import mekanism.api.energy.IEnergizedItem; import mekanism.common.IElectricChest; -import mekanism.common.InventoryElectricChest; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; -import mekanism.common.TileEntityElectricChest; +import mekanism.common.inventory.InventoryElectricChest; +import mekanism.common.tileentity.TileEntityElectricChest; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/network/PacketPortableTeleport.java b/common/mekanism/common/network/PacketPortableTeleport.java index 5507620b7..9915fbbf2 100644 --- a/common/mekanism/common/network/PacketPortableTeleport.java +++ b/common/mekanism/common/network/PacketPortableTeleport.java @@ -3,11 +3,11 @@ package mekanism.common.network; import java.io.DataOutputStream; import mekanism.api.Object3D; -import mekanism.common.ItemPortableTeleporter; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.Teleporter; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.item.ItemPortableTeleporter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/network/PacketRemoveUpgrade.java b/common/mekanism/common/network/PacketRemoveUpgrade.java index de4bb1568..23382e33a 100644 --- a/common/mekanism/common/network/PacketRemoveUpgrade.java +++ b/common/mekanism/common/network/PacketRemoveUpgrade.java @@ -5,7 +5,7 @@ import java.io.DataOutputStream; import mekanism.api.IUpgradeManagement; import mekanism.api.Object3D; import mekanism.common.Mekanism; -import mekanism.common.TileEntityBasicBlock; +import mekanism.common.tileentity.TileEntityBasicBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/network/PacketStatusUpdate.java b/common/mekanism/common/network/PacketStatusUpdate.java index 95165f604..4b6a1a36f 100644 --- a/common/mekanism/common/network/PacketStatusUpdate.java +++ b/common/mekanism/common/network/PacketStatusUpdate.java @@ -2,7 +2,7 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.common.ItemPortableTeleporter; +import mekanism.common.item.ItemPortableTeleporter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketTransmitterTransferUpdate.java b/common/mekanism/common/network/PacketTransmitterTransferUpdate.java index 2d5ca1d77..cf23ef904 100644 --- a/common/mekanism/common/network/PacketTransmitterTransferUpdate.java +++ b/common/mekanism/common/network/PacketTransmitterTransferUpdate.java @@ -2,7 +2,7 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.api.EnumGas; +import mekanism.api.gas.EnumGas; import mekanism.client.EnergyClientUpdate; import mekanism.client.GasClientUpdate; import mekanism.client.FluidClientUpdate; diff --git a/common/mekanism/common/TileEntityAdvancedElectricMachine.java b/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java similarity index 96% rename from common/mekanism/common/TileEntityAdvancedElectricMachine.java rename to common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java index f9adfeb1e..a25d7ef39 100644 --- a/common/mekanism/common/TileEntityAdvancedElectricMachine.java +++ b/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java @@ -1,11 +1,16 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.ArrayList; import mekanism.api.EnumColor; -import mekanism.api.EnumGas; import mekanism.api.IStorageTank; import mekanism.api.SideData; +import mekanism.api.gas.EnumGas; +import mekanism.common.ChargeUtils; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.RecipeHandler; +import mekanism.common.TileComponentUpgrade; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; @@ -57,7 +62,7 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM SECONDARY_ENERGY_PER_TICK = secondaryPerTick; MAX_SECONDARY_ENERGY = maxSecondaryEnergy; - upgradeComponent = new UpgradeTileComponent(this, 4); + upgradeComponent = new TileComponentUpgrade(this, 4); } /** diff --git a/common/mekanism/common/TileEntityAdvancedFactory.java b/common/mekanism/common/tileentity/TileEntityAdvancedFactory.java similarity index 88% rename from common/mekanism/common/TileEntityAdvancedFactory.java rename to common/mekanism/common/tileentity/TileEntityAdvancedFactory.java index 3dc0606fa..3ae95bbe3 100644 --- a/common/mekanism/common/TileEntityAdvancedFactory.java +++ b/common/mekanism/common/tileentity/TileEntityAdvancedFactory.java @@ -1,9 +1,9 @@ -package mekanism.common; +package mekanism.common.tileentity; import mekanism.api.EnumColor; import mekanism.api.SideData; -import mekanism.common.BlockMachine.MachineType; import mekanism.common.Tier.FactoryTier; +import mekanism.common.block.BlockMachine.MachineType; public class TileEntityAdvancedFactory extends TileEntityFactory { diff --git a/common/mekanism/common/TileEntityBasicBlock.java b/common/mekanism/common/tileentity/TileEntityBasicBlock.java similarity index 95% rename from common/mekanism/common/TileEntityBasicBlock.java rename to common/mekanism/common/tileentity/TileEntityBasicBlock.java index ef6e48107..579a46234 100644 --- a/common/mekanism/common/TileEntityBasicBlock.java +++ b/common/mekanism/common/tileentity/TileEntityBasicBlock.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.tile.IWrenchable; @@ -7,6 +7,9 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Object3D; +import mekanism.common.ITileComponent; +import mekanism.common.ITileNetwork; +import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; import mekanism.common.network.PacketTileEntity; diff --git a/common/mekanism/common/TileEntityBasicMachine.java b/common/mekanism/common/tileentity/TileEntityBasicMachine.java similarity index 94% rename from common/mekanism/common/TileEntityBasicMachine.java rename to common/mekanism/common/tileentity/TileEntityBasicMachine.java index b23ec1d4d..75c09cab6 100644 --- a/common/mekanism/common/TileEntityBasicMachine.java +++ b/common/mekanism/common/tileentity/TileEntityBasicMachine.java @@ -1,15 +1,24 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.tile.IEnergySink; import java.util.ArrayList; import mekanism.api.IConfigurable; -import mekanism.api.IStrictEnergyAcceptor; import mekanism.api.IUpgradeManagement; import mekanism.api.Object3D; import mekanism.api.SideData; +import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.client.IHasSound; +import mekanism.common.IActiveState; +import mekanism.common.IElectricMachine; +import mekanism.common.IRedstoneControl; +import mekanism.common.IUpgradeTile; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.PacketHandler; +import mekanism.common.TileComponentUpgrade; +import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import net.minecraft.nbt.NBTTagCompound; @@ -57,7 +66,7 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; - public UpgradeTileComponent upgradeComponent; + public TileComponentUpgrade upgradeComponent; /** * The foundation of all machines - a simple tile entity with a facing, active state, initialized state, sound effect, and animated texture. @@ -393,7 +402,7 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp } @Override - public UpgradeTileComponent getComponent() + public TileComponentUpgrade getComponent() { return upgradeComponent; } diff --git a/common/mekanism/common/TileEntityBoundingBlock.java b/common/mekanism/common/tileentity/TileEntityBoundingBlock.java similarity index 94% rename from common/mekanism/common/TileEntityBoundingBlock.java rename to common/mekanism/common/tileentity/TileEntityBoundingBlock.java index ed3b08ca1..3b8e827f1 100644 --- a/common/mekanism/common/TileEntityBoundingBlock.java +++ b/common/mekanism/common/tileentity/TileEntityBoundingBlock.java @@ -1,10 +1,12 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.ArrayList; import com.google.common.io.ByteArrayDataInput; import mekanism.api.Object3D; +import mekanism.common.ITileNetwork; +import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; import mekanism.common.network.PacketTileEntity; diff --git a/common/mekanism/common/TileEntityChargepad.java b/common/mekanism/common/tileentity/TileEntityChargepad.java similarity index 95% rename from common/mekanism/common/TileEntityChargepad.java rename to common/mekanism/common/tileentity/TileEntityChargepad.java index 94ba489e1..508620045 100644 --- a/common/mekanism/common/TileEntityChargepad.java +++ b/common/mekanism/common/tileentity/TileEntityChargepad.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.tile.IEnergySink; import ic2.api.item.ElectricItem; @@ -9,11 +9,16 @@ import java.util.EnumSet; import java.util.List; import java.util.Random; -import mekanism.api.EnergizedItemManager; -import mekanism.api.IEnergizedItem; -import mekanism.api.IStrictEnergyAcceptor; import mekanism.api.Object3D; +import mekanism.api.energy.EnergizedItemManager; +import mekanism.api.energy.IEnergizedItem; +import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.client.IHasSound; +import mekanism.common.EntityRobit; +import mekanism.common.IActiveState; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import net.minecraft.entity.EntityLiving; diff --git a/common/mekanism/common/TileEntityCombiner.java b/common/mekanism/common/tileentity/TileEntityCombiner.java similarity index 86% rename from common/mekanism/common/TileEntityCombiner.java rename to common/mekanism/common/tileentity/TileEntityCombiner.java index 7faf31bc6..be5701468 100644 --- a/common/mekanism/common/TileEntityCombiner.java +++ b/common/mekanism/common/tileentity/TileEntityCombiner.java @@ -1,9 +1,10 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.Map; -import mekanism.common.BlockMachine.MachineType; +import mekanism.common.Mekanism; import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/TileEntityContainerBlock.java b/common/mekanism/common/tileentity/TileEntityContainerBlock.java similarity index 98% rename from common/mekanism/common/TileEntityContainerBlock.java rename to common/mekanism/common/tileentity/TileEntityContainerBlock.java index 37cd7a687..43d5348f1 100644 --- a/common/mekanism/common/TileEntityContainerBlock.java +++ b/common/mekanism/common/tileentity/TileEntityContainerBlock.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.tileentity; +import mekanism.common.ISustainedInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; diff --git a/common/mekanism/common/TileEntityControlPanel.java b/common/mekanism/common/tileentity/TileEntityControlPanel.java similarity index 94% rename from common/mekanism/common/TileEntityControlPanel.java rename to common/mekanism/common/tileentity/TileEntityControlPanel.java index 2c9a8008f..c57b25f5f 100644 --- a/common/mekanism/common/TileEntityControlPanel.java +++ b/common/mekanism/common/tileentity/TileEntityControlPanel.java @@ -1,8 +1,10 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.ArrayList; import mekanism.api.Object3D; +import mekanism.common.ITileNetwork; +import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/common/TileEntityCrusher.java b/common/mekanism/common/tileentity/TileEntityCrusher.java similarity index 80% rename from common/mekanism/common/TileEntityCrusher.java rename to common/mekanism/common/tileentity/TileEntityCrusher.java index 32f53b396..ffb4e557f 100644 --- a/common/mekanism/common/TileEntityCrusher.java +++ b/common/mekanism/common/tileentity/TileEntityCrusher.java @@ -1,11 +1,11 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.Map; import net.minecraft.util.ResourceLocation; - -import mekanism.common.BlockMachine.MachineType; +import mekanism.common.Mekanism; import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.block.BlockMachine.MachineType; public class TileEntityCrusher extends TileEntityElectricMachine { diff --git a/common/mekanism/common/TileEntityDynamicTank.java b/common/mekanism/common/tileentity/TileEntityDynamicTank.java similarity index 98% rename from common/mekanism/common/TileEntityDynamicTank.java rename to common/mekanism/common/tileentity/TileEntityDynamicTank.java index c9c0c52fc..fea0dfe98 100644 --- a/common/mekanism/common/TileEntityDynamicTank.java +++ b/common/mekanism/common/tileentity/TileEntityDynamicTank.java @@ -1,10 +1,15 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import mekanism.api.Object3D; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.PacketHandler; +import mekanism.common.SynchronizedTankData; +import mekanism.common.TankUpdateProtocol; import mekanism.common.PacketHandler.Transmission; import mekanism.common.SynchronizedTankData.ValveData; import mekanism.common.network.PacketTileEntity; diff --git a/common/mekanism/common/TileEntityDynamicValve.java b/common/mekanism/common/tileentity/TileEntityDynamicValve.java similarity index 95% rename from common/mekanism/common/TileEntityDynamicValve.java rename to common/mekanism/common/tileentity/TileEntityDynamicValve.java index 280cd2557..34756317f 100644 --- a/common/mekanism/common/TileEntityDynamicValve.java +++ b/common/mekanism/common/tileentity/TileEntityDynamicValve.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.tileentity; +import mekanism.common.DynamicFluidTank; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/common/mekanism/common/TileEntityElectricBlock.java b/common/mekanism/common/tileentity/TileEntityElectricBlock.java similarity index 97% rename from common/mekanism/common/TileEntityElectricBlock.java rename to common/mekanism/common/tileentity/TileEntityElectricBlock.java index 332379818..9d2ebf0d6 100644 --- a/common/mekanism/common/TileEntityElectricBlock.java +++ b/common/mekanism/common/tileentity/TileEntityElectricBlock.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; @@ -8,7 +8,9 @@ import ic2.api.tile.IWrenchable; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.IStrictEnergyStorage; +import mekanism.api.energy.IStrictEnergyStorage; +import mekanism.common.ITileNetwork; +import mekanism.common.Mekanism; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/common/TileEntityElectricChest.java b/common/mekanism/common/tileentity/TileEntityElectricChest.java similarity index 96% rename from common/mekanism/common/TileEntityElectricChest.java rename to common/mekanism/common/tileentity/TileEntityElectricChest.java index 6b5235524..967512fda 100644 --- a/common/mekanism/common/TileEntityElectricChest.java +++ b/common/mekanism/common/tileentity/TileEntityElectricChest.java @@ -1,10 +1,12 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.tile.IEnergySink; import java.util.ArrayList; -import mekanism.api.IStrictEnergyAcceptor; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.common.ChargeUtils; +import mekanism.common.Mekanism; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/common/TileEntityElectricMachine.java b/common/mekanism/common/tileentity/TileEntityElectricMachine.java similarity index 94% rename from common/mekanism/common/TileEntityElectricMachine.java rename to common/mekanism/common/tileentity/TileEntityElectricMachine.java index cf029f093..6414fe3db 100644 --- a/common/mekanism/common/TileEntityElectricMachine.java +++ b/common/mekanism/common/tileentity/TileEntityElectricMachine.java @@ -1,7 +1,12 @@ -package mekanism.common; +package mekanism.common.tileentity; import mekanism.api.EnumColor; import mekanism.api.SideData; +import mekanism.common.ChargeUtils; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.RecipeHandler; +import mekanism.common.TileComponentUpgrade; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import dan200.computer.api.IComputerAccess; @@ -33,7 +38,7 @@ public abstract class TileEntityElectricMachine extends TileEntityBasicMachine inventory = new ItemStack[4]; - upgradeComponent = new UpgradeTileComponent(this, 3); + upgradeComponent = new TileComponentUpgrade(this, 3); } @Override diff --git a/common/mekanism/common/TileEntityElectricPump.java b/common/mekanism/common/tileentity/TileEntityElectricPump.java similarity index 98% rename from common/mekanism/common/TileEntityElectricPump.java rename to common/mekanism/common/tileentity/TileEntityElectricPump.java index af2b18eaf..c2dec6939 100644 --- a/common/mekanism/common/TileEntityElectricPump.java +++ b/common/mekanism/common/tileentity/TileEntityElectricPump.java @@ -1,6 +1,7 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.tile.IEnergySink; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -8,8 +9,13 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import mekanism.api.IStrictEnergyAcceptor; import mekanism.api.Object3D; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.common.ChargeUtils; +import mekanism.common.ISustainedTank; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; import net.minecraft.item.ItemStack; @@ -23,6 +29,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import com.google.common.io.ByteArrayDataInput; public class TileEntityElectricPump extends TileEntityElectricBlock implements IFluidHandler, ISustainedTank, IEnergySink, IStrictEnergyAcceptor diff --git a/common/mekanism/common/TileEntityEliteFactory.java b/common/mekanism/common/tileentity/TileEntityEliteFactory.java similarity index 88% rename from common/mekanism/common/TileEntityEliteFactory.java rename to common/mekanism/common/tileentity/TileEntityEliteFactory.java index d9f8c1ff4..49ea7a0f0 100644 --- a/common/mekanism/common/TileEntityEliteFactory.java +++ b/common/mekanism/common/tileentity/TileEntityEliteFactory.java @@ -1,9 +1,9 @@ -package mekanism.common; +package mekanism.common.tileentity; import mekanism.api.EnumColor; import mekanism.api.SideData; -import mekanism.common.BlockMachine.MachineType; import mekanism.common.Tier.FactoryTier; +import mekanism.common.block.BlockMachine.MachineType; public class TileEntityEliteFactory extends TileEntityFactory { diff --git a/common/mekanism/common/TileEntityEnergizedSmelter.java b/common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java similarity index 90% rename from common/mekanism/common/TileEntityEnergizedSmelter.java rename to common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java index f197f843e..bfd241620 100644 --- a/common/mekanism/common/TileEntityEnergizedSmelter.java +++ b/common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java @@ -1,10 +1,11 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.HashMap; import java.util.List; import java.util.Map; -import mekanism.common.BlockMachine.MachineType; +import mekanism.common.Mekanism; +import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.util.ResourceLocation; diff --git a/common/mekanism/common/TileEntityEnergyCube.java b/common/mekanism/common/tileentity/TileEntityEnergyCube.java similarity index 96% rename from common/mekanism/common/TileEntityEnergyCube.java rename to common/mekanism/common/tileentity/TileEntityEnergyCube.java index 4e0ad0c35..4cf392b26 100644 --- a/common/mekanism/common/TileEntityEnergyCube.java +++ b/common/mekanism/common/tileentity/TileEntityEnergyCube.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; @@ -8,10 +8,17 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; -import mekanism.api.ICableOutputter; -import mekanism.api.IStrictEnergyAcceptor; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.energy.ICableOutputter; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.transmitters.TransmissionType; +import mekanism.common.CableUtils; +import mekanism.common.ChargeUtils; +import mekanism.common.IRedstoneControl; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.Tier; +import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.Tier.EnergyCubeTier; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/common/TileEntityEnrichmentChamber.java b/common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java similarity index 82% rename from common/mekanism/common/TileEntityEnrichmentChamber.java rename to common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java index d4cc9caab..2e6e70eb2 100644 --- a/common/mekanism/common/TileEntityEnrichmentChamber.java +++ b/common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java @@ -1,9 +1,10 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.Map; -import mekanism.common.BlockMachine.MachineType; +import mekanism.common.Mekanism; import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.util.ResourceLocation; public class TileEntityEnrichmentChamber extends TileEntityElectricMachine diff --git a/common/mekanism/common/TileEntityFactory.java b/common/mekanism/common/tileentity/TileEntityFactory.java similarity index 95% rename from common/mekanism/common/TileEntityFactory.java rename to common/mekanism/common/tileentity/TileEntityFactory.java index efc91d9d9..2e9a432d8 100644 --- a/common/mekanism/common/TileEntityFactory.java +++ b/common/mekanism/common/tileentity/TileEntityFactory.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.tile.IEnergySink; @@ -6,15 +6,27 @@ import java.util.ArrayList; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; -import mekanism.api.IStrictEnergyAcceptor; import mekanism.api.IUpgradeManagement; import mekanism.api.Object3D; import mekanism.api.SideData; +import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.client.IHasSound; -import mekanism.common.BlockMachine.MachineType; +import mekanism.common.ChargeUtils; +import mekanism.common.IActiveState; +import mekanism.common.IFactory; +import mekanism.common.IRedstoneControl; +import mekanism.common.IUpgradeTile; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.PacketHandler; +import mekanism.common.Tier; +import mekanism.common.TileComponentUpgrade; import mekanism.common.IFactory.RecipeType; +import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.FactoryTier; +import mekanism.common.block.BlockMachine; +import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -67,7 +79,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; - public UpgradeTileComponent upgradeComponent = new UpgradeTileComponent(this, 0); + public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 0); public TileEntityFactory() { @@ -732,7 +744,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IEnerg } @Override - public UpgradeTileComponent getComponent() + public TileComponentUpgrade getComponent() { return upgradeComponent; } diff --git a/common/mekanism/common/TileEntityGasTank.java b/common/mekanism/common/tileentity/TileEntityGasTank.java similarity index 95% rename from common/mekanism/common/TileEntityGasTank.java rename to common/mekanism/common/tileentity/TileEntityGasTank.java index 27c269372..3c79580c0 100644 --- a/common/mekanism/common/TileEntityGasTank.java +++ b/common/mekanism/common/tileentity/TileEntityGasTank.java @@ -1,14 +1,17 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.ArrayList; -import mekanism.api.EnumGas; -import mekanism.api.GasTransmission; -import mekanism.api.IGasAcceptor; -import mekanism.api.IGasStorage; import mekanism.api.IStorageTank; -import mekanism.api.ITubeConnection; import mekanism.api.Object3D; +import mekanism.api.gas.EnumGas; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasAcceptor; +import mekanism.api.gas.IGasStorage; +import mekanism.api.gas.ITubeConnection; +import mekanism.common.IRedstoneControl; +import mekanism.common.MekanismUtils; +import mekanism.common.IRedstoneControl.RedstoneControl; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/TileEntityLogisticalTransporter.java b/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java similarity index 93% rename from common/mekanism/common/TileEntityLogisticalTransporter.java rename to common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java index cae13041f..ecd4c146e 100644 --- a/common/mekanism/common/TileEntityLogisticalTransporter.java +++ b/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java @@ -1,11 +1,15 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.ArrayList; import java.util.HashSet; -import mekanism.api.ITransmitter; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; +import mekanism.common.ITileNetwork; +import mekanism.common.InventoryNetwork; +import mekanism.common.PacketHandler; +import mekanism.common.TransporterUtils; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/common/TileEntityMechanicalPipe.java b/common/mekanism/common/tileentity/TileEntityMechanicalPipe.java similarity index 95% rename from common/mekanism/common/TileEntityMechanicalPipe.java rename to common/mekanism/common/tileentity/TileEntityMechanicalPipe.java index a9f9886b2..1dcf2d462 100644 --- a/common/mekanism/common/TileEntityMechanicalPipe.java +++ b/common/mekanism/common/tileentity/TileEntityMechanicalPipe.java @@ -1,12 +1,16 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; -import mekanism.api.ITransmitter; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; +import mekanism.common.FluidNetwork; +import mekanism.common.ITileNetwork; +import mekanism.common.PacketHandler; +import mekanism.common.PipeUtils; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/common/TileEntityMetallurgicInfuser.java b/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java similarity index 94% rename from common/mekanism/common/TileEntityMetallurgicInfuser.java rename to common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java index 91cd28be2..d8a3e8ba7 100644 --- a/common/mekanism/common/TileEntityMetallurgicInfuser.java +++ b/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.tile.IEnergySink; @@ -6,19 +6,29 @@ import java.util.ArrayList; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; -import mekanism.api.IStrictEnergyAcceptor; import mekanism.api.IUpgradeManagement; -import mekanism.api.InfuseObject; -import mekanism.api.InfuseRegistry; -import mekanism.api.InfuseType; -import mekanism.api.InfusionInput; -import mekanism.api.InfusionOutput; import mekanism.api.Object3D; import mekanism.api.SideData; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.infuse.InfuseObject; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.api.infuse.InfuseType; +import mekanism.api.infuse.InfusionInput; +import mekanism.api.infuse.InfusionOutput; import mekanism.client.IHasSound; -import mekanism.common.BlockMachine.MachineType; +import mekanism.common.ChargeUtils; +import mekanism.common.IActiveState; +import mekanism.common.IRedstoneControl; +import mekanism.common.IUpgradeTile; +import mekanism.common.Mekanism; +import mekanism.common.MekanismUtils; +import mekanism.common.PacketHandler; +import mekanism.common.RecipeHandler; +import mekanism.common.TileComponentUpgrade; +import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.PacketHandler.Transmission; import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -68,7 +78,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; - public UpgradeTileComponent upgradeComponent = new UpgradeTileComponent(this, 0); + public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 0); public TileEntityMetallurgicInfuser() { @@ -627,7 +637,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem } @Override - public UpgradeTileComponent getComponent() + public TileComponentUpgrade getComponent() { return upgradeComponent; } diff --git a/common/mekanism/common/TileEntityOsmiumCompressor.java b/common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java similarity index 87% rename from common/mekanism/common/TileEntityOsmiumCompressor.java rename to common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java index dddff7459..70855d3b2 100644 --- a/common/mekanism/common/TileEntityOsmiumCompressor.java +++ b/common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java @@ -1,9 +1,10 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.Map; -import mekanism.common.BlockMachine.MachineType; +import mekanism.common.Mekanism; import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; diff --git a/common/mekanism/common/TileEntityPressurizedTube.java b/common/mekanism/common/tileentity/TileEntityPressurizedTube.java similarity index 90% rename from common/mekanism/common/TileEntityPressurizedTube.java rename to common/mekanism/common/tileentity/TileEntityPressurizedTube.java index 22faea8fa..8e0098075 100644 --- a/common/mekanism/common/TileEntityPressurizedTube.java +++ b/common/mekanism/common/tileentity/TileEntityPressurizedTube.java @@ -1,14 +1,15 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.HashSet; -import mekanism.api.EnumGas; -import mekanism.api.GasNetwork; -import mekanism.api.GasTransmission; -import mekanism.api.IGasTransmitter; -import mekanism.api.ITransmitter; -import mekanism.api.ITubeConnection; + import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.gas.EnumGas; +import mekanism.api.gas.GasNetwork; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasTransmitter; +import mekanism.api.gas.ITubeConnection; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/common/TileEntityPurificationChamber.java b/common/mekanism/common/tileentity/TileEntityPurificationChamber.java similarity index 91% rename from common/mekanism/common/TileEntityPurificationChamber.java rename to common/mekanism/common/tileentity/TileEntityPurificationChamber.java index 4d7879ac6..518088010 100644 --- a/common/mekanism/common/TileEntityPurificationChamber.java +++ b/common/mekanism/common/tileentity/TileEntityPurificationChamber.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.Map; @@ -6,14 +6,14 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; - -import mekanism.api.EnumGas; -import mekanism.api.IGasAcceptor; -import mekanism.api.IGasStorage; import mekanism.api.IStorageTank; -import mekanism.api.ITubeConnection; -import mekanism.common.BlockMachine.MachineType; +import mekanism.api.gas.EnumGas; +import mekanism.api.gas.IGasAcceptor; +import mekanism.api.gas.IGasStorage; +import mekanism.api.gas.ITubeConnection; +import mekanism.common.Mekanism; import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.block.BlockMachine.MachineType; public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMachine implements IGasAcceptor, IGasStorage, ITubeConnection { diff --git a/common/mekanism/common/TileEntityTeleporter.java b/common/mekanism/common/tileentity/TileEntityTeleporter.java similarity index 97% rename from common/mekanism/common/TileEntityTeleporter.java rename to common/mekanism/common/tileentity/TileEntityTeleporter.java index 733d50d6c..2e66d6a98 100644 --- a/common/mekanism/common/TileEntityTeleporter.java +++ b/common/mekanism/common/tileentity/TileEntityTeleporter.java @@ -1,13 +1,19 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.tile.IEnergySink; + import java.util.ArrayList; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.IStrictEnergyAcceptor; import mekanism.api.Object3D; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.common.ChargeUtils; +import mekanism.common.Mekanism; +import mekanism.common.PacketHandler; +import mekanism.common.Teleporter; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.Teleporter.Code; import mekanism.common.network.PacketPortalFX; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -17,6 +23,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; + import com.google.common.io.ByteArrayDataInput; import dan200.computer.api.IComputerAccess; diff --git a/common/mekanism/common/TileEntityTheoreticalElementizer.java b/common/mekanism/common/tileentity/TileEntityTheoreticalElementizer.java similarity index 93% rename from common/mekanism/common/TileEntityTheoreticalElementizer.java rename to common/mekanism/common/tileentity/TileEntityTheoreticalElementizer.java index e89102401..9b974b213 100644 --- a/common/mekanism/common/TileEntityTheoreticalElementizer.java +++ b/common/mekanism/common/tileentity/TileEntityTheoreticalElementizer.java @@ -1,9 +1,10 @@ -package mekanism.common; +package mekanism.common.tileentity; import java.util.HashMap; import java.util.Random; -import mekanism.common.BlockMachine.MachineType; +import mekanism.common.Mekanism; +import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; diff --git a/common/mekanism/common/TileEntityTransmitter.java b/common/mekanism/common/tileentity/TileEntityTransmitter.java similarity index 86% rename from common/mekanism/common/TileEntityTransmitter.java rename to common/mekanism/common/tileentity/TileEntityTransmitter.java index 8baf22810..c17415ca5 100644 --- a/common/mekanism/common/TileEntityTransmitter.java +++ b/common/mekanism/common/tileentity/TileEntityTransmitter.java @@ -1,9 +1,9 @@ -package mekanism.common; +package mekanism.common.tileentity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.api.ITransmitter; -import mekanism.api.TransmitterNetworkRegistry; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmitterNetworkRegistry; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/common/mekanism/common/TileEntityUniversalCable.java b/common/mekanism/common/tileentity/TileEntityUniversalCable.java similarity index 94% rename from common/mekanism/common/TileEntityUniversalCable.java rename to common/mekanism/common/tileentity/TileEntityUniversalCable.java index 70fe2c872..f060ff741 100644 --- a/common/mekanism/common/TileEntityUniversalCable.java +++ b/common/mekanism/common/tileentity/TileEntityUniversalCable.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tileentity; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergyTile; @@ -6,9 +6,12 @@ import ic2.api.energy.tile.IEnergyTile; import java.util.ArrayList; import java.util.HashSet; -import mekanism.api.ITransmitter; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.transmitters.ITransmitter; +import mekanism.api.transmitters.TransmissionType; +import mekanism.common.CableUtils; +import mekanism.common.EnergyNetwork; +import mekanism.common.Mekanism; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/generators/client/BlockRenderingHandler.java b/common/mekanism/generators/client/BlockRenderingHandler.java index 544dab0d5..33781d389 100644 --- a/common/mekanism/generators/client/BlockRenderingHandler.java +++ b/common/mekanism/generators/client/BlockRenderingHandler.java @@ -3,7 +3,13 @@ package mekanism.generators.client; import mekanism.client.MekanismRenderer; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.BlockGenerator.GeneratorType; +import mekanism.generators.client.model.ModelAdvancedSolarGenerator; +import mekanism.generators.client.model.ModelBioGenerator; +import mekanism.generators.client.model.ModelElectrolyticSeparator; +import mekanism.generators.client.model.ModelHeatGenerator; +import mekanism.generators.client.model.ModelHydrogenGenerator; +import mekanism.generators.client.model.ModelWindTurbine; +import mekanism.generators.common.block.BlockGenerator.GeneratorType; import mekanism.generators.common.MekanismGenerators; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/common/mekanism/generators/client/GeneratorsClientProxy.java b/common/mekanism/generators/client/GeneratorsClientProxy.java index ee76ca20a..b8c00d4af 100644 --- a/common/mekanism/generators/client/GeneratorsClientProxy.java +++ b/common/mekanism/generators/client/GeneratorsClientProxy.java @@ -1,13 +1,25 @@ package mekanism.generators.client; +import mekanism.generators.client.gui.GuiBioGenerator; +import mekanism.generators.client.gui.GuiElectrolyticSeparator; +import mekanism.generators.client.gui.GuiHeatGenerator; +import mekanism.generators.client.gui.GuiHydrogenGenerator; +import mekanism.generators.client.gui.GuiSolarGenerator; +import mekanism.generators.client.gui.GuiWindTurbine; +import mekanism.generators.client.render.RenderAdvancedSolarGenerator; +import mekanism.generators.client.render.RenderBioGenerator; +import mekanism.generators.client.render.RenderElectrolyticSeparator; +import mekanism.generators.client.render.RenderHeatGenerator; +import mekanism.generators.client.render.RenderHydrogenGenerator; +import mekanism.generators.client.render.RenderWindTurbine; import mekanism.generators.common.GeneratorsCommonProxy; -import mekanism.generators.common.TileEntityAdvancedSolarGenerator; -import mekanism.generators.common.TileEntityBioGenerator; -import mekanism.generators.common.TileEntityElectrolyticSeparator; -import mekanism.generators.common.TileEntityHeatGenerator; -import mekanism.generators.common.TileEntityHydrogenGenerator; -import mekanism.generators.common.TileEntitySolarGenerator; -import mekanism.generators.common.TileEntityWindTurbine; +import mekanism.generators.common.tileentity.TileEntityAdvancedSolarGenerator; +import mekanism.generators.common.tileentity.TileEntityBioGenerator; +import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator; +import mekanism.generators.common.tileentity.TileEntityHeatGenerator; +import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; +import mekanism.generators.common.tileentity.TileEntitySolarGenerator; +import mekanism.generators.common.tileentity.TileEntityWindTurbine; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/GuiBioGenerator.java b/common/mekanism/generators/client/gui/GuiBioGenerator.java similarity index 90% rename from common/mekanism/generators/client/GuiBioGenerator.java rename to common/mekanism/generators/client/gui/GuiBioGenerator.java index d5d3b8373..d16abc0cb 100644 --- a/common/mekanism/generators/client/GuiBioGenerator.java +++ b/common/mekanism/generators/client/gui/GuiBioGenerator.java @@ -1,11 +1,11 @@ -package mekanism.generators.client; +package mekanism.generators.client.gui; -import mekanism.client.GuiMekanism; -import mekanism.client.GuiRedstoneControl; +import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.GuiRedstoneControl; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.ContainerBioGenerator; -import mekanism.generators.common.TileEntityBioGenerator; +import mekanism.generators.common.inventory.container.ContainerBioGenerator; +import mekanism.generators.common.tileentity.TileEntityBioGenerator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/GuiElectrolyticSeparator.java b/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java similarity index 95% rename from common/mekanism/generators/client/GuiElectrolyticSeparator.java rename to common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java index 84183c3ad..84332db8f 100644 --- a/common/mekanism/generators/client/GuiElectrolyticSeparator.java +++ b/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java @@ -1,18 +1,19 @@ -package mekanism.generators.client; +package mekanism.generators.client.gui; import java.util.ArrayList; -import mekanism.api.EnumGas; import mekanism.api.Object3D; +import mekanism.api.gas.EnumGas; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; -import mekanism.generators.common.ContainerElectrolyticSeparator; -import mekanism.generators.common.TileEntityElectrolyticSeparator; +import mekanism.generators.common.inventory.container.ContainerElectrolyticSeparator; +import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; import universalelectricity.core.electricity.ElectricityDisplay; diff --git a/common/mekanism/generators/client/GuiHeatGenerator.java b/common/mekanism/generators/client/gui/GuiHeatGenerator.java similarity index 91% rename from common/mekanism/generators/client/GuiHeatGenerator.java rename to common/mekanism/generators/client/gui/GuiHeatGenerator.java index 88a1a81e4..38d030df8 100644 --- a/common/mekanism/generators/client/GuiHeatGenerator.java +++ b/common/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -1,11 +1,11 @@ -package mekanism.generators.client; +package mekanism.generators.client.gui; -import mekanism.client.GuiMekanism; -import mekanism.client.GuiRedstoneControl; +import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.GuiRedstoneControl; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.ContainerHeatGenerator; -import mekanism.generators.common.TileEntityHeatGenerator; +import mekanism.generators.common.inventory.container.ContainerHeatGenerator; +import mekanism.generators.common.tileentity.TileEntityHeatGenerator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/GuiHydrogenGenerator.java b/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java similarity index 90% rename from common/mekanism/generators/client/GuiHydrogenGenerator.java rename to common/mekanism/generators/client/gui/GuiHydrogenGenerator.java index b3d2df762..b42021b9d 100644 --- a/common/mekanism/generators/client/GuiHydrogenGenerator.java +++ b/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java @@ -1,11 +1,11 @@ -package mekanism.generators.client; +package mekanism.generators.client.gui; -import mekanism.client.GuiMekanism; -import mekanism.client.GuiRedstoneControl; +import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.GuiRedstoneControl; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.ContainerHydrogenGenerator; -import mekanism.generators.common.TileEntityHydrogenGenerator; +import mekanism.generators.common.inventory.container.ContainerHydrogenGenerator; +import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/GuiSolarGenerator.java b/common/mekanism/generators/client/gui/GuiSolarGenerator.java similarity index 90% rename from common/mekanism/generators/client/GuiSolarGenerator.java rename to common/mekanism/generators/client/gui/GuiSolarGenerator.java index f09ec2c54..bf393c868 100644 --- a/common/mekanism/generators/client/GuiSolarGenerator.java +++ b/common/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -1,11 +1,11 @@ -package mekanism.generators.client; +package mekanism.generators.client.gui; -import mekanism.client.GuiMekanism; -import mekanism.client.GuiRedstoneControl; +import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.GuiRedstoneControl; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.ContainerSolarGenerator; -import mekanism.generators.common.TileEntitySolarGenerator; +import mekanism.generators.common.inventory.container.ContainerSolarGenerator; +import mekanism.generators.common.tileentity.TileEntitySolarGenerator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/GuiWindTurbine.java b/common/mekanism/generators/client/gui/GuiWindTurbine.java similarity index 91% rename from common/mekanism/generators/client/GuiWindTurbine.java rename to common/mekanism/generators/client/gui/GuiWindTurbine.java index b7b3d7cc0..43a4a8a55 100644 --- a/common/mekanism/generators/client/GuiWindTurbine.java +++ b/common/mekanism/generators/client/gui/GuiWindTurbine.java @@ -1,13 +1,13 @@ -package mekanism.generators.client; +package mekanism.generators.client.gui; import mekanism.api.EnumColor; -import mekanism.client.GuiMekanism; -import mekanism.client.GuiRedstoneControl; +import mekanism.client.gui.GuiMekanism; +import mekanism.client.gui.GuiRedstoneControl; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.ContainerWindTurbine; import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.TileEntityWindTurbine; +import mekanism.generators.common.inventory.container.ContainerWindTurbine; +import mekanism.generators.common.tileentity.TileEntityWindTurbine; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/ModelAdvancedSolarGenerator.java b/common/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java similarity index 99% rename from common/mekanism/generators/client/ModelAdvancedSolarGenerator.java rename to common/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java index 034a8fa53..35c46b8e1 100644 --- a/common/mekanism/generators/client/ModelAdvancedSolarGenerator.java +++ b/common/mekanism/generators/client/model/ModelAdvancedSolarGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.client; +package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/common/mekanism/generators/client/ModelBioGenerator.java b/common/mekanism/generators/client/model/ModelBioGenerator.java similarity index 99% rename from common/mekanism/generators/client/ModelBioGenerator.java rename to common/mekanism/generators/client/model/ModelBioGenerator.java index 0ebceecba..6ec0c034d 100644 --- a/common/mekanism/generators/client/ModelBioGenerator.java +++ b/common/mekanism/generators/client/model/ModelBioGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.client; +package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/common/mekanism/generators/client/ModelElectrolyticSeparator.java b/common/mekanism/generators/client/model/ModelElectrolyticSeparator.java similarity index 99% rename from common/mekanism/generators/client/ModelElectrolyticSeparator.java rename to common/mekanism/generators/client/model/ModelElectrolyticSeparator.java index d4f612674..cb0eac234 100644 --- a/common/mekanism/generators/client/ModelElectrolyticSeparator.java +++ b/common/mekanism/generators/client/model/ModelElectrolyticSeparator.java @@ -1,4 +1,4 @@ -package mekanism.generators.client; +package mekanism.generators.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/generators/client/ModelHeatGenerator.java b/common/mekanism/generators/client/model/ModelHeatGenerator.java similarity index 99% rename from common/mekanism/generators/client/ModelHeatGenerator.java rename to common/mekanism/generators/client/model/ModelHeatGenerator.java index bee9a22cf..69502d0c2 100644 --- a/common/mekanism/generators/client/ModelHeatGenerator.java +++ b/common/mekanism/generators/client/model/ModelHeatGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.client; +package mekanism.generators.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/generators/client/ModelHydrogenGenerator.java b/common/mekanism/generators/client/model/ModelHydrogenGenerator.java similarity index 99% rename from common/mekanism/generators/client/ModelHydrogenGenerator.java rename to common/mekanism/generators/client/model/ModelHydrogenGenerator.java index f090a564d..9e469f5f6 100644 --- a/common/mekanism/generators/client/ModelHydrogenGenerator.java +++ b/common/mekanism/generators/client/model/ModelHydrogenGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.client; +package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/common/mekanism/generators/client/ModelWindTurbine.java b/common/mekanism/generators/client/model/ModelWindTurbine.java similarity index 99% rename from common/mekanism/generators/client/ModelWindTurbine.java rename to common/mekanism/generators/client/model/ModelWindTurbine.java index 49b1ab94e..8357b7909 100644 --- a/common/mekanism/generators/client/ModelWindTurbine.java +++ b/common/mekanism/generators/client/model/ModelWindTurbine.java @@ -1,4 +1,4 @@ -package mekanism.generators.client; +package mekanism.generators.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/common/mekanism/generators/client/RenderAdvancedSolarGenerator.java b/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java similarity index 88% rename from common/mekanism/generators/client/RenderAdvancedSolarGenerator.java rename to common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index aeca899f1..712c5e302 100644 --- a/common/mekanism/generators/client/RenderAdvancedSolarGenerator.java +++ b/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -1,8 +1,9 @@ -package mekanism.generators.client; +package mekanism.generators.client.render; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.TileEntityAdvancedSolarGenerator; +import mekanism.generators.client.model.ModelAdvancedSolarGenerator; +import mekanism.generators.common.tileentity.TileEntityAdvancedSolarGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/RenderBioGenerator.java b/common/mekanism/generators/client/render/RenderBioGenerator.java similarity index 89% rename from common/mekanism/generators/client/RenderBioGenerator.java rename to common/mekanism/generators/client/render/RenderBioGenerator.java index 5e03591b3..02cf4dbb6 100644 --- a/common/mekanism/generators/client/RenderBioGenerator.java +++ b/common/mekanism/generators/client/render/RenderBioGenerator.java @@ -1,8 +1,9 @@ -package mekanism.generators.client; +package mekanism.generators.client.render; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.TileEntityBioGenerator; +import mekanism.generators.client.model.ModelBioGenerator; +import mekanism.generators.common.tileentity.TileEntityBioGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/RenderElectrolyticSeparator.java b/common/mekanism/generators/client/render/RenderElectrolyticSeparator.java similarity index 87% rename from common/mekanism/generators/client/RenderElectrolyticSeparator.java rename to common/mekanism/generators/client/render/RenderElectrolyticSeparator.java index d6241ac85..7ddddcf08 100644 --- a/common/mekanism/generators/client/RenderElectrolyticSeparator.java +++ b/common/mekanism/generators/client/render/RenderElectrolyticSeparator.java @@ -1,9 +1,10 @@ -package mekanism.generators.client; +package mekanism.generators.client.render; -import mekanism.api.EnumGas; +import mekanism.api.gas.EnumGas; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.TileEntityElectrolyticSeparator; +import mekanism.generators.client.model.ModelElectrolyticSeparator; +import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/RenderHeatGenerator.java b/common/mekanism/generators/client/render/RenderHeatGenerator.java similarity index 88% rename from common/mekanism/generators/client/RenderHeatGenerator.java rename to common/mekanism/generators/client/render/RenderHeatGenerator.java index 462bbf276..b4fd5d2de 100644 --- a/common/mekanism/generators/client/RenderHeatGenerator.java +++ b/common/mekanism/generators/client/render/RenderHeatGenerator.java @@ -1,8 +1,9 @@ -package mekanism.generators.client; +package mekanism.generators.client.render; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.TileEntityHeatGenerator; +import mekanism.generators.client.model.ModelHeatGenerator; +import mekanism.generators.common.tileentity.TileEntityHeatGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/RenderHydrogenGenerator.java b/common/mekanism/generators/client/render/RenderHydrogenGenerator.java similarity index 88% rename from common/mekanism/generators/client/RenderHydrogenGenerator.java rename to common/mekanism/generators/client/render/RenderHydrogenGenerator.java index 7b7ce483a..ba45b96fb 100644 --- a/common/mekanism/generators/client/RenderHydrogenGenerator.java +++ b/common/mekanism/generators/client/render/RenderHydrogenGenerator.java @@ -1,8 +1,9 @@ -package mekanism.generators.client; +package mekanism.generators.client.render; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.TileEntityHydrogenGenerator; +import mekanism.generators.client.model.ModelHydrogenGenerator; +import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/RenderWindTurbine.java b/common/mekanism/generators/client/render/RenderWindTurbine.java similarity index 90% rename from common/mekanism/generators/client/RenderWindTurbine.java rename to common/mekanism/generators/client/render/RenderWindTurbine.java index 770340e96..683e4d32b 100644 --- a/common/mekanism/generators/client/RenderWindTurbine.java +++ b/common/mekanism/generators/client/render/RenderWindTurbine.java @@ -1,9 +1,10 @@ -package mekanism.generators.client; +package mekanism.generators.client.render; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; -import mekanism.generators.common.TileEntityWindTurbine; +import mekanism.generators.client.model.ModelWindTurbine; +import mekanism.generators.common.tileentity.TileEntityWindTurbine; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/common/GeneratorsCommonProxy.java b/common/mekanism/generators/common/GeneratorsCommonProxy.java index b64e46015..400a1508e 100644 --- a/common/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/common/mekanism/generators/common/GeneratorsCommonProxy.java @@ -1,6 +1,19 @@ package mekanism.generators.common; import mekanism.common.Mekanism; +import mekanism.generators.common.inventory.container.ContainerBioGenerator; +import mekanism.generators.common.inventory.container.ContainerElectrolyticSeparator; +import mekanism.generators.common.inventory.container.ContainerHeatGenerator; +import mekanism.generators.common.inventory.container.ContainerHydrogenGenerator; +import mekanism.generators.common.inventory.container.ContainerSolarGenerator; +import mekanism.generators.common.inventory.container.ContainerWindTurbine; +import mekanism.generators.common.tileentity.TileEntityAdvancedSolarGenerator; +import mekanism.generators.common.tileentity.TileEntityBioGenerator; +import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator; +import mekanism.generators.common.tileentity.TileEntityHeatGenerator; +import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; +import mekanism.generators.common.tileentity.TileEntitySolarGenerator; +import mekanism.generators.common.tileentity.TileEntityWindTurbine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/common/ItemBlockGenerator.java b/common/mekanism/generators/common/ItemBlockGenerator.java index ae4370aef..083848bee 100644 --- a/common/mekanism/generators/common/ItemBlockGenerator.java +++ b/common/mekanism/generators/common/ItemBlockGenerator.java @@ -5,12 +5,12 @@ import ic2.api.item.ICustomElectricItem; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.IEnergizedItem; +import mekanism.api.energy.IEnergizedItem; import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; -import mekanism.common.TileEntityElectricBlock; -import mekanism.generators.common.BlockGenerator.GeneratorType; +import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.generators.common.block.BlockGenerator.GeneratorType; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/common/mekanism/generators/common/MekanismGenerators.java b/common/mekanism/generators/common/MekanismGenerators.java index 1fe8241a6..71b64630d 100644 --- a/common/mekanism/generators/common/MekanismGenerators.java +++ b/common/mekanism/generators/common/MekanismGenerators.java @@ -1,18 +1,20 @@ package mekanism.generators.common; -import mekanism.api.InfuseObject; -import mekanism.api.InfuseRegistry; -import mekanism.api.InfuseType; +import mekanism.api.infuse.InfuseObject; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.api.infuse.InfuseType; import mekanism.common.IModule; -import mekanism.common.ItemMekanism; import mekanism.common.Mekanism; import mekanism.common.MekanismRecipe; import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils.ResourceType; +import mekanism.common.item.ItemMekanism; import mekanism.common.PacketHandler; import mekanism.common.RecipeHandler; import mekanism.common.Version; +import mekanism.generators.common.block.BlockGenerator; import mekanism.generators.common.network.PacketElectrolyticSeparatorParticle; +import mekanism.generators.common.tileentity.TileEntitySolarGenerator; import net.minecraft.block.Block; import net.minecraft.block.BlockLeaves; import net.minecraft.item.Item; diff --git a/common/mekanism/generators/common/BlockGenerator.java b/common/mekanism/generators/common/block/BlockGenerator.java similarity index 95% rename from common/mekanism/generators/common/BlockGenerator.java rename to common/mekanism/generators/common/block/BlockGenerator.java index a7daed1c8..38b758721 100644 --- a/common/mekanism/generators/common/BlockGenerator.java +++ b/common/mekanism/generators/common/block/BlockGenerator.java @@ -1,9 +1,9 @@ -package mekanism.generators.common; +package mekanism.generators.common.block; import java.util.List; import java.util.Random; -import mekanism.api.IEnergizedItem; +import mekanism.api.energy.IEnergizedItem; import mekanism.common.IActiveState; import mekanism.common.IBoundingBlock; import mekanism.common.ISpecialBounds; @@ -11,9 +11,17 @@ import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; -import mekanism.common.TileEntityBasicBlock; -import mekanism.common.TileEntityElectricBlock; +import mekanism.common.tileentity.TileEntityBasicBlock; +import mekanism.common.tileentity.TileEntityElectricBlock; import mekanism.generators.client.GeneratorsClientProxy; +import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.tileentity.TileEntityAdvancedSolarGenerator; +import mekanism.generators.common.tileentity.TileEntityBioGenerator; +import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator; +import mekanism.generators.common.tileentity.TileEntityHeatGenerator; +import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; +import mekanism.generators.common.tileentity.TileEntitySolarGenerator; +import mekanism.generators.common.tileentity.TileEntityWindTurbine; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/common/mekanism/generators/common/ContainerBioGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java similarity index 95% rename from common/mekanism/generators/common/ContainerBioGenerator.java rename to common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index fb87e7ee6..7fd6853fd 100644 --- a/common/mekanism/generators/common/ContainerBioGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -1,7 +1,8 @@ -package mekanism.generators.common; +package mekanism.generators.common.inventory.container; import mekanism.common.ChargeUtils; -import mekanism.common.SlotEnergy.SlotCharge; +import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.generators.common.tileentity.TileEntityBioGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/ContainerElectrolyticSeparator.java b/common/mekanism/generators/common/inventory/container/ContainerElectrolyticSeparator.java similarity index 94% rename from common/mekanism/generators/common/ContainerElectrolyticSeparator.java rename to common/mekanism/generators/common/inventory/container/ContainerElectrolyticSeparator.java index fafeeafd8..265915013 100644 --- a/common/mekanism/generators/common/ContainerElectrolyticSeparator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerElectrolyticSeparator.java @@ -1,10 +1,11 @@ -package mekanism.generators.common; +package mekanism.generators.common.inventory.container; -import mekanism.api.EnumGas; import mekanism.api.IStorageTank; +import mekanism.api.gas.EnumGas; import mekanism.common.ChargeUtils; -import mekanism.common.SlotEnergy.SlotDischarge; -import mekanism.common.SlotStorageTank; +import mekanism.common.inventory.slot.SlotStorageTank; +import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/ContainerHeatGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java similarity index 95% rename from common/mekanism/generators/common/ContainerHeatGenerator.java rename to common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java index 460998024..5670dc8af 100644 --- a/common/mekanism/generators/common/ContainerHeatGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java @@ -1,7 +1,8 @@ -package mekanism.generators.common; +package mekanism.generators.common.inventory.container; import mekanism.common.ChargeUtils; -import mekanism.common.SlotEnergy.SlotCharge; +import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.generators.common.tileentity.TileEntityHeatGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/ContainerHydrogenGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java similarity index 94% rename from common/mekanism/generators/common/ContainerHydrogenGenerator.java rename to common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java index 5a2996304..aac994ac6 100644 --- a/common/mekanism/generators/common/ContainerHydrogenGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java @@ -1,9 +1,10 @@ -package mekanism.generators.common; +package mekanism.generators.common.inventory.container; -import mekanism.api.EnumGas; import mekanism.api.IStorageTank; +import mekanism.api.gas.EnumGas; import mekanism.common.ChargeUtils; -import mekanism.common.SlotEnergy.SlotCharge; +import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/ContainerSolarGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java similarity index 94% rename from common/mekanism/generators/common/ContainerSolarGenerator.java rename to common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java index 9aac6a181..8226fb23d 100644 --- a/common/mekanism/generators/common/ContainerSolarGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java @@ -1,7 +1,8 @@ -package mekanism.generators.common; +package mekanism.generators.common.inventory.container; import mekanism.common.ChargeUtils; -import mekanism.common.SlotEnergy.SlotCharge; +import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.generators.common.tileentity.TileEntitySolarGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/ContainerWindTurbine.java b/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java similarity index 94% rename from common/mekanism/generators/common/ContainerWindTurbine.java rename to common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java index ec88200e6..8aa741bd1 100644 --- a/common/mekanism/generators/common/ContainerWindTurbine.java +++ b/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java @@ -1,7 +1,8 @@ -package mekanism.generators.common; +package mekanism.generators.common.inventory.container; import mekanism.common.ChargeUtils; -import mekanism.common.SlotEnergy.SlotCharge; +import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.generators.common.tileentity.TileEntityWindTurbine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java b/common/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java index b1935c8b5..8ca99db2e 100644 --- a/common/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java +++ b/common/mekanism/generators/common/network/PacketElectrolyticSeparatorParticle.java @@ -3,7 +3,7 @@ package mekanism.generators.common.network; import java.io.DataOutputStream; import mekanism.common.network.IMekanismPacket; -import mekanism.generators.common.TileEntityElectrolyticSeparator; +import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java similarity index 90% rename from common/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java rename to common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java index dca57d4b1..810fc41d9 100644 --- a/common/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java @@ -1,8 +1,9 @@ -package mekanism.generators.common; +package mekanism.generators.common.tileentity; import mekanism.api.Object3D; import mekanism.common.IBoundingBlock; import mekanism.common.MekanismUtils; +import mekanism.generators.common.MekanismGenerators; public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock { diff --git a/common/mekanism/generators/common/TileEntityBioGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java similarity index 98% rename from common/mekanism/generators/common/TileEntityBioGenerator.java rename to common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java index c9c0bbbf1..8d4fc58c5 100644 --- a/common/mekanism/generators/common/TileEntityBioGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.common; +package mekanism.generators.common.tileentity; import java.util.ArrayList; @@ -6,6 +6,7 @@ import mekanism.client.Sound; import mekanism.common.ChargeUtils; import mekanism.common.FluidSlot; import mekanism.common.MekanismUtils; +import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/generators/common/TileEntityElectrolyticSeparator.java b/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java similarity index 97% rename from common/mekanism/generators/common/TileEntityElectrolyticSeparator.java rename to common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java index 53306d6ea..689c00f08 100644 --- a/common/mekanism/generators/common/TileEntityElectrolyticSeparator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java @@ -1,25 +1,27 @@ -package mekanism.generators.common; +package mekanism.generators.common.tileentity; import ic2.api.energy.tile.IEnergySink; + import java.util.ArrayList; import java.util.Random; -import mekanism.api.EnumGas; -import mekanism.api.GasTransmission; -import mekanism.api.IGasAcceptor; -import mekanism.api.IGasStorage; import mekanism.api.IStorageTank; -import mekanism.api.IStrictEnergyAcceptor; -import mekanism.api.ITubeConnection; import mekanism.api.Object3D; +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.gas.EnumGas; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasAcceptor; +import mekanism.api.gas.IGasStorage; +import mekanism.api.gas.ITubeConnection; import mekanism.common.ChargeUtils; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileEntityElectricBlock; -import mekanism.generators.common.BlockGenerator.GeneratorType; +import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.block.BlockGenerator.GeneratorType; import mekanism.generators.common.network.PacketElectrolyticSeparatorParticle; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -33,6 +35,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import com.google.common.io.ByteArrayDataInput; import dan200.computer.api.IComputerAccess; diff --git a/common/mekanism/generators/common/TileEntityGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityGenerator.java similarity index 97% rename from common/mekanism/generators/common/TileEntityGenerator.java rename to common/mekanism/generators/common/tileentity/TileEntityGenerator.java index e996ffaf2..521d26c2c 100644 --- a/common/mekanism/generators/common/TileEntityGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.common; +package mekanism.generators.common.tileentity; import ic2.api.energy.tile.IEnergySource; import ic2.api.tile.IEnergyStorage; @@ -6,9 +6,9 @@ import ic2.api.tile.IEnergyStorage; import java.util.ArrayList; import java.util.EnumSet; -import mekanism.api.ICableOutputter; import mekanism.api.Object3D; -import mekanism.api.TransmissionType; +import mekanism.api.energy.ICableOutputter; +import mekanism.api.transmitters.TransmissionType; import mekanism.client.IHasSound; import mekanism.common.CableUtils; import mekanism.common.IActiveState; @@ -17,8 +17,9 @@ import mekanism.common.Mekanism; import mekanism.common.MekanismUtils; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileEntityElectricBlock; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.generators.common.MekanismGenerators; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/common/mekanism/generators/common/TileEntityHeatGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java similarity index 98% rename from common/mekanism/generators/common/TileEntityHeatGenerator.java rename to common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java index a199945ed..db90cd057 100644 --- a/common/mekanism/generators/common/TileEntityHeatGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java @@ -1,9 +1,10 @@ -package mekanism.generators.common; +package mekanism.generators.common.tileentity; import java.util.ArrayList; import mekanism.common.ChargeUtils; import mekanism.common.MekanismUtils; +import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,6 +17,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + import com.google.common.io.ByteArrayDataInput; import dan200.computer.api.IComputerAccess; diff --git a/common/mekanism/generators/common/TileEntityHydrogenGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java similarity index 96% rename from common/mekanism/generators/common/TileEntityHydrogenGenerator.java rename to common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java index 51cef6384..25f6b7035 100644 --- a/common/mekanism/generators/common/TileEntityHydrogenGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java @@ -1,17 +1,19 @@ -package mekanism.generators.common; +package mekanism.generators.common.tileentity; import java.util.ArrayList; -import mekanism.api.EnumGas; -import mekanism.api.IGasAcceptor; -import mekanism.api.IGasStorage; import mekanism.api.IStorageTank; -import mekanism.api.ITubeConnection; +import mekanism.api.gas.EnumGas; +import mekanism.api.gas.IGasAcceptor; +import mekanism.api.gas.IGasStorage; +import mekanism.api.gas.ITubeConnection; import mekanism.common.ChargeUtils; import mekanism.common.MekanismUtils; +import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.ForgeDirection; + import com.google.common.io.ByteArrayDataInput; import dan200.computer.api.IComputerAccess; diff --git a/common/mekanism/generators/common/TileEntitySolarGenerator.java b/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java similarity index 95% rename from common/mekanism/generators/common/TileEntitySolarGenerator.java rename to common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java index 6e96b6503..d0c2431c2 100644 --- a/common/mekanism/generators/common/TileEntitySolarGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java @@ -1,14 +1,16 @@ -package mekanism.generators.common; +package mekanism.generators.common.tileentity; import java.util.ArrayList; import mekanism.api.Object3D; import mekanism.common.ChargeUtils; import mekanism.common.MekanismUtils; -import mekanism.generators.common.BlockGenerator.GeneratorType; +import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.block.BlockGenerator.GeneratorType; import micdoodle8.mods.galacticraft.API.ISolarLevel; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; + import com.google.common.io.ByteArrayDataInput; import dan200.computer.api.IComputerAccess; diff --git a/common/mekanism/generators/common/TileEntityWindTurbine.java b/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java similarity index 96% rename from common/mekanism/generators/common/TileEntityWindTurbine.java rename to common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java index aa3f7582b..d75de35e0 100644 --- a/common/mekanism/generators/common/TileEntityWindTurbine.java +++ b/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java @@ -1,9 +1,10 @@ -package mekanism.generators.common; +package mekanism.generators.common.tileentity; import mekanism.api.Object3D; import mekanism.common.ChargeUtils; import mekanism.common.IBoundingBlock; import mekanism.common.MekanismUtils; +import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.ItemStack; import dan200.computer.api.IComputerAccess; diff --git a/common/mekanism/tools/common/MekanismTools.java b/common/mekanism/tools/common/MekanismTools.java index d356a1d8c..2d8fcf104 100644 --- a/common/mekanism/tools/common/MekanismTools.java +++ b/common/mekanism/tools/common/MekanismTools.java @@ -6,6 +6,13 @@ import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.MekanismRecipe; import mekanism.common.Version; +import mekanism.tools.item.ItemMekanismArmor; +import mekanism.tools.item.ItemMekanismAxe; +import mekanism.tools.item.ItemMekanismHoe; +import mekanism.tools.item.ItemMekanismPaxel; +import mekanism.tools.item.ItemMekanismPickaxe; +import mekanism.tools.item.ItemMekanismShovel; +import mekanism.tools.item.ItemMekanismSword; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.item.EnumArmorMaterial; diff --git a/common/mekanism/tools/common/ItemMekanismArmor.java b/common/mekanism/tools/item/ItemMekanismArmor.java similarity index 97% rename from common/mekanism/tools/common/ItemMekanismArmor.java rename to common/mekanism/tools/item/ItemMekanismArmor.java index e16fc3bd4..d7e8ef97c 100644 --- a/common/mekanism/tools/common/ItemMekanismArmor.java +++ b/common/mekanism/tools/item/ItemMekanismArmor.java @@ -1,4 +1,4 @@ -package mekanism.tools.common; +package mekanism.tools.item; import java.util.List; diff --git a/common/mekanism/tools/common/ItemMekanismAxe.java b/common/mekanism/tools/item/ItemMekanismAxe.java similarity index 96% rename from common/mekanism/tools/common/ItemMekanismAxe.java rename to common/mekanism/tools/item/ItemMekanismAxe.java index 0a20fcb28..3b601ef22 100644 --- a/common/mekanism/tools/common/ItemMekanismAxe.java +++ b/common/mekanism/tools/item/ItemMekanismAxe.java @@ -1,4 +1,4 @@ -package mekanism.tools.common; +package mekanism.tools.item; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/common/mekanism/tools/common/ItemMekanismHoe.java b/common/mekanism/tools/item/ItemMekanismHoe.java similarity index 97% rename from common/mekanism/tools/common/ItemMekanismHoe.java rename to common/mekanism/tools/item/ItemMekanismHoe.java index 158e9e22a..b90c2124c 100644 --- a/common/mekanism/tools/common/ItemMekanismHoe.java +++ b/common/mekanism/tools/item/ItemMekanismHoe.java @@ -1,8 +1,8 @@ -package mekanism.tools.common; +package mekanism.tools.item; import java.util.List; -import mekanism.common.ItemMekanism; +import mekanism.common.item.ItemMekanism; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/tools/common/ItemMekanismPaxel.java b/common/mekanism/tools/item/ItemMekanismPaxel.java similarity index 98% rename from common/mekanism/tools/common/ItemMekanismPaxel.java rename to common/mekanism/tools/item/ItemMekanismPaxel.java index aea162868..9749dc7b9 100644 --- a/common/mekanism/tools/common/ItemMekanismPaxel.java +++ b/common/mekanism/tools/item/ItemMekanismPaxel.java @@ -1,4 +1,4 @@ -package mekanism.tools.common; +package mekanism.tools.item; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/common/mekanism/tools/common/ItemMekanismPickaxe.java b/common/mekanism/tools/item/ItemMekanismPickaxe.java similarity index 98% rename from common/mekanism/tools/common/ItemMekanismPickaxe.java rename to common/mekanism/tools/item/ItemMekanismPickaxe.java index 6c426be46..92254e5c8 100644 --- a/common/mekanism/tools/common/ItemMekanismPickaxe.java +++ b/common/mekanism/tools/item/ItemMekanismPickaxe.java @@ -1,4 +1,4 @@ -package mekanism.tools.common; +package mekanism.tools.item; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/common/mekanism/tools/common/ItemMekanismShovel.java b/common/mekanism/tools/item/ItemMekanismShovel.java similarity index 96% rename from common/mekanism/tools/common/ItemMekanismShovel.java rename to common/mekanism/tools/item/ItemMekanismShovel.java index f9fd655f9..5be7ba0cd 100644 --- a/common/mekanism/tools/common/ItemMekanismShovel.java +++ b/common/mekanism/tools/item/ItemMekanismShovel.java @@ -1,4 +1,4 @@ -package mekanism.tools.common; +package mekanism.tools.item; import net.minecraft.block.Block; import net.minecraft.item.EnumToolMaterial; diff --git a/common/mekanism/tools/common/ItemMekanismSword.java b/common/mekanism/tools/item/ItemMekanismSword.java similarity index 96% rename from common/mekanism/tools/common/ItemMekanismSword.java rename to common/mekanism/tools/item/ItemMekanismSword.java index 8e12ba18f..24f9f1ccb 100644 --- a/common/mekanism/tools/common/ItemMekanismSword.java +++ b/common/mekanism/tools/item/ItemMekanismSword.java @@ -1,4 +1,4 @@ -package mekanism.tools.common; +package mekanism.tools.item; import java.util.List; diff --git a/common/mekanism/tools/common/ItemMekanismTool.java b/common/mekanism/tools/item/ItemMekanismTool.java similarity index 96% rename from common/mekanism/tools/common/ItemMekanismTool.java rename to common/mekanism/tools/item/ItemMekanismTool.java index 12b0777ca..c19c0aebf 100644 --- a/common/mekanism/tools/common/ItemMekanismTool.java +++ b/common/mekanism/tools/item/ItemMekanismTool.java @@ -1,4 +1,4 @@ -package mekanism.tools.common; +package mekanism.tools.item; import java.util.List;