diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 9d4590fa8..b51ea9f8e 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -142,7 +142,6 @@ import mekanism.common.item.ItemSeismicReader; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.multiblock.MultiblockManager; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBin; @@ -160,7 +159,6 @@ import mekanism.common.tile.TileEntityCrusher; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; -import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityEliteFactory; @@ -193,6 +191,8 @@ import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.tile.TileEntityThermalEvaporationController; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.prefab.TileEntityElectricMachine; import mekanism.common.tile.transmitter.TileEntityDiversionTransporter; import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter; import mekanism.common.tile.transmitter.TileEntityMechanicalPipe; diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 2cb5eec36..ac3ccef8f 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -19,7 +19,7 @@ import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import mekanism.common.util.LangUtils; import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java index c94fc277a..ab12e5cd6 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInjectionChamber.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiCombiner.java b/src/main/java/mekanism/client/gui/GuiCombiner.java index 358e22677..8b7dfb9bb 100644 --- a/src/main/java/mekanism/client/gui/GuiCombiner.java +++ b/src/main/java/mekanism/client/gui/GuiCombiner.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiCrusher.java b/src/main/java/mekanism/client/gui/GuiCrusher.java index e3557a5ad..368c8d42c 100644 --- a/src/main/java/mekanism/client/gui/GuiCrusher.java +++ b/src/main/java/mekanism/client/gui/GuiCrusher.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.tile.TileEntityElectricMachine; +import mekanism.common.tile.prefab.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index 96fd2b111..b351d4c53 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -17,7 +17,7 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.common.inventory.container.ContainerElectricMachine; -import mekanism.common.tile.TileEntityElectricMachine; +import mekanism.common.tile.prefab.TileEntityElectricMachine; import mekanism.common.util.LangUtils; import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java index 1503e37af..a88b5cfd4 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java +++ b/src/main/java/mekanism/client/gui/GuiEnergizedSmelter.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.tile.TileEntityElectricMachine; +import mekanism.common.tile.prefab.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java index 0808c3f6f..ace10b6bc 100644 --- a/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java +++ b/src/main/java/mekanism/client/gui/GuiEnrichmentChamber.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.tile.TileEntityElectricMachine; +import mekanism.common.tile.prefab.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 830e3e6ab..b6684a510 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -10,7 +10,7 @@ import mekanism.client.gui.element.GuiElement; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java index 02d63182e..a4c0cb086 100644 --- a/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java +++ b/src/main/java/mekanism/client/gui/GuiOsmiumCompressor.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java index a0b7c801b..315db642e 100644 --- a/src/main/java/mekanism/client/gui/GuiPurificationChamber.java +++ b/src/main/java/mekanism/client/gui/GuiPurificationChamber.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress.ProgressBar; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java index 484f66335..a365da363 100644 --- a/src/main/java/mekanism/client/gui/GuiSideConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiSideConfiguration.java @@ -19,8 +19,8 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java index b98b87132..681b8f777 100644 --- a/src/main/java/mekanism/client/gui/GuiTransporterConfig.java +++ b/src/main/java/mekanism/client/gui/GuiTransporterConfig.java @@ -16,8 +16,8 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 136e30bfa..ed112445f 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -59,7 +59,6 @@ import mekanism.common.inventory.container.ContainerThermalEvaporationController import mekanism.common.inventory.container.ContainerUpgradeManagement; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityBoilerCasing; @@ -73,12 +72,10 @@ import mekanism.common.tile.TileEntityChemicalInjectionChamber; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalWasher; import mekanism.common.tile.TileEntityCombiner; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityCrusher; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; -import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityEliteFactory; @@ -111,6 +108,9 @@ import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.tile.TileEntityThermalEvaporationController; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.prefab.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityElectricMachine; import mekanism.common.tile.transmitter.TileEntityDiversionTransporter; import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter; import mekanism.common.tile.transmitter.TileEntityMechanicalPipe; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 6bea737e5..bd397a3e4 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -82,7 +82,6 @@ import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalWasher; -import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityFluidicPlenisher; @@ -102,6 +101,7 @@ import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationValve; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.transmitters.grid.EnergyNetwork.EnergyTransferEvent; import mekanism.common.transmitters.grid.FluidNetwork.FluidTransferEvent; import mekanism.common.transmitters.grid.GasNetwork.GasTransferEvent; diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 4a156d9c1..52ed06033 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -15,7 +15,7 @@ import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.recipe.machines.MachineRecipe; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import mekanism.common.util.LangUtils; import mekanism.common.util.StackUtils; import net.minecraft.block.Block; diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 75ce725de..112995856 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -25,7 +25,6 @@ import mekanism.common.inventory.InventoryBin; import mekanism.common.item.ItemBlockBasic; import mekanism.common.multiblock.IMultiblock; import mekanism.common.multiblock.IStructuralMultiblock; -import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityInductionCell; @@ -35,6 +34,7 @@ import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntitySuperheatingElement; import mekanism.common.tile.TileEntityThermalEvaporationController; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 4585e88c9..b2afc4857 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -14,8 +14,8 @@ import mekanism.common.block.states.BlockStateFacing; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; -import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityEnergyCube; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 7d66543f5..64297680f 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -12,8 +12,8 @@ import mekanism.common.block.states.BlockStateFacing; import mekanism.common.block.states.BlockStateGasTank; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; -import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index f8933a00b..d30e0d308 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -34,15 +34,15 @@ import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMess import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; -import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityChargepad; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityPersonalChest; +import mekanism.common.tile.prefab.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index e5fbc6b0a..86a3310c6 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -5,7 +5,7 @@ import java.util.Map; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.inputs.AdvancedMachineInput; -import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java index 901987ed9..a1bc5e83b 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -4,7 +4,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; -import mekanism.common.tile.TileEntityElectricMachine; +import mekanism.common.tile.prefab.TileEntityElectricMachine; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java index d33b110f4..aa279f50e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFilter.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFilter.java @@ -1,6 +1,6 @@ package mekanism.common.inventory.container; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerNull.java b/src/main/java/mekanism/common/inventory/container/ContainerNull.java index 57275199d..19367463b 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerNull.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerNull.java @@ -1,6 +1,6 @@ package mekanism.common.inventory.container; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java index 5cce2a08c..7bbe35c28 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerUpgradeManagement.java @@ -3,7 +3,7 @@ package mekanism.common.inventory.container; import mekanism.common.base.IUpgradeItem; import mekanism.common.base.IUpgradeTile; import mekanism.common.inventory.slot.SlotMachineUpgrade; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 5bb398a5d..08a7826ed 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -41,10 +41,10 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; -import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; +import mekanism.common.tile.prefab.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index cd4798933..802ad3489 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -8,7 +8,7 @@ import mekanism.common.base.IRedstoneControl; import mekanism.common.base.IRedstoneControl.RedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.capabilities.Capabilities; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 7c40d59a8..4ff0fdcbf 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -16,9 +16,9 @@ import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.component.TileComponentConfig; +import mekanism.common.tile.prefab.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/common/item/ItemTierInstaller.java b/src/main/java/mekanism/common/item/ItemTierInstaller.java index ba783a20e..c7ffec555 100644 --- a/src/main/java/mekanism/common/item/ItemTierInstaller.java +++ b/src/main/java/mekanism/common/item/ItemTierInstaller.java @@ -3,7 +3,7 @@ package mekanism.common.item; import mekanism.common.Tier.BaseTier; import mekanism.common.base.IMetaItem; import mekanism.common.base.ITierUpgradeable; -import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java index 9b721874d..6b1f1465e 100644 --- a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.common.PacketHandler; -import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityInternalMultiblock extends TileEntityBasicBlock diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index df1bc6cde..05a36b884 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -14,7 +14,7 @@ import mekanism.common.base.ITileNetwork; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index f4fb22f79..d2a26e761 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -19,8 +19,8 @@ import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index 8beca8bba..e08e3c901 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -13,8 +13,8 @@ import mekanism.common.PacketHandler; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java index 533ebb5ed..cbdd1a102 100644 --- a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java +++ b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java @@ -13,8 +13,8 @@ import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerOredictionificator; import mekanism.common.network.PacketOredictionificatorGui.OredictionificatorGuiMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityOredictionificator; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java index 7188d0b41..d4538f8b7 100644 --- a/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java +++ b/src/main/java/mekanism/common/network/PacketRemoveUpgrade.java @@ -6,7 +6,7 @@ import mekanism.common.PacketHandler; import mekanism.common.Upgrade; import mekanism.common.base.IUpgradeTile; import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage; -import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/mekanism/common/network/PacketSimpleGui.java b/src/main/java/mekanism/common/network/PacketSimpleGui.java index 6c6796ac3..739a32bdf 100644 --- a/src/main/java/mekanism/common/network/PacketSimpleGui.java +++ b/src/main/java/mekanism/common/network/PacketSimpleGui.java @@ -10,7 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.base.IGuiProvider; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; -import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java index 8610d5a4e..b5b6205ad 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java +++ b/src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java @@ -13,6 +13,7 @@ import mekanism.api.gas.ITubeConnection; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.IntegerInput; import mekanism.common.recipe.machines.AmbientGasRecipe; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 7e6fde918..b7f9bdc7c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -18,6 +18,7 @@ import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; import mekanism.common.item.ItemBlockBasic; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.LangUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 966f24a72..50e41d4c7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -11,6 +11,7 @@ import mekanism.common.base.ITileNetwork; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java index 2c6cfe345..35ceb290e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java @@ -13,6 +13,7 @@ import mekanism.common.recipe.machines.ChanceMachineRecipe; import mekanism.common.recipe.outputs.ChanceOutput; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.prefab.TileEntityBasicMachine; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; @@ -23,9 +24,9 @@ import net.minecraft.util.ResourceLocation; public abstract class TileEntityChanceMachine> extends TileEntityBasicMachine { - public TileEntityChanceMachine(String soundPath, String name, int ticksRequired, double maxEnergy, double baseEnergyUsage, ResourceLocation location) + public TileEntityChanceMachine(String soundPath, String name, double maxEnergy, double baseEnergyUsage, int ticksRequired, ResourceLocation location) { - super(soundPath, name, ticksRequired, maxEnergy, baseEnergyUsage, 3, location); + super(soundPath, name, maxEnergy, baseEnergyUsage, 3, ticksRequired, location); configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 03dd23736..d769bfe39 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -19,6 +19,7 @@ import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.prefab.TileEntityNoisyBlock; import mekanism.common.util.MekanismUtils; import net.darkhax.tesla.api.ITeslaConsumer; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index d1b156598..278936cba 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -15,7 +15,6 @@ import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; -import mekanism.common.Upgrade; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; @@ -27,7 +26,7 @@ import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; -import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.tile.prefab.TileEntityOperationalMachine; import mekanism.common.util.ChargeUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; @@ -40,18 +39,12 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; -public class TileEntityChemicalCrystallizer extends TileEntityMachine implements IGasHandler, ITubeConnection, ISideConfiguration, ISustainedData, ITankManager, IConfigCardAccess +public class TileEntityChemicalCrystallizer extends TileEntityOperationalMachine implements IGasHandler, ITubeConnection, ISideConfiguration, ISustainedData, ITankManager, IConfigCardAccess { public static final int MAX_GAS = 10000; public GasTank inputTank = new GasTank(MAX_GAS); - public int operatingTicks; - - public int BASE_TICKS_REQUIRED = 200; - - public int ticksRequired = 200; - public CrystallizerRecipe cachedRecipe; public TileComponentEjector ejectorComponent; @@ -59,7 +52,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityMachine implements public TileEntityChemicalCrystallizer() { - super("machine.crystallizer", "ChemicalCrystallizer", BlockStateMachine.MachineType.CHEMICAL_CRYSTALLIZER.baseEnergy, usage.chemicalCrystallizerUsage, 3); + super("machine.crystallizer", "ChemicalCrystallizer", BlockStateMachine.MachineType.CHEMICAL_CRYSTALLIZER.baseEnergy, usage.chemicalCrystallizerUsage, 3, 200); configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY, TransmissionType.GAS); @@ -80,8 +73,6 @@ public class TileEntityChemicalCrystallizer extends TileEntityMachine implements ejectorComponent = new TileComponentEjector(this); ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2)); - - securityComponent = new TileComponentSecurity(this); } @Override @@ -168,8 +159,6 @@ public class TileEntityChemicalCrystallizer extends TileEntityMachine implements if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { - operatingTicks = dataStream.readInt(); - if(dataStream.readBoolean()) { inputTank.setGas(new GasStack(GasRegistry.getGas(dataStream.readInt()), dataStream.readInt())); @@ -185,8 +174,6 @@ public class TileEntityChemicalCrystallizer extends TileEntityMachine implements { super.getNetworkedData(data); - data.add(operatingTicks); - if(inputTank.getGas() != null) { data.add(true); @@ -205,7 +192,6 @@ public class TileEntityChemicalCrystallizer extends TileEntityMachine implements { super.readFromNBT(nbtTags); - operatingTicks = nbtTags.getInteger("operatingTicks"); inputTank.read(nbtTags.getCompoundTag("rightTank")); } @@ -214,8 +200,6 @@ public class TileEntityChemicalCrystallizer extends TileEntityMachine implements { super.writeToNBT(nbtTags); - nbtTags.setInteger("operatingTicks", operatingTicks); - nbtTags.setTag("rightTank", inputTank.write(new NBTTagCompound())); nbtTags.setBoolean("sideDataStored", true); @@ -228,11 +212,6 @@ public class TileEntityChemicalCrystallizer extends TileEntityMachine implements { return i != 0 && i != 1; } - - public double getScaledProgress() - { - return ((double)operatingTicks) / (double)ticksRequired; - } @Override public boolean canTubeConnect(EnumFacing side) @@ -362,22 +341,6 @@ public class TileEntityChemicalCrystallizer extends TileEntityMachine implements { inputTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "inputTank"))); } - - @Override - public void recalculateUpgradables(Upgrade upgrade) - { - super.recalculateUpgradables(upgrade); - - switch(upgrade) - { - case SPEED: - ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED); - energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE); - break; - default: - break; - } - } @Override public Object[] getTanks() diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index aa0a884fa..883a79c57 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -22,6 +22,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.DissolutionRecipe; import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.tile.prefab.TileEntityMachine; import mekanism.common.util.ChargeUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index db8e542a1..140f34e82 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -25,6 +25,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ChemicalPairInput; import mekanism.common.recipe.machines.ChemicalInfuserRecipe; import mekanism.common.security.ISecurityTile; +import mekanism.common.tile.prefab.TileEntityMachine; import mekanism.common.util.ChargeUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index d1fff7527..0a8965102 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -15,6 +15,7 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.InjectionRecipe; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; @@ -26,7 +27,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr { public TileEntityChemicalInjectionChamber() { - super("injection", "ChemicalInjectionChamber", usage.chemicalInjectionChamberUsage, 1, 200, BlockStateMachine.MachineType.CHEMICAL_INJECTION_CHAMBER.baseEnergy); + super("injection", "ChemicalInjectionChamber", BlockStateMachine.MachineType.CHEMICAL_INJECTION_CHAMBER.baseEnergy, usage.chemicalInjectionChamberUsage, 200, 1); configComponent.addSupported(TransmissionType.GAS); configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index 4a1f4f4a8..76335b93f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -9,7 +9,6 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.common.Upgrade; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; import mekanism.common.block.states.BlockStateMachine; @@ -18,6 +17,7 @@ import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.OxidationRecipe; +import mekanism.common.tile.prefab.TileEntityOperationalMachine; import mekanism.common.util.ChargeUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; @@ -32,7 +32,7 @@ import net.minecraft.util.NonNullList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; -public class TileEntityChemicalOxidizer extends TileEntityMachine implements ITubeConnection, ISustainedData, ITankManager +public class TileEntityChemicalOxidizer extends TileEntityOperationalMachine implements ITubeConnection, ISustainedData, ITankManager { public GasTank gasTank = new GasTank(MAX_GAS); @@ -40,17 +40,11 @@ public class TileEntityChemicalOxidizer extends TileEntityMachine implements ITu public int gasOutput = 256; - public int operatingTicks = 0; - - public int BASE_TICKS_REQUIRED = 100; - - public int ticksRequired = BASE_TICKS_REQUIRED; - public OxidationRecipe cachedRecipe; public TileEntityChemicalOxidizer() { - super("machine.oxidizer", "ChemicalOxidizer", BlockStateMachine.MachineType.CHEMICAL_OXIDIZER.baseEnergy, usage.rotaryCondensentratorUsage, 3); + super("machine.oxidizer", "ChemicalOxidizer", BlockStateMachine.MachineType.CHEMICAL_OXIDIZER.baseEnergy, usage.rotaryCondensentratorUsage, 3, 100); inventory = NonNullList.withSize(4, ItemStack.EMPTY); } @@ -149,11 +143,6 @@ public class TileEntityChemicalOxidizer extends TileEntityMachine implements ITu return InventoryUtils.EMPTY; } - public double getScaledProgress() - { - return ((double)operatingTicks) / ((double)ticksRequired); - } - public OxidationRecipe getRecipe() { ItemStackInput input = getInput(); @@ -190,8 +179,6 @@ public class TileEntityChemicalOxidizer extends TileEntityMachine implements ITu if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { - operatingTicks = dataStream.readInt(); - if(dataStream.readBoolean()) { gasTank.setGas(new GasStack(GasRegistry.getGas(dataStream.readInt()), dataStream.readInt())); @@ -207,8 +194,6 @@ public class TileEntityChemicalOxidizer extends TileEntityMachine implements ITu { super.getNetworkedData(data); - data.add(operatingTicks); - if(gasTank.getGas() != null) { data.add(true); @@ -227,7 +212,6 @@ public class TileEntityChemicalOxidizer extends TileEntityMachine implements ITu { super.readFromNBT(nbtTags); - operatingTicks = nbtTags.getInteger("operatingTicks"); gasTank.read(nbtTags.getCompoundTag("gasTank")); } @@ -236,7 +220,6 @@ public class TileEntityChemicalOxidizer extends TileEntityMachine implements ITu { super.writeToNBT(nbtTags); - nbtTags.setInteger("operatingTicks", operatingTicks); nbtTags.setTag("gasTank", gasTank.write(new NBTTagCompound())); return nbtTags; @@ -285,22 +268,6 @@ public class TileEntityChemicalOxidizer extends TileEntityMachine implements ITu { gasTank.setGas(GasStack.readFromNBT(ItemDataUtils.getCompound(itemStack, "gasTank"))); } - - @Override - public void recalculateUpgradables(Upgrade upgrade) - { - super.recalculateUpgradables(upgrade); - - switch(upgrade) - { - case SPEED: - ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED); - energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE); - break; - default: - break; - } - } @Override public Object[] getTanks() diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 8725c19e4..5cd5f7e78 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -26,6 +26,7 @@ import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.GasInput; import mekanism.common.recipe.machines.WasherRecipe; +import mekanism.common.tile.prefab.TileEntityMachine; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.FluidContainerUtils.FluidChecker; diff --git a/src/main/java/mekanism/common/tile/TileEntityCombiner.java b/src/main/java/mekanism/common/tile/TileEntityCombiner.java index f396411a0..9a0fa53cc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCombiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityCombiner.java @@ -9,6 +9,7 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.CombinerRecipe; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; @@ -18,7 +19,7 @@ public class TileEntityCombiner extends TileEntityAdvancedElectricMachine { public TileEntityCrusher() { - super("crusher", "Crusher", 200, BlockStateMachine.MachineType.CRUSHER.baseEnergy, usage.crusherUsage); + super("crusher", "Crusher", BlockStateMachine.MachineType.CRUSHER.baseEnergy, usage.crusherUsage, 200); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index ea71c820a..d03a6e0af 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -41,6 +41,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.component.TileComponentChunkLoader; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 816a25563..b84590e32 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -28,6 +28,7 @@ import mekanism.common.integration.IComputerIntegration; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 00e8ff698..e42f766a4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -5,8 +5,6 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.List; -import mekanism.api.Coord4D; -import mekanism.api.Range4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -14,31 +12,25 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.common.Mekanism; import mekanism.common.MekanismFluids; import mekanism.common.Upgrade; import mekanism.common.Upgrade.IUpgradeInfoHandler; import mekanism.common.base.FluidHandlerWrapper; -import mekanism.common.base.IActiveState; import mekanism.common.base.IFluidHandlerWrapper; -import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISustainedData; import mekanism.common.base.ITankManager; -import mekanism.common.base.IUpgradeTile; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.capabilities.Capabilities; -import mekanism.common.config.MekanismConfig; import mekanism.common.integration.IComputerIntegration; -import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.FluidInput; import mekanism.common.recipe.machines.SeparatorRecipe; import mekanism.common.recipe.outputs.ChemicalPairOutput; -import mekanism.common.security.ISecurityTile; import mekanism.common.tile.TileEntityGasTank.GasMode; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.tile.prefab.TileEntityMachine; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.GasUtils; @@ -61,7 +53,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.ByteBufUtils; -public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IFluidHandlerWrapper, IComputerIntegration, ITubeConnection, ISustainedData, IGasHandler, IUpgradeTile, IUpgradeInfoHandler, ITankManager, IRedstoneControl, IActiveState, ISecurityTile +public class TileEntityElectrolyticSeparator extends TileEntityMachine implements IFluidHandlerWrapper, IComputerIntegration, ITubeConnection, ISustainedData, IGasHandler, IUpgradeInfoHandler, ITankManager { /** This separator's water slot. */ public FluidTank fluidTank = new FluidTank(24000); @@ -83,18 +75,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp /** Type type of gas this block is dumping. */ public GasMode dumpRight = GasMode.IDLE; - - public double BASE_ENERGY_USAGE; - - public double energyPerTick; - - public int updateDelay; - - public boolean isActive = false; - - public boolean clientActive = false; - - public double prevEnergy; public SeparatorRecipe cachedRecipe; @@ -108,7 +88,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp public TileEntityElectrolyticSeparator() { - super("ElectrolyticSeparator", BlockStateMachine.MachineType.ELECTROLYTIC_SEPARATOR.baseEnergy); + super("machine.electrolyticseparator", "ElectrolyticSeparator", BlockStateMachine.MachineType.ELECTROLYTIC_SEPARATOR.baseEnergy, 0, 4); inventory = NonNullList.withSize(5, ItemStack.EMPTY); } @@ -117,29 +97,8 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { super.onUpdate(); - if(world.isRemote && updateDelay > 0) - { - updateDelay--; - - if(updateDelay == 0 && clientActive != isActive) - { - isActive = clientActive; - MekanismUtils.updateBlock(world, getPos()); - } - } - if(!world.isRemote) { - if(updateDelay > 0) - { - updateDelay--; - - if(updateDelay == 0 && clientActive != isActive) - { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } - } - ChargeUtils.discharge(3, this); if(!inventory.get(0).isEmpty()) @@ -171,9 +130,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { setActive(true); - boolean update = BASE_ENERGY_USAGE != recipe.energyUsage; + boolean update = BASE_ENERGY_PER_TICK != recipe.energyUsage; - BASE_ENERGY_USAGE = recipe.energyUsage; + BASE_ENERGY_PER_TICK = recipe.energyUsage; if(update) { @@ -395,18 +354,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp rightTank.setGas(null); } - controlType = RedstoneControl.values()[dataStream.readInt()]; dumpLeft = GasMode.values()[dataStream.readInt()]; dumpRight = GasMode.values()[dataStream.readInt()]; - clientActive = dataStream.readBoolean(); clientEnergyUsed = dataStream.readDouble(); - - if(updateDelay == 0 && clientActive != isActive) - { - updateDelay = MekanismConfig.general.UPDATE_DELAY; - isActive = clientActive; - MekanismUtils.updateBlock(world, getPos()); - } } } @@ -445,10 +395,8 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp data.add(false); } - data.add(controlType.ordinal()); data.add(dumpLeft.ordinal()); data.add(dumpRight.ordinal()); - data.add(isActive); data.add(clientEnergyUsed); return data; @@ -470,9 +418,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp fluidTank.readFromNBT(nbtTags.getCompoundTag("fluidTank")); } - isActive = nbtTags.getBoolean("isActive"); - controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; - leftTank.read(nbtTags.getCompoundTag("leftTank")); rightTank.read(nbtTags.getCompoundTag("rightTank")); @@ -490,9 +435,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp nbtTags.setTag("fluidTank", fluidTank.writeToNBT(new NBTTagCompound())); } - nbtTags.setBoolean("isActive", isActive); - nbtTags.setInteger("controlType", controlType.ordinal()); - nbtTags.setTag("leftTank", leftTank.write(new NBTTagCompound())); nbtTags.setTag("rightTank", rightTank.write(new NBTTagCompound())); @@ -678,85 +620,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp return super.getCapability(capability, side); } - - @Override - public RedstoneControl getControlType() - { - return controlType; - } - - @Override - public void setControlType(RedstoneControl type) - { - controlType = type; - MekanismUtils.saveChunk(this); - } - - @Override - public boolean canPulse() - { - return false; - } - - @Override - public void setActive(boolean active) - { - isActive = active; - - if(clientActive != active && updateDelay == 0) - { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - - updateDelay = 10; - clientActive = active; - } - } - - @Override - public boolean getActive() - { - return isActive; - } - - @Override - public boolean renderUpdate() - { - return false; - } - - @Override - public boolean lightUpdate() - { - return true; - } - - @Override - public TileComponentUpgrade getComponent() - { - return upgradeComponent; - } - - @Override - public TileComponentSecurity getSecurity() - { - return securityComponent; - } - - @Override - public void recalculateUpgradables(Upgrade upgrade) - { - super.recalculateUpgradables(upgrade); - - switch(upgrade) - { - case ENERGY: - maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY); - energyPerTick = BASE_ENERGY_USAGE; //Don't scale energy usage. - setEnergy(Math.min(getMaxEnergy(), getEnergy())); - default: - break; - } - } @Override public List getInfo(Upgrade upgrade) diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java index 6d8df9234..9a15b8f80 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java @@ -7,12 +7,13 @@ import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.SmeltingRecipe; +import mekanism.common.tile.prefab.TileEntityElectricMachine; public class TileEntityEnergizedSmelter extends TileEntityElectricMachine { public TileEntityEnergizedSmelter() { - super("smelter", "EnergizedSmelter", 200, BlockStateMachine.MachineType.ENERGIZED_SMELTER.baseEnergy, usage.energizedSmelterUsage); + super("smelter", "EnergizedSmelter", BlockStateMachine.MachineType.ENERGIZED_SMELTER.baseEnergy, usage.energizedSmelterUsage, 200); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 1bfee20c8..6b2eda933 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -22,6 +22,7 @@ import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.CableUtils; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java index 2e11e16f1..898e98a95 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java @@ -6,6 +6,7 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.EnrichmentRecipe; +import mekanism.common.tile.prefab.TileEntityElectricMachine; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -13,7 +14,7 @@ public class TileEntityEnrichmentChamber extends TileEntityElectricMachine capability, EnumFacing side) diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index db5a595ca..60fe361e3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -14,6 +14,7 @@ import mekanism.common.multiblock.MultiblockManager; import mekanism.common.multiblock.SynchronizedData; import mekanism.common.multiblock.UpdateProtocol; import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index d0b4d691b..54fa60fd4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -20,6 +20,7 @@ import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index fec8a2f41..2fc6ab456 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -9,6 +9,7 @@ import mekanism.common.block.states.BlockStateMachine; import mekanism.common.config.MekanismConfig.usage; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.OsmiumCompressorRecipe; +import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -16,7 +17,7 @@ public class TileEntityOsmiumCompressor extends TileEntityAdvancedElectricMachin { public TileEntityOsmiumCompressor() { - super("compressor", "OsmiumCompressor", usage.osmiumCompressorUsage, 1, 200, BlockStateMachine.MachineType.OSMIUM_COMPRESSOR.baseEnergy); + super("compressor", "OsmiumCompressor", BlockStateMachine.MachineType.OSMIUM_COMPRESSOR.baseEnergy, usage.osmiumCompressorUsage, 200, 1); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index fafb1b8e9..7d47287fa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -30,6 +30,7 @@ import mekanism.common.recipe.machines.PressurizedRecipe; import mekanism.common.recipe.outputs.PressurizedOutput; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.prefab.TileEntityBasicMachine; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; @@ -58,7 +59,7 @@ public class TileEntityPRC extends TileEntityBasicMachine= MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE + recipe.extraEnergy)) + if(canOperate(recipe) && MekanismUtils.canFunction(this) && getEnergy() >= MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK + recipe.extraEnergy)) { boolean update = BASE_TICKS_REQUIRED != recipe.ticks; @@ -114,14 +115,14 @@ public class TileEntityPRC extends TileEntityBasicMachine= ticksRequired && getEnergy() >= MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE + recipe.extraEnergy)) + else if((operatingTicks+1) >= ticksRequired && getEnergy() >= MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK + recipe.extraEnergy)) { operate(recipe); operatingTicks = 0; - electricityStored -= MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE + recipe.extraEnergy); + electricityStored -= MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK + recipe.extraEnergy); } } else { diff --git a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java index 0bad6d2eb..12bea361b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java +++ b/src/main/java/mekanism/common/tile/TileEntityPersonalChest.java @@ -2,6 +2,7 @@ package mekanism.common.tile; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; import mekanism.common.util.SecurityUtils; import net.minecraft.init.SoundEvents; diff --git a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java index 4bd1197ba..49c08c217 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java +++ b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java @@ -16,7 +16,7 @@ public class TileEntityPrecisionSawmill extends TileEntityChanceMachine 0) - { - updateDelay--; - - if(updateDelay == 0 && clientActive != isActive) - { - isActive = clientActive; - MekanismUtils.updateBlock(world, getPos()); - } - } - } - if(!world.isRemote) { - if(updateDelay > 0) - { - updateDelay--; - - if(updateDelay == 0 && clientActive != isActive) - { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } - } - ChargeUtils.discharge(4, this); if(mode == 0) @@ -257,8 +208,6 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { mode = dataStream.readInt(); - isActive = dataStream.readBoolean(); - controlType = RedstoneControl.values()[dataStream.readInt()]; clientEnergyUsed = dataStream.readDouble(); if(dataStream.readBoolean()) @@ -276,13 +225,6 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp else { gasTank.setGas(null); } - - if(updateDelay == 0 && clientActive != isActive) - { - updateDelay = general.UPDATE_DELAY; - isActive = clientActive; - MekanismUtils.updateBlock(world, getPos()); - } } } @@ -292,8 +234,6 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp super.getNetworkedData(data); data.add(mode); - data.add(isActive); - data.add(controlType.ordinal()); data.add(clientEnergyUsed); if(fluidTank.getFluid() != null) @@ -325,9 +265,6 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp super.readFromNBT(nbtTags); mode = nbtTags.getInteger("mode"); - isActive = nbtTags.getBoolean("isActive"); - controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; - gasTank.read(nbtTags.getCompoundTag("gasTank")); if(nbtTags.hasKey("fluidTank")) @@ -342,8 +279,6 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp super.writeToNBT(nbtTags); nbtTags.setInteger("mode", mode); - nbtTags.setBoolean("isActive", isActive); - nbtTags.setInteger("controlType", controlType.ordinal()); nbtTags.setTag("gasTank", gasTank.write(new NBTTagCompound())); if(fluidTank.getFluid() != null) @@ -354,44 +289,6 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp return nbtTags; } - @Override - public boolean canSetFacing(int i) - { - return i != 0 && i != 1; - } - - @Override - public void setActive(boolean active) - { - isActive = active; - - if(clientActive != active && updateDelay == 0) - { - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - - updateDelay = 10; - clientActive = active; - } - } - - @Override - public boolean getActive() - { - return isActive; - } - - @Override - public boolean renderUpdate() - { - return false; - } - - @Override - public boolean lightUpdate() - { - return true; - } - @Override public boolean canTubeConnect(EnumFacing side) { @@ -522,47 +419,6 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp return null; } - @Override - public RedstoneControl getControlType() - { - return controlType; - } - - @Override - public void setControlType(RedstoneControl type) - { - controlType = type; - MekanismUtils.saveChunk(this); - } - - @Override - public boolean canPulse() - { - return false; - } - - @Override - public TileComponentUpgrade getComponent() - { - return upgradeComponent; - } - - @Override - public void recalculateUpgradables(Upgrade upgrade) - { - super.recalculateUpgradables(upgrade); - - switch(upgrade) - { - case ENERGY: - maxEnergy = MekanismUtils.getMaxEnergy(this, BASE_MAX_ENERGY); - energyPerTick = MekanismUtils.getBaseEnergyPerTick(this, BASE_ENERGY_USAGE); - setEnergy(Math.min(getMaxEnergy(), getEnergy())); - default: - break; - } - } - @Override public List getInfo(Upgrade upgrade) { @@ -574,10 +430,4 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp { return new Object[] {gasTank, fluidTank}; } - - @Override - public TileComponentSecurity getSecurity() - { - return securityComponent; - } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index bcccbe9d1..1a2c383d1 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -18,6 +18,7 @@ import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.security.SecurityData; import mekanism.common.security.SecurityFrequency; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index e7e9836ae..3c67dec50 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -17,6 +17,7 @@ import mekanism.common.config.MekanismConfig.usage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index e973164b8..01d316e28 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -31,6 +31,7 @@ import mekanism.common.recipe.machines.SolarNeutronRecipe; import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.GasUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.ListUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 1655020f7..12f0b6dd1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -32,6 +32,7 @@ import mekanism.common.security.ISecurityTile; import mekanism.common.tile.component.TileComponentChunkLoader; import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.tile.component.TileComponentUpgrade; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.ReflectionUtils; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java index fdb06bebc..f341c6630 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationBlock.java @@ -5,6 +5,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.integration.IComputerIntegration; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java index 1a1cff9ca..a1c755798 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentChunkLoader.java @@ -13,7 +13,7 @@ import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeTile; import mekanism.common.chunkloading.IChunkLoader; import mekanism.common.config.MekanismConfig.general; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.math.ChunkPos; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index 449d23b88..d3c303e18 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -13,7 +13,7 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.SideData; import mekanism.common.SideData.IOState; import mekanism.common.base.ITileComponent; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java index d8bdb1b8b..bc1dba58d 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentEjector.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentEjector.java @@ -18,7 +18,7 @@ import mekanism.common.base.ITankManager; import mekanism.common.base.ITileComponent; import mekanism.common.capabilities.Capabilities; import mekanism.common.content.transporter.TransporterManager; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.GasUtils; import mekanism.common.util.InventoryUtils; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java index 006b5c75d..a2af50f49 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java @@ -14,7 +14,7 @@ import mekanism.common.frequency.Frequency; import mekanism.common.frequency.FrequencyManager; import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.security.SecurityFrequency; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.UsernameCache; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 1337edaa1..d61665133 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -15,7 +15,7 @@ import mekanism.common.Upgrade; import mekanism.common.base.ITileComponent; import mekanism.common.base.IUpgradeItem; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.nbt.NBTTagCompound; public class TileComponentUpgrade implements ITileComponent diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java similarity index 97% rename from src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java rename to src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java index e53e5bd13..fe3ceccd1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityAdvancedElectricMachine.java @@ -1,4 +1,4 @@ -package mekanism.common.tile; +package mekanism.common.tile.prefab; import io.netty.buffer.ByteBuf; @@ -23,6 +23,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; +import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.ChargeUtils; @@ -64,9 +65,9 @@ public abstract class TileEntityAdvancedElectricMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityMachine implements IElectricMachine, IComputerIntegration, ISideConfiguration, IConfigCardAccess +public abstract class TileEntityBasicMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityOperationalMachine implements IElectricMachine, IComputerIntegration, ISideConfiguration, IConfigCardAccess { - /** How many ticks this machine has operated for. */ - public int operatingTicks = 0; - - /** Un-upgraded ticks required to operate -- or smelt an item. */ - public int BASE_TICKS_REQUIRED; - - /** Ticks required including upgrades */ - public int ticksRequired; - public ResourceLocation guiLocation; public RECIPE cachedRecipe = null; @@ -51,12 +35,10 @@ public abstract class TileEntityBasicMachine, * @param baseTicksRequired - how many ticks it takes to run a cycle * @param maxEnergy - how much energy this machine can store */ - public TileEntityBasicMachine(String soundPath, String name, int baseTicksRequired, double maxEnergy, double baseEnergyUsage, int upgradeSlot, ResourceLocation location) + public TileEntityBasicMachine(String soundPath, String name, double maxEnergy, double baseEnergyUsage, int upgradeSlot, int baseTicksRequired, ResourceLocation location) { - super("machine." + soundPath, name, maxEnergy, baseEnergyUsage, upgradeSlot); + super("machine." + soundPath, name, maxEnergy, baseEnergyUsage, upgradeSlot, baseTicksRequired); - BASE_TICKS_REQUIRED = baseTicksRequired; - ticksRequired = baseTicksRequired; guiLocation = location; } @@ -66,77 +48,6 @@ public abstract class TileEntityBasicMachine, return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); } - @Override - public void readFromNBT(NBTTagCompound nbtTags) - { - super.readFromNBT(nbtTags); - - operatingTicks = nbtTags.getInteger("operatingTicks"); - } - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) - { - super.writeToNBT(nbtTags); - - nbtTags.setInteger("operatingTicks", operatingTicks); - - return nbtTags; - } - - @Override - public void handlePacketData(ByteBuf dataStream) - { - super.handlePacketData(dataStream); - - if(FMLCommonHandler.instance().getEffectiveSide().isClient()) - { - operatingTicks = dataStream.readInt(); - ticksRequired = dataStream.readInt(); - } - } - - @Override - public ArrayList getNetworkedData(ArrayList data) - { - super.getNetworkedData(data); - - data.add(operatingTicks); - data.add(ticksRequired); - - return data; - } - - /** - * Gets the scaled progress level for the GUI. - */ - public double getScaledProgress() - { - return ((double)operatingTicks) / ((double)ticksRequired); - } - - @Override - public void recalculateUpgradables(Upgrade upgrade) - { - super.recalculateUpgradables(upgrade); - - switch(upgrade) - { - case SPEED: - ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED); - energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_USAGE); - break; - default: - break; - } - } - - @Override - public boolean canSetFacing(int facing) - { - return facing != 0 && facing != 1; - } - @Override public int[] getSlotsForFace(EnumFacing side) { diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java similarity index 99% rename from src/main/java/mekanism/common/tile/TileEntityContainerBlock.java rename to src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java index df7acc601..83397a91b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityContainerBlock.java @@ -1,4 +1,4 @@ -package mekanism.common.tile; +package mekanism.common.tile.prefab; import mekanism.common.Upgrade; import mekanism.common.base.ISustainedInventory; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java similarity index 99% rename from src/main/java/mekanism/common/tile/TileEntityElectricBlock.java rename to src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java index 9a5f9c0cd..8280fefd4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricBlock.java @@ -1,4 +1,4 @@ -package mekanism.common.tile; +package mekanism.common.tile.prefab; import ic2.api.energy.EnergyNet; import ic2.api.energy.event.EnergyTileLoadEvent; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java similarity index 97% rename from src/main/java/mekanism/common/tile/TileEntityElectricMachine.java rename to src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java index b7fb251a1..47bb9ec14 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/prefab/TileEntityElectricMachine.java @@ -1,4 +1,4 @@ -package mekanism.common.tile; +package mekanism.common.tile.prefab; import mekanism.api.EnumColor; import mekanism.api.transmitters.TransmissionType; @@ -13,6 +13,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.recipe.outputs.ItemStackOutput; +import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.component.TileComponentConfig; import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.ChargeUtils; @@ -35,9 +36,9 @@ public abstract class TileEntityElectricMachine getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(operatingTicks); + data.add(ticksRequired); + + return data; + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + operatingTicks = nbtTags.getInteger("operatingTicks"); + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setInteger("operatingTicks", operatingTicks); + + return nbtTags; + } + + @Override + public void recalculateUpgradables(Upgrade upgrade) + { + super.recalculateUpgradables(upgrade); + + switch(upgrade) + { + case SPEED: + ticksRequired = MekanismUtils.getTicks(this, BASE_TICKS_REQUIRED); + energyPerTick = MekanismUtils.getEnergyPerTick(this, BASE_ENERGY_PER_TICK); + break; + default: + break; + } + } +} diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index ce4b9a678..7e4c570fc 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -9,7 +9,7 @@ import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig.general; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.darkhax.tesla.api.ITeslaConsumer; import net.darkhax.tesla.api.ITeslaProducer; import net.minecraft.init.Items; diff --git a/src/main/java/mekanism/common/util/FluidContainerUtils.java b/src/main/java/mekanism/common/util/FluidContainerUtils.java index 063e6a31c..d9a452cbd 100644 --- a/src/main/java/mekanism/common/util/FluidContainerUtils.java +++ b/src/main/java/mekanism/common/util/FluidContainerUtils.java @@ -1,6 +1,6 @@ package mekanism.common.util; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 7c2720e57..9b3efae73 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -5,7 +5,7 @@ import mekanism.common.base.IGuiProvider; import mekanism.common.config.MekanismConfig.generators; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; -import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; import mekanism.generators.common.block.states.BlockStateGenerator.GeneratorType; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.inventory.container.ContainerGasGenerator; diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index f9fc63dbb..f1e7ff397 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -18,10 +18,10 @@ import mekanism.common.config.MekanismConfig.client; import mekanism.common.multiblock.IMultiblock; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; -import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.tile.TileEntityContainerBlock; -import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.tile.TileEntityMultiblock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityContainerBlock; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.SecurityUtils; import mekanism.generators.common.GeneratorsBlocks; diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 6eb14e97c..63a7c3df0 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -6,8 +6,8 @@ import mekanism.client.render.ctm.ICTMBlock; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.block.states.BlockStateBasic; -import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java index f8b15afb9..dbe6ade6f 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java @@ -2,7 +2,7 @@ package mekanism.generators.common.block.states; import mekanism.common.Mekanism; import mekanism.common.block.states.BlockStateBasic; -import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.LangUtils; import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.block.BlockReactor; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index d30f49395..096990f2b 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -22,8 +22,8 @@ import mekanism.common.integration.tesla.TeslaItemWrapper; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; -import mekanism.common.tile.TileEntityBasicBlock; -import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index 88d1c0eeb..54427d7ea 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -16,8 +16,8 @@ import mekanism.common.config.MekanismConfig.general; import mekanism.common.integration.IComputerIntegration; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityTile; -import mekanism.common.tile.TileEntityNoisyBlock; import mekanism.common.tile.component.TileComponentSecurity; +import mekanism.common.tile.prefab.TileEntityNoisyBlock; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.states.BlockStateGenerator; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 11bdafc0a..6f92bf465 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.prefab.TileEntityElectricBlock; import mekanism.generators.common.FusionReactor; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java index 4c99f3bf1..630465491 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityElectromagneticCoil.java @@ -1,6 +1,6 @@ package mekanism.generators.common.tile.turbine; -import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; public class TileEntityElectromagneticCoil extends TileEntityBasicBlock { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntitySaturatingCondenser.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntitySaturatingCondenser.java index e2450155a..40351c118 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntitySaturatingCondenser.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntitySaturatingCondenser.java @@ -1,6 +1,6 @@ package mekanism.generators.common.tile.turbine; -import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; public class TileEntitySaturatingCondenser extends TileEntityBasicBlock { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java index d6f66e43d..6dcf25102 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java @@ -10,7 +10,7 @@ import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.prefab.TileEntityBasicBlock; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/resources/assets/mekanism/sounds.json b/src/main/resources/assets/mekanism/sounds.json index 75e60a50f..6a82f604a 100644 --- a/src/main/resources/assets/mekanism/sounds.json +++ b/src/main/resources/assets/mekanism/sounds.json @@ -38,6 +38,8 @@ "tile.machine.laser": {"category": "block", "sounds": [{"name": "mekanism:Laser", "stream": false}]}, "tile.machine.fusionreactor": {"category": "block", "sounds": [{"name": "mekanism:FusionReactor", "stream": false}]}, "tile.machine.resistiveheater": {"category": "block", "sounds": [{"name": "mekanism:ResistiveHeater", "stream": false}]}, + "tile.machine.electrolyticseparator": {"category": "block", "sounds": [{"name": "mekanism:ElectrolyticSeparator", "stream": false}]}, + "tile.machine.rotarycondensentrator": {"category": "block", "sounds": [{"name": "mekanism:RotaryCondensentrator", "stream": false}]}, "tile.christmas.1": {"category": "block", "sounds": [{"name": "mekanism:holiday/Nutcracker1", "stream": false}]}, "tile.christmas.2": {"category": "block", "sounds": [{"name": "mekanism:holiday/Nutcracker2", "stream": false}]}, @@ -55,4 +57,4 @@ "item.flamethrower.active": {"category": "player", "sounds": [{"name": "mekanism:FlamethrowerActive", "stream": false}]}, "item.gasMask": {"category": "player", "sounds": [{"name": "mekanism:GasMask", "stream": false}]}, "item.jetpack": {"category": "player", "sounds": [{"name": "mekanism:Jetpack", "stream": false}]} -} \ No newline at end of file +} diff --git a/src/main/resources/assets/mekanism/sounds/electrolyticseparator.ogg b/src/main/resources/assets/mekanism/sounds/electrolyticseparator.ogg new file mode 100644 index 000000000..873665334 Binary files /dev/null and b/src/main/resources/assets/mekanism/sounds/electrolyticseparator.ogg differ diff --git a/src/main/resources/assets/mekanism/sounds/rotarycondensentrator.ogg b/src/main/resources/assets/mekanism/sounds/rotarycondensentrator.ogg new file mode 100644 index 000000000..ea65f31b2 Binary files /dev/null and b/src/main/resources/assets/mekanism/sounds/rotarycondensentrator.ogg differ