diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index 0912ba6c3..564fabc90 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -63,44 +63,44 @@ import mekanism.client.render.tileentity.RenderTeleporter; import mekanism.client.sound.Sound; import mekanism.client.sound.SoundHandler; import mekanism.common.CommonProxy; -import mekanism.common.EntityBalloon; -import mekanism.common.EntityObsidianTNT; -import mekanism.common.EntityRobit; import mekanism.common.IElectricChest; import mekanism.common.IInvConfiguration; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.entity.EntityBalloon; +import mekanism.common.entity.EntityObsidianTNT; +import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.item.ItemPortableTeleporter; -import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; -import mekanism.common.tileentity.TileEntityAdvancedFactory; -import mekanism.common.tileentity.TileEntityBin; -import mekanism.common.tileentity.TileEntityChargepad; -import mekanism.common.tileentity.TileEntityChemicalInfuser; -import mekanism.common.tileentity.TileEntityChemicalInjectionChamber; -import mekanism.common.tileentity.TileEntityChemicalOxidizer; -import mekanism.common.tileentity.TileEntityCombiner; -import mekanism.common.tileentity.TileEntityCrusher; -import mekanism.common.tileentity.TileEntityDigitalMiner; -import mekanism.common.tileentity.TileEntityDynamicTank; -import mekanism.common.tileentity.TileEntityDynamicValve; -import mekanism.common.tileentity.TileEntityElectricChest; -import mekanism.common.tileentity.TileEntityElectricMachine; -import mekanism.common.tileentity.TileEntityElectricPump; -import mekanism.common.tileentity.TileEntityElectrolyticSeparator; -import mekanism.common.tileentity.TileEntityEliteFactory; -import mekanism.common.tileentity.TileEntityEnergizedSmelter; -import mekanism.common.tileentity.TileEntityEnergyCube; -import mekanism.common.tileentity.TileEntityEnrichmentChamber; -import mekanism.common.tileentity.TileEntityFactory; -import mekanism.common.tileentity.TileEntityGasTank; -import mekanism.common.tileentity.TileEntityLogisticalSorter; -import mekanism.common.tileentity.TileEntityMetallurgicInfuser; -import mekanism.common.tileentity.TileEntityObsidianTNT; -import mekanism.common.tileentity.TileEntityOsmiumCompressor; -import mekanism.common.tileentity.TileEntityPurificationChamber; -import mekanism.common.tileentity.TileEntityRotaryCondensentrator; -import mekanism.common.tileentity.TileEntityTeleporter; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.TileEntityAdvancedFactory; +import mekanism.common.tile.TileEntityBin; +import mekanism.common.tile.TileEntityChargepad; +import mekanism.common.tile.TileEntityChemicalInfuser; +import mekanism.common.tile.TileEntityChemicalInjectionChamber; +import mekanism.common.tile.TileEntityChemicalOxidizer; +import mekanism.common.tile.TileEntityCombiner; +import mekanism.common.tile.TileEntityCrusher; +import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityDynamicValve; +import mekanism.common.tile.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricMachine; +import mekanism.common.tile.TileEntityElectricPump; +import mekanism.common.tile.TileEntityElectrolyticSeparator; +import mekanism.common.tile.TileEntityEliteFactory; +import mekanism.common.tile.TileEntityEnergizedSmelter; +import mekanism.common.tile.TileEntityEnergyCube; +import mekanism.common.tile.TileEntityEnrichmentChamber; +import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityGasTank; +import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityMetallurgicInfuser; +import mekanism.common.tile.TileEntityObsidianTNT; +import mekanism.common.tile.TileEntityOsmiumCompressor; +import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/client/ThreadTankSparkle.java b/common/mekanism/client/ThreadTankSparkle.java index 03b099a8d..c396953ac 100644 --- a/common/mekanism/client/ThreadTankSparkle.java +++ b/common/mekanism/client/ThreadTankSparkle.java @@ -6,7 +6,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.Mekanism; -import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/client/gui/GuiAdvancedElectricMachine.java b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java index decabdf11..ba2a156c9 100644 --- a/common/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/common/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; -import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiChemicalInfuser.java b/common/mekanism/client/gui/GuiChemicalInfuser.java index ee784ef58..22d49149f 100644 --- a/common/mekanism/client/gui/GuiChemicalInfuser.java +++ b/common/mekanism/client/gui/GuiChemicalInfuser.java @@ -9,7 +9,7 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityChemicalInfuser; +import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiChemicalInjectionChamber.java b/common/mekanism/client/gui/GuiChemicalInjectionChamber.java index 8fc1d9f05..10fb709cc 100644 --- a/common/mekanism/client/gui/GuiChemicalInjectionChamber.java +++ b/common/mekanism/client/gui/GuiChemicalInjectionChamber.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/gui/GuiChemicalOxidizer.java b/common/mekanism/client/gui/GuiChemicalOxidizer.java index 23c810ac1..af8939978 100644 --- a/common/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/common/mekanism/client/gui/GuiChemicalOxidizer.java @@ -3,7 +3,7 @@ package mekanism.client.gui; import mekanism.api.gas.GasStack; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerChemicalOxidizer; -import mekanism.common.tileentity.TileEntityChemicalOxidizer; +import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiCombiner.java b/common/mekanism/client/gui/GuiCombiner.java index d6deb8b2a..9811a280a 100644 --- a/common/mekanism/client/gui/GuiCombiner.java +++ b/common/mekanism/client/gui/GuiCombiner.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/gui/GuiConfiguration.java b/common/mekanism/client/gui/GuiConfiguration.java index 032c80e20..090d8b5af 100644 --- a/common/mekanism/client/gui/GuiConfiguration.java +++ b/common/mekanism/client/gui/GuiConfiguration.java @@ -15,7 +15,7 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketConfigurationUpdate; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketSimpleGui; -import mekanism.common.tileentity.TileEntityContainerBlock; +import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/client/gui/GuiCrusher.java b/common/mekanism/client/gui/GuiCrusher.java index 3b7167490..8e76abd5e 100644 --- a/common/mekanism/client/gui/GuiCrusher.java +++ b/common/mekanism/client/gui/GuiCrusher.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.tileentity.TileEntityElectricMachine; +import mekanism.common.tile.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/gui/GuiDigitalMiner.java b/common/mekanism/client/gui/GuiDigitalMiner.java index b4df63583..20db10a3b 100644 --- a/common/mekanism/client/gui/GuiDigitalMiner.java +++ b/common/mekanism/client/gui/GuiDigitalMiner.java @@ -10,7 +10,7 @@ import mekanism.common.miner.ThreadMinerSearch.State; import mekanism.common.network.PacketDigitalMinerGui; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; diff --git a/common/mekanism/client/gui/GuiDigitalMinerConfig.java b/common/mekanism/client/gui/GuiDigitalMinerConfig.java index 00a069df5..2be500eb9 100644 --- a/common/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/common/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -17,7 +17,7 @@ import mekanism.common.miner.MinerFilter; import mekanism.common.network.PacketDigitalMinerGui; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; diff --git a/common/mekanism/client/gui/GuiDynamicTank.java b/common/mekanism/client/gui/GuiDynamicTank.java index 342dc8085..18cff50f2 100644 --- a/common/mekanism/client/gui/GuiDynamicTank.java +++ b/common/mekanism/client/gui/GuiDynamicTank.java @@ -1,9 +1,9 @@ package mekanism.client.gui; import mekanism.client.render.MekanismRenderer; -import mekanism.common.TankUpdateProtocol; import mekanism.common.inventory.container.ContainerDynamicTank; -import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tank.TankUpdateProtocol; +import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiElectricChest.java b/common/mekanism/client/gui/GuiElectricChest.java index 7903bdeb8..7e217868d 100644 --- a/common/mekanism/client/gui/GuiElectricChest.java +++ b/common/mekanism/client/gui/GuiElectricChest.java @@ -10,7 +10,7 @@ import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; diff --git a/common/mekanism/client/gui/GuiElectricMachine.java b/common/mekanism/client/gui/GuiElectricMachine.java index 092c8f0d5..e4216958c 100644 --- a/common/mekanism/client/gui/GuiElectricMachine.java +++ b/common/mekanism/client/gui/GuiElectricMachine.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.common.inventory.container.ContainerElectricMachine; -import mekanism.common.tileentity.TileEntityElectricMachine; +import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiElectricPump.java b/common/mekanism/client/gui/GuiElectricPump.java index 2c5109d68..5b4a02f27 100644 --- a/common/mekanism/client/gui/GuiElectricPump.java +++ b/common/mekanism/client/gui/GuiElectricPump.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import mekanism.client.render.MekanismRenderer; import mekanism.common.inventory.container.ContainerElectricPump; -import mekanism.common.tileentity.TileEntityElectricPump; +import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiElectrolyticSeparator.java b/common/mekanism/client/gui/GuiElectrolyticSeparator.java index 371452612..9ac423ceb 100644 --- a/common/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/common/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -9,7 +9,7 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerElectrolyticSeparator; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityElectrolyticSeparator; +import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/common/mekanism/client/gui/GuiEnergizedSmelter.java b/common/mekanism/client/gui/GuiEnergizedSmelter.java index 634c2d89c..c00fa7711 100644 --- a/common/mekanism/client/gui/GuiEnergizedSmelter.java +++ b/common/mekanism/client/gui/GuiEnergizedSmelter.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.tileentity.TileEntityElectricMachine; +import mekanism.common.tile.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/gui/GuiEnergyCube.java b/common/mekanism/client/gui/GuiEnergyCube.java index 78dc6d846..95554d5b7 100644 --- a/common/mekanism/client/gui/GuiEnergyCube.java +++ b/common/mekanism/client/gui/GuiEnergyCube.java @@ -3,7 +3,7 @@ package mekanism.client.gui; import mekanism.common.EnergyDisplay; import mekanism.common.EnergyDisplay.ElectricUnit; import mekanism.common.inventory.container.ContainerEnergyCube; -import mekanism.common.tileentity.TileEntityEnergyCube; +import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiEnrichmentChamber.java b/common/mekanism/client/gui/GuiEnrichmentChamber.java index 4a979f319..75d287290 100644 --- a/common/mekanism/client/gui/GuiEnrichmentChamber.java +++ b/common/mekanism/client/gui/GuiEnrichmentChamber.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.tileentity.TileEntityElectricMachine; +import mekanism.common.tile.TileEntityElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/gui/GuiFactory.java b/common/mekanism/client/gui/GuiFactory.java index 0ecbd5f08..64f172d70 100644 --- a/common/mekanism/client/gui/GuiFactory.java +++ b/common/mekanism/client/gui/GuiFactory.java @@ -3,7 +3,7 @@ package mekanism.client.gui; import mekanism.common.IFactory.RecipeType; import mekanism.common.Tier.FactoryTier; import mekanism.common.inventory.container.ContainerFactory; -import mekanism.common.tileentity.TileEntityFactory; +import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiGasTank.java b/common/mekanism/client/gui/GuiGasTank.java index 152d99614..0b0d5dc58 100644 --- a/common/mekanism/client/gui/GuiGasTank.java +++ b/common/mekanism/client/gui/GuiGasTank.java @@ -1,7 +1,7 @@ package mekanism.client.gui; import mekanism.common.inventory.container.ContainerGasTank; -import mekanism.common.tileentity.TileEntityGasTank; +import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiLogisticalSorter.java b/common/mekanism/client/gui/GuiLogisticalSorter.java index 0ac93caf4..c8da258c0 100644 --- a/common/mekanism/client/gui/GuiLogisticalSorter.java +++ b/common/mekanism/client/gui/GuiLogisticalSorter.java @@ -15,7 +15,7 @@ import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TItemStackFilter; import mekanism.common.transporter.TOreDictFilter; import mekanism.common.transporter.TransporterFilter; diff --git a/common/mekanism/client/gui/GuiMItemStackFilter.java b/common/mekanism/client/gui/GuiMItemStackFilter.java index f225584b2..78efd395c 100644 --- a/common/mekanism/client/gui/GuiMItemStackFilter.java +++ b/common/mekanism/client/gui/GuiMItemStackFilter.java @@ -10,7 +10,7 @@ import mekanism.common.network.PacketDigitalMinerGui; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketNewFilter; -import mekanism.common.tileentity.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; diff --git a/common/mekanism/client/gui/GuiMOreDictFilter.java b/common/mekanism/client/gui/GuiMOreDictFilter.java index f84508061..3200e5c55 100644 --- a/common/mekanism/client/gui/GuiMOreDictFilter.java +++ b/common/mekanism/client/gui/GuiMOreDictFilter.java @@ -13,7 +13,7 @@ import mekanism.common.network.PacketDigitalMinerGui; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketNewFilter; -import mekanism.common.tileentity.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; diff --git a/common/mekanism/client/gui/GuiMekanism.java b/common/mekanism/client/gui/GuiMekanism.java index 49dd780c2..4f5322fa3 100644 --- a/common/mekanism/client/gui/GuiMekanism.java +++ b/common/mekanism/client/gui/GuiMekanism.java @@ -6,11 +6,12 @@ import java.util.Set; import mekanism.common.IInvConfiguration; import mekanism.common.SideData; import mekanism.common.item.ItemConfigurator; -import mekanism.common.tileentity.TileEntityContainerBlock; +import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; public abstract class GuiMekanism extends GuiContainer diff --git a/common/mekanism/client/gui/GuiMetallurgicInfuser.java b/common/mekanism/client/gui/GuiMetallurgicInfuser.java index e17cc6ec9..54457668c 100644 --- a/common/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/common/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -7,7 +7,7 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityMetallurgicInfuser; +import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiOsmiumCompressor.java b/common/mekanism/client/gui/GuiOsmiumCompressor.java index d06c4b5cb..bbe3e853e 100644 --- a/common/mekanism/client/gui/GuiOsmiumCompressor.java +++ b/common/mekanism/client/gui/GuiOsmiumCompressor.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/gui/GuiPasswordEnter.java b/common/mekanism/client/gui/GuiPasswordEnter.java index cb4211576..d4f85643c 100644 --- a/common/mekanism/client/gui/GuiPasswordEnter.java +++ b/common/mekanism/client/gui/GuiPasswordEnter.java @@ -8,7 +8,7 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; diff --git a/common/mekanism/client/gui/GuiPasswordModify.java b/common/mekanism/client/gui/GuiPasswordModify.java index 2e6e13d81..2d473c837 100644 --- a/common/mekanism/client/gui/GuiPasswordModify.java +++ b/common/mekanism/client/gui/GuiPasswordModify.java @@ -7,7 +7,7 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; diff --git a/common/mekanism/client/gui/GuiPurificationChamber.java b/common/mekanism/client/gui/GuiPurificationChamber.java index fbd133a21..4944e5e5c 100644 --- a/common/mekanism/client/gui/GuiPurificationChamber.java +++ b/common/mekanism/client/gui/GuiPurificationChamber.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; import net.minecraft.entity.player.InventoryPlayer; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/gui/GuiRecipeType.java b/common/mekanism/client/gui/GuiRecipeType.java index 041df922f..9561cd00d 100644 --- a/common/mekanism/client/gui/GuiRecipeType.java +++ b/common/mekanism/client/gui/GuiRecipeType.java @@ -1,6 +1,6 @@ package mekanism.client.gui; -import mekanism.common.tileentity.TileEntityFactory; +import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/common/mekanism/client/gui/GuiRobitInventory.java b/common/mekanism/client/gui/GuiRobitInventory.java index 7cac4b3f6..80ca3def3 100644 --- a/common/mekanism/client/gui/GuiRobitInventory.java +++ b/common/mekanism/client/gui/GuiRobitInventory.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import mekanism.common.EntityRobit; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitInventory; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; diff --git a/common/mekanism/client/gui/GuiRobitMain.java b/common/mekanism/client/gui/GuiRobitMain.java index 8fa931d75..484b861be 100644 --- a/common/mekanism/client/gui/GuiRobitMain.java +++ b/common/mekanism/client/gui/GuiRobitMain.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import mekanism.common.EntityRobit; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; diff --git a/common/mekanism/client/gui/GuiRobitSmelting.java b/common/mekanism/client/gui/GuiRobitSmelting.java index 741b9b64f..4e2cbd488 100644 --- a/common/mekanism/client/gui/GuiRobitSmelting.java +++ b/common/mekanism/client/gui/GuiRobitSmelting.java @@ -1,9 +1,9 @@ package mekanism.client.gui; -import mekanism.common.EntityRobit; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit.RobitPacketType; diff --git a/common/mekanism/client/gui/GuiRotaryCondensentrator.java b/common/mekanism/client/gui/GuiRotaryCondensentrator.java index f2d8d4502..9208b9a63 100644 --- a/common/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/common/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -10,7 +10,7 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/gui/GuiSortingTab.java b/common/mekanism/client/gui/GuiSortingTab.java index 629545ddd..7065c128a 100644 --- a/common/mekanism/client/gui/GuiSortingTab.java +++ b/common/mekanism/client/gui/GuiSortingTab.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityFactory; +import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiScreen; diff --git a/common/mekanism/client/gui/GuiTItemStackFilter.java b/common/mekanism/client/gui/GuiTItemStackFilter.java index dc276ed47..db42071e9 100644 --- a/common/mekanism/client/gui/GuiTItemStackFilter.java +++ b/common/mekanism/client/gui/GuiTItemStackFilter.java @@ -10,7 +10,7 @@ import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TItemStackFilter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/common/mekanism/client/gui/GuiTOreDictFilter.java b/common/mekanism/client/gui/GuiTOreDictFilter.java index 8cda6b10b..13fb71310 100644 --- a/common/mekanism/client/gui/GuiTOreDictFilter.java +++ b/common/mekanism/client/gui/GuiTOreDictFilter.java @@ -14,7 +14,7 @@ import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TItemStackFilter; import mekanism.common.transporter.TOreDictFilter; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/client/gui/GuiTeleporter.java b/common/mekanism/client/gui/GuiTeleporter.java index 7b06cecdf..7da26e816 100644 --- a/common/mekanism/client/gui/GuiTeleporter.java +++ b/common/mekanism/client/gui/GuiTeleporter.java @@ -7,7 +7,7 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityTeleporter; +import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 979ffee70..767c6e852 100644 --- a/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -7,7 +7,7 @@ import mekanism.api.ListUtils; import mekanism.api.gas.GasRegistry; import mekanism.client.gui.GuiChemicalInjectionChamber; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/common/mekanism/client/nei/CombinerRecipeHandler.java b/common/mekanism/client/nei/CombinerRecipeHandler.java index 02dd9825b..a74706065 100644 --- a/common/mekanism/client/nei/CombinerRecipeHandler.java +++ b/common/mekanism/client/nei/CombinerRecipeHandler.java @@ -5,7 +5,7 @@ import java.util.Set; import mekanism.api.ListUtils; import mekanism.client.gui.GuiCombiner; -import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/client/nei/CrusherRecipeHandler.java b/common/mekanism/client/nei/CrusherRecipeHandler.java index 7a4322335..df3d1f6e2 100644 --- a/common/mekanism/client/nei/CrusherRecipeHandler.java +++ b/common/mekanism/client/nei/CrusherRecipeHandler.java @@ -3,7 +3,7 @@ package mekanism.client.nei; import java.util.Set; import mekanism.client.gui.GuiCrusher; -import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.recipe.RecipeHandler.Recipe; public class CrusherRecipeHandler extends MachineRecipeHandler { diff --git a/common/mekanism/client/nei/EnrichmentChamberRecipeHandler.java b/common/mekanism/client/nei/EnrichmentChamberRecipeHandler.java index 3d398230e..59f8bbd93 100644 --- a/common/mekanism/client/nei/EnrichmentChamberRecipeHandler.java +++ b/common/mekanism/client/nei/EnrichmentChamberRecipeHandler.java @@ -3,7 +3,7 @@ package mekanism.client.nei; import java.util.Set; import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.recipe.RecipeHandler.Recipe; public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler { diff --git a/common/mekanism/client/nei/MekanismRecipeHandler.java b/common/mekanism/client/nei/MekanismRecipeHandler.java index ca2181427..c52052a9a 100644 --- a/common/mekanism/client/nei/MekanismRecipeHandler.java +++ b/common/mekanism/client/nei/MekanismRecipeHandler.java @@ -7,8 +7,8 @@ import java.util.List; import mekanism.api.energy.IEnergizedItem; import mekanism.common.IEnergyCube; import mekanism.common.IFactory; -import mekanism.common.MekanismRecipe; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.recipe.MekanismRecipe; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; diff --git a/common/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java b/common/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java index dfcbb55b6..f1b82bc5c 100644 --- a/common/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java +++ b/common/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java @@ -16,7 +16,7 @@ import mekanism.api.infuse.InfuseType; import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionOutput; import mekanism.client.gui.GuiMetallurgicInfuser; -import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java b/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java index 021f17a10..4f1449dfb 100644 --- a/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java +++ b/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java @@ -6,7 +6,7 @@ import java.util.Set; import mekanism.api.ListUtils; import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.item.ItemStack; public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler diff --git a/common/mekanism/client/nei/PurificationChamberRecipeHandler.java b/common/mekanism/client/nei/PurificationChamberRecipeHandler.java index 036a01baf..5e45ef244 100644 --- a/common/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/common/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -6,7 +6,7 @@ import java.util.Set; import mekanism.api.ListUtils; import mekanism.api.gas.GasRegistry; import mekanism.client.gui.GuiPurificationChamber; -import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/client/render/entity/RenderBalloon.java b/common/mekanism/client/render/entity/RenderBalloon.java index 7bff0101d..a31ab1bc9 100644 --- a/common/mekanism/client/render/entity/RenderBalloon.java +++ b/common/mekanism/client/render/entity/RenderBalloon.java @@ -2,7 +2,7 @@ package mekanism.client.render.entity; import mekanism.api.EnumColor; import mekanism.client.model.ModelBalloon; -import mekanism.common.EntityBalloon; +import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.Minecraft; @@ -29,10 +29,17 @@ public class RenderBalloon extends Render } @Override - public void doRender(Entity entity, double x, double y, double z, float f, float f1) + public void doRender(Entity entity, double x, double y, double z, float f, float partialTick) { EntityBalloon balloon = (EntityBalloon)entity; + if(balloon.isLatchedToEntity()) + { + x = (balloon.latchedEntity.lastTickPosX + (balloon.latchedEntity.posX - balloon.latchedEntity.lastTickPosX)*partialTick); + y = (balloon.latchedEntity.lastTickPosY + (balloon.latchedEntity.posY - balloon.latchedEntity.lastTickPosY)*partialTick) + (balloon.latchedEntity.ySize/2); + z = (balloon.latchedEntity.lastTickPosZ + (balloon.latchedEntity.posZ - balloon.latchedEntity.lastTickPosZ)*partialTick); + } + render(((EntityBalloon)entity).color, x, y, z); } diff --git a/common/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/common/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index c203d0c5f..7eab21c85 100644 --- a/common/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/common/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -1,8 +1,8 @@ package mekanism.client.render.entity; import mekanism.client.model.ModelObsidianTNT; -import mekanism.common.EntityObsidianTNT; import mekanism.common.Mekanism; +import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.RenderBlocks; diff --git a/common/mekanism/client/render/item/ItemRenderingHandler.java b/common/mekanism/client/render/item/ItemRenderingHandler.java index f4bd221c3..97664a46d 100644 --- a/common/mekanism/client/render/item/ItemRenderingHandler.java +++ b/common/mekanism/client/render/item/ItemRenderingHandler.java @@ -32,7 +32,7 @@ import mekanism.common.item.ItemScubaTank; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.multipart.ItemPartTransmitter; import mekanism.common.multipart.TransmitterType; -import mekanism.common.tileentity.TileEntityBin; +import mekanism.common.tile.TileEntityBin; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; diff --git a/common/mekanism/client/render/tileentity/RenderBin.java b/common/mekanism/client/render/tileentity/RenderBin.java index 9ed235342..56afbe63a 100644 --- a/common/mekanism/client/render/tileentity/RenderBin.java +++ b/common/mekanism/client/render/tileentity/RenderBin.java @@ -1,7 +1,7 @@ package mekanism.client.render.tileentity; import mekanism.api.Coord4D; -import mekanism.common.tileentity.TileEntityBin; +import mekanism.common.tile.TileEntityBin; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/common/mekanism/client/render/tileentity/RenderChargepad.java b/common/mekanism/client/render/tileentity/RenderChargepad.java index 476d51470..37830883b 100644 --- a/common/mekanism/client/render/tileentity/RenderChargepad.java +++ b/common/mekanism/client/render/tileentity/RenderChargepad.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelChargepad; -import mekanism.common.tileentity.TileEntityChargepad; +import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderChemicalInfuser.java b/common/mekanism/client/render/tileentity/RenderChemicalInfuser.java index e5b51847a..c074f70bd 100644 --- a/common/mekanism/client/render/tileentity/RenderChemicalInfuser.java +++ b/common/mekanism/client/render/tileentity/RenderChemicalInfuser.java @@ -9,7 +9,7 @@ import mekanism.client.model.ModelChemicalInfuser; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.tileentity.TileEntityChemicalInfuser; +import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; diff --git a/common/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/common/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 466bb8df7..13571d131 100644 --- a/common/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/common/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -8,7 +8,7 @@ import mekanism.client.model.ModelChemicalOxidizer; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.tileentity.TileEntityChemicalOxidizer; +import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.block.Block; diff --git a/common/mekanism/client/render/tileentity/RenderDigitalMiner.java b/common/mekanism/client/render/tileentity/RenderDigitalMiner.java index 77d2dedbd..95ce6e320 100644 --- a/common/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/common/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -1,7 +1,7 @@ package mekanism.client.render.tileentity; import mekanism.client.model.ModelDigitalMiner; -import mekanism.common.tileentity.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderDynamicTank.java b/common/mekanism/client/render/tileentity/RenderDynamicTank.java index a6eb8327d..f9a00ae34 100644 --- a/common/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/common/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -7,9 +7,9 @@ import mekanism.api.Coord4D; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.SynchronizedTankData.ValveData; -import mekanism.common.TankUpdateProtocol; -import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tank.TankUpdateProtocol; +import mekanism.common.tank.SynchronizedTankData.ValveData; +import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.block.Block; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderElectricChest.java b/common/mekanism/client/render/tileentity/RenderElectricChest.java index 2f0bf6fe5..36d5a8c4d 100644 --- a/common/mekanism/client/render/tileentity/RenderElectricChest.java +++ b/common/mekanism/client/render/tileentity/RenderElectricChest.java @@ -1,6 +1,6 @@ package mekanism.client.render.tileentity; -import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelChest; diff --git a/common/mekanism/client/render/tileentity/RenderElectricPump.java b/common/mekanism/client/render/tileentity/RenderElectricPump.java index 027b2d46c..24c15704d 100644 --- a/common/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/common/mekanism/client/render/tileentity/RenderElectricPump.java @@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelElectricPump; -import mekanism.common.tileentity.TileEntityElectricPump; +import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/common/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index 67eb53a92..8ca9e6bbf 100644 --- a/common/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/common/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -3,11 +3,12 @@ package mekanism.client.render.tileentity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.model.ModelElectrolyticSeparator; -import mekanism.common.tileentity.TileEntityElectrolyticSeparator; +import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) diff --git a/common/mekanism/client/render/tileentity/RenderEnergyCube.java b/common/mekanism/client/render/tileentity/RenderEnergyCube.java index 86cbcaab4..b6ab67031 100644 --- a/common/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/common/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -5,7 +5,7 @@ import mekanism.client.MekanismClient; import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; import mekanism.client.render.MekanismRenderer; -import mekanism.common.tileentity.TileEntityEnergyCube; +import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.Minecraft; diff --git a/common/mekanism/client/render/tileentity/RenderGasTank.java b/common/mekanism/client/render/tileentity/RenderGasTank.java index 904af89c1..f898cee3a 100644 --- a/common/mekanism/client/render/tileentity/RenderGasTank.java +++ b/common/mekanism/client/render/tileentity/RenderGasTank.java @@ -1,7 +1,7 @@ package mekanism.client.render.tileentity; import mekanism.client.model.ModelGasTank; -import mekanism.common.tileentity.TileEntityGasTank; +import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/common/mekanism/client/render/tileentity/RenderLogisticalSorter.java index bd7b2fc01..77812c96e 100644 --- a/common/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/common/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -1,7 +1,7 @@ package mekanism.client.render.tileentity; import mekanism.client.model.ModelLogisticalSorter; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java b/common/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java index 55e08a6c0..ac16d8148 100644 --- a/common/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java +++ b/common/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java @@ -1,7 +1,7 @@ package mekanism.client.render.tileentity; import mekanism.client.model.ModelMetallurgicInfuser; -import mekanism.common.tileentity.TileEntityMetallurgicInfuser; +import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderObsidianTNT.java b/common/mekanism/client/render/tileentity/RenderObsidianTNT.java index f28a1b17a..60199c8b4 100644 --- a/common/mekanism/client/render/tileentity/RenderObsidianTNT.java +++ b/common/mekanism/client/render/tileentity/RenderObsidianTNT.java @@ -1,7 +1,7 @@ package mekanism.client.render.tileentity; import mekanism.client.model.ModelObsidianTNT; -import mekanism.common.tileentity.TileEntityObsidianTNT; +import mekanism.common.tile.TileEntityObsidianTNT; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/common/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index 7b4073f2f..8d7b35b24 100644 --- a/common/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/common/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -3,7 +3,7 @@ package mekanism.client.render.tileentity; import org.lwjgl.opengl.GL11; import mekanism.client.model.ModelRotaryCondensentrator; -import mekanism.common.tileentity.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/client/render/tileentity/RenderTeleporter.java b/common/mekanism/client/render/tileentity/RenderTeleporter.java index 73b8aafeb..254a0a00d 100644 --- a/common/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/common/mekanism/client/render/tileentity/RenderTeleporter.java @@ -9,7 +9,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.Mekanism; -import mekanism.common.tileentity.TileEntityTeleporter; +import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.block.Block; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java index 337dcd801..57129b4b0 100644 --- a/common/mekanism/common/CommonProxy.java +++ b/common/mekanism/common/CommonProxy.java @@ -2,6 +2,7 @@ package mekanism.common; import java.io.File; +import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.inventory.container.ContainerChemicalOxidizer; @@ -24,36 +25,36 @@ import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.inventory.container.ContainerTeleporter; -import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; -import mekanism.common.tileentity.TileEntityAdvancedFactory; -import mekanism.common.tileentity.TileEntityBin; -import mekanism.common.tileentity.TileEntityChargepad; -import mekanism.common.tileentity.TileEntityChemicalInfuser; -import mekanism.common.tileentity.TileEntityChemicalInjectionChamber; -import mekanism.common.tileentity.TileEntityChemicalOxidizer; -import mekanism.common.tileentity.TileEntityCombiner; -import mekanism.common.tileentity.TileEntityContainerBlock; -import mekanism.common.tileentity.TileEntityCrusher; -import mekanism.common.tileentity.TileEntityDigitalMiner; -import mekanism.common.tileentity.TileEntityDynamicTank; -import mekanism.common.tileentity.TileEntityDynamicValve; -import mekanism.common.tileentity.TileEntityElectricChest; -import mekanism.common.tileentity.TileEntityElectricMachine; -import mekanism.common.tileentity.TileEntityElectricPump; -import mekanism.common.tileentity.TileEntityElectrolyticSeparator; -import mekanism.common.tileentity.TileEntityEliteFactory; -import mekanism.common.tileentity.TileEntityEnergizedSmelter; -import mekanism.common.tileentity.TileEntityEnergyCube; -import mekanism.common.tileentity.TileEntityEnrichmentChamber; -import mekanism.common.tileentity.TileEntityFactory; -import mekanism.common.tileentity.TileEntityGasTank; -import mekanism.common.tileentity.TileEntityLogisticalSorter; -import mekanism.common.tileentity.TileEntityMetallurgicInfuser; -import mekanism.common.tileentity.TileEntityObsidianTNT; -import mekanism.common.tileentity.TileEntityOsmiumCompressor; -import mekanism.common.tileentity.TileEntityPurificationChamber; -import mekanism.common.tileentity.TileEntityRotaryCondensentrator; -import mekanism.common.tileentity.TileEntityTeleporter; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.TileEntityAdvancedFactory; +import mekanism.common.tile.TileEntityBin; +import mekanism.common.tile.TileEntityChargepad; +import mekanism.common.tile.TileEntityChemicalInfuser; +import mekanism.common.tile.TileEntityChemicalInjectionChamber; +import mekanism.common.tile.TileEntityChemicalOxidizer; +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.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricMachine; +import mekanism.common.tile.TileEntityElectricPump; +import mekanism.common.tile.TileEntityElectrolyticSeparator; +import mekanism.common.tile.TileEntityEliteFactory; +import mekanism.common.tile.TileEntityEnergizedSmelter; +import mekanism.common.tile.TileEntityEnergyCube; +import mekanism.common.tile.TileEntityEnrichmentChamber; +import mekanism.common.tile.TileEntityFactory; +import mekanism.common.tile.TileEntityGasTank; +import mekanism.common.tile.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityMetallurgicInfuser; +import mekanism.common.tile.TileEntityObsidianTNT; +import mekanism.common.tile.TileEntityOsmiumCompressor; +import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/CommonWorldTickHandler.java b/common/mekanism/common/CommonWorldTickHandler.java index a78e1b64d..73abb7e30 100644 --- a/common/mekanism/common/CommonWorldTickHandler.java +++ b/common/mekanism/common/CommonWorldTickHandler.java @@ -7,7 +7,8 @@ import java.util.HashSet; import java.util.Map; import mekanism.api.Coord4D; -import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tank.DynamicTankCache; +import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import cpw.mods.fml.common.ITickHandler; diff --git a/common/mekanism/common/IFactory.java b/common/mekanism/common/IFactory.java index 659d5080b..d5bfd6824 100644 --- a/common/mekanism/common/IFactory.java +++ b/common/mekanism/common/IFactory.java @@ -1,8 +1,9 @@ package mekanism.common; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/common/mekanism/common/ILogisticalTransporter.java b/common/mekanism/common/ILogisticalTransporter.java index f33e67d0f..8d9f0389e 100644 --- a/common/mekanism/common/ILogisticalTransporter.java +++ b/common/mekanism/common/ILogisticalTransporter.java @@ -3,7 +3,7 @@ package mekanism.common; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.transmitters.IBlockableConnection; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterStack; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/IUpgradeTile.java b/common/mekanism/common/IUpgradeTile.java index febb29873..98e1d3cb5 100644 --- a/common/mekanism/common/IUpgradeTile.java +++ b/common/mekanism/common/IUpgradeTile.java @@ -1,5 +1,7 @@ package mekanism.common; +import mekanism.common.tile.component.TileComponentUpgrade; + public interface IUpgradeTile extends IUpgradeManagement { public TileComponentUpgrade getComponent(); diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 2f55d6b58..7e013bc55 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -38,6 +38,11 @@ import mekanism.common.block.BlockGasTank; import mekanism.common.block.BlockMachine; import mekanism.common.block.BlockObsidianTNT; import mekanism.common.block.BlockOre; +import mekanism.common.entity.EntityBalloon; +import mekanism.common.entity.EntityObsidianTNT; +import mekanism.common.entity.EntityRobit; +import mekanism.common.integration.MekanismHooks; +import mekanism.common.integration.OreDictManager; import mekanism.common.item.ItemAtomicDisassembler; import mekanism.common.item.ItemBalloon; import mekanism.common.item.ItemBlockBasic; @@ -91,10 +96,13 @@ import mekanism.common.network.PacketTileEntity; import mekanism.common.network.PacketTransmitterUpdate; import mekanism.common.network.PacketTransmitterUpdate.PacketType; import mekanism.common.network.PacketWalkieTalkieState; -import mekanism.common.tileentity.TileEntityAdvancedBoundingBlock; -import mekanism.common.tileentity.TileEntityBoundingBlock; -import mekanism.common.tileentity.TileEntityElectricBlock; -import mekanism.common.tileentity.TileEntityEnergizedSmelter; +import mekanism.common.recipe.MekanismRecipe; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.tank.DynamicTankCache; +import mekanism.common.tile.TileEntityAdvancedBoundingBlock; +import mekanism.common.tile.TileEntityBoundingBlock; +import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.transporter.TransporterManager; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/common/mekanism/common/RobitAIFollow.java b/common/mekanism/common/RobitAIFollow.java index 0cec17862..197442193 100644 --- a/common/mekanism/common/RobitAIFollow.java +++ b/common/mekanism/common/RobitAIFollow.java @@ -1,5 +1,6 @@ package mekanism.common; +import mekanism.common.entity.EntityRobit; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.pathfinding.PathNavigate; diff --git a/common/mekanism/common/RobitAIPickup.java b/common/mekanism/common/RobitAIPickup.java index a24a4b785..fc14e39f8 100644 --- a/common/mekanism/common/RobitAIPickup.java +++ b/common/mekanism/common/RobitAIPickup.java @@ -3,6 +3,7 @@ package mekanism.common; import java.util.Iterator; import java.util.List; +import mekanism.common.entity.EntityRobit; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/block/BlockBasic.java b/common/mekanism/common/block/BlockBasic.java index a905eb4b2..fe9bb818a 100644 --- a/common/mekanism/common/block/BlockBasic.java +++ b/common/mekanism/common/block/BlockBasic.java @@ -13,13 +13,13 @@ import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TankUpdateProtocol; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityBasicBlock; -import mekanism.common.tileentity.TileEntityBin; -import mekanism.common.tileentity.TileEntityDynamicTank; -import mekanism.common.tileentity.TileEntityDynamicValve; +import mekanism.common.tank.TankUpdateProtocol; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityBin; +import mekanism.common.tile.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityDynamicValve; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/common/mekanism/common/block/BlockBounding.java b/common/mekanism/common/block/BlockBounding.java index 27023791b..744fc9504 100644 --- a/common/mekanism/common/block/BlockBounding.java +++ b/common/mekanism/common/block/BlockBounding.java @@ -2,8 +2,8 @@ package mekanism.common.block; import java.util.Random; -import mekanism.common.tileentity.TileEntityAdvancedBoundingBlock; -import mekanism.common.tileentity.TileEntityBoundingBlock; +import mekanism.common.tile.TileEntityAdvancedBoundingBlock; +import mekanism.common.tile.TileEntityBoundingBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/block/BlockEnergyCube.java b/common/mekanism/common/block/BlockEnergyCube.java index 526cfe916..00ceb2989 100644 --- a/common/mekanism/common/block/BlockEnergyCube.java +++ b/common/mekanism/common/block/BlockEnergyCube.java @@ -15,10 +15,10 @@ import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.item.ItemBlockEnergyCube; -import mekanism.common.tileentity.TileEntityBasicBlock; -import mekanism.common.tileentity.TileEntityDynamicTank; -import mekanism.common.tileentity.TileEntityElectricBlock; -import mekanism.common.tileentity.TileEntityEnergyCube; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityEnergyCube; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/block/BlockGasTank.java b/common/mekanism/common/block/BlockGasTank.java index c61f2cba0..647c6d9bd 100644 --- a/common/mekanism/common/block/BlockGasTank.java +++ b/common/mekanism/common/block/BlockGasTank.java @@ -6,9 +6,9 @@ import mekanism.api.gas.IGasItem; import mekanism.common.ISustainedInventory; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; -import mekanism.common.tileentity.TileEntityBasicBlock; -import mekanism.common.tileentity.TileEntityElectricBlock; -import mekanism.common.tileentity.TileEntityGasTank; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityGasTank; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java index 34060b6ee..f73423eb9 100644 --- a/common/mekanism/common/block/BlockMachine.java +++ b/common/mekanism/common/block/BlockMachine.java @@ -14,7 +14,7 @@ import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; -import mekanism.common.tileentity.*; +import mekanism.common.tile.*; import mekanism.common.transporter.TransporterFilter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; diff --git a/common/mekanism/common/block/BlockObsidianTNT.java b/common/mekanism/common/block/BlockObsidianTNT.java index ed84e6460..a3593248d 100644 --- a/common/mekanism/common/block/BlockObsidianTNT.java +++ b/common/mekanism/common/block/BlockObsidianTNT.java @@ -1,8 +1,8 @@ package mekanism.common.block; -import mekanism.common.EntityObsidianTNT; import mekanism.common.Mekanism; -import mekanism.common.tileentity.TileEntityObsidianTNT; +import mekanism.common.entity.EntityObsidianTNT; +import mekanism.common.tile.TileEntityObsidianTNT; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/common/mekanism/common/EntityBalloon.java b/common/mekanism/common/entity/EntityBalloon.java similarity index 64% rename from common/mekanism/common/EntityBalloon.java rename to common/mekanism/common/entity/EntityBalloon.java index 2b54b3f83..6241beb42 100644 --- a/common/mekanism/common/EntityBalloon.java +++ b/common/mekanism/common/entity/EntityBalloon.java @@ -1,4 +1,6 @@ -package mekanism.common; +package mekanism.common.entity; + +import java.util.UUID; import mekanism.api.Coord4D; import mekanism.api.EnumColor; @@ -21,6 +23,12 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData public EnumColor color = EnumColor.DARK_BLUE; public Coord4D latched; + public Entity latchedEntity; + + /* server-only */ + public boolean hasCachedEntity; + + public UUID cachedEntityUUID; public EntityBalloon(World world) { @@ -33,10 +41,11 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData setSize(0.25F, 0.25F); motionY = 0.04; - dataWatcher.addObject(2, new Byte((byte)0)); + dataWatcher.addObject(2, new Byte((byte)0)); /* Is latched */ dataWatcher.addObject(3, new Integer(0)); /* Latched X */ dataWatcher.addObject(4, new Integer(0)); /* Latched Y */ dataWatcher.addObject(5, new Integer(0)); /* Latched Z */ + dataWatcher.addObject(6, new Integer(-1)); /* Latched entity ID */ } public EntityBalloon(World world, double x, double y, double z, EnumColor c) @@ -52,6 +61,26 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData color = c; } + public EntityBalloon(Entity entity, EnumColor c) + { + this(entity.worldObj); + + latchedEntity = entity; + setPosition(latchedEntity.posX, (latchedEntity.ySize/2), latchedEntity.posZ); + + prevPosX = posX; + prevPosY = posY; + prevPosZ = posZ; + + color = c; + + dataWatcher.updateObject(2, new Byte((byte)2)); /* Is latched */ + dataWatcher.updateObject(3, new Integer(0)); /* Latched X */ + dataWatcher.updateObject(4, new Integer(0)); /* Latched Y */ + dataWatcher.updateObject(5, new Integer(0)); /* Latched Z */ + dataWatcher.updateObject(6, new Integer(entity.entityId)); /* Latched entity ID */ + } + public EntityBalloon(World world, Coord4D obj, EnumColor c) { this(world); @@ -65,10 +94,11 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData color = c; - dataWatcher.updateObject(2, new Byte(latched != null ? (byte)1 : (byte)0)); /* Is latched */ + dataWatcher.updateObject(2, new Byte((byte)1)); /* Is latched */ dataWatcher.updateObject(3, new Integer(latched != null ? latched.xCoord : 0)); /* Latched X */ dataWatcher.updateObject(4, new Integer(latched != null ? latched.yCoord : 0)); /* Latched Y */ dataWatcher.updateObject(5, new Integer(latched != null ? latched.zCoord : 0)); /* Latched Z */ + dataWatcher.updateObject(6, new Integer(-1)); /* Latched entity ID */ } @Override @@ -95,26 +125,41 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData } } else { + if(hasCachedEntity) + { + findCachedEntity(); + cachedEntityUUID = null; + hasCachedEntity = false; + } + if(ticksExisted == 1) { - dataWatcher.updateObject(2, new Byte(latched != null ? (byte)1 : (byte)0)); /* Is latched */ + dataWatcher.updateObject(2, new Byte(latched != null ? (byte)1 : (latchedEntity != null ? (byte)2 : (byte)0))); /* Is latched */ dataWatcher.updateObject(3, new Integer(latched != null ? latched.xCoord : 0)); /* Latched X */ dataWatcher.updateObject(4, new Integer(latched != null ? latched.yCoord : 0)); /* Latched Y */ dataWatcher.updateObject(5, new Integer(latched != null ? latched.zCoord : 0)); /* Latched Z */ + dataWatcher.updateObject(6, new Integer(latchedEntity != null ? latchedEntity.entityId : -1)); /* Latched entity ID */ } } if(!worldObj.isRemote) - { + { if(latched != null && (latched.exists(worldObj) && latched.isAirBlock(worldObj))) { latched = null; dataWatcher.updateObject(2, (byte)0); /* Is latched */ } + + if(latchedEntity != null && (latchedEntity.isDead || !worldObj.loadedEntityList.contains(latchedEntity))) + { + latchedEntity = null; + + dataWatcher.updateObject(2, (byte)0); /* Is latched */ + } } - if(latched == null) + if(!isLatched()) { motionY = Math.min(motionY*1.02F, 0.2F); @@ -134,11 +179,34 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData motionY = 0.04; } } - else { + else if(latched != null) + { motionX = 0; motionY = 0; motionZ = 0; } + else if(latchedEntity != null) + { + posX = latchedEntity.posX; + posY = latchedEntity.posY + (latchedEntity.ySize/2); + posZ = latchedEntity.posZ; + } + } + + private void findCachedEntity() + { + for(Object obj : worldObj.loadedEntityList) + { + if(obj instanceof Entity) + { + Entity entity = (Entity)obj; + + if(entity.getUniqueID().equals(cachedEntityUUID)) + { + latchedEntity = entity; + } + } + } } private void pop() @@ -193,13 +261,12 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { latched = Coord4D.read(nbtTags.getCompoundTag("latched")); } - } - - @Override - public boolean hitByEntity(Entity entity) - { - pop(); - return true; + + if(nbtTags.hasKey("idMost")) + { + hasCachedEntity = true; + cachedEntityUUID = new UUID(nbtTags.getLong("idMost"), nbtTags.getLong("idLeast")); + } } @Override @@ -211,6 +278,19 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { nbtTags.setCompoundTag("latched", latched.write(new NBTTagCompound())); } + + if(latchedEntity != null) + { + nbtTags.setLong("idMost", latchedEntity.getUniqueID().getMostSignificantBits()); + nbtTags.setLong("idLeast", latchedEntity.getUniqueID().getLeastSignificantBits()); + } + } + + @Override + public boolean hitByEntity(Entity entity) + { + pop(); + return true; } @Override @@ -224,15 +304,20 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData if(latched != null) { - data.writeBoolean(true); + data.writeByte((byte)1); data.writeInt(latched.xCoord); data.writeInt(latched.yCoord); data.writeInt(latched.zCoord); data.writeInt(latched.dimensionId); } + else if(latchedEntity != null) + { + data.writeByte((byte)2); + data.writeInt(latchedEntity.entityId); + } else { - data.writeBoolean(false); + data.writeByte((byte)0); } } @@ -243,15 +328,32 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData color = EnumColor.values()[data.readInt()]; - if(data.readBoolean()) + byte type = data.readByte(); + + if(type == 1) { latched = Coord4D.read(data); } + else if(type == 2) + { + latchedEntity = worldObj.getEntityByID(data.readInt()); + } else { latched = null; } } + @Override + public void setDead() + { + super.setDead(); + + if(latchedEntity != null) + { + latchedEntity.isAirBorne = false; + } + } + @Override public boolean isInRangeToRenderDist(double dist) { @@ -263,4 +365,20 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData { return true; } + + public boolean isLatched() + { + if(!worldObj.isRemote) + { + return latched != null || latchedEntity != null; + } + else { + return dataWatcher.getWatchableObjectByte(2) > 0; + } + } + + public boolean isLatchedToEntity() + { + return dataWatcher.getWatchableObjectByte(2) == 2 && latchedEntity != null; + } } diff --git a/common/mekanism/common/EntityObsidianTNT.java b/common/mekanism/common/entity/EntityObsidianTNT.java similarity index 97% rename from common/mekanism/common/EntityObsidianTNT.java rename to common/mekanism/common/entity/EntityObsidianTNT.java index 3889c71de..14b4a2cd8 100644 --- a/common/mekanism/common/EntityObsidianTNT.java +++ b/common/mekanism/common/entity/EntityObsidianTNT.java @@ -1,5 +1,6 @@ -package mekanism.common; +package mekanism.common.entity; +import mekanism.common.Mekanism; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/common/mekanism/common/EntityRobit.java b/common/mekanism/common/entity/EntityRobit.java similarity index 98% rename from common/mekanism/common/EntityRobit.java rename to common/mekanism/common/entity/EntityRobit.java index cfd4f5794..1fe9ba2d8 100644 --- a/common/mekanism/common/EntityRobit.java +++ b/common/mekanism/common/entity/EntityRobit.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.entity; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; @@ -10,9 +10,13 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.ISustainedInventory; +import mekanism.common.Mekanism; +import mekanism.common.RobitAIFollow; +import mekanism.common.RobitAIPickup; import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemRobit; -import mekanism.common.tileentity.TileEntityChargepad; +import mekanism.common.tile.TileEntityChargepad; import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/common/mekanism/common/MekanismHooks.java b/common/mekanism/common/integration/MekanismHooks.java similarity index 97% rename from common/mekanism/common/MekanismHooks.java rename to common/mekanism/common/integration/MekanismHooks.java index fb05f5856..7191af15c 100644 --- a/common/mekanism/common/MekanismHooks.java +++ b/common/mekanism/common/integration/MekanismHooks.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.integration; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; @@ -9,7 +9,9 @@ import ic2.api.recipe.Recipes; import java.util.List; import java.util.Map; -import mekanism.common.RecipeHandler.Recipe; +import mekanism.common.Mekanism; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/common/mekanism/common/OreDictManager.java b/common/mekanism/common/integration/OreDictManager.java similarity index 99% rename from common/mekanism/common/OreDictManager.java rename to common/mekanism/common/integration/OreDictManager.java index 6f81d6b20..98ca4c578 100644 --- a/common/mekanism/common/OreDictManager.java +++ b/common/mekanism/common/integration/OreDictManager.java @@ -1,10 +1,12 @@ -package mekanism.common; +package mekanism.common.integration; import ic2.api.recipe.RecipeInputOreDict; import ic2.api.recipe.Recipes; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfusionInput; +import mekanism.common.Mekanism; +import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 2ac55ef4a..990e87543 100644 --- a/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -2,13 +2,13 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.item.ItemMachineUpgrade; -import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; -import mekanism.common.tileentity.TileEntityPurificationChamber; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.tile.TileEntityAdvancedElectricMachine; +import mekanism.common.tile.TileEntityPurificationChamber; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerChemicalInfuser.java b/common/mekanism/common/inventory/container/ContainerChemicalInfuser.java index cd094db1e..bc41adb89 100644 --- a/common/mekanism/common/inventory/container/ContainerChemicalInfuser.java +++ b/common/mekanism/common/inventory/container/ContainerChemicalInfuser.java @@ -4,7 +4,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.item.ItemMachineUpgrade; -import mekanism.common.tileentity.TileEntityChemicalInfuser; +import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerChemicalOxidizer.java b/common/mekanism/common/inventory/container/ContainerChemicalOxidizer.java index 4d3885c22..3c1aa674e 100644 --- a/common/mekanism/common/inventory/container/ContainerChemicalOxidizer.java +++ b/common/mekanism/common/inventory/container/ContainerChemicalOxidizer.java @@ -1,10 +1,10 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; -import mekanism.common.RecipeHandler; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotStorageTank; -import mekanism.common.tileentity.TileEntityChemicalOxidizer; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerDigitalMiner.java b/common/mekanism/common/inventory/container/ContainerDigitalMiner.java index f54af2af3..2feba9ce2 100644 --- a/common/mekanism/common/inventory/container/ContainerDigitalMiner.java +++ b/common/mekanism/common/inventory/container/ContainerDigitalMiner.java @@ -4,7 +4,7 @@ import mekanism.common.inventory.slot.SlotElectricChest; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.item.ItemMachineUpgrade; -import mekanism.common.tileentity.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerDynamicTank.java b/common/mekanism/common/inventory/container/ContainerDynamicTank.java index 62b8312eb..baaeb0392 100644 --- a/common/mekanism/common/inventory/container/ContainerDynamicTank.java +++ b/common/mekanism/common/inventory/container/ContainerDynamicTank.java @@ -1,7 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; -import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/inventory/container/ContainerElectricChest.java b/common/mekanism/common/inventory/container/ContainerElectricChest.java index 4a2ee33e2..2f5a5d82d 100644 --- a/common/mekanism/common/inventory/container/ContainerElectricChest.java +++ b/common/mekanism/common/inventory/container/ContainerElectricChest.java @@ -4,7 +4,7 @@ import mekanism.common.IElectricChest; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.slot.SlotElectricChest; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; -import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerElectricMachine.java b/common/mekanism/common/inventory/container/ContainerElectricMachine.java index 070e50e3c..9402da8d9 100644 --- a/common/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/common/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -1,11 +1,11 @@ package mekanism.common.inventory.container; -import mekanism.common.RecipeHandler; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.item.ItemMachineUpgrade; -import mekanism.common.tileentity.TileEntityElectricMachine; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.tile.TileEntityElectricMachine; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerElectricPump.java b/common/mekanism/common/inventory/container/ContainerElectricPump.java index 6b2ca55be..22778525c 100644 --- a/common/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/common/mekanism/common/inventory/container/ContainerElectricPump.java @@ -2,7 +2,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; -import mekanism.common.tileentity.TileEntityElectricPump; +import mekanism.common.tile.TileEntityElectricPump; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java b/common/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java index ea666b311..bd3aaa2a7 100644 --- a/common/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/common/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java @@ -2,10 +2,10 @@ package mekanism.common.inventory.container; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.IGasItem; -import mekanism.common.RecipeHandler; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotStorageTank; -import mekanism.common.tileentity.TileEntityElectrolyticSeparator; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.tile.TileEntityElectrolyticSeparator; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerEnergyCube.java b/common/mekanism/common/inventory/container/ContainerEnergyCube.java index cfe89ee76..5ac24717a 100644 --- a/common/mekanism/common/inventory/container/ContainerEnergyCube.java +++ b/common/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -3,7 +3,7 @@ package mekanism.common.inventory.container; import ic2.api.item.IElectricItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; -import mekanism.common.tileentity.TileEntityEnergyCube; +import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerFactory.java b/common/mekanism/common/inventory/container/ContainerFactory.java index ab761a908..15cb72866 100644 --- a/common/mekanism/common/inventory/container/ContainerFactory.java +++ b/common/mekanism/common/inventory/container/ContainerFactory.java @@ -9,7 +9,7 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemMachineUpgrade; -import mekanism.common.tileentity.TileEntityFactory; +import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerFilter.java b/common/mekanism/common/inventory/container/ContainerFilter.java index e2c83c443..3a2da0f1f 100644 --- a/common/mekanism/common/inventory/container/ContainerFilter.java +++ b/common/mekanism/common/inventory/container/ContainerFilter.java @@ -1,6 +1,6 @@ package mekanism.common.inventory.container; -import mekanism.common.tileentity.TileEntityContainerBlock; +import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/inventory/container/ContainerGasTank.java b/common/mekanism/common/inventory/container/ContainerGasTank.java index e22f6dadb..52c9a5667 100644 --- a/common/mekanism/common/inventory/container/ContainerGasTank.java +++ b/common/mekanism/common/inventory/container/ContainerGasTank.java @@ -2,7 +2,7 @@ package mekanism.common.inventory.container; import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotStorageTank; -import mekanism.common.tileentity.TileEntityGasTank; +import mekanism.common.tile.TileEntityGasTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index 46eb0aa63..c1e4762b5 100644 --- a/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -2,13 +2,13 @@ package mekanism.common.inventory.container; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfusionInput; -import mekanism.common.RecipeHandler; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.item.ItemMachineUpgrade; -import mekanism.common.tileentity.TileEntityMetallurgicInfuser; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerNull.java b/common/mekanism/common/inventory/container/ContainerNull.java index 1697c173e..75c0a4e20 100644 --- a/common/mekanism/common/inventory/container/ContainerNull.java +++ b/common/mekanism/common/inventory/container/ContainerNull.java @@ -1,6 +1,6 @@ package mekanism.common.inventory.container; -import mekanism.common.tileentity.TileEntityContainerBlock; +import mekanism.common.tile.TileEntityContainerBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/inventory/container/ContainerRobitInventory.java b/common/mekanism/common/inventory/container/ContainerRobitInventory.java index c53a86454..ecd8d4e32 100644 --- a/common/mekanism/common/inventory/container/ContainerRobitInventory.java +++ b/common/mekanism/common/inventory/container/ContainerRobitInventory.java @@ -1,6 +1,6 @@ package mekanism.common.inventory.container; -import mekanism.common.EntityRobit; +import mekanism.common.entity.EntityRobit; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/inventory/container/ContainerRobitMain.java b/common/mekanism/common/inventory/container/ContainerRobitMain.java index 209730ea7..8df3b0bf5 100644 --- a/common/mekanism/common/inventory/container/ContainerRobitMain.java +++ b/common/mekanism/common/inventory/container/ContainerRobitMain.java @@ -1,6 +1,6 @@ package mekanism.common.inventory.container; -import mekanism.common.EntityRobit; +import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerRobitSmelting.java b/common/mekanism/common/inventory/container/ContainerRobitSmelting.java index 801c9f523..75a336443 100644 --- a/common/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/common/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -1,6 +1,6 @@ package mekanism.common.inventory.container; -import mekanism.common.EntityRobit; +import mekanism.common.entity.EntityRobit; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java b/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java index 6b234c5eb..24a464ce1 100644 --- a/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java +++ b/common/mekanism/common/inventory/container/ContainerRotaryCondensentrator.java @@ -4,7 +4,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotStorageTank; -import mekanism.common.tileentity.TileEntityRotaryCondensentrator; +import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/inventory/container/ContainerTeleporter.java b/common/mekanism/common/inventory/container/ContainerTeleporter.java index 2820608d2..22ba34452 100644 --- a/common/mekanism/common/inventory/container/ContainerTeleporter.java +++ b/common/mekanism/common/inventory/container/ContainerTeleporter.java @@ -1,7 +1,7 @@ package mekanism.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; -import mekanism.common.tileentity.TileEntityTeleporter; +import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.ChargeUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/common/item/ItemBalloon.java b/common/mekanism/common/item/ItemBalloon.java index ae9e7ee06..741209abf 100644 --- a/common/mekanism/common/item/ItemBalloon.java +++ b/common/mekanism/common/item/ItemBalloon.java @@ -5,13 +5,15 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; -import mekanism.common.EntityBalloon; +import mekanism.common.entity.EntityBalloon; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -82,6 +84,15 @@ public class ItemBalloon extends ItemMekanism { if(player.isSneaking()) { + AxisAlignedBB bound = AxisAlignedBB.getBoundingBox(x, y, z, x+1, y+3, z+1); + + List balloonsNear = player.worldObj.getEntitiesWithinAABB(EntityBalloon.class, bound); + + if(balloonsNear.size() > 0) + { + return true; + } + Coord4D obj = new Coord4D(x, y, z, world.provider.dimensionId); if(Block.blocksList[obj.getBlockId(world)].isBlockReplaceable(world, x, y, z)) @@ -97,9 +108,8 @@ public class ItemBalloon extends ItemMekanism if(!world.isRemote) { world.spawnEntityInWorld(new EntityBalloon(world, obj, getColor(stack))); + stack.stackSize--; } - - stack.stackSize--; } return true; @@ -108,6 +118,34 @@ public class ItemBalloon extends ItemMekanism return false; } + @Override + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity) + { + /*if(player.isSneaking()) + { + if(!player.worldObj.isRemote) + { + AxisAlignedBB bound = AxisAlignedBB.getBoundingBox(entity.posX - 0.2, entity.posY - 0.5, entity.posZ - 0.2, entity.posX + 0.2, entity.posY + entity.ySize + 4, entity.posZ + 0.2); + + List balloonsNear = player.worldObj.getEntitiesWithinAABB(EntityBalloon.class, bound); + + for(EntityBalloon balloon : balloonsNear) + { + if(balloon.latchedEntity == entity) + { + return true; + } + } + player.worldObj.spawnEntityInWorld(new EntityBalloon(entity, getColor(stack))); + stack.stackSize--; + } + + return true; + }*/ + + return false; + } + private boolean canReplace(World world, int x, int y, int z) { return world.isAirBlock(x, y, z) || Block.blocksList[world.getBlockId(x, y, z)].isBlockReplaceable(world, x, y, z); diff --git a/common/mekanism/common/item/ItemBlockBasic.java b/common/mekanism/common/item/ItemBlockBasic.java index 90aa707bf..e998d6b45 100644 --- a/common/mekanism/common/item/ItemBlockBasic.java +++ b/common/mekanism/common/item/ItemBlockBasic.java @@ -5,7 +5,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; import mekanism.common.inventory.InventoryBin; -import mekanism.common.tileentity.TileEntityBin; +import mekanism.common.tile.TileEntityBin; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/common/mekanism/common/item/ItemBlockEnergyCube.java b/common/mekanism/common/item/ItemBlockEnergyCube.java index 1eecc8cd2..08c919cad 100644 --- a/common/mekanism/common/item/ItemBlockEnergyCube.java +++ b/common/mekanism/common/item/ItemBlockEnergyCube.java @@ -17,7 +17,7 @@ import mekanism.common.PacketHandler.Transmission; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.integration.IC2ItemManager; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityEnergyCube; +import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/item/ItemBlockGasTank.java b/common/mekanism/common/item/ItemBlockGasTank.java index df65edf7d..95ad1fdc0 100644 --- a/common/mekanism/common/item/ItemBlockGasTank.java +++ b/common/mekanism/common/item/ItemBlockGasTank.java @@ -9,7 +9,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; -import mekanism.common.tileentity.TileEntityGasTank; +import mekanism.common.tile.TileEntityGasTank; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/item/ItemBlockMachine.java b/common/mekanism/common/item/ItemBlockMachine.java index 502b37636..6444efffc 100644 --- a/common/mekanism/common/item/ItemBlockMachine.java +++ b/common/mekanism/common/item/ItemBlockMachine.java @@ -28,8 +28,7 @@ import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.miner.MinerFilter; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tileentity.*; -import mekanism.common.tileentity.TileEntityChemicalOxidizer; +import mekanism.common.tile.*; import mekanism.common.transporter.TransporterFilter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; diff --git a/common/mekanism/common/item/ItemConfigurator.java b/common/mekanism/common/item/ItemConfigurator.java index 59fd844f6..710e543b2 100644 --- a/common/mekanism/common/item/ItemConfigurator.java +++ b/common/mekanism/common/item/ItemConfigurator.java @@ -11,8 +11,8 @@ import mekanism.common.IInvConfiguration; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityBasicBlock; -import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/item/ItemRobit.java b/common/mekanism/common/item/ItemRobit.java index 5d9e66871..68c18c5b9 100644 --- a/common/mekanism/common/item/ItemRobit.java +++ b/common/mekanism/common/item/ItemRobit.java @@ -4,9 +4,9 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.Coord4D; -import mekanism.common.EntityRobit; import mekanism.common.ISustainedInventory; -import mekanism.common.tileentity.TileEntityChargepad; +import mekanism.common.entity.EntityRobit; +import mekanism.common.tile.TileEntityChargepad; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/miner/ThreadMinerSearch.java b/common/mekanism/common/miner/ThreadMinerSearch.java index 21f10d488..b7e1226d1 100644 --- a/common/mekanism/common/miner/ThreadMinerSearch.java +++ b/common/mekanism/common/miner/ThreadMinerSearch.java @@ -4,7 +4,7 @@ import java.util.Collections; import mekanism.api.Coord4D; import mekanism.common.IBoundingBlock; -import mekanism.common.tileentity.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/multipart/PartLogisticalTransporter.java b/common/mekanism/common/multipart/PartLogisticalTransporter.java index 3169bcaf4..bc3e09b86 100644 --- a/common/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/common/mekanism/common/multipart/PartLogisticalTransporter.java @@ -14,7 +14,7 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketDataRequest; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.Finder.FirstFinder; import mekanism.common.transporter.InvStack; import mekanism.common.transporter.TransporterManager; diff --git a/common/mekanism/common/network/PacketConfigurationUpdate.java b/common/mekanism/common/network/PacketConfigurationUpdate.java index 57f0c9dc4..5e6228013 100644 --- a/common/mekanism/common/network/PacketConfigurationUpdate.java +++ b/common/mekanism/common/network/PacketConfigurationUpdate.java @@ -8,7 +8,7 @@ import mekanism.common.IInvConfiguration; import mekanism.common.ITileNetwork; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.tileentity.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/common/mekanism/common/network/PacketDataRequest.java b/common/mekanism/common/network/PacketDataRequest.java index 2f6feff06..ad1c86478 100644 --- a/common/mekanism/common/network/PacketDataRequest.java +++ b/common/mekanism/common/network/PacketDataRequest.java @@ -9,7 +9,7 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.ITileNetwork; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketDigitalMinerGui.java b/common/mekanism/common/network/PacketDigitalMinerGui.java index 235993ff2..6222d0d99 100644 --- a/common/mekanism/common/network/PacketDigitalMinerGui.java +++ b/common/mekanism/common/network/PacketDigitalMinerGui.java @@ -13,8 +13,8 @@ import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; -import mekanism.common.tileentity.TileEntityContainerBlock; -import mekanism.common.tileentity.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.TileEntityDigitalMiner; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/common/mekanism/common/network/PacketEditFilter.java b/common/mekanism/common/network/PacketEditFilter.java index 344517f88..59f61efd2 100644 --- a/common/mekanism/common/network/PacketEditFilter.java +++ b/common/mekanism/common/network/PacketEditFilter.java @@ -7,8 +7,8 @@ import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.miner.MinerFilter; -import mekanism.common.tileentity.TileEntityDigitalMiner; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterFilter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketElectricChest.java b/common/mekanism/common/network/PacketElectricChest.java index e4ab8a1a8..7d595bd0e 100644 --- a/common/mekanism/common/network/PacketElectricChest.java +++ b/common/mekanism/common/network/PacketElectricChest.java @@ -8,7 +8,7 @@ import mekanism.common.IElectricChest; import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryElectricChest; -import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/common/mekanism/common/network/PacketLogisticalSorterGui.java b/common/mekanism/common/network/PacketLogisticalSorterGui.java index 531c02df5..e1ed27d37 100644 --- a/common/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/common/mekanism/common/network/PacketLogisticalSorterGui.java @@ -11,8 +11,8 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; -import mekanism.common.tileentity.TileEntityContainerBlock; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityContainerBlock; +import mekanism.common.tile.TileEntityLogisticalSorter; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/common/mekanism/common/network/PacketNewFilter.java b/common/mekanism/common/network/PacketNewFilter.java index 6a4d03b29..2d1a1b56e 100644 --- a/common/mekanism/common/network/PacketNewFilter.java +++ b/common/mekanism/common/network/PacketNewFilter.java @@ -7,8 +7,8 @@ import mekanism.api.Coord4D; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.miner.MinerFilter; -import mekanism.common.tileentity.TileEntityDigitalMiner; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityDigitalMiner; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterFilter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketPortableTeleport.java b/common/mekanism/common/network/PacketPortableTeleport.java index 64e048cc8..6534a8e44 100644 --- a/common/mekanism/common/network/PacketPortableTeleport.java +++ b/common/mekanism/common/network/PacketPortableTeleport.java @@ -7,7 +7,7 @@ import mekanism.common.PacketHandler; import mekanism.common.Teleporter; import mekanism.common.PacketHandler.Transmission; import mekanism.common.item.ItemPortableTeleporter; -import mekanism.common.tileentity.TileEntityTeleporter; +import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/common/mekanism/common/network/PacketRemoveUpgrade.java b/common/mekanism/common/network/PacketRemoveUpgrade.java index c6f93992e..64389a065 100644 --- a/common/mekanism/common/network/PacketRemoveUpgrade.java +++ b/common/mekanism/common/network/PacketRemoveUpgrade.java @@ -5,7 +5,7 @@ import java.io.DataOutputStream; import mekanism.api.Coord4D; import mekanism.common.IUpgradeManagement; import mekanism.common.Mekanism; -import mekanism.common.tileentity.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityBasicBlock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/network/PacketRobit.java b/common/mekanism/common/network/PacketRobit.java index 6eec890cf..9084f6b79 100644 --- a/common/mekanism/common/network/PacketRobit.java +++ b/common/mekanism/common/network/PacketRobit.java @@ -2,8 +2,8 @@ package mekanism.common.network; import java.io.DataOutputStream; -import mekanism.common.EntityRobit; import mekanism.common.Mekanism; +import mekanism.common.entity.EntityRobit; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/common/mekanism/common/network/PacketSimpleGui.java b/common/mekanism/common/network/PacketSimpleGui.java index a29cdb3d5..9d6167de7 100644 --- a/common/mekanism/common/network/PacketSimpleGui.java +++ b/common/mekanism/common/network/PacketSimpleGui.java @@ -6,7 +6,7 @@ import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.tileentity.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityBasicBlock; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/common/mekanism/common/MekanismRecipe.java b/common/mekanism/common/recipe/MekanismRecipe.java similarity index 98% rename from common/mekanism/common/MekanismRecipe.java rename to common/mekanism/common/recipe/MekanismRecipe.java index 02180db26..2439eca9d 100644 --- a/common/mekanism/common/MekanismRecipe.java +++ b/common/mekanism/common/recipe/MekanismRecipe.java @@ -1,9 +1,12 @@ -package mekanism.common; +package mekanism.common.recipe; import java.util.ArrayList; import java.util.HashMap; import mekanism.api.energy.IEnergizedItem; +import mekanism.common.IEnergyCube; +import mekanism.common.IFactory; +import mekanism.common.IUpgradeManagement; import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; diff --git a/common/mekanism/common/RecipeHandler.java b/common/mekanism/common/recipe/RecipeHandler.java similarity index 99% rename from common/mekanism/common/RecipeHandler.java rename to common/mekanism/common/recipe/RecipeHandler.java index 2eb9718b7..7615064bf 100644 --- a/common/mekanism/common/RecipeHandler.java +++ b/common/mekanism/common/recipe/RecipeHandler.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.recipe; import java.util.HashMap; import java.util.Map; diff --git a/common/mekanism/common/DynamicFluidTank.java b/common/mekanism/common/tank/DynamicFluidTank.java similarity index 97% rename from common/mekanism/common/DynamicFluidTank.java rename to common/mekanism/common/tank/DynamicFluidTank.java index d183e1f2f..c8c9afd81 100644 --- a/common/mekanism/common/DynamicFluidTank.java +++ b/common/mekanism/common/tank/DynamicFluidTank.java @@ -1,8 +1,8 @@ -package mekanism.common; +package mekanism.common.tank; import mekanism.api.Coord4D; -import mekanism.common.SynchronizedTankData.ValveData; -import mekanism.common.tileentity.TileEntityDynamicTank; +import mekanism.common.tank.SynchronizedTankData.ValveData; +import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.util.MekanismUtils; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; diff --git a/common/mekanism/common/DynamicTankCache.java b/common/mekanism/common/tank/DynamicTankCache.java similarity index 91% rename from common/mekanism/common/DynamicTankCache.java rename to common/mekanism/common/tank/DynamicTankCache.java index 65de00b1c..2174cf8bb 100644 --- a/common/mekanism/common/DynamicTankCache.java +++ b/common/mekanism/common/tank/DynamicTankCache.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tank; import java.util.HashSet; diff --git a/common/mekanism/common/SynchronizedTankData.java b/common/mekanism/common/tank/SynchronizedTankData.java similarity index 98% rename from common/mekanism/common/SynchronizedTankData.java rename to common/mekanism/common/tank/SynchronizedTankData.java index 3b3b0d2d0..acba89884 100644 --- a/common/mekanism/common/SynchronizedTankData.java +++ b/common/mekanism/common/tank/SynchronizedTankData.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.tank; import java.util.HashSet; import java.util.Set; diff --git a/common/mekanism/common/TankUpdateProtocol.java b/common/mekanism/common/tank/TankUpdateProtocol.java similarity index 97% rename from common/mekanism/common/TankUpdateProtocol.java rename to common/mekanism/common/tank/TankUpdateProtocol.java index 1f5a63424..979df2715 100644 --- a/common/mekanism/common/TankUpdateProtocol.java +++ b/common/mekanism/common/tank/TankUpdateProtocol.java @@ -1,12 +1,13 @@ -package mekanism.common; +package mekanism.common.tank; import java.util.HashSet; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.SynchronizedTankData.ValveData; -import mekanism.common.tileentity.TileEntityDynamicTank; -import mekanism.common.tileentity.TileEntityDynamicValve; +import mekanism.common.Mekanism; +import mekanism.common.tank.SynchronizedTankData.ValveData; +import mekanism.common.tile.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityDynamicValve; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/common/mekanism/common/tileentity/TileEntityAdvancedBoundingBlock.java b/common/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityAdvancedBoundingBlock.java rename to common/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index 76103fe52..18ad99943 100644 --- a/common/mekanism/common/tileentity/TileEntityAdvancedBoundingBlock.java +++ b/common/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergyTile; diff --git a/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java b/common/mekanism/common/tile/TileEntityAdvancedElectricMachine.java similarity index 97% rename from common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java rename to common/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index b3bca5436..ce1f34bae 100644 --- a/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java +++ b/common/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -1,13 +1,13 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; import mekanism.api.EnumColor; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler; import mekanism.common.SideData; -import mekanism.common.TileComponentEjector; -import mekanism.common.TileComponentUpgrade; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/tileentity/TileEntityAdvancedFactory.java b/common/mekanism/common/tile/TileEntityAdvancedFactory.java similarity index 90% rename from common/mekanism/common/tileentity/TileEntityAdvancedFactory.java rename to common/mekanism/common/tile/TileEntityAdvancedFactory.java index 1d11caf25..9ad75b660 100644 --- a/common/mekanism/common/tileentity/TileEntityAdvancedFactory.java +++ b/common/mekanism/common/tile/TileEntityAdvancedFactory.java @@ -1,10 +1,10 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import mekanism.api.EnumColor; import mekanism.common.SideData; -import mekanism.common.TileComponentEjector; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.InventoryUtils; public class TileEntityAdvancedFactory extends TileEntityFactory diff --git a/common/mekanism/common/tileentity/TileEntityBasicBlock.java b/common/mekanism/common/tile/TileEntityBasicBlock.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityBasicBlock.java rename to common/mekanism/common/tile/TileEntityBasicBlock.java index 43752ba98..cf369de91 100644 --- a/common/mekanism/common/tileentity/TileEntityBasicBlock.java +++ b/common/mekanism/common/tile/TileEntityBasicBlock.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import ic2.api.tile.IWrenchable; diff --git a/common/mekanism/common/tileentity/TileEntityBasicMachine.java b/common/mekanism/common/tile/TileEntityBasicMachine.java similarity index 98% rename from common/mekanism/common/tileentity/TileEntityBasicMachine.java rename to common/mekanism/common/tile/TileEntityBasicMachine.java index 403688135..a755ee6cc 100644 --- a/common/mekanism/common/tileentity/TileEntityBasicMachine.java +++ b/common/mekanism/common/tile/TileEntityBasicMachine.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; @@ -14,9 +14,9 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileComponentEjector; -import mekanism.common.TileComponentUpgrade; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; diff --git a/common/mekanism/common/tileentity/TileEntityBin.java b/common/mekanism/common/tile/TileEntityBin.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityBin.java rename to common/mekanism/common/tile/TileEntityBin.java index be3182c93..b78569021 100644 --- a/common/mekanism/common/tileentity/TileEntityBin.java +++ b/common/mekanism/common/tile/TileEntityBin.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; diff --git a/common/mekanism/common/tileentity/TileEntityBoundingBlock.java b/common/mekanism/common/tile/TileEntityBoundingBlock.java similarity index 98% rename from common/mekanism/common/tileentity/TileEntityBoundingBlock.java rename to common/mekanism/common/tile/TileEntityBoundingBlock.java index a0b610e90..ea68c6177 100644 --- a/common/mekanism/common/tileentity/TileEntityBoundingBlock.java +++ b/common/mekanism/common/tile/TileEntityBoundingBlock.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; diff --git a/common/mekanism/common/tileentity/TileEntityChargepad.java b/common/mekanism/common/tile/TileEntityChargepad.java similarity index 98% rename from common/mekanism/common/tileentity/TileEntityChargepad.java rename to common/mekanism/common/tile/TileEntityChargepad.java index 2c8fadf6d..5c441a361 100644 --- a/common/mekanism/common/tileentity/TileEntityChargepad.java +++ b/common/mekanism/common/tile/TileEntityChargepad.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; @@ -12,12 +12,12 @@ import mekanism.api.Coord4D; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.client.sound.IHasSound; -import mekanism.common.EntityRobit; import mekanism.common.IActiveState; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.entity.EntityRobit; import mekanism.common.network.PacketTileEntity; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.EntityLiving; diff --git a/common/mekanism/common/tileentity/TileEntityChemicalInfuser.java b/common/mekanism/common/tile/TileEntityChemicalInfuser.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityChemicalInfuser.java rename to common/mekanism/common/tile/TileEntityChemicalInfuser.java index eb7d6670e..45a6c364f 100644 --- a/common/mekanism/common/tileentity/TileEntityChemicalInfuser.java +++ b/common/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; @@ -15,6 +15,7 @@ import mekanism.common.*; import mekanism.common.PacketHandler.Transmission; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; +import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/tileentity/TileEntityChemicalInjectionChamber.java b/common/mekanism/common/tile/TileEntityChemicalInjectionChamber.java similarity index 96% rename from common/mekanism/common/tileentity/TileEntityChemicalInjectionChamber.java rename to common/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index 00437d9c6..fd6708ccb 100644 --- a/common/mekanism/common/tileentity/TileEntityChemicalInjectionChamber.java +++ b/common/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.Map; @@ -10,8 +10,8 @@ import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/common/mekanism/common/tileentity/TileEntityChemicalOxidizer.java b/common/mekanism/common/tile/TileEntityChemicalOxidizer.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityChemicalOxidizer.java rename to common/mekanism/common/tile/TileEntityChemicalOxidizer.java index 5b3edf6a0..ae6bbac35 100644 --- a/common/mekanism/common/tileentity/TileEntityChemicalOxidizer.java +++ b/common/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; @@ -15,9 +15,9 @@ import mekanism.common.IRedstoneControl; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.RecipeHandler; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; +import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/tileentity/TileEntityCombiner.java b/common/mekanism/common/tile/TileEntityCombiner.java similarity index 90% rename from common/mekanism/common/tileentity/TileEntityCombiner.java rename to common/mekanism/common/tile/TileEntityCombiner.java index be5701468..f37806a5c 100644 --- a/common/mekanism/common/tileentity/TileEntityCombiner.java +++ b/common/mekanism/common/tile/TileEntityCombiner.java @@ -1,10 +1,10 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.Map; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/tileentity/TileEntityContainerBlock.java b/common/mekanism/common/tile/TileEntityContainerBlock.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityContainerBlock.java rename to common/mekanism/common/tile/TileEntityContainerBlock.java index 1db0dccba..f4b43385d 100644 --- a/common/mekanism/common/tileentity/TileEntityContainerBlock.java +++ b/common/mekanism/common/tile/TileEntityContainerBlock.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import mekanism.common.ISustainedInventory; import mekanism.common.util.InventoryUtils; diff --git a/common/mekanism/common/tileentity/TileEntityCrusher.java b/common/mekanism/common/tile/TileEntityCrusher.java similarity index 92% rename from common/mekanism/common/tileentity/TileEntityCrusher.java rename to common/mekanism/common/tile/TileEntityCrusher.java index 4da03067b..6d11af8f3 100644 --- a/common/mekanism/common/tileentity/TileEntityCrusher.java +++ b/common/mekanism/common/tile/TileEntityCrusher.java @@ -1,11 +1,11 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.EnumSet; import java.util.Map; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/common/tileentity/TileEntityDigitalMiner.java b/common/mekanism/common/tile/TileEntityDigitalMiner.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityDigitalMiner.java rename to common/mekanism/common/tile/TileEntityDigitalMiner.java index f328b0eef..4ce72af51 100644 --- a/common/mekanism/common/tileentity/TileEntityDigitalMiner.java +++ b/common/mekanism/common/tile/TileEntityDigitalMiner.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; import java.util.HashSet; @@ -16,7 +16,6 @@ import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.TileComponentUpgrade; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; @@ -26,6 +25,7 @@ import mekanism.common.miner.MinerFilter; import mekanism.common.miner.ThreadMinerSearch; import mekanism.common.miner.ThreadMinerSearch.State; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.transporter.InvStack; import mekanism.common.transporter.TransporterManager; import mekanism.common.util.ChargeUtils; diff --git a/common/mekanism/common/tileentity/TileEntityDynamicTank.java b/common/mekanism/common/tile/TileEntityDynamicTank.java similarity index 98% rename from common/mekanism/common/tileentity/TileEntityDynamicTank.java rename to common/mekanism/common/tile/TileEntityDynamicTank.java index 732e08ac8..06f2f953c 100644 --- a/common/mekanism/common/tileentity/TileEntityDynamicTank.java +++ b/common/mekanism/common/tile/TileEntityDynamicTank.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; import java.util.HashMap; @@ -8,10 +8,10 @@ import mekanism.api.Coord4D; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.SynchronizedTankData; -import mekanism.common.SynchronizedTankData.ValveData; -import mekanism.common.TankUpdateProtocol; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tank.SynchronizedTankData; +import mekanism.common.tank.TankUpdateProtocol; +import mekanism.common.tank.SynchronizedTankData.ValveData; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/tileentity/TileEntityDynamicValve.java b/common/mekanism/common/tile/TileEntityDynamicValve.java similarity index 95% rename from common/mekanism/common/tileentity/TileEntityDynamicValve.java rename to common/mekanism/common/tile/TileEntityDynamicValve.java index dbc59b21f..f73ac69f1 100644 --- a/common/mekanism/common/tileentity/TileEntityDynamicValve.java +++ b/common/mekanism/common/tile/TileEntityDynamicValve.java @@ -1,6 +1,6 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; -import mekanism.common.DynamicFluidTank; +import mekanism.common.tank.DynamicFluidTank; import mekanism.common.util.PipeUtils; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; diff --git a/common/mekanism/common/tileentity/TileEntityElectricBlock.java b/common/mekanism/common/tile/TileEntityElectricBlock.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityElectricBlock.java rename to common/mekanism/common/tile/TileEntityElectricBlock.java index b7f7c72ff..51067868b 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricBlock.java +++ b/common/mekanism/common/tile/TileEntityElectricBlock.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; diff --git a/common/mekanism/common/tileentity/TileEntityElectricChest.java b/common/mekanism/common/tile/TileEntityElectricChest.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityElectricChest.java rename to common/mekanism/common/tile/TileEntityElectricChest.java index a7b0f943d..1976e1b0a 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricChest.java +++ b/common/mekanism/common/tile/TileEntityElectricChest.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; diff --git a/common/mekanism/common/tileentity/TileEntityElectricMachine.java b/common/mekanism/common/tile/TileEntityElectricMachine.java similarity index 96% rename from common/mekanism/common/tileentity/TileEntityElectricMachine.java rename to common/mekanism/common/tile/TileEntityElectricMachine.java index 8eaa7e2af..f3a7aac43 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricMachine.java +++ b/common/mekanism/common/tile/TileEntityElectricMachine.java @@ -1,11 +1,11 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import mekanism.api.EnumColor; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler; import mekanism.common.SideData; -import mekanism.common.TileComponentEjector; -import mekanism.common.TileComponentUpgrade; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/tileentity/TileEntityElectricPump.java b/common/mekanism/common/tile/TileEntityElectricPump.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityElectricPump.java rename to common/mekanism/common/tile/TileEntityElectricPump.java index 0abdfab39..6f635cc8f 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricPump.java +++ b/common/mekanism/common/tile/TileEntityElectricPump.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; import java.util.Arrays; diff --git a/common/mekanism/common/tileentity/TileEntityElectrolyticSeparator.java b/common/mekanism/common/tile/TileEntityElectrolyticSeparator.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityElectrolyticSeparator.java rename to common/mekanism/common/tile/TileEntityElectrolyticSeparator.java index 184269b7f..649aedefe 100644 --- a/common/mekanism/common/tileentity/TileEntityElectrolyticSeparator.java +++ b/common/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; @@ -16,10 +16,10 @@ import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.RecipeHandler; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/tileentity/TileEntityEliteFactory.java b/common/mekanism/common/tile/TileEntityEliteFactory.java similarity index 90% rename from common/mekanism/common/tileentity/TileEntityEliteFactory.java rename to common/mekanism/common/tile/TileEntityEliteFactory.java index f8f9b1143..46d739692 100644 --- a/common/mekanism/common/tileentity/TileEntityEliteFactory.java +++ b/common/mekanism/common/tile/TileEntityEliteFactory.java @@ -1,10 +1,10 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import mekanism.api.EnumColor; import mekanism.common.SideData; import mekanism.common.Tier.FactoryTier; -import mekanism.common.TileComponentEjector; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.tile.component.TileComponentEjector; import mekanism.common.util.InventoryUtils; public class TileEntityEliteFactory extends TileEntityFactory diff --git a/common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java b/common/mekanism/common/tile/TileEntityEnergizedSmelter.java similarity index 95% rename from common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java rename to common/mekanism/common/tile/TileEntityEnergizedSmelter.java index 2e14a7e75..992176290 100644 --- a/common/mekanism/common/tileentity/TileEntityEnergizedSmelter.java +++ b/common/mekanism/common/tile/TileEntityEnergizedSmelter.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.HashMap; import java.util.List; diff --git a/common/mekanism/common/tileentity/TileEntityEnergyCube.java b/common/mekanism/common/tile/TileEntityEnergyCube.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityEnergyCube.java rename to common/mekanism/common/tile/TileEntityEnergyCube.java index c281a9e64..5099f5f87 100644 --- a/common/mekanism/common/tileentity/TileEntityEnergyCube.java +++ b/common/mekanism/common/tile/TileEntityEnergyCube.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; import java.util.EnumSet; diff --git a/common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java b/common/mekanism/common/tile/TileEntityEnrichmentChamber.java similarity index 88% rename from common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java rename to common/mekanism/common/tile/TileEntityEnrichmentChamber.java index 2d7184c2f..0b817e774 100644 --- a/common/mekanism/common/tileentity/TileEntityEnrichmentChamber.java +++ b/common/mekanism/common/tile/TileEntityEnrichmentChamber.java @@ -1,10 +1,10 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.Map; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.util.ResourceLocation; public class TileEntityEnrichmentChamber extends TileEntityElectricMachine diff --git a/common/mekanism/common/tileentity/TileEntityFactory.java b/common/mekanism/common/tile/TileEntityFactory.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityFactory.java rename to common/mekanism/common/tile/TileEntityFactory.java index 13465a9fc..90787b776 100644 --- a/common/mekanism/common/tileentity/TileEntityFactory.java +++ b/common/mekanism/common/tile/TileEntityFactory.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; import java.util.List; @@ -24,10 +24,10 @@ import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.SideData; import mekanism.common.Tier.FactoryTier; -import mekanism.common.TileComponentEjector; -import mekanism.common.TileComponentUpgrade; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; +import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/tileentity/TileEntityGasTank.java b/common/mekanism/common/tile/TileEntityGasTank.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityGasTank.java rename to common/mekanism/common/tile/TileEntityGasTank.java index 7423e1fc6..6585961ad 100644 --- a/common/mekanism/common/tileentity/TileEntityGasTank.java +++ b/common/mekanism/common/tile/TileEntityGasTank.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; diff --git a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java b/common/mekanism/common/tile/TileEntityLogisticalSorter.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityLogisticalSorter.java rename to common/mekanism/common/tile/TileEntityLogisticalSorter.java index 12e55447e..467d02325 100644 --- a/common/mekanism/common/tileentity/TileEntityLogisticalSorter.java +++ b/common/mekanism/common/tile/TileEntityLogisticalSorter.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; import java.util.EnumSet; diff --git a/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java b/common/mekanism/common/tile/TileEntityMetallurgicInfuser.java similarity index 98% rename from common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java rename to common/mekanism/common/tile/TileEntityMetallurgicInfuser.java index da7aad7cd..664de9b3d 100644 --- a/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java +++ b/common/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; @@ -18,13 +18,13 @@ import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; -import mekanism.common.RecipeHandler; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.SideData; -import mekanism.common.TileComponentEjector; -import mekanism.common.TileComponentUpgrade; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; +import mekanism.common.recipe.RecipeHandler; +import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.tile.component.TileComponentEjector; +import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/tileentity/TileEntityObsidianTNT.java b/common/mekanism/common/tile/TileEntityObsidianTNT.java similarity index 76% rename from common/mekanism/common/tileentity/TileEntityObsidianTNT.java rename to common/mekanism/common/tile/TileEntityObsidianTNT.java index 73772f20a..075a70c85 100644 --- a/common/mekanism/common/tileentity/TileEntityObsidianTNT.java +++ b/common/mekanism/common/tile/TileEntityObsidianTNT.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java b/common/mekanism/common/tile/TileEntityOsmiumCompressor.java similarity index 92% rename from common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java rename to common/mekanism/common/tile/TileEntityOsmiumCompressor.java index 45d2ee95f..9f737babb 100644 --- a/common/mekanism/common/tileentity/TileEntityOsmiumCompressor.java +++ b/common/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -1,10 +1,10 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.Map; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; diff --git a/common/mekanism/common/tileentity/TileEntityPurificationChamber.java b/common/mekanism/common/tile/TileEntityPurificationChamber.java similarity index 96% rename from common/mekanism/common/tileentity/TileEntityPurificationChamber.java rename to common/mekanism/common/tile/TileEntityPurificationChamber.java index 6a1f58b4d..6d962ddcb 100644 --- a/common/mekanism/common/tileentity/TileEntityPurificationChamber.java +++ b/common/mekanism/common/tile/TileEntityPurificationChamber.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.Map; @@ -10,8 +10,8 @@ import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; -import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; +import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java b/common/mekanism/common/tile/TileEntityRotaryCondensentrator.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java rename to common/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 3984966b9..c0796c450 100644 --- a/common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java +++ b/common/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; diff --git a/common/mekanism/common/tileentity/TileEntityTeleporter.java b/common/mekanism/common/tile/TileEntityTeleporter.java similarity index 99% rename from common/mekanism/common/tileentity/TileEntityTeleporter.java rename to common/mekanism/common/tile/TileEntityTeleporter.java index 5b8d3f49f..1cc9ab242 100644 --- a/common/mekanism/common/tileentity/TileEntityTeleporter.java +++ b/common/mekanism/common/tile/TileEntityTeleporter.java @@ -1,4 +1,4 @@ -package mekanism.common.tileentity; +package mekanism.common.tile; import java.util.ArrayList; import java.util.HashSet; diff --git a/common/mekanism/common/TileComponentEjector.java b/common/mekanism/common/tile/component/TileComponentEjector.java similarity index 95% rename from common/mekanism/common/TileComponentEjector.java rename to common/mekanism/common/tile/component/TileComponentEjector.java index b8dbfbd36..46696e0cd 100644 --- a/common/mekanism/common/TileComponentEjector.java +++ b/common/mekanism/common/tile/component/TileComponentEjector.java @@ -1,11 +1,16 @@ -package mekanism.common; +package mekanism.common.tile.component; import java.util.ArrayList; import java.util.List; import mekanism.api.EnumColor; import mekanism.api.Coord4D; -import mekanism.common.tileentity.TileEntityContainerBlock; +import mekanism.common.IEjector; +import mekanism.common.IInvConfiguration; +import mekanism.common.ILogisticalTransporter; +import mekanism.common.ITileComponent; +import mekanism.common.SideData; +import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.transporter.TransporterManager; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/TileComponentUpgrade.java b/common/mekanism/common/tile/component/TileComponentUpgrade.java similarity index 94% rename from common/mekanism/common/TileComponentUpgrade.java rename to common/mekanism/common/tile/component/TileComponentUpgrade.java index 320d086c1..4328ebb18 100644 --- a/common/mekanism/common/TileComponentUpgrade.java +++ b/common/mekanism/common/tile/component/TileComponentUpgrade.java @@ -1,8 +1,10 @@ -package mekanism.common; +package mekanism.common.tile.component; import java.util.ArrayList; -import mekanism.common.tileentity.TileEntityContainerBlock; +import mekanism.common.ITileComponent; +import mekanism.common.Mekanism; +import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/common/transporter/TransporterManager.java b/common/mekanism/common/transporter/TransporterManager.java index 48e37dee4..9d880ca08 100644 --- a/common/mekanism/common/transporter/TransporterManager.java +++ b/common/mekanism/common/transporter/TransporterManager.java @@ -8,7 +8,7 @@ import java.util.Set; import mekanism.api.EnumColor; import mekanism.api.Coord4D; import mekanism.common.IInvConfiguration; -import mekanism.common.tileentity.TileEntityBin; +import mekanism.common.tile.TileEntityBin; import mekanism.common.transporter.TransporterStack.Path; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; diff --git a/common/mekanism/common/transporter/TransporterPathfinder.java b/common/mekanism/common/transporter/TransporterPathfinder.java index 1a547d234..839386edf 100644 --- a/common/mekanism/common/transporter/TransporterPathfinder.java +++ b/common/mekanism/common/transporter/TransporterPathfinder.java @@ -10,7 +10,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.ILogisticalTransporter; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterPathfinder.Pathfinder.DestChecker; import mekanism.common.transporter.TransporterStack.Path; import mekanism.common.util.InventoryUtils; diff --git a/common/mekanism/common/transporter/TransporterStack.java b/common/mekanism/common/transporter/TransporterStack.java index b649504e9..99ec6d009 100644 --- a/common/mekanism/common/transporter/TransporterStack.java +++ b/common/mekanism/common/transporter/TransporterStack.java @@ -6,7 +6,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.ILogisticalTransporter; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterPathfinder.Destination; import mekanism.common.util.TransporterUtils; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/common/util/CableUtils.java b/common/mekanism/common/util/CableUtils.java index 9c20c7f1c..2d06f4b73 100644 --- a/common/mekanism/common/util/CableUtils.java +++ b/common/mekanism/common/util/CableUtils.java @@ -14,7 +14,7 @@ import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.Mekanism; -import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityElectricBlock; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import buildcraft.api.power.IPowerEmitter; diff --git a/common/mekanism/common/util/ChargeUtils.java b/common/mekanism/common/util/ChargeUtils.java index 6824d1e4b..4a653af35 100644 --- a/common/mekanism/common/util/ChargeUtils.java +++ b/common/mekanism/common/util/ChargeUtils.java @@ -5,7 +5,7 @@ import ic2.api.item.IElectricItem; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; -import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityElectricBlock; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; diff --git a/common/mekanism/common/util/InventoryUtils.java b/common/mekanism/common/util/InventoryUtils.java index 1e7fefe61..3b699d7ad 100644 --- a/common/mekanism/common/util/InventoryUtils.java +++ b/common/mekanism/common/util/InventoryUtils.java @@ -2,8 +2,8 @@ package mekanism.common.util; import mekanism.api.EnumColor; import mekanism.common.IInvConfiguration; -import mekanism.common.tileentity.TileEntityBin; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityBin; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.Finder; import mekanism.common.transporter.InvStack; import net.minecraft.inventory.IInventory; diff --git a/common/mekanism/common/util/MekanismUtils.java b/common/mekanism/common/util/MekanismUtils.java index 4cb487f74..c86891e8c 100644 --- a/common/mekanism/common/util/MekanismUtils.java +++ b/common/mekanism/common/util/MekanismUtils.java @@ -18,7 +18,6 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; -import mekanism.common.DynamicTankCache; import mekanism.common.EnergyDisplay; import mekanism.common.EnergyDisplay.ElectricUnit; import mekanism.common.IActiveState; @@ -40,10 +39,11 @@ import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockGasTank; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; -import mekanism.common.tileentity.TileEntityAdvancedBoundingBlock; -import mekanism.common.tileentity.TileEntityBoundingBlock; -import mekanism.common.tileentity.TileEntityDynamicTank; -import mekanism.common.tileentity.TileEntityElectricChest; +import mekanism.common.tank.DynamicTankCache; +import mekanism.common.tile.TileEntityAdvancedBoundingBlock; +import mekanism.common.tile.TileEntityBoundingBlock; +import mekanism.common.tile.TileEntityDynamicTank; +import mekanism.common.tile.TileEntityElectricChest; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/common/mekanism/common/util/TransporterUtils.java b/common/mekanism/common/util/TransporterUtils.java index 9b6fc1072..ddb01baa8 100644 --- a/common/mekanism/common/util/TransporterUtils.java +++ b/common/mekanism/common/util/TransporterUtils.java @@ -8,7 +8,7 @@ import mekanism.api.EnumColor; import mekanism.api.ListUtils; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.ILogisticalTransporter; -import mekanism.common.tileentity.TileEntityLogisticalSorter; +import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TransporterManager; import mekanism.common.transporter.TransporterStack; import net.minecraft.entity.item.EntityItem; diff --git a/common/mekanism/generators/client/GeneratorsClientProxy.java b/common/mekanism/generators/client/GeneratorsClientProxy.java index 18a069022..3aaa06beb 100644 --- a/common/mekanism/generators/client/GeneratorsClientProxy.java +++ b/common/mekanism/generators/client/GeneratorsClientProxy.java @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly; import mekanism.generators.client.gui.*; import mekanism.generators.client.render.*; import mekanism.generators.common.GeneratorsCommonProxy; -import mekanism.generators.common.tileentity.*; +import mekanism.generators.common.tile.*; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/gui/GuiBioGenerator.java b/common/mekanism/generators/client/gui/GuiBioGenerator.java index 48fab3d12..2e85cbbff 100644 --- a/common/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/common/mekanism/generators/client/gui/GuiBioGenerator.java @@ -5,7 +5,7 @@ import mekanism.client.gui.GuiRedstoneControl; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerBioGenerator; -import mekanism.generators.common.tileentity.TileEntityBioGenerator; +import mekanism.generators.common.tile.TileEntityBioGenerator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/gui/GuiHeatGenerator.java b/common/mekanism/generators/client/gui/GuiHeatGenerator.java index 8307da2ad..a3e95fc92 100644 --- a/common/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/common/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -5,7 +5,7 @@ import mekanism.client.gui.GuiRedstoneControl; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; -import mekanism.generators.common.tileentity.TileEntityHeatGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java b/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java index c54641449..e528cb739 100644 --- a/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java +++ b/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java @@ -5,7 +5,7 @@ import mekanism.client.gui.GuiRedstoneControl; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerHydrogenGenerator; -import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; +import mekanism.generators.common.tile.TileEntityHydrogenGenerator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/gui/GuiSolarGenerator.java b/common/mekanism/generators/client/gui/GuiSolarGenerator.java index 0a89ac217..32a400ffb 100644 --- a/common/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/common/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -5,7 +5,7 @@ import mekanism.client.gui.GuiRedstoneControl; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; -import mekanism.generators.common.tileentity.TileEntitySolarGenerator; +import mekanism.generators.common.tile.TileEntitySolarGenerator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/gui/GuiWindTurbine.java b/common/mekanism/generators/client/gui/GuiWindTurbine.java index 95e1526ee..8700b7a14 100644 --- a/common/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/common/mekanism/generators/client/gui/GuiWindTurbine.java @@ -7,7 +7,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerWindTurbine; -import mekanism.generators.common.tileentity.TileEntityWindTurbine; +import mekanism.generators.common.tile.TileEntityWindTurbine; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; diff --git a/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index e58babf04..db3321273 100644 --- a/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -3,7 +3,7 @@ package mekanism.generators.client.render; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelAdvancedSolarGenerator; -import mekanism.generators.common.tileentity.TileEntityAdvancedSolarGenerator; +import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/render/RenderBioGenerator.java b/common/mekanism/generators/client/render/RenderBioGenerator.java index e58d0970e..1da931647 100644 --- a/common/mekanism/generators/client/render/RenderBioGenerator.java +++ b/common/mekanism/generators/client/render/RenderBioGenerator.java @@ -9,7 +9,7 @@ import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelBioGenerator; -import mekanism.generators.common.tileentity.TileEntityBioGenerator; +import mekanism.generators.common.tile.TileEntityBioGenerator; import net.minecraft.block.Block; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/render/RenderHeatGenerator.java b/common/mekanism/generators/client/render/RenderHeatGenerator.java index 42a83a8fc..815a79231 100644 --- a/common/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/common/mekanism/generators/client/render/RenderHeatGenerator.java @@ -3,7 +3,7 @@ package mekanism.generators.client.render; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelHeatGenerator; -import mekanism.generators.common.tileentity.TileEntityHeatGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/render/RenderHydrogenGenerator.java b/common/mekanism/generators/client/render/RenderHydrogenGenerator.java index 6d9a8e972..33cd02727 100644 --- a/common/mekanism/generators/client/render/RenderHydrogenGenerator.java +++ b/common/mekanism/generators/client/render/RenderHydrogenGenerator.java @@ -3,7 +3,7 @@ package mekanism.generators.client.render; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelHydrogenGenerator; -import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; +import mekanism.generators.common.tile.TileEntityHydrogenGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/render/RenderSolarGenerator.java b/common/mekanism/generators/client/render/RenderSolarGenerator.java index 0f42d09fb..a3b833c47 100644 --- a/common/mekanism/generators/client/render/RenderSolarGenerator.java +++ b/common/mekanism/generators/client/render/RenderSolarGenerator.java @@ -3,7 +3,7 @@ package mekanism.generators.client.render; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelSolarGenerator; -import mekanism.generators.common.tileentity.TileEntitySolarGenerator; +import mekanism.generators.common.tile.TileEntitySolarGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/client/render/RenderWindTurbine.java b/common/mekanism/generators/client/render/RenderWindTurbine.java index 833a272ae..64f19e842 100644 --- a/common/mekanism/generators/client/render/RenderWindTurbine.java +++ b/common/mekanism/generators/client/render/RenderWindTurbine.java @@ -4,7 +4,7 @@ import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.model.ModelWindTurbine; -import mekanism.generators.common.tileentity.TileEntityWindTurbine; +import mekanism.generators.common.tile.TileEntityWindTurbine; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/common/GeneratorsCommonProxy.java b/common/mekanism/generators/common/GeneratorsCommonProxy.java index 88a9f45de..f8e13c58b 100644 --- a/common/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/common/mekanism/generators/common/GeneratorsCommonProxy.java @@ -3,7 +3,7 @@ package mekanism.generators.common; import cpw.mods.fml.common.registry.GameRegistry; import mekanism.common.Mekanism; import mekanism.generators.common.inventory.container.*; -import mekanism.generators.common.tileentity.*; +import mekanism.generators.common.tile.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/common/MekanismGenerators.java b/common/mekanism/generators/common/MekanismGenerators.java index f8faabe19..a983d9f93 100644 --- a/common/mekanism/generators/common/MekanismGenerators.java +++ b/common/mekanism/generators/common/MekanismGenerators.java @@ -8,10 +8,10 @@ import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; import mekanism.common.IModule; import mekanism.common.Mekanism; -import mekanism.common.MekanismRecipe; -import mekanism.common.RecipeHandler; import mekanism.common.Version; import mekanism.common.item.ItemMekanism; +import mekanism.common.recipe.MekanismRecipe; +import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.block.BlockGenerator; diff --git a/common/mekanism/generators/common/block/BlockGenerator.java b/common/mekanism/generators/common/block/BlockGenerator.java index 19661ecf5..0ba1ec25f 100644 --- a/common/mekanism/generators/common/block/BlockGenerator.java +++ b/common/mekanism/generators/common/block/BlockGenerator.java @@ -5,12 +5,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mekanism.api.energy.IEnergizedItem; import mekanism.common.*; -import mekanism.common.tileentity.TileEntityBasicBlock; -import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityBasicBlock; +import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.generators.client.GeneratorsClientProxy; import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.tileentity.*; +import mekanism.generators.common.tile.*; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index f4e371959..2721de72c 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -2,7 +2,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; -import mekanism.generators.common.tileentity.TileEntityBioGenerator; +import mekanism.generators.common.tile.TileEntityBioGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java index e3c3203e8..474c8a6fc 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java @@ -2,7 +2,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; -import mekanism.generators.common.tileentity.TileEntityHeatGenerator; +import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java index f8862e0f1..64656c6c3 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java @@ -4,7 +4,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.IGasItem; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; -import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; +import mekanism.generators.common.tile.TileEntityHydrogenGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java index 538d8d9c8..64a18183c 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java @@ -2,7 +2,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; -import mekanism.generators.common.tileentity.TileEntitySolarGenerator; +import mekanism.generators.common.tile.TileEntitySolarGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java b/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java index 802d1e445..be832cbef 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java +++ b/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java @@ -2,7 +2,7 @@ package mekanism.generators.common.inventory.container; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.util.ChargeUtils; -import mekanism.generators.common.tileentity.TileEntityWindTurbine; +import mekanism.generators.common.tile.TileEntityWindTurbine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/common/mekanism/generators/common/item/ItemBlockGenerator.java b/common/mekanism/generators/common/item/ItemBlockGenerator.java index c166c1ed7..ca56dc579 100644 --- a/common/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/common/mekanism/generators/common/item/ItemBlockGenerator.java @@ -11,7 +11,7 @@ import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; -import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import net.minecraft.block.Block; @@ -24,6 +24,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + import org.lwjgl.input.Keyboard; import java.util.List; diff --git a/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java b/common/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java similarity index 96% rename from common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java rename to common/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 8240edf08..e469eb60d 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java +++ b/common/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.common.tileentity; +package mekanism.generators.common.tile; import java.util.EnumSet; diff --git a/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java b/common/mekanism/generators/common/tile/TileEntityBioGenerator.java similarity index 99% rename from common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java rename to common/mekanism/generators/common/tile/TileEntityBioGenerator.java index aa1b3c16f..6b9ce294b 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java +++ b/common/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.common.tileentity; +package mekanism.generators.common.tile; import java.util.ArrayList; import java.util.EnumSet; diff --git a/common/mekanism/generators/common/tileentity/TileEntityGenerator.java b/common/mekanism/generators/common/tile/TileEntityGenerator.java similarity index 98% rename from common/mekanism/generators/common/tileentity/TileEntityGenerator.java rename to common/mekanism/generators/common/tile/TileEntityGenerator.java index b83328424..064020706 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityGenerator.java +++ b/common/mekanism/generators/common/tile/TileEntityGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.common.tileentity; +package mekanism.generators.common.tile; import java.util.ArrayList; import java.util.EnumSet; @@ -11,7 +11,7 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.network.PacketTileEntity; -import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java b/common/mekanism/generators/common/tile/TileEntityHeatGenerator.java similarity index 99% rename from common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java rename to common/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 332c6ebf7..45b6a4e82 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java +++ b/common/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.common.tileentity; +package mekanism.generators.common.tile; import java.util.ArrayList; diff --git a/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java b/common/mekanism/generators/common/tile/TileEntityHydrogenGenerator.java similarity index 99% rename from common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java rename to common/mekanism/generators/common/tile/TileEntityHydrogenGenerator.java index a4ed40545..f05601b11 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java +++ b/common/mekanism/generators/common/tile/TileEntityHydrogenGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.common.tileentity; +package mekanism.generators.common.tile; import java.util.ArrayList; diff --git a/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java b/common/mekanism/generators/common/tile/TileEntitySolarGenerator.java similarity index 99% rename from common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java rename to common/mekanism/generators/common/tile/TileEntitySolarGenerator.java index d6b3b794f..c87154552 100644 --- a/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java +++ b/common/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -1,4 +1,4 @@ -package mekanism.generators.common.tileentity; +package mekanism.generators.common.tile; import java.util.ArrayList; import java.util.EnumSet; diff --git a/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java b/common/mekanism/generators/common/tile/TileEntityWindTurbine.java similarity index 98% rename from common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java rename to common/mekanism/generators/common/tile/TileEntityWindTurbine.java index 48a870b1e..4aebaac8e 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java +++ b/common/mekanism/generators/common/tile/TileEntityWindTurbine.java @@ -1,4 +1,4 @@ -package mekanism.generators.common.tileentity; +package mekanism.generators.common.tile; import mekanism.api.Coord4D; import mekanism.common.IBoundingBlock; diff --git a/common/mekanism/tools/common/MekanismTools.java b/common/mekanism/tools/common/MekanismTools.java index 608a1fd4e..cf499d4d1 100644 --- a/common/mekanism/tools/common/MekanismTools.java +++ b/common/mekanism/tools/common/MekanismTools.java @@ -7,8 +7,8 @@ import com.google.common.io.ByteArrayDataInput; import mekanism.common.IModule; import mekanism.common.Mekanism; -import mekanism.common.MekanismRecipe; import mekanism.common.Version; +import mekanism.common.recipe.MekanismRecipe; import mekanism.tools.item.ItemMekanismArmor; import mekanism.tools.item.ItemMekanismAxe; import mekanism.tools.item.ItemMekanismHoe;