Fixed API for @micdoodle8

common/mekanism/api/Object3D.java

@@ -1,4 +1,4 @@
-package mekanism.common;
+package mekanism.api;
 
 import java.util.ArrayList;
 

common/mekanism/api/gas/GasTransmission.java

@@ -3,9 +3,9 @@ package mekanism.api.gas;
 import java.util.HashSet;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.api.transmitters.ITransmitter;
 import mekanism.api.transmitters.TransmissionType;
-import mekanism.common.Object3D;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;

common/mekanism/api/transmitters/DynamicNetwork.java

@@ -11,8 +11,7 @@ import java.util.NoSuchElementException;
 import java.util.Set;
 
 import mekanism.api.IClientTicker;
-import mekanism.client.ClientTickHandler;
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -71,7 +70,7 @@ public abstract class DynamicNetwork<A, N> implements ITransmitterNetwork<A, N>,
 					TransmitterNetworkRegistry.getInstance().registerNetwork(this);			
 				}
 				else {
-					ClientTickHandler.tickingSet.add(this);
+					MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)1));
 				}
 			}
 		} catch(NoSuchElementException e) {}
@@ -87,7 +86,7 @@ public abstract class DynamicNetwork<A, N> implements ITransmitterNetwork<A, N>,
 			TransmitterNetworkRegistry.getInstance().removeNetwork(this);
 		}
 		else {
-			ClientTickHandler.tickingSet.remove(this);
+			MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)0));
 		}
 	}
 	
@@ -254,6 +253,18 @@ public abstract class DynamicNetwork<A, N> implements ITransmitterNetwork<A, N>,
 		}
 	}
 	
+	public static class ClientTickUpdate extends Event
+	{
+		public DynamicNetwork network;
+		public byte operation; /*0 remove, 1 add*/
+		
+		public ClientTickUpdate(DynamicNetwork net, byte b)
+		{
+			network = net;
+			operation = b;
+		}
+	}
+	
 	public static class NetworkClientRequest extends Event
 	{
 		public TileEntity tileEntity;

common/mekanism/client/ClientPlayerTickHandler.java

@@ -4,8 +4,8 @@ import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.item.ItemConfigurator;

common/mekanism/client/ThreadTankSparkle.java

@@ -4,8 +4,8 @@ import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.tileentity.TileEntityDynamicTank;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;

common/mekanism/client/gui/GuiConfiguration.java

@@ -3,10 +3,10 @@ package mekanism.client.gui;
 import java.util.HashMap;
 import java.util.Map;
 
+import mekanism.api.Object3D;
 import mekanism.client.render.MekanismRenderer;
 import mekanism.common.EnumColor;
 import mekanism.common.IInvConfiguration;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.SideData;
 import mekanism.common.PacketHandler.Transmission;

common/mekanism/client/gui/GuiConfigurationTab.java

@@ -1,8 +1,8 @@
 package mekanism.client.gui;
 
+import mekanism.api.Object3D;
 import mekanism.common.IRedstoneControl;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketSimpleGui;

common/mekanism/client/gui/GuiDigitalMiner.java

@@ -2,7 +2,7 @@ package mekanism.client.gui;
 
 import java.util.ArrayList;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerDigitalMiner;

common/mekanism/client/gui/GuiDigitalMinerConfig.java

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerNull;

common/mekanism/client/gui/GuiElectricChest.java

@@ -1,10 +1,10 @@
 package mekanism.client.gui;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.IEnergizedItem;
 import mekanism.common.EnumColor;
 import mekanism.common.IElectricChest;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerElectricChest;

common/mekanism/client/gui/GuiLogisticalSorter.java

@@ -7,8 +7,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.client.render.MekanismRenderer;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerNull;

common/mekanism/client/gui/GuiMItemStackFilter.java

@@ -1,7 +1,7 @@
 package mekanism.client.gui;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerFilter;

common/mekanism/client/gui/GuiMOreDictFilter.java

@@ -3,8 +3,8 @@ package mekanism.client.gui;
 import java.util.ArrayList;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerFilter;

common/mekanism/client/gui/GuiMetallurgicInfuser.java

@@ -2,7 +2,7 @@ package mekanism.client.gui;
 
 import java.util.ArrayList;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerMetallurgicInfuser;

common/mekanism/client/gui/GuiPasswordEnter.java

@@ -1,9 +1,9 @@
 package mekanism.client.gui;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.IEnergizedItem;
 import mekanism.common.EnumColor;
 import mekanism.common.IElectricChest;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketElectricChest;

common/mekanism/client/gui/GuiPasswordModify.java

@@ -1,8 +1,8 @@
 package mekanism.client.gui;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
 import mekanism.common.IElectricChest;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketElectricChest;

common/mekanism/client/gui/GuiRedstoneControl.java

@@ -1,7 +1,7 @@
 package mekanism.client.gui;
 
+import mekanism.api.Object3D;
 import mekanism.common.IRedstoneControl;
-import mekanism.common.Object3D;
 import mekanism.common.IRedstoneControl.RedstoneControl;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;

common/mekanism/client/gui/GuiRotaryCondensentrator.java

@@ -2,9 +2,9 @@ package mekanism.client.gui;
 
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.api.gas.GasStack;
 import mekanism.client.render.MekanismRenderer;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerRotaryCondensentrator;

common/mekanism/client/gui/GuiTItemStackFilter.java

@@ -1,8 +1,8 @@
 package mekanism.client.gui;
 
+import mekanism.api.Object3D;
 import mekanism.client.render.MekanismRenderer;
 import mekanism.common.EnumColor;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerFilter;

common/mekanism/client/gui/GuiTOreDictFilter.java

@@ -3,10 +3,10 @@ package mekanism.client.gui;
 import java.util.ArrayList;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.client.render.MekanismRenderer;
 import mekanism.common.EnumColor;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerFilter;

common/mekanism/client/gui/GuiTeleporter.java

@@ -2,7 +2,7 @@ package mekanism.client.gui;
 
 import java.util.ArrayList;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerTeleporter;

common/mekanism/client/gui/GuiUpgradeManagement.java

@@ -1,7 +1,7 @@
 package mekanism.client.gui;
 
+import mekanism.api.Object3D;
 import mekanism.common.IUpgradeTile;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketRemoveUpgrade;

common/mekanism/client/render/RenderTickHandler.java

@@ -2,8 +2,8 @@ package mekanism.client.render;
 
 import java.util.EnumSet;
 
+import mekanism.api.Object3D;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.entity.player.EntityPlayer;

common/mekanism/client/render/tileentity/RenderBin.java

@@ -1,6 +1,6 @@
 package mekanism.client.render.tileentity;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.tileentity.TileEntityBin;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;

common/mekanism/client/render/tileentity/RenderConfigurableMachine.java

@@ -2,12 +2,12 @@ package mekanism.client.render.tileentity;
 
 import java.util.HashMap;
 
+import mekanism.api.Object3D;
 import mekanism.client.render.MekanismRenderer;
 import mekanism.client.render.MekanismRenderer.DisplayInteger;
 import mekanism.client.render.MekanismRenderer.Model3D;
 import mekanism.common.EnumColor;
 import mekanism.common.IInvConfiguration;
-import mekanism.common.Object3D;
 import mekanism.common.item.ItemConfigurator;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;

common/mekanism/client/render/tileentity/RenderDynamicTank.java

@@ -3,11 +3,11 @@ package mekanism.client.render.tileentity;
 import java.util.HashMap;
 import java.util.Map;
 
+import mekanism.api.Object3D;
 import mekanism.client.render.MekanismRenderer;
 import mekanism.client.render.MekanismRenderer.DisplayInteger;
 import mekanism.client.render.MekanismRenderer.Model3D;
 import mekanism.common.SynchronizedTankData.ValveData;
-import mekanism.common.Object3D;
 import mekanism.common.TankUpdateProtocol;
 import mekanism.common.tileentity.TileEntityDynamicTank;
 import net.minecraft.block.Block;

common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java

@@ -2,13 +2,13 @@ package mekanism.client.render.tileentity;
 
 import java.util.HashMap;
 
+import mekanism.api.Object3D;
 import mekanism.client.model.ModelTransmitter;
 import mekanism.client.model.ModelTransmitter.Size;
 import mekanism.client.model.ModelTransporterBox;
 import mekanism.client.render.MekanismRenderer;
 import mekanism.client.render.MekanismRenderer.DisplayInteger;
 import mekanism.client.render.MekanismRenderer.Model3D;
-import mekanism.common.Object3D;
 import mekanism.common.item.ItemConfigurator;
 import mekanism.common.tileentity.TileEntityDiversionTransporter;
 import mekanism.common.tileentity.TileEntityLogisticalTransporter;

common/mekanism/client/render/tileentity/RenderPressurizedTube.java

@@ -3,6 +3,7 @@ package mekanism.client.render.tileentity;
 import java.util.Arrays;
 import java.util.HashMap;
 
+import mekanism.api.Object3D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasTransmission;
 import mekanism.api.gas.ITubeConnection;
@@ -12,7 +13,6 @@ import mekanism.client.render.MekanismRenderer;
 import mekanism.client.render.MekanismRenderer.BooleanArray;
 import mekanism.client.render.MekanismRenderer.DisplayInteger;
 import mekanism.client.render.MekanismRenderer.Model3D;
-import mekanism.common.Object3D;
 import mekanism.common.tileentity.TileEntityGasTank;
 import mekanism.common.tileentity.TileEntityPressurizedTube;
 import mekanism.common.util.MekanismUtils;

common/mekanism/client/sound/SoundHandler.java

@@ -13,9 +13,9 @@ import java.util.Random;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import mekanism.api.Object3D;
 import mekanism.common.IActiveState;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;

common/mekanism/common/CommonWorldTickHandler.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
+import mekanism.api.Object3D;
 import mekanism.common.tileentity.TileEntityDynamicTank;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;

common/mekanism/common/ConnectedTextureRenderer.java

@@ -3,6 +3,7 @@ package mekanism.common;
 import java.util.HashMap;
 import java.util.Map;
 
+import mekanism.api.Object3D;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;

common/mekanism/common/DynamicFluidTank.java

@@ -1,5 +1,6 @@
 package mekanism.common;
 
+import mekanism.api.Object3D;
 import mekanism.common.SynchronizedTankData.ValveData;
 import mekanism.common.tileentity.TileEntityDynamicTank;
 import mekanism.common.util.MekanismUtils;

common/mekanism/common/DynamicTankCache.java

@@ -2,6 +2,7 @@ package mekanism.common;
 
 import java.util.HashSet;
 
+import mekanism.api.Object3D;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 

common/mekanism/common/EnergyNetwork.java

@@ -11,6 +11,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.IStrictEnergyAcceptor;
 import mekanism.api.transmitters.DynamicNetwork;
 import mekanism.api.transmitters.ITransmitter;

common/mekanism/common/EntityRobit.java

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.EnergizedItemManager;
 import mekanism.api.energy.IEnergizedItem;
 import mekanism.common.item.ItemConfigurator;

common/mekanism/common/IAdvancedBoundingBlock.java

@@ -7,6 +7,7 @@ import universalelectricity.core.block.IElectrical;
 import universalelectricity.core.block.IElectricalStorage;
 import buildcraft.api.power.IPowerReceptor;
 import cofh.api.energy.IEnergyHandler;
+import mekanism.api.Object3D;
 import mekanism.api.energy.IStrictEnergyAcceptor;
 import mekanism.api.energy.IStrictEnergyStorage;
 import net.minecraft.inventory.ISidedInventory;

common/mekanism/common/Mekanism.java

@@ -13,6 +13,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
 
+import mekanism.api.Object3D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasNetwork.GasTransferEvent;
 import mekanism.api.gas.GasRegistry;
@@ -20,8 +21,10 @@ import mekanism.api.infuse.InfuseObject;
 import mekanism.api.infuse.InfuseRegistry;
 import mekanism.api.infuse.InfuseType;
 import mekanism.api.infuse.InfusionInput;
+import mekanism.api.transmitters.DynamicNetwork.ClientTickUpdate;
 import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest;
 import mekanism.api.transmitters.TransmitterNetworkRegistry;
+import mekanism.client.ClientTickHandler;
 import mekanism.common.EnergyNetwork.EnergyTransferEvent;
 import mekanism.common.FluidNetwork.FluidTransferEvent;
 import mekanism.common.IFactory.RecipeType;
@@ -1205,6 +1208,20 @@ public class Mekanism
 		} catch(Exception e) {}
 	}
 	
+	@ForgeSubscribe
+	public void onClientTickUpdate(ClientTickUpdate event)
+	{
+		try {
+			if(event.operation == 0)
+			{
+				ClientTickHandler.tickingSet.remove(event.network);
+			}
+			else {
+				ClientTickHandler.tickingSet.add(event.network);
+			}
+		} catch(Exception e) {}
+	}
+	
 	@ForgeSubscribe
 	public synchronized void onChunkLoad(ChunkEvent.Load event)
 	{

common/mekanism/common/PacketHandler.java

@@ -5,6 +5,7 @@ import java.io.DataOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.common.network.IMekanismPacket;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;

common/mekanism/common/PipeUtils.java

@@ -2,6 +2,7 @@ package mekanism.common;
 
 import java.util.Arrays;
 
+import mekanism.api.Object3D;
 import mekanism.api.transmitters.ITransmitter;
 import mekanism.api.transmitters.TransmissionType;
 import net.minecraft.tileentity.TileEntity;

common/mekanism/common/SynchronizedTankData.java

@@ -3,6 +3,7 @@ package mekanism.common;
 import java.util.HashSet;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;

common/mekanism/common/TankUpdateProtocol.java

@@ -3,6 +3,7 @@ package mekanism.common;
 import java.util.HashSet;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.common.SynchronizedTankData.ValveData;
 import mekanism.common.tileentity.TileEntityDynamicTank;
 import mekanism.common.tileentity.TileEntityDynamicValve;

common/mekanism/common/TileComponentEjector.java

@@ -3,6 +3,7 @@ package mekanism.common;
 import java.util.ArrayList;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.common.tileentity.TileEntityContainerBlock;
 import mekanism.common.tileentity.TileEntityLogisticalTransporter;
 import mekanism.common.transporter.TransporterManager;

common/mekanism/common/block/BlockBasic.java

@@ -4,13 +4,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import mekanism.api.Object3D;
 import mekanism.client.ClientProxy;
 import mekanism.common.ConnectedTextureRenderer;
 import mekanism.common.IActiveState;
 import mekanism.common.IBoundingBlock;
 import mekanism.common.ItemAttacher;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.TankUpdateProtocol;

common/mekanism/common/block/BlockMachine.java

@@ -3,6 +3,7 @@ package mekanism.common.block;
 import java.util.List;
 import java.util.Random;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.IEnergizedItem;
 import mekanism.api.gas.IGasItem;
 import mekanism.client.ClientProxy;
@@ -19,7 +20,6 @@ import mekanism.common.ISustainedTank;
 import mekanism.common.IUpgradeManagement;
 import mekanism.common.ItemAttacher;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.miner.MinerFilter;

common/mekanism/common/item/ItemBlockEnergyCube.java

@@ -6,12 +6,12 @@ import ic2.api.item.ISpecialElectricItem;
 import java.util.ArrayList;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.IEnergizedItem;
 import mekanism.common.EnumColor;
 import mekanism.common.IEnergyCube;
 import mekanism.common.ISustainedInventory;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.Tier.EnergyCubeTier;

common/mekanism/common/item/ItemConfigurator.java

@@ -4,10 +4,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
 import mekanism.common.IConfigurable;
 import mekanism.common.IInvConfiguration;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketTileEntity;

common/mekanism/common/item/ItemPortableTeleporter.java

@@ -1,8 +1,8 @@
 package mekanism.common.item;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.util.MekanismUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;

common/mekanism/common/item/ItemRobit.java

@@ -2,10 +2,10 @@ package mekanism.common.item;
 
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.common.EntityRobit;
 import mekanism.common.EnumColor;
 import mekanism.common.ISustainedInventory;
-import mekanism.common.Object3D;
 import mekanism.common.tileentity.TileEntityChargepad;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;

common/mekanism/common/miner/ThreadMinerSearch.java

@@ -2,8 +2,8 @@ package mekanism.common.miner;
 
 import java.util.Collections;
 
+import mekanism.api.Object3D;
 import mekanism.common.IBoundingBlock;
-import mekanism.common.Object3D;
 import mekanism.common.tileentity.TileEntityDigitalMiner;
 import mekanism.common.util.MekanismUtils;
 import net.minecraft.item.ItemStack;

common/mekanism/common/network/PacketConfigurationUpdate.java

@@ -3,9 +3,9 @@ package mekanism.common.network;
 import java.io.DataOutputStream;
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.common.IInvConfiguration;
 import mekanism.common.ITileNetwork;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.tileentity.TileEntityBasicBlock;

common/mekanism/common/network/PacketDataRequest.java

@@ -3,10 +3,10 @@ package mekanism.common.network;
 import java.io.DataOutputStream;
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.api.transmitters.DynamicNetwork;
 import mekanism.api.transmitters.ITransmitter;
 import mekanism.common.ITileNetwork;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.tileentity.TileEntityDynamicTank;

common/mekanism/common/network/PacketDigitalMinerGui.java

@@ -3,11 +3,11 @@ package mekanism.common.network;
 import java.io.DataOutputStream;
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.client.gui.GuiDigitalMiner;
 import mekanism.client.gui.GuiDigitalMinerConfig;
 import mekanism.client.gui.GuiMItemStackFilter;
 import mekanism.client.gui.GuiMOreDictFilter;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerDigitalMiner;

common/mekanism/common/network/PacketEditFilter.java

@@ -3,7 +3,7 @@ package mekanism.common.network;
 import java.io.DataOutputStream;
 import java.util.ArrayList;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.miner.MinerFilter;

common/mekanism/common/network/PacketElectricChest.java

@@ -2,10 +2,10 @@ package mekanism.common.network;
 
 import java.io.DataOutputStream;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.IEnergizedItem;
 import mekanism.common.IElectricChest;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.block.BlockMachine.MachineType;
 import mekanism.common.inventory.InventoryElectricChest;
 import mekanism.common.tileentity.TileEntityElectricChest;

common/mekanism/common/network/PacketLogisticalSorterGui.java

@@ -2,11 +2,11 @@ package mekanism.common.network;
 
 import java.io.DataOutputStream;
 
+import mekanism.api.Object3D;
 import mekanism.client.gui.GuiTItemStackFilter;
 import mekanism.client.gui.GuiLogisticalSorter;
 import mekanism.client.gui.GuiTOreDictFilter;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.inventory.container.ContainerFilter;

common/mekanism/common/network/PacketNewFilter.java

@@ -3,7 +3,7 @@ package mekanism.common.network;
 import java.io.DataOutputStream;
 import java.util.ArrayList;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.miner.MinerFilter;

common/mekanism/common/network/PacketPortableTeleport.java

@@ -2,7 +2,7 @@ package mekanism.common.network;
 
 import java.io.DataOutputStream;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.Teleporter;
 import mekanism.common.PacketHandler.Transmission;

common/mekanism/common/network/PacketPortalFX.java

@@ -3,7 +3,7 @@ package mekanism.common.network;
 import java.io.DataOutputStream;
 import java.util.Random;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 

common/mekanism/common/network/PacketRedstoneControl.java

@@ -3,8 +3,8 @@ package mekanism.common.network;
 import java.io.DataOutputStream;
 import java.util.Random;
 
+import mekanism.api.Object3D;
 import mekanism.common.IRedstoneControl;
-import mekanism.common.Object3D;
 import mekanism.common.IRedstoneControl.RedstoneControl;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;

common/mekanism/common/network/PacketRemoveUpgrade.java

@@ -2,9 +2,9 @@ package mekanism.common.network;
 
 import java.io.DataOutputStream;
 
+import mekanism.api.Object3D;
 import mekanism.common.IUpgradeManagement;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.tileentity.TileEntityBasicBlock;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

common/mekanism/common/network/PacketSimpleGui.java

@@ -2,8 +2,8 @@ package mekanism.common.network;
 
 import java.io.DataOutputStream;
 
+import mekanism.api.Object3D;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.tileentity.TileEntityBasicBlock;

common/mekanism/common/network/PacketTileEntity.java

@@ -3,8 +3,8 @@ package mekanism.common.network;
 import java.io.DataOutputStream;
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.common.ITileNetwork;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;

common/mekanism/common/tileentity/TileEntityAdvancedBoundingBlock.java

@@ -10,10 +10,10 @@ import buildcraft.api.power.PowerHandler.PowerReceiver;
 import cofh.api.energy.IEnergyHandler;
 import ic2.api.energy.tile.IEnergySink;
 import ic2.api.energy.tile.IEnergyTile;
+import mekanism.api.Object3D;
 import mekanism.api.energy.IStrictEnergyAcceptor;
 import mekanism.api.energy.IStrictEnergyStorage;
 import mekanism.common.IAdvancedBoundingBlock;
-import mekanism.common.Object3D;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;

common/mekanism/common/tileentity/TileEntityBasicBlock.java

@@ -7,9 +7,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.common.ITileComponent;
 import mekanism.common.ITileNetwork;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketDataRequest;

common/mekanism/common/tileentity/TileEntityBasicMachine.java

@@ -2,6 +2,7 @@ package mekanism.common.tileentity;
 
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.client.sound.IHasSound;
 import mekanism.common.IActiveState;
 import mekanism.common.IInvConfiguration;
@@ -10,7 +11,6 @@ import mekanism.common.IElectricMachine;
 import mekanism.common.IRedstoneControl;
 import mekanism.common.IUpgradeTile;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.SideData;
 import mekanism.common.PacketHandler.Transmission;

common/mekanism/common/tileentity/TileEntityBin.java

@@ -2,9 +2,9 @@ package mekanism.common.tileentity;
 
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.common.IActiveState;
 import mekanism.common.IConfigurable;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.item.ItemBlockBasic;

common/mekanism/common/tileentity/TileEntityBoundingBlock.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 
 import com.google.common.io.ByteArrayDataInput;
 
+import mekanism.api.Object3D;
 import mekanism.common.ITileNetwork;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketDataRequest;

common/mekanism/common/tileentity/TileEntityChargepad.java

@@ -8,13 +8,13 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.EnergizedItemManager;
 import mekanism.api.energy.IEnergizedItem;
 import mekanism.client.sound.IHasSound;
 import mekanism.common.EntityRobit;
 import mekanism.common.IActiveState;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.block.BlockMachine.MachineType;

common/mekanism/common/tileentity/TileEntityDigitalMiner.java

@@ -6,13 +6,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.common.HashList;
 import mekanism.common.IActiveState;
 import mekanism.common.IAdvancedBoundingBlock;
 import mekanism.common.IRedstoneControl;
 import mekanism.common.IUpgradeTile;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.TileComponentUpgrade;

common/mekanism/common/tileentity/TileEntityDiversionTransporter.java

@@ -2,8 +2,8 @@ package mekanism.common.tileentity;
 
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketTileEntity;

common/mekanism/common/tileentity/TileEntityDynamicTank.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
+import mekanism.api.Object3D;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.SynchronizedTankData;
 import mekanism.common.TankUpdateProtocol;

common/mekanism/common/tileentity/TileEntityElectricBlock.java

@@ -9,12 +9,12 @@ import ic2.api.tile.IEnergyStorage;
 import java.util.ArrayList;
 import java.util.EnumSet;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.ICableOutputter;
 import mekanism.api.energy.IStrictEnergyAcceptor;
 import mekanism.api.energy.IStrictEnergyStorage;
 import mekanism.common.ITileNetwork;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.util.MekanismUtils;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;

common/mekanism/common/tileentity/TileEntityElectricPump.java

@@ -8,10 +8,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
 import mekanism.common.IConfigurable;
 import mekanism.common.ISustainedTank;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketTileEntity;

common/mekanism/common/tileentity/TileEntityEnergyCube.java

@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashSet;
 
+import mekanism.api.Object3D;
 import mekanism.common.IRedstoneControl;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.Tier.EnergyCubeTier;

common/mekanism/common/tileentity/TileEntityFactory.java

@@ -1,7 +1,9 @@
 package mekanism.common.tileentity;
 
 import java.util.ArrayList;
+import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
@@ -11,18 +13,17 @@ import mekanism.api.gas.IGasItem;
 import mekanism.api.gas.IGasStorage;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.client.sound.IHasSound;
-import mekanism.common.IActiveState;
-import mekanism.common.IFactory.RecipeType;
 import mekanism.common.EnumColor;
-import mekanism.common.IInvConfiguration;
+import mekanism.common.IActiveState;
 import mekanism.common.IEjector;
+import mekanism.common.IFactory.RecipeType;
+import mekanism.common.IInvConfiguration;
 import mekanism.common.IRedstoneControl;
 import mekanism.common.IUpgradeTile;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
-import mekanism.common.SideData;
 import mekanism.common.PacketHandler.Transmission;
+import mekanism.common.SideData;
 import mekanism.common.Tier.FactoryTier;
 import mekanism.common.TileComponentEjector;
 import mekanism.common.TileComponentUpgrade;
@@ -30,6 +31,7 @@ import mekanism.common.block.BlockMachine.MachineType;
 import mekanism.common.network.PacketTileEntity;
 import mekanism.common.util.ChargeUtils;
 import mekanism.common.util.MekanismUtils;
+import mekanism.common.util.StackUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.ForgeDirection;
@@ -149,6 +151,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip
 			ChargeUtils.discharge(1, this);
 			
 			handleSecondaryFuel();
+			//sortInventory();
 			
 			if(inventory[2] != null && inventory[3] == null)
 			{
@@ -242,6 +245,91 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip
 		}
 	}
 	
+	public void sortInventory()
+	{
+		int[] inputSlots = null;
+		
+		List<Integer> nullSlots = new ArrayList<Integer>();
+		List<Integer> fullSlots = new ArrayList<Integer>();
+		
+		if(tier == FactoryTier.BASIC)
+		{
+			inputSlots = new int[] {5, 6, 7};
+		}
+		else if(tier == FactoryTier.ADVANCED)
+		{
+			inputSlots = new int[] {5, 6, 7, 8, 9};
+		}
+		else if(tier == FactoryTier.ELITE)
+		{
+			inputSlots = new int[] {5, 6, 7, 8, 9, 10, 11};
+		}
+		
+		for(int id : inputSlots)
+		{
+			if(inventory[id] == null)
+			{
+				nullSlots.add(id);
+			}
+			else if(inventory[id].stackSize > 1)
+			{
+				fullSlots.add(id);
+			}
+		}
+		
+		if(nullSlots.size() > 0 && fullSlots.size() > 0)
+		{
+			int fullID = fullSlots.get(0);
+			List<ItemStack> split = StackUtils.split(inventory[fullID]);
+			
+			inventory[fullID] = split.get(0);
+			inventory[nullSlots.get(0)] = split.get(1);
+		}
+	}
+	
+	public static class InvID implements Comparable<InvID>
+	{
+		public ItemStack stack;
+		public int ID;
+		
+		public InvID(ItemStack s, int i)
+		{
+			stack = s;
+			ID = i;
+		}
+
+		@Override
+		public int compareTo(InvID arg0)
+		{
+			if(arg0.stack == null && stack == null)
+			{
+				return 0;
+			}
+			else if(arg0.stack == null && stack != null)
+			{
+				return 1;
+			}
+			else if(arg0.stack != null && stack == null)
+			{
+				return -1;
+			}
+			else if(arg0.stack.itemID == stack.itemID)
+			{
+				return 0;
+			}
+			else if(arg0.stack.itemID < stack.itemID)
+			{
+				return 1;
+			}
+			else if(arg0.stack.itemID > stack.itemID)
+			{
+				return -1;
+			}
+			
+			return 0;
+		}
+	}
+	
 	public int getSecondaryEnergyPerTick()
 	{
 		return RecipeType.values()[recipeType].getSecondaryEnergyPerTick();

common/mekanism/common/tileentity/TileEntityGasTank.java

@@ -2,6 +2,7 @@ package mekanism.common.tileentity;
 
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
@@ -11,7 +12,6 @@ import mekanism.api.gas.IGasItem;
 import mekanism.api.gas.IGasStorage;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.common.IRedstoneControl;
-import mekanism.common.Object3D;
 import mekanism.common.util.MekanismUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

common/mekanism/common/tileentity/TileEntityLogisticalSorter.java

@@ -3,11 +3,11 @@ package mekanism.common.tileentity;
 import java.util.ArrayList;
 import java.util.EnumSet;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
 import mekanism.common.HashList;
 import mekanism.common.IActiveState;
 import mekanism.common.IRedstoneControl;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.block.BlockMachine.MachineType;

common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java

@@ -4,11 +4,11 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
 import mekanism.common.HashList;
 import mekanism.common.IConfigurable;
 import mekanism.common.ITileNetwork;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketDataRequest;

common/mekanism/common/tileentity/TileEntityMechanicalPipe.java

@@ -4,11 +4,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 
+import mekanism.api.Object3D;
 import mekanism.api.transmitters.ITransmitter;
 import mekanism.api.transmitters.TransmissionType;
 import mekanism.api.transmitters.TransmitterNetworkRegistry;
 import mekanism.common.FluidNetwork;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.PipeUtils;

common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java

@@ -2,6 +2,7 @@ package mekanism.common.tileentity;
 
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.api.infuse.InfuseObject;
 import mekanism.api.infuse.InfuseRegistry;
 import mekanism.api.infuse.InfuseType;
@@ -15,7 +16,6 @@ import mekanism.common.IEjector;
 import mekanism.common.IRedstoneControl;
 import mekanism.common.IUpgradeTile;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.SideData;
 import mekanism.common.PacketHandler.Transmission;

common/mekanism/common/tileentity/TileEntityPressurizedTube.java

@@ -2,6 +2,7 @@ package mekanism.common.tileentity;
 
 import java.util.HashSet;
 
+import mekanism.api.Object3D;
 import mekanism.api.gas.GasNetwork;
 import mekanism.api.gas.GasTransmission;
 import mekanism.api.gas.IGasTransmitter;
@@ -9,7 +10,6 @@ import mekanism.api.gas.ITubeConnection;
 import mekanism.api.transmitters.ITransmitter;
 import mekanism.api.transmitters.TransmissionType;
 import mekanism.api.transmitters.TransmitterNetworkRegistry;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketDataRequest;

common/mekanism/common/tileentity/TileEntityRotaryCondensentrator.java

@@ -2,6 +2,7 @@ package mekanism.common.tileentity;
 
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
@@ -13,7 +14,6 @@ import mekanism.common.IActiveState;
 import mekanism.common.IRedstoneControl;
 import mekanism.common.ISustainedTank;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.block.BlockMachine.MachineType;

common/mekanism/common/tileentity/TileEntityTeleporter.java

@@ -3,9 +3,9 @@ package mekanism.common.tileentity;
 import java.util.ArrayList;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.Teleporter;

common/mekanism/common/tileentity/TileEntityUniversalCable.java

@@ -7,12 +7,12 @@ import ic2.api.energy.tile.IEnergySink;
 import java.util.ArrayList;
 import java.util.HashSet;
 
+import mekanism.api.Object3D;
 import mekanism.api.transmitters.ITransmitter;
 import mekanism.api.transmitters.TransmissionType;
 import mekanism.api.transmitters.TransmitterNetworkRegistry;
 import mekanism.common.EnergyNetwork;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.util.CableUtils;
 import mekanism.common.util.MekanismUtils;
 import net.minecraft.tileentity.TileEntity;

common/mekanism/common/transporter/TransporterManager.java

@@ -5,9 +5,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
 import mekanism.common.IInvConfiguration;
-import mekanism.common.Object3D;
 import mekanism.common.tileentity.TileEntityBin;
 import mekanism.common.transporter.TransporterStack.Path;
 import mekanism.common.util.InventoryUtils;

common/mekanism/common/transporter/TransporterPathfinder.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.tileentity.TileEntityLogisticalSorter;
 import mekanism.common.tileentity.TileEntityLogisticalTransporter;
 import mekanism.common.transporter.TransporterPathfinder.Pathfinder.DestChecker;

common/mekanism/common/transporter/TransporterStack.java

@@ -3,8 +3,8 @@ package mekanism.common.transporter;
 import java.util.ArrayList;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.common.EnumColor;
-import mekanism.common.Object3D;
 import mekanism.common.tileentity.TileEntityLogisticalSorter;
 import mekanism.common.tileentity.TileEntityLogisticalTransporter;
 import mekanism.common.transporter.TransporterPathfinder.Destination;

common/mekanism/common/util/CableUtils.java

@@ -9,13 +9,13 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.ICableOutputter;
 import mekanism.api.energy.IStrictEnergyAcceptor;
 import mekanism.api.transmitters.ITransmitter;
 import mekanism.api.transmitters.TransmissionType;
 import mekanism.common.EnergyNetwork;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.tileentity.TileEntityElectricBlock;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;

common/mekanism/common/util/MekanismUtils.java

@@ -12,12 +12,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import mekanism.api.Object3D;
 import mekanism.common.DynamicTankCache;
 import mekanism.common.EnumColor;
 import mekanism.common.IActiveState;
 import mekanism.common.IInvConfiguration;
 import mekanism.common.IFactory;
-import mekanism.common.Object3D;
 import mekanism.common.IFactory.RecipeType;
 import mekanism.common.IModule;
 import mekanism.common.IRedstoneControl;

common/mekanism/common/util/MinerUtils.java

@@ -3,7 +3,7 @@ package mekanism.common.util;
 import java.util.ArrayList;
 import java.util.List;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;

common/mekanism/common/util/StackUtils.java

@@ -0,0 +1,33 @@
+package mekanism.common.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+
+public final class StackUtils
+{
+	public static List<ItemStack> split(ItemStack stack)
+	{
+		if(stack == null || stack.stackSize == 0)
+		{
+			return null;
+		}
+		
+		List<ItemStack> ret = new ArrayList<ItemStack>();
+		
+		if(stack.stackSize == 1)
+		{
+			ret.add(stack);
+			return ret;
+		}
+		
+		int remain = stack.stackSize % 2;
+		int split = (int)((float)stack.stackSize/2F);
+		
+		ret.add(MekanismUtils.size(stack, split+remain));
+		ret.add(MekanismUtils.size(stack, split));
+		
+		return ret;
+	}
+}

common/mekanism/common/util/TransporterUtils.java

@@ -4,9 +4,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import mekanism.api.Object3D;
 import mekanism.api.transmitters.ITransmitter;
 import mekanism.common.EnumColor;
-import mekanism.common.Object3D;
 import mekanism.common.tileentity.TileEntityDiversionTransporter;
 import mekanism.common.tileentity.TileEntityLogisticalSorter;
 import mekanism.common.tileentity.TileEntityLogisticalTransporter;

common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java

@@ -2,9 +2,9 @@ package mekanism.generators.client.gui;
 
 import java.util.ArrayList;
 
+import mekanism.api.Object3D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketTileEntity;

common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java

@@ -2,8 +2,8 @@ package mekanism.generators.common.tileentity;
 
 import java.util.EnumSet;
 
+import mekanism.api.Object3D;
 import mekanism.common.IBoundingBlock;
-import mekanism.common.Object3D;
 import mekanism.common.util.MekanismUtils;
 import mekanism.generators.common.MekanismGenerators;
 import net.minecraftforge.common.ForgeDirection;

common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java

@@ -3,6 +3,7 @@ package mekanism.generators.common.tileentity;
 import java.util.ArrayList;
 import java.util.Random;
 
+import mekanism.api.Object3D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
@@ -12,7 +13,6 @@ import mekanism.api.gas.IGasItem;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.common.ISustainedTank;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.tileentity.TileEntityElectricBlock;

common/mekanism/generators/common/tileentity/TileEntityGenerator.java

@@ -6,12 +6,12 @@ import ic2.api.tile.IEnergyStorage;
 import java.util.ArrayList;
 import java.util.EnumSet;
 
+import mekanism.api.Object3D;
 import mekanism.api.energy.ICableOutputter;
 import mekanism.client.sound.IHasSound;
 import mekanism.common.IActiveState;
 import mekanism.common.IRedstoneControl;
 import mekanism.common.Mekanism;
-import mekanism.common.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketTileEntity;

common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java

@@ -3,7 +3,7 @@ package mekanism.generators.common.tileentity;
 import java.util.ArrayList;
 import java.util.EnumSet;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.util.ChargeUtils;
 import mekanism.common.util.MekanismUtils;
 import mekanism.generators.common.MekanismGenerators;

common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java

@@ -1,7 +1,7 @@
 package mekanism.generators.common.tileentity;
 
+import mekanism.api.Object3D;
 import mekanism.common.IBoundingBlock;
-import mekanism.common.Object3D;
 import mekanism.common.util.ChargeUtils;
 import mekanism.common.util.MekanismUtils;
 import mekanism.generators.common.MekanismGenerators;

common/mekanism/induction/client/gui/GuiMultimeter.java

@@ -5,7 +5,7 @@ package mekanism.induction.client.gui;
 
 import java.util.ArrayList;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.PacketHandler;
 import mekanism.common.PacketHandler.Transmission;
 import mekanism.common.network.PacketTileEntity;

common/mekanism/induction/common/BatteryUpdateProtocol.java

@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import mekanism.common.Object3D;
+import mekanism.api.Object3D;
 import mekanism.common.util.ListUtils;
 import mekanism.induction.common.tileentity.TileEntityBattery;
 import net.minecraft.entity.item.EntityItem;