tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Organized some classes, began work on balloon entity connections

Browse source
This commit is contained in:
Aidan Brady 2014-01-07 20:55:50 -05:00
parent 45eef1465e
commit 4ab61c856f
205 changed files with 563 additions and 362 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
common/mekanism/client/ClientProxy.java
View file

@ -63,44 +63,44 @@ import mekanism.client.render.tileentity.RenderTeleporter;
import mekanism.client.sound.Sound; import mekanism.client.sound.Sound;
import mekanism.client.sound.SoundHandler; import mekanism.client.sound.SoundHandler;
import mekanism.common.CommonProxy; import mekanism.common.CommonProxy;
import mekanism.common.EntityBalloon;
import mekanism.common.EntityObsidianTNT;
import mekanism.common.EntityRobit;
import mekanism.common.IElectricChest; import mekanism.common.IElectricChest;
import mekanism.common.IInvConfiguration; import mekanism.common.IInvConfiguration;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.block.BlockMachine.MachineType; 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.inventory.InventoryElectricChest;
import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import mekanism.common.tileentity.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAdvancedFactory;
import mekanism.common.tileentity.TileEntityBin; import mekanism.common.tile.TileEntityBin;
import mekanism.common.tileentity.TileEntityChargepad; import mekanism.common.tile.TileEntityChargepad;
import mekanism.common.tileentity.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalInfuser;
import mekanism.common.tileentity.TileEntityChemicalInjectionChamber; import mekanism.common.tile.TileEntityChemicalInjectionChamber;
import mekanism.common.tileentity.TileEntityChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer;
import mekanism.common.tileentity.TileEntityCombiner; import mekanism.common.tile.TileEntityCombiner;
import mekanism.common.tileentity.TileEntityCrusher; import mekanism.common.tile.TileEntityCrusher;
import mekanism.common.tileentity.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDigitalMiner;
import mekanism.common.tileentity.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicTank;
import mekanism.common.tileentity.TileEntityDynamicValve; import mekanism.common.tile.TileEntityDynamicValve;
import mekanism.common.tileentity.TileEntityElectricChest; import mekanism.common.tile.TileEntityElectricChest;
import mekanism.common.tileentity.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricMachine;
import mekanism.common.tileentity.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectricPump;
import mekanism.common.tileentity.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityElectrolyticSeparator;
import mekanism.common.tileentity.TileEntityEliteFactory; import mekanism.common.tile.TileEntityEliteFactory;
import mekanism.common.tileentity.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergizedSmelter;
import mekanism.common.tileentity.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnergyCube;
import mekanism.common.tileentity.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityEnrichmentChamber;
import mekanism.common.tileentity.TileEntityFactory; import mekanism.common.tile.TileEntityFactory;
import mekanism.common.tileentity.TileEntityGasTank; import mekanism.common.tile.TileEntityGasTank;
import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.tileentity.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityMetallurgicInfuser;
import mekanism.common.tileentity.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityObsidianTNT;
import mekanism.common.tileentity.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityOsmiumCompressor;
import mekanism.common.tileentity.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityPurificationChamber;
import mekanism.common.tileentity.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntityRotaryCondensentrator;
import mekanism.common.tileentity.TileEntityTeleporter; import mekanism.common.tile.TileEntityTeleporter;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

2
common/mekanism/client/ThreadTankSparkle.java
View file

@ -6,7 +6,7 @@ import java.util.Set;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.tileentity.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicTank;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

2
common/mekanism/client/gui/GuiAdvancedElectricMachine.java
View file

@ -1,7 +1,7 @@
package mekanism.client.gui; package mekanism.client.gui;
import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiChemicalInfuser.java
View file

@ -9,7 +9,7 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.inventory.container.ContainerChemicalInfuser;
import mekanism.common.network.PacketTileEntity; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiChemicalInjectionChamber.java
View file

@ -2,7 +2,7 @@ package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/gui/GuiChemicalOxidizer.java
View file

@ -3,7 +3,7 @@ package mekanism.client.gui;
import mekanism.api.gas.GasStack; import mekanism.api.gas.GasStack;
import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer;
import mekanism.common.inventory.container.ContainerChemicalOxidizer; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiCombiner.java
View file

@ -2,7 +2,7 @@ package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/gui/GuiConfiguration.java
View file

@ -15,7 +15,7 @@ import mekanism.common.inventory.container.ContainerNull;
import mekanism.common.network.PacketConfigurationUpdate; import mekanism.common.network.PacketConfigurationUpdate;
import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket;
import mekanism.common.network.PacketSimpleGui; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

2
common/mekanism/client/gui/GuiCrusher.java
View file

@ -2,7 +2,7 @@ package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.tileentity.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/gui/GuiDigitalMiner.java
View file

@ -10,7 +10,7 @@ import mekanism.common.miner.ThreadMinerSearch.State;
import mekanism.common.network.PacketDigitalMinerGui; import mekanism.common.network.PacketDigitalMinerGui;
import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket;
import mekanism.common.network.PacketTileEntity; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block; import net.minecraft.block.Block;

2
common/mekanism/client/gui/GuiDigitalMinerConfig.java
View file

@ -17,7 +17,7 @@ import mekanism.common.miner.MinerFilter;
import mekanism.common.network.PacketDigitalMinerGui; import mekanism.common.network.PacketDigitalMinerGui;
import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket;
import mekanism.common.network.PacketTileEntity; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;

4
common/mekanism/client/gui/GuiDynamicTank.java
View file

@ -1,9 +1,9 @@
package mekanism.client.gui; package mekanism.client.gui;
import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer;
import mekanism.common.TankUpdateProtocol;
import mekanism.common.inventory.container.ContainerDynamicTank; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiElectricChest.java
View file

@ -10,7 +10,7 @@ import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.inventory.container.ContainerElectricChest;
import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;

2
common/mekanism/client/gui/GuiElectricMachine.java
View file

@ -1,7 +1,7 @@
package mekanism.client.gui; package mekanism.client.gui;
import mekanism.common.inventory.container.ContainerElectricMachine; import mekanism.common.inventory.container.ContainerElectricMachine;
import mekanism.common.tileentity.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricMachine;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiElectricPump.java
View file

@ -2,7 +2,7 @@ package mekanism.client.gui;
import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer;
import mekanism.common.inventory.container.ContainerElectricPump; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiElectrolyticSeparator.java
View file

@ -9,7 +9,7 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerElectrolyticSeparator; import mekanism.common.inventory.container.ContainerElectrolyticSeparator;
import mekanism.common.network.PacketTileEntity; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;

2
common/mekanism/client/gui/GuiEnergizedSmelter.java
View file

@ -2,7 +2,7 @@ package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.tileentity.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/gui/GuiEnergyCube.java
View file

@ -3,7 +3,7 @@ package mekanism.client.gui;
import mekanism.common.EnergyDisplay; import mekanism.common.EnergyDisplay;
import mekanism.common.EnergyDisplay.ElectricUnit; import mekanism.common.EnergyDisplay.ElectricUnit;
import mekanism.common.inventory.container.ContainerEnergyCube; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiEnrichmentChamber.java
View file

@ -2,7 +2,7 @@ package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.tileentity.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/gui/GuiFactory.java
View file

@ -3,7 +3,7 @@ package mekanism.client.gui;
import mekanism.common.IFactory.RecipeType; import mekanism.common.IFactory.RecipeType;
import mekanism.common.Tier.FactoryTier; import mekanism.common.Tier.FactoryTier;
import mekanism.common.inventory.container.ContainerFactory; import mekanism.common.inventory.container.ContainerFactory;
import mekanism.common.tileentity.TileEntityFactory; import mekanism.common.tile.TileEntityFactory;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiGasTank.java
View file

@ -1,7 +1,7 @@
package mekanism.client.gui; package mekanism.client.gui;
import mekanism.common.inventory.container.ContainerGasTank; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiLogisticalSorter.java
View file

@ -15,7 +15,7 @@ import mekanism.common.inventory.container.ContainerNull;
import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui;
import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket;
import mekanism.common.network.PacketTileEntity; import mekanism.common.network.PacketTileEntity;
import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.transporter.TItemStackFilter; import mekanism.common.transporter.TItemStackFilter;
import mekanism.common.transporter.TOreDictFilter; import mekanism.common.transporter.TOreDictFilter;
import mekanism.common.transporter.TransporterFilter; import mekanism.common.transporter.TransporterFilter;

2
common/mekanism/client/gui/GuiMItemStackFilter.java
View file

@ -10,7 +10,7 @@ import mekanism.common.network.PacketDigitalMinerGui;
import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket;
import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketEditFilter;
import mekanism.common.network.PacketNewFilter; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block; import net.minecraft.block.Block;

2
common/mekanism/client/gui/GuiMOreDictFilter.java
View file

@ -13,7 +13,7 @@ import mekanism.common.network.PacketDigitalMinerGui;
import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket;
import mekanism.common.network.PacketEditFilter; import mekanism.common.network.PacketEditFilter;
import mekanism.common.network.PacketNewFilter; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;

3
common/mekanism/client/gui/GuiMekanism.java
View file

@ -6,11 +6,12 @@ import java.util.Set;
import mekanism.common.IInvConfiguration; import mekanism.common.IInvConfiguration;
import mekanism.common.SideData; import mekanism.common.SideData;
import mekanism.common.item.ItemConfigurator; 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.client.gui.inventory.GuiContainer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
public abstract class GuiMekanism extends GuiContainer public abstract class GuiMekanism extends GuiContainer

2
common/mekanism/client/gui/GuiMetallurgicInfuser.java
View file

@ -7,7 +7,7 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.inventory.container.ContainerMetallurgicInfuser;
import mekanism.common.network.PacketTileEntity; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiOsmiumCompressor.java
View file

@ -2,7 +2,7 @@ package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/gui/GuiPasswordEnter.java
View file

@ -8,7 +8,7 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;

2
common/mekanism/client/gui/GuiPasswordModify.java
View file

@ -7,7 +7,7 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;

2
common/mekanism/client/gui/GuiPurificationChamber.java
View file

@ -2,7 +2,7 @@ package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/gui/GuiRecipeType.java
View file

@ -1,6 +1,6 @@
package mekanism.client.gui; package mekanism.client.gui;
import mekanism.common.tileentity.TileEntityFactory; import mekanism.common.tile.TileEntityFactory;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;

2
common/mekanism/client/gui/GuiRobitInventory.java
View file

@ -1,9 +1,9 @@
package mekanism.client.gui; package mekanism.client.gui;
import mekanism.common.EntityRobit;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.entity.EntityRobit;
import mekanism.common.inventory.container.ContainerRobitInventory; import mekanism.common.inventory.container.ContainerRobitInventory;
import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.network.PacketRobit.RobitPacketType;

2
common/mekanism/client/gui/GuiRobitMain.java
View file

@ -1,9 +1,9 @@
package mekanism.client.gui; package mekanism.client.gui;
import mekanism.common.EntityRobit;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.entity.EntityRobit;
import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.inventory.container.ContainerRobitMain;
import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.network.PacketRobit.RobitPacketType;

2
common/mekanism/client/gui/GuiRobitSmelting.java
View file

@ -1,9 +1,9 @@
package mekanism.client.gui; package mekanism.client.gui;
import mekanism.common.EntityRobit;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.entity.EntityRobit;
import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.inventory.container.ContainerRobitSmelting;
import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.network.PacketRobit.RobitPacketType;

2
common/mekanism/client/gui/GuiRotaryCondensentrator.java
View file

@ -10,7 +10,7 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.inventory.container.ContainerRotaryCondensentrator;
import mekanism.common.network.PacketTileEntity; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiSortingTab.java
View file

@ -6,7 +6,7 @@ import mekanism.api.Coord4D;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketTileEntity; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;

2
common/mekanism/client/gui/GuiTItemStackFilter.java
View file

@ -10,7 +10,7 @@ import mekanism.common.network.PacketEditFilter;
import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui;
import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket;
import mekanism.common.network.PacketNewFilter; import mekanism.common.network.PacketNewFilter;
import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.transporter.TItemStackFilter; import mekanism.common.transporter.TItemStackFilter;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;

2
common/mekanism/client/gui/GuiTOreDictFilter.java
View file

@ -14,7 +14,7 @@ import mekanism.common.network.PacketEditFilter;
import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui;
import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket;
import mekanism.common.network.PacketNewFilter; import mekanism.common.network.PacketNewFilter;
import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.transporter.TItemStackFilter; import mekanism.common.transporter.TItemStackFilter;
import mekanism.common.transporter.TOreDictFilter; import mekanism.common.transporter.TOreDictFilter;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;

2
common/mekanism/client/gui/GuiTeleporter.java
View file

@ -7,7 +7,7 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.inventory.container.ContainerTeleporter;
import mekanism.common.network.PacketTileEntity; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java
View file

@ -7,7 +7,7 @@ import mekanism.api.ListUtils;
import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasRegistry;
import mekanism.client.gui.GuiChemicalInjectionChamber; import mekanism.client.gui.GuiChemicalInjectionChamber;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;

2
common/mekanism/client/nei/CombinerRecipeHandler.java
View file

@ -5,7 +5,7 @@ import java.util.Set;
import mekanism.api.ListUtils; import mekanism.api.ListUtils;
import mekanism.client.gui.GuiCombiner; import mekanism.client.gui.GuiCombiner;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

2
common/mekanism/client/nei/CrusherRecipeHandler.java
View file

@ -3,7 +3,7 @@ package mekanism.client.nei;
import java.util.Set; import java.util.Set;
import mekanism.client.gui.GuiCrusher; import mekanism.client.gui.GuiCrusher;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
public class CrusherRecipeHandler extends MachineRecipeHandler public class CrusherRecipeHandler extends MachineRecipeHandler
{ {

2
common/mekanism/client/nei/EnrichmentChamberRecipeHandler.java
View file

@ -3,7 +3,7 @@ package mekanism.client.nei;
import java.util.Set; import java.util.Set;
import mekanism.client.gui.GuiEnrichmentChamber; import mekanism.client.gui.GuiEnrichmentChamber;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler
{ {

2
common/mekanism/client/nei/MekanismRecipeHandler.java
View file

@ -7,8 +7,8 @@ import java.util.List;
import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IEnergizedItem;
import mekanism.common.IEnergyCube; import mekanism.common.IEnergyCube;
import mekanism.common.IFactory; import mekanism.common.IFactory;
import mekanism.common.MekanismRecipe;
import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.recipe.MekanismRecipe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipe;

2
common/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java
View file

@ -16,7 +16,7 @@ import mekanism.api.infuse.InfuseType;
import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionInput;
import mekanism.api.infuse.InfusionOutput; import mekanism.api.infuse.InfusionOutput;
import mekanism.client.gui.GuiMetallurgicInfuser; import mekanism.client.gui.GuiMetallurgicInfuser;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java
View file

@ -6,7 +6,7 @@ import java.util.Set;
import mekanism.api.ListUtils; import mekanism.api.ListUtils;
import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiOsmiumCompressor;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler

2
common/mekanism/client/nei/PurificationChamberRecipeHandler.java
View file

@ -6,7 +6,7 @@ import java.util.Set;
import mekanism.api.ListUtils; import mekanism.api.ListUtils;
import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasRegistry;
import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiPurificationChamber;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

11
common/mekanism/client/render/entity/RenderBalloon.java
View file

@ -2,7 +2,7 @@ package mekanism.client.render.entity;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.client.model.ModelBalloon; import mekanism.client.model.ModelBalloon;
import mekanism.common.EntityBalloon; import mekanism.common.entity.EntityBalloon;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -29,10 +29,17 @@ public class RenderBalloon extends Render
} }
@Override @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; 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); render(((EntityBalloon)entity).color, x, y, z);
} }

2
common/mekanism/client/render/entity/RenderObsidianTNTPrimed.java
View file

@ -1,8 +1,8 @@
package mekanism.client.render.entity; package mekanism.client.render.entity;
import mekanism.client.model.ModelObsidianTNT; import mekanism.client.model.ModelObsidianTNT;
import mekanism.common.EntityObsidianTNT;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.entity.EntityObsidianTNT;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;

2
common/mekanism/client/render/item/ItemRenderingHandler.java
View file

@ -32,7 +32,7 @@ import mekanism.common.item.ItemScubaTank;
import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.item.ItemWalkieTalkie;
import mekanism.common.multipart.ItemPartTransmitter; import mekanism.common.multipart.ItemPartTransmitter;
import mekanism.common.multipart.TransmitterType; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block; import net.minecraft.block.Block;

2
common/mekanism/client/render/tileentity/RenderBin.java
View file

@ -1,7 +1,7 @@
package mekanism.client.render.tileentity; package mekanism.client.render.tileentity;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.common.tileentity.TileEntityBin; import mekanism.common.tile.TileEntityBin;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.OpenGlHelper;

2
common/mekanism/client/render/tileentity/RenderChargepad.java
View file

@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.client.model.ModelChargepad; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

2
common/mekanism/client/render/tileentity/RenderChemicalInfuser.java
View file

@ -9,7 +9,7 @@ import mekanism.client.model.ModelChemicalInfuser;
import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.Model3D; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block; import net.minecraft.block.Block;

2
common/mekanism/client/render/tileentity/RenderChemicalOxidizer.java
View file

@ -8,7 +8,7 @@ import mekanism.client.model.ModelChemicalOxidizer;
import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.Model3D; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block; import net.minecraft.block.Block;

2
common/mekanism/client/render/tileentity/RenderDigitalMiner.java
View file

@ -1,7 +1,7 @@
package mekanism.client.render.tileentity; package mekanism.client.render.tileentity;
import mekanism.client.model.ModelDigitalMiner; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

6
common/mekanism/client/render/tileentity/RenderDynamicTank.java
View file

@ -7,9 +7,9 @@ import mekanism.api.Coord4D;
import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.client.render.MekanismRenderer.Model3D;
import mekanism.common.SynchronizedTankData.ValveData; import mekanism.common.tank.TankUpdateProtocol;
import mekanism.common.TankUpdateProtocol; import mekanism.common.tank.SynchronizedTankData.ValveData;
import mekanism.common.tileentity.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicTank;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer;

2
common/mekanism/client/render/tileentity/RenderElectricChest.java
View file

@ -1,6 +1,6 @@
package mekanism.client.render.tileentity; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.model.ModelChest; import net.minecraft.client.model.ModelChest;

2
common/mekanism/client/render/tileentity/RenderElectricPump.java
View file

@ -5,7 +5,7 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.client.model.ModelElectricPump; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

3
common/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java
View file

@ -3,11 +3,12 @@ package mekanism.client.render.tileentity;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.client.model.ModelElectrolyticSeparator; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/render/tileentity/RenderEnergyCube.java
View file

@ -5,7 +5,7 @@ import mekanism.client.MekanismClient;
import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelEnergyCube;
import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore;
import mekanism.client.render.MekanismRenderer; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;

2
common/mekanism/client/render/tileentity/RenderGasTank.java
View file

@ -1,7 +1,7 @@
package mekanism.client.render.tileentity; package mekanism.client.render.tileentity;
import mekanism.client.model.ModelGasTank; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

2
common/mekanism/client/render/tileentity/RenderLogisticalSorter.java
View file

@ -1,7 +1,7 @@
package mekanism.client.render.tileentity; package mekanism.client.render.tileentity;
import mekanism.client.model.ModelLogisticalSorter; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

2
common/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java
View file

@ -1,7 +1,7 @@
package mekanism.client.render.tileentity; package mekanism.client.render.tileentity;
import mekanism.client.model.ModelMetallurgicInfuser; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

2
common/mekanism/client/render/tileentity/RenderObsidianTNT.java
View file

@ -1,7 +1,7 @@
package mekanism.client.render.tileentity; package mekanism.client.render.tileentity;
import mekanism.client.model.ModelObsidianTNT; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

2
common/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java
View file

@ -3,7 +3,7 @@ package mekanism.client.render.tileentity;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import mekanism.client.model.ModelRotaryCondensentrator; 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;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

2
common/mekanism/client/render/tileentity/RenderTeleporter.java
View file

@ -9,7 +9,7 @@ import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.client.render.MekanismRenderer.Model3D;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.tileentity.TileEntityTeleporter; import mekanism.common.tile.TileEntityTeleporter;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

61
common/mekanism/common/CommonProxy.java
View file

@ -2,6 +2,7 @@ package mekanism.common;
import java.io.File; import java.io.File;
import mekanism.common.entity.EntityRobit;
import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine;
import mekanism.common.inventory.container.ContainerChemicalInfuser; import mekanism.common.inventory.container.ContainerChemicalInfuser;
import mekanism.common.inventory.container.ContainerChemicalOxidizer; 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.ContainerRobitSmelting;
import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.inventory.container.ContainerRotaryCondensentrator;
import mekanism.common.inventory.container.ContainerTeleporter; import mekanism.common.inventory.container.ContainerTeleporter;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import mekanism.common.tileentity.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAdvancedFactory;
import mekanism.common.tileentity.TileEntityBin; import mekanism.common.tile.TileEntityBin;
import mekanism.common.tileentity.TileEntityChargepad; import mekanism.common.tile.TileEntityChargepad;
import mekanism.common.tileentity.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalInfuser;
import mekanism.common.tileentity.TileEntityChemicalInjectionChamber; import mekanism.common.tile.TileEntityChemicalInjectionChamber;
import mekanism.common.tileentity.TileEntityChemicalOxidizer; import mekanism.common.tile.TileEntityChemicalOxidizer;
import mekanism.common.tileentity.TileEntityCombiner; import mekanism.common.tile.TileEntityCombiner;
import mekanism.common.tileentity.TileEntityContainerBlock; import mekanism.common.tile.TileEntityContainerBlock;
import mekanism.common.tileentity.TileEntityCrusher; import mekanism.common.tile.TileEntityCrusher;
import mekanism.common.tileentity.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDigitalMiner;
import mekanism.common.tileentity.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicTank;
import mekanism.common.tileentity.TileEntityDynamicValve; import mekanism.common.tile.TileEntityDynamicValve;
import mekanism.common.tileentity.TileEntityElectricChest; import mekanism.common.tile.TileEntityElectricChest;
import mekanism.common.tileentity.TileEntityElectricMachine; import mekanism.common.tile.TileEntityElectricMachine;
import mekanism.common.tileentity.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectricPump;
import mekanism.common.tileentity.TileEntityElectrolyticSeparator; import mekanism.common.tile.TileEntityElectrolyticSeparator;
import mekanism.common.tileentity.TileEntityEliteFactory; import mekanism.common.tile.TileEntityEliteFactory;
import mekanism.common.tileentity.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergizedSmelter;
import mekanism.common.tileentity.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnergyCube;
import mekanism.common.tileentity.TileEntityEnrichmentChamber; import mekanism.common.tile.TileEntityEnrichmentChamber;
import mekanism.common.tileentity.TileEntityFactory; import mekanism.common.tile.TileEntityFactory;
import mekanism.common.tileentity.TileEntityGasTank; import mekanism.common.tile.TileEntityGasTank;
import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.tileentity.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityMetallurgicInfuser;
import mekanism.common.tileentity.TileEntityObsidianTNT; import mekanism.common.tile.TileEntityObsidianTNT;
import mekanism.common.tileentity.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityOsmiumCompressor;
import mekanism.common.tileentity.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityPurificationChamber;
import mekanism.common.tileentity.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntityRotaryCondensentrator;
import mekanism.common.tileentity.TileEntityTeleporter; import mekanism.common.tile.TileEntityTeleporter;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

3
common/mekanism/common/CommonWorldTickHandler.java
View file

@ -7,7 +7,8 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import mekanism.api.Coord4D; 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.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.World;
import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.ITickHandler;

5
common/mekanism/common/IFactory.java
View file

@ -1,8 +1,9 @@
package mekanism.common; package mekanism.common;
import mekanism.common.RecipeHandler.Recipe;
import mekanism.common.block.BlockMachine.MachineType; 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 mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.FurnaceRecipes;

2
common/mekanism/common/ILogisticalTransporter.java
View file

@ -3,7 +3,7 @@ package mekanism.common;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.IBlockableConnection;
import mekanism.common.tileentity.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityLogisticalSorter;
import mekanism.common.transporter.TransporterStack; import mekanism.common.transporter.TransporterStack;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

2
common/mekanism/common/IUpgradeTile.java
View file

@ -1,5 +1,7 @@
package mekanism.common; package mekanism.common;
import mekanism.common.tile.component.TileComponentUpgrade;
public interface IUpgradeTile extends IUpgradeManagement public interface IUpgradeTile extends IUpgradeManagement
{ {
public TileComponentUpgrade getComponent(); public TileComponentUpgrade getComponent();

16
common/mekanism/common/Mekanism.java
View file

@ -38,6 +38,11 @@ import mekanism.common.block.BlockGasTank;
import mekanism.common.block.BlockMachine; import mekanism.common.block.BlockMachine;
import mekanism.common.block.BlockObsidianTNT; import mekanism.common.block.BlockObsidianTNT;
import mekanism.common.block.BlockOre; 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.ItemAtomicDisassembler;
import mekanism.common.item.ItemBalloon; import mekanism.common.item.ItemBalloon;
import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockBasic;
@ -91,10 +96,13 @@ import mekanism.common.network.PacketTileEntity;
import mekanism.common.network.PacketTransmitterUpdate; import mekanism.common.network.PacketTransmitterUpdate;
import mekanism.common.network.PacketTransmitterUpdate.PacketType; import mekanism.common.network.PacketTransmitterUpdate.PacketType;
import mekanism.common.network.PacketWalkieTalkieState; import mekanism.common.network.PacketWalkieTalkieState;
import mekanism.common.tileentity.TileEntityAdvancedBoundingBlock; import mekanism.common.recipe.MekanismRecipe;
import mekanism.common.tileentity.TileEntityBoundingBlock; import mekanism.common.recipe.RecipeHandler;
import mekanism.common.tileentity.TileEntityElectricBlock; import mekanism.common.tank.DynamicTankCache;
import mekanism.common.tileentity.TileEntityEnergizedSmelter; 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.transporter.TransporterManager;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.util.MekanismUtils.ResourceType;

1
common/mekanism/common/RobitAIFollow.java
View file

@ -1,5 +1,6 @@
package mekanism.common; package mekanism.common;
import mekanism.common.entity.EntityRobit;
import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityAIBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.pathfinding.PathNavigate; import net.minecraft.pathfinding.PathNavigate;

1
common/mekanism/common/RobitAIPickup.java
View file

@ -3,6 +3,7 @@ package mekanism.common;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import mekanism.common.entity.EntityRobit;
import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityAIBase;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

10
common/mekanism/common/block/BlockBasic.java
View file

@ -13,13 +13,13 @@ import mekanism.common.ItemAttacher;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.TankUpdateProtocol;
import mekanism.common.inventory.InventoryBin; import mekanism.common.inventory.InventoryBin;
import mekanism.common.network.PacketTileEntity; import mekanism.common.network.PacketTileEntity;
import mekanism.common.tileentity.TileEntityBasicBlock; import mekanism.common.tank.TankUpdateProtocol;
import mekanism.common.tileentity.TileEntityBin; import mekanism.common.tile.TileEntityBasicBlock;
import mekanism.common.tileentity.TileEntityDynamicTank; import mekanism.common.tile.TileEntityBin;
import mekanism.common.tileentity.TileEntityDynamicValve; import mekanism.common.tile.TileEntityDynamicTank;
import mekanism.common.tile.TileEntityDynamicValve;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;

4
common/mekanism/common/block/BlockBounding.java
View file

@ -2,8 +2,8 @@ package mekanism.common.block;
import java.util.Random; import java.util.Random;
import mekanism.common.tileentity.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityAdvancedBoundingBlock;
import mekanism.common.tileentity.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;

8
common/mekanism/common/block/BlockEnergyCube.java
View file

@ -15,10 +15,10 @@ import mekanism.common.ItemAttacher;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.EnergyCubeTier;
import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.item.ItemBlockEnergyCube;
import mekanism.common.tileentity.TileEntityBasicBlock; import mekanism.common.tile.TileEntityBasicBlock;
import mekanism.common.tileentity.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicTank;
import mekanism.common.tileentity.TileEntityElectricBlock; import mekanism.common.tile.TileEntityElectricBlock;
import mekanism.common.tileentity.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnergyCube;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;

6
common/mekanism/common/block/BlockGasTank.java
View file

@ -6,9 +6,9 @@ import mekanism.api.gas.IGasItem;
import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedInventory;
import mekanism.common.ItemAttacher; import mekanism.common.ItemAttacher;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.tileentity.TileEntityBasicBlock; import mekanism.common.tile.TileEntityBasicBlock;
import mekanism.common.tileentity.TileEntityElectricBlock; import mekanism.common.tile.TileEntityElectricBlock;
import mekanism.common.tileentity.TileEntityGasTank; import mekanism.common.tile.TileEntityGasTank;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;

2
common/mekanism/common/block/BlockMachine.java
View file

@ -14,7 +14,7 @@ import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.network.PacketLogisticalSorterGui; import mekanism.common.network.PacketLogisticalSorterGui;
import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket;
import mekanism.common.tileentity.*; import mekanism.common.tile.*;
import mekanism.common.transporter.TransporterFilter; import mekanism.common.transporter.TransporterFilter;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import mekanism.common.util.TransporterUtils; import mekanism.common.util.TransporterUtils;

4
common/mekanism/common/block/BlockObsidianTNT.java
View file

@ -1,8 +1,8 @@
package mekanism.common.block; package mekanism.common.block;
import mekanism.common.EntityObsidianTNT;
import mekanism.common.Mekanism; 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.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.client.renderer.texture.IconRegister;

152
common/mekanism/common/EntityBalloon.java → common/mekanism/common/entity/EntityBalloon.java
View file

@ -1,4 +1,6 @@
package mekanism.common; package mekanism.common.entity;
import java.util.UUID;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
@ -21,6 +23,12 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
public EnumColor color = EnumColor.DARK_BLUE; public EnumColor color = EnumColor.DARK_BLUE;
public Coord4D latched; public Coord4D latched;
public Entity latchedEntity;
/* server-only */
public boolean hasCachedEntity;
public UUID cachedEntityUUID;
public EntityBalloon(World world) public EntityBalloon(World world)
{ {
@ -33,10 +41,11 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
setSize(0.25F, 0.25F); setSize(0.25F, 0.25F);
motionY = 0.04; 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(3, new Integer(0)); /* Latched X */
dataWatcher.addObject(4, new Integer(0)); /* Latched Y */ dataWatcher.addObject(4, new Integer(0)); /* Latched Y */
dataWatcher.addObject(5, new Integer(0)); /* Latched Z */ 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) 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; 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) public EntityBalloon(World world, Coord4D obj, EnumColor c)
{ {
this(world); this(world);
@ -65,10 +94,11 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
color = c; 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(3, new Integer(latched != null ? latched.xCoord : 0)); /* Latched X */
dataWatcher.updateObject(4, new Integer(latched != null ? latched.yCoord : 0)); /* Latched Y */ 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(5, new Integer(latched != null ? latched.zCoord : 0)); /* Latched Z */
dataWatcher.updateObject(6, new Integer(-1)); /* Latched entity ID */
} }
@Override @Override
@ -95,26 +125,41 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
} }
} }
else { else {
if(hasCachedEntity)
{
findCachedEntity();
cachedEntityUUID = null;
hasCachedEntity = false;
}
if(ticksExisted == 1) 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(3, new Integer(latched != null ? latched.xCoord : 0)); /* Latched X */
dataWatcher.updateObject(4, new Integer(latched != null ? latched.yCoord : 0)); /* Latched Y */ 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(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(!worldObj.isRemote)
{ {
if(latched != null && (latched.exists(worldObj) && latched.isAirBlock(worldObj))) if(latched != null && (latched.exists(worldObj) && latched.isAirBlock(worldObj)))
{ {
latched = null; latched = null;
dataWatcher.updateObject(2, (byte)0); /* Is latched */ 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); motionY = Math.min(motionY*1.02F, 0.2F);
@ -134,11 +179,34 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
motionY = 0.04; motionY = 0.04;
} }
} }
else { else if(latched != null)
{
motionX = 0; motionX = 0;
motionY = 0; motionY = 0;
motionZ = 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() private void pop()
@ -193,13 +261,12 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
{ {
latched = Coord4D.read(nbtTags.getCompoundTag("latched")); latched = Coord4D.read(nbtTags.getCompoundTag("latched"));
} }
}
if(nbtTags.hasKey("idMost"))
@Override {
public boolean hitByEntity(Entity entity) hasCachedEntity = true;
{ cachedEntityUUID = new UUID(nbtTags.getLong("idMost"), nbtTags.getLong("idLeast"));
pop(); }
return true;
} }
@Override @Override
@ -211,6 +278,19 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
{ {
nbtTags.setCompoundTag("latched", latched.write(new NBTTagCompound())); 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 @Override
@ -224,15 +304,20 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
if(latched != null) if(latched != null)
{ {
data.writeBoolean(true); data.writeByte((byte)1);
data.writeInt(latched.xCoord); data.writeInt(latched.xCoord);
data.writeInt(latched.yCoord); data.writeInt(latched.yCoord);
data.writeInt(latched.zCoord); data.writeInt(latched.zCoord);
data.writeInt(latched.dimensionId); data.writeInt(latched.dimensionId);
} }
else if(latchedEntity != null)
{
data.writeByte((byte)2);
data.writeInt(latchedEntity.entityId);
}
else { else {
data.writeBoolean(false); data.writeByte((byte)0);
} }
} }
@ -243,15 +328,32 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
color = EnumColor.values()[data.readInt()]; color = EnumColor.values()[data.readInt()];
if(data.readBoolean()) byte type = data.readByte();
if(type == 1)
{ {
latched = Coord4D.read(data); latched = Coord4D.read(data);
} }
else if(type == 2)
{
latchedEntity = worldObj.getEntityByID(data.readInt());
}
else { else {
latched = null; latched = null;
} }
} }
@Override
public void setDead()
{
super.setDead();
if(latchedEntity != null)
{
latchedEntity.isAirBorne = false;
}
}
@Override @Override
public boolean isInRangeToRenderDist(double dist) public boolean isInRangeToRenderDist(double dist)
{ {
@ -263,4 +365,20 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData
{ {
return true; 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;
}
} }

3
common/mekanism/common/EntityObsidianTNT.java → common/mekanism/common/entity/EntityObsidianTNT.java
View file

@ -1,5 +1,6 @@
package mekanism.common; package mekanism.common.entity;
import mekanism.common.Mekanism;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World; import net.minecraft.world.World;

8
common/mekanism/common/EntityRobit.java → common/mekanism/common/entity/EntityRobit.java
View file

@ -1,4 +1,4 @@
package mekanism.common; package mekanism.common.entity;
import ic2.api.item.ElectricItem; import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItem;
@ -10,9 +10,13 @@ import java.util.List;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.EnergizedItemManager;
import mekanism.api.energy.IEnergizedItem; 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.ItemConfigurator;
import mekanism.common.item.ItemRobit; import mekanism.common.item.ItemRobit;
import mekanism.common.tileentity.TileEntityChargepad; import mekanism.common.tile.TileEntityChargepad;
import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable;
import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.SharedMonsterAttributes;

6
common/mekanism/common/MekanismHooks.java → common/mekanism/common/integration/MekanismHooks.java
View file

@ -1,4 +1,4 @@
package mekanism.common; package mekanism.common.integration;
import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.IRecipeInput;
import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.RecipeInputItemStack;
@ -9,7 +9,9 @@ import ic2.api.recipe.Recipes;
import java.util.List; import java.util.List;
import java.util.Map; 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 mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;

4
common/mekanism/common/OreDictManager.java → common/mekanism/common/integration/OreDictManager.java
View file

@ -1,10 +1,12 @@
package mekanism.common; package mekanism.common.integration;
import ic2.api.recipe.RecipeInputOreDict; import ic2.api.recipe.RecipeInputOreDict;
import ic2.api.recipe.Recipes; import ic2.api.recipe.Recipes;
import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseObject;
import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseRegistry;
import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionInput;
import mekanism.common.Mekanism;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;

6
common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java
View file

@ -2,13 +2,13 @@ package mekanism.common.inventory.container;
import mekanism.api.gas.IGasItem; import mekanism.api.gas.IGasItem;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.RecipeHandler;
import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotMachineUpgrade;
import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotOutput;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.item.ItemMachineUpgrade;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine; import mekanism.common.recipe.RecipeHandler;
import mekanism.common.tileentity.TileEntityPurificationChamber; import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import mekanism.common.tile.TileEntityPurificationChamber;
import mekanism.common.util.ChargeUtils; import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/common/inventory/container/ContainerChemicalInfuser.java
View file

@ -4,7 +4,7 @@ import mekanism.api.gas.IGasItem;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.inventory.slot.SlotStorageTank;
import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.item.ItemMachineUpgrade;
import mekanism.common.tileentity.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalInfuser;
import mekanism.common.util.ChargeUtils; import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

4
common/mekanism/common/inventory/container/ContainerChemicalOxidizer.java
View file

@ -1,10 +1,10 @@
package mekanism.common.inventory.container; package mekanism.common.inventory.container;
import mekanism.api.gas.IGasItem; import mekanism.api.gas.IGasItem;
import mekanism.common.RecipeHandler;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.inventory.slot.SlotStorageTank; 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 mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/common/inventory/container/ContainerDigitalMiner.java
View file

@ -4,7 +4,7 @@ import mekanism.common.inventory.slot.SlotElectricChest;
import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotMachineUpgrade;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.item.ItemMachineUpgrade;
import mekanism.common.tileentity.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityDigitalMiner;
import mekanism.common.util.ChargeUtils; import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/common/inventory/container/ContainerDynamicTank.java
View file

@ -1,7 +1,7 @@
package mekanism.common.inventory.container; package mekanism.common.inventory.container;
import mekanism.common.inventory.slot.SlotOutput; 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.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/container/ContainerElectricChest.java
View file

@ -4,7 +4,7 @@ import mekanism.common.IElectricChest;
import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.inventory.slot.SlotElectricChest; import mekanism.common.inventory.slot.SlotElectricChest;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.tileentity.TileEntityElectricChest; import mekanism.common.tile.TileEntityElectricChest;
import mekanism.common.util.ChargeUtils; import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

4
common/mekanism/common/inventory/container/ContainerElectricMachine.java
View file

@ -1,11 +1,11 @@
package mekanism.common.inventory.container; package mekanism.common.inventory.container;
import mekanism.common.RecipeHandler;
import mekanism.common.inventory.slot.SlotMachineUpgrade; import mekanism.common.inventory.slot.SlotMachineUpgrade;
import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotOutput;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.item.ItemMachineUpgrade; 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 mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/common/inventory/container/ContainerElectricPump.java
View file

@ -2,7 +2,7 @@ package mekanism.common.inventory.container;
import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotOutput;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.tileentity.TileEntityElectricPump; import mekanism.common.tile.TileEntityElectricPump;
import mekanism.common.util.ChargeUtils; import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

4
common/mekanism/common/inventory/container/ContainerElectrolyticSeparator.java
View file

@ -2,10 +2,10 @@ package mekanism.common.inventory.container;
import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.IGasItem; import mekanism.api.gas.IGasItem;
import mekanism.common.RecipeHandler;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.inventory.slot.SlotStorageTank; 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 mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/common/inventory/container/ContainerEnergyCube.java
View file

@ -3,7 +3,7 @@ package mekanism.common.inventory.container;
import ic2.api.item.IElectricItem; import ic2.api.item.IElectricItem;
import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.tileentity.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnergyCube;
import mekanism.common.util.ChargeUtils; import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/common/inventory/container/ContainerFactory.java
View file

@ -9,7 +9,7 @@ import mekanism.common.inventory.slot.SlotOutput;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemMachineUpgrade; import mekanism.common.item.ItemMachineUpgrade;
import mekanism.common.tileentity.TileEntityFactory; import mekanism.common.tile.TileEntityFactory;
import mekanism.common.util.ChargeUtils; import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/common/inventory/container/ContainerFilter.java
View file

@ -1,6 +1,6 @@
package mekanism.common.inventory.container; 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.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/container/ContainerGasTank.java
View file

@ -2,7 +2,7 @@ package mekanism.common.inventory.container;
import mekanism.api.gas.IGasItem; import mekanism.api.gas.IGasItem;
import mekanism.common.inventory.slot.SlotStorageTank; 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.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

6
common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java
View file

@ -2,13 +2,13 @@ package mekanism.common.inventory.container;
import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseRegistry;
import mekanism.api.infuse.InfusionInput; 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.SlotMachineUpgrade;
import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.inventory.slot.SlotOutput;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.item.ItemMachineUpgrade; 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 mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/common/inventory/container/ContainerNull.java
View file

@ -1,6 +1,6 @@
package mekanism.common.inventory.container; 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.EntityPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;

Some files were not shown because too many files have changed in this diff Show more