v5.5.0 Release #1

*Removed unneeded imports.
*getMaxGas() in IGasStorage.
*Fixed Hydrogen Generator continuously draining hydrogen.
*Improved energy transfer protocol to equally distribute remainder.
*Gas transfer protocol now ignores full acceptors.

src/minecraft/mekanism/api/GasTransferProtocol.java

@@ -3,7 +3,6 @@ package mekanism.api;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
@@ -57,7 +56,10 @@ public class GasTransferProtocol
 			{
 				if(acceptor != original && acceptor.canReceiveGas(ForgeDirection.getOrientation(Arrays.asList(acceptors).indexOf(acceptor)).getOpposite(), transferType))
 				{
-					availableAcceptors.add(acceptor);
+					if(!(acceptor instanceof IGasStorage) || (acceptor instanceof IGasStorage && (((IGasStorage)acceptor).getMaxGas(transferType) - ((IGasStorage)acceptor).getGas(transferType)) > 0))
+					{
+						availableAcceptors.add(acceptor);
+					}
 				}
 			}
 		}

src/minecraft/mekanism/api/IElectricMachine.java

@@ -1,6 +1,5 @@
 package mekanism.api;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**

src/minecraft/mekanism/api/IGasStorage.java

@@ -20,4 +20,11 @@ public interface IGasStorage
 	 * @param amount - amount to store
 	 */
 	public void setGas(EnumGas type, int amount);
+	
+	/**
+	 * Gets the maximum amount of gas this tile entity can store.
+	 * @param type - type of gas
+	 * @return maximum gas
+	 */
+	public int getMaxGas(EnumGas type);
 }

src/minecraft/mekanism/client/BlockRenderingHandler.java

@@ -6,7 +6,6 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.client.ForgeHooksClient;
 
 import org.lwjgl.opengl.GL11;
 

src/minecraft/mekanism/client/ClientProxy.java

@@ -1,6 +1,5 @@
 package mekanism.client;
 
-import java.io.IOException;
 
 import mekanism.common.CommonProxy;
 import mekanism.common.EntityObsidianTNT;
@@ -13,32 +12,18 @@ import mekanism.common.TileEntityEnergyCube;
 import mekanism.common.TileEntityGasTank;
 import mekanism.common.TileEntityMetallurgicInfuser;
 import mekanism.common.TileEntityPressurizedTube;
-import mekanism.common.TileEntityPurificationChamber;
 import mekanism.common.TileEntityFactory;
 import mekanism.common.TileEntityTeleporter;
 import mekanism.common.TileEntityTheoreticalElementizer;
 import mekanism.common.TileEntityUniversalCable;
-import mekanism.generators.client.ModelAdvancedSolarGenerator;
-import mekanism.generators.client.RenderAdvancedSolarGenerator;
-import mekanism.generators.client.RenderBioGenerator;
-import mekanism.generators.client.RenderElectrolyticSeparator;
-import mekanism.generators.client.RenderHeatGenerator;
-import mekanism.generators.client.RenderHydrogenGenerator;
-import mekanism.generators.common.TileEntityAdvancedSolarGenerator;
-import mekanism.generators.common.TileEntityBioGenerator;
-import mekanism.generators.common.TileEntityElectrolyticSeparator;
-import mekanism.generators.common.TileEntityHeatGenerator;
-import mekanism.generators.common.TileEntityHydrogenGenerator;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.Configuration;
 import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.TextureFXManager;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.registry.TickRegistry;

src/minecraft/mekanism/client/ClientTickHandler.java

@@ -2,12 +2,8 @@ package mekanism.client;
 
 import java.util.EnumSet;
 
-import org.lwjgl.input.Keyboard;
-
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismUtils;
-import net.minecraft.src.ModLoader;
-import net.minecraftforge.common.MinecraftForge;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.ITickHandler;

src/minecraft/mekanism/client/GuiCredits.java

@@ -3,7 +3,6 @@ package mekanism.client;
 import mekanism.api.EnumColor;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismUtils;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 

src/minecraft/mekanism/client/GuiPortableTeleporter.java

@@ -1,14 +1,11 @@
 package mekanism.client;
 
-import mekanism.common.ContainerTeleporter;
 import mekanism.common.EnumPacketType;
 import mekanism.common.ItemPortableTeleporter;
 import mekanism.common.PacketHandler;
-import mekanism.common.TileEntityTeleporter;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
 import org.lwjgl.opengl.GL11;

src/minecraft/mekanism/client/ItemRenderingHandler.java

@@ -7,7 +7,6 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;

src/minecraft/mekanism/client/RenderPressurizedTube.java

@@ -7,9 +7,7 @@ import org.lwjgl.opengl.GL11;
 import net.minecraftforge.common.ForgeDirection;
 
 import mekanism.api.GasTransmission;
-import mekanism.api.IGasAcceptor;
 import mekanism.api.ITubeConnection;
-import mekanism.common.MekanismUtils;
 import mekanism.common.TileEntityPressurizedTube;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;

src/minecraft/mekanism/client/RenderUniversalCable.java

@@ -1,13 +1,7 @@
 package mekanism.client;
 
-import ic2.api.Direction;
-import ic2.api.energy.tile.IEnergyAcceptor;
-
 import java.util.Arrays;
 
-import mekanism.api.GasTransmission;
-import mekanism.api.ICableOutputter;
-import mekanism.api.ITubeConnection;
 import mekanism.common.MekanismUtils;
 import mekanism.common.TileEntityUniversalCable;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -16,10 +10,6 @@ import net.minecraftforge.common.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
-import universalelectricity.core.block.IConnectionProvider;
-
-import buildcraft.api.power.IPowerReceptor;
-
 public class RenderUniversalCable extends TileEntitySpecialRenderer
 {
 	private ModelTransmitter model;

src/minecraft/mekanism/client/Sound.java

@@ -7,7 +7,6 @@ import cpw.mods.fml.client.FMLClientHandler;
 import mekanism.common.Mekanism;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
-import paulscode.sound.SoundSystem;
 
 /**
  * Sound -- an object that is created in SoundHandler. A 'Sound' object runs off of

src/minecraft/mekanism/client/SoundHandler.java

@@ -6,7 +6,6 @@ import java.util.List;
 import java.util.Random;
 
 import mekanism.api.IActiveState;
-import mekanism.common.TileEntityBasicMachine;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import paulscode.sound.SoundSystem;

src/minecraft/mekanism/client/ThreadClientUpdate.java

@@ -2,7 +2,6 @@ package mekanism.client;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;

src/minecraft/mekanism/client/ThreadSendData.java

@@ -8,8 +8,6 @@ import java.net.Socket;
 import cpw.mods.fml.client.FMLClientHandler;
 
 import mekanism.common.Mekanism;
-import mekanism.common.MekanismUtils;
-import net.minecraft.src.ModLoader;
 
 /**
  * Sends information about this mod to the Mekanism server.

src/minecraft/mekanism/common/BlockBasic.java

@@ -3,11 +3,9 @@ package mekanism.common;
 import java.util.List;
 import java.util.Random;
 
-import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-import mekanism.client.GuiControlPanel;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -17,12 +15,10 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.src.*;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeChunkManager;
 
 /**
  * Block class for handling multiple metal block IDs.

src/minecraft/mekanism/common/BlockBounding.java

@@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 public class BlockBounding extends Block

src/minecraft/mekanism/common/BlockEnergyCube.java

@@ -1,6 +1,5 @@
 package mekanism.common;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
@@ -15,27 +14,21 @@ import universalelectricity.prefab.implement.IToolConfigurator;
 
 import mekanism.api.IEnergyCube;
 import mekanism.api.Tier.EnergyCubeTier;
-import mekanism.generators.common.MekanismGenerators;
-import mekanism.generators.common.BlockGenerator.GeneratorType;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.src.*;
-import net.minecraft.stats.StatList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeDirection;
 
 /**
  * Block class for handling multiple energy cube block IDs. 

src/minecraft/mekanism/common/BlockGasTank.java

@@ -6,8 +6,6 @@ import thermalexpansion.api.core.IDismantleable;
 import universalelectricity.prefab.implement.IToolConfigurator;
 import buildcraft.api.tools.IToolWrench;
 
-import mekanism.api.IUpgradeManagement;
-import mekanism.common.BlockMachine.MachineType;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;

src/minecraft/mekanism/common/BlockMachine.java

@@ -10,7 +10,6 @@ import universalelectricity.core.item.IItemElectric;
 import universalelectricity.prefab.implement.IToolConfigurator;
 
 import mekanism.api.IActiveState;
-import mekanism.api.IEnergyCube;
 import mekanism.api.Tier;
 import mekanism.api.IUpgradeManagement;
 import mekanism.client.ClientProxy;
@@ -22,7 +21,6 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;

src/minecraft/mekanism/common/BlockObsidianTNT.java

@@ -6,7 +6,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.item.Item;

src/minecraft/mekanism/common/BlockOre.java

@@ -8,7 +8,6 @@ import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
-import net.minecraft.world.World;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/minecraft/mekanism/common/BlockTransmitter.java

@@ -1,28 +1,19 @@
 package mekanism.common;
 
-import ic2.api.Direction;
-import ic2.api.energy.tile.IEnergyAcceptor;
-import ic2.api.energy.tile.IEnergyTile;
-
 import java.util.Arrays;
 import java.util.List;
 
-import buildcraft.api.power.IPowerReceptor;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 import mekanism.api.GasTransmission;
-import mekanism.api.IGasAcceptor;
 import mekanism.api.ITubeConnection;
 import mekanism.client.ClientProxy;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 

src/minecraft/mekanism/common/CommandMekanism.java

@@ -6,7 +6,6 @@ import java.util.List;
 import mekanism.api.EnumColor;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
-import net.minecraft.server.MinecraftServer;
 
 public class CommandMekanism extends CommandBase
 {

src/minecraft/mekanism/common/CommonProxy.java

@@ -3,12 +3,9 @@ package mekanism.common;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.TickRegistry;
 import cpw.mods.fml.relauncher.Side;
-import mekanism.client.GuiTeleporter;
-import mekanism.generators.common.TileEntityAdvancedSolarGenerator;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 

src/minecraft/mekanism/common/ContainerFactory.java

@@ -11,7 +11,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.FurnaceRecipes;
 
 public class ContainerFactory extends Container
 {

src/minecraft/mekanism/common/ContainerMetallurgicInfuser.java

@@ -1,12 +1,9 @@
 package mekanism.common;
 
-import java.util.Map;
-
 import universalelectricity.core.item.IItemElectric;
 
 import ic2.api.IElectricItem;
 import mekanism.api.InfusionInput;
-import mekanism.api.InfusionOutput;
 import mekanism.api.InfusionType;
 import mekanism.common.RecipeHandler.Recipe;
 import net.minecraft.entity.player.EntityPlayer;
@@ -15,7 +12,6 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
 
 public class ContainerMetallurgicInfuser extends Container
 {

src/minecraft/mekanism/common/EnergyTransferProtocol.java

@@ -1,6 +1,5 @@
 package mekanism.common;
 
-import ic2.api.Direction;
 import ic2.api.energy.tile.IEnergySink;
 
 import java.util.ArrayList;
@@ -11,7 +10,6 @@ import java.util.Map;
 
 import universalelectricity.core.block.IElectricityStorage;
 
-import buildcraft.api.power.IPowerProvider;
 import buildcraft.api.power.IPowerReceptor;
 
 import mekanism.api.IStrictEnergyAcceptor;
@@ -146,21 +144,21 @@ public class EnergyTransferProtocol
 		{
 			int divider = availableAcceptors.size();
 			double remaining = energyToSend % divider;
+			double currentRemaining = remaining;
 			double sending = (energyToSend-remaining)/divider;
 			
 			for(TileEntity acceptor : availableAcceptors)
 			{
 				double currentSending = sending;
 				
-				if(remaining > 0)
+				if(currentRemaining > 0)
 				{
-					currentSending++;
+					currentSending += (currentRemaining/divider);
-					remaining--;
+					currentRemaining -= (currentRemaining/divider);
 				}
 				
 				if(acceptor instanceof IStrictEnergyAcceptor)
 				{
-					double before = energyToSend;
 					energyToSend -= (currentSending - ((IStrictEnergyAcceptor)acceptor).transferEnergyToAcceptor(currentSending));
 				}
 				else if(acceptor instanceof IEnergySink)

src/minecraft/mekanism/common/ItemAtomicDisassembler.java

@@ -8,7 +8,6 @@ import mekanism.api.EnumColor;
 import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;

src/minecraft/mekanism/common/ItemBlockEnergyCube.java

@@ -8,13 +8,11 @@ import java.util.List;
 import universalelectricity.core.electricity.ElectricityDisplay;
 import universalelectricity.core.electricity.ElectricityPack;
 import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
-import universalelectricity.core.item.ElectricItemHelper;
 import universalelectricity.core.item.IItemElectric;
 
 import mekanism.api.IEnergyCube;
 import mekanism.api.Tier.EnergyCubeTier;
 import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;

src/minecraft/mekanism/common/ItemBlockMachine.java

@@ -11,7 +11,6 @@ import ic2.api.ICustomElectricItem;
 import mekanism.api.IUpgradeManagement;
 import mekanism.common.BlockMachine.MachineType;
 import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;

src/minecraft/mekanism/common/ItemConfigurator.java

@@ -2,7 +2,6 @@ package mekanism.common;
 
 import universalelectricity.core.electricity.ElectricityPack;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import mekanism.api.EnumColor;

src/minecraft/mekanism/common/ItemEnergized.java

@@ -10,7 +10,6 @@ import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
 import universalelectricity.core.item.IItemElectric;
 
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

src/minecraft/mekanism/common/ItemMachineUpgrade.java

@@ -1,13 +1,7 @@
 package mekanism.common;
 
-import java.util.List;
-
 import universalelectricity.prefab.modifier.IModifier;
 
-import mekanism.api.TabProxy;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public class ItemMachineUpgrade extends ItemMekanism implements IModifier

src/minecraft/mekanism/common/ItemMekanism.java

@@ -2,7 +2,6 @@ package mekanism.common;
 
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.item.Item;
-import net.minecraft.util.Icon;
 
 public class ItemMekanism extends Item 
 {

src/minecraft/mekanism/common/ItemPortableTeleporter.java

@@ -6,7 +6,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagFloat;
 import net.minecraft.world.World;
 
 public class ItemPortableTeleporter extends ItemEnergized

src/minecraft/mekanism/common/LinkedPowerProvider.java

@@ -1,11 +1,7 @@
 package mekanism.common;
 
-import java.util.ArrayList;
-
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import universalelectricity.core.vector.Vector3;
-import universalelectricity.core.vector.VectorHelper;
 import buildcraft.api.power.IPowerReceptor;
 import buildcraft.api.power.PowerProvider;
 

src/minecraft/mekanism/common/Mekanism.java

@@ -10,9 +10,7 @@ import java.util.logging.Logger;
 
 import mekanism.api.InfuseObject;
 import mekanism.api.InfusionInput;
-import mekanism.api.InfusionOutput;
 import mekanism.api.InfusionType;
-import mekanism.api.RecipeHelper;
 import mekanism.api.Tier.EnergyCubeTier;
 import mekanism.api.Tier.FactoryTier;
 import mekanism.client.SoundHandler;
@@ -48,7 +46,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import cpw.mods.fml.server.FMLServerHandler;
 
 /**
  * Mekanism mod -- adds in Tools, Armor, Weapons, Machines, and Magic. Universal source.

src/minecraft/mekanism/common/MekanismHooks.java

@@ -3,14 +3,9 @@ package mekanism.common;
 import universalelectricity.prefab.RecipeHelper;
 import cpw.mods.fml.common.Loader;
 import ic2.api.Ic2Recipes;
-import ic2.api.Items;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.src.*;
-import net.minecraftforge.liquids.LiquidContainerRegistry;
-import net.minecraftforge.liquids.LiquidDictionary;
-import net.minecraftforge.liquids.LiquidStack;
 
 /**
  * Hooks for Mekanism. Use to grab items or blocks out of different mods.

src/minecraft/mekanism/common/MekanismUtils.java

@@ -11,20 +11,15 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Map;
 
 import buildcraft.api.power.IPowerReceptor;
-import buildcraft.api.transport.IPipeTile;
 
 import universalelectricity.core.block.IConnectionProvider;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
-import universalelectricity.prefab.multiblock.TileEntityMulti;
 
 import mekanism.api.EnumColor;
-import mekanism.api.EnumGas;
-import mekanism.api.GasTransferProtocol;
 import mekanism.api.IActiveState;
 import mekanism.api.ICableOutputter;
 import mekanism.api.IConfigurable;
@@ -36,7 +31,6 @@ import mekanism.api.Tier.FactoryTier;
 import mekanism.common.IFactory.RecipeType;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.network.packet.Packet3Chat;
@@ -44,7 +38,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import cpw.mods.fml.common.network.PacketDispatcher;

src/minecraft/mekanism/common/PacketHandler.java

@@ -24,7 +24,6 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.IPacketHandler;
 import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
-import cpw.mods.fml.server.FMLServerHandler;
 
 /**
  * Mekanism packet handler. As always, use packets sparingly!

src/minecraft/mekanism/common/TileEntityAdvancedElectricMachine.java

@@ -8,13 +8,9 @@ import ic2.api.ElectricItem;
 import ic2.api.IElectricItem;
 import mekanism.api.EnumColor;
 import mekanism.api.SideData;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import net.minecraftforge.common.ForgeDirection;
 
 import com.google.common.io.ByteArrayDataInput;
 

src/minecraft/mekanism/common/TileEntityBasicBlock.java

@@ -5,14 +5,11 @@ import java.util.ArrayList;
 import com.google.common.io.ByteArrayDataInput;
 
 import ic2.api.IWrenchable;
-import ic2.api.energy.EnergyNet;
 import mekanism.api.ITileNetwork;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import universalelectricity.prefab.tile.TileEntityDisableable;
 
 public abstract class TileEntityBasicBlock extends TileEntityDisableable implements IWrenchable, ITileNetwork

src/minecraft/mekanism/common/TileEntityBasicMachine.java

@@ -4,29 +4,20 @@ import ic2.api.Direction;
 import ic2.api.energy.tile.IEnergySink;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
 
 import com.google.common.io.ByteArrayDataInput;
 
 import mekanism.api.IActiveState;
 import mekanism.api.IConfigurable;
 import mekanism.api.IElectricMachine;
-import mekanism.api.IEnergyCube;
 import mekanism.api.IStrictEnergyAcceptor;
 import mekanism.api.IUpgradeManagement;
 import mekanism.api.SideData;
 import mekanism.client.IHasSound;
 import mekanism.client.Sound;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.ForgeDirection;
-import net.minecraftforge.common.MinecraftForge;
-import universalelectricity.core.item.IItemElectric;
-import universalelectricity.core.vector.Vector3;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/minecraft/mekanism/common/TileEntityBoundingBlock.java

@@ -4,15 +4,9 @@ import java.util.ArrayList;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import mekanism.api.EnumGas;
 import mekanism.api.ITileNetwork;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 
 public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork
 {

src/minecraft/mekanism/common/TileEntityCombiner.java

@@ -1,6 +1,5 @@
 package mekanism.common;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import mekanism.common.RecipeHandler.Recipe;

src/minecraft/mekanism/common/TileEntityControlPanel.java

@@ -3,10 +3,7 @@ package mekanism.common;
 import java.util.ArrayList;
 
 import mekanism.api.ITileNetwork;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 
 import com.google.common.io.ByteArrayDataInput;

src/minecraft/mekanism/common/TileEntityCrusher.java

@@ -1,10 +1,8 @@
 package mekanism.common;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import mekanism.common.RecipeHandler.Recipe;
-import net.minecraft.item.ItemStack;
 
 public class TileEntityCrusher extends TileEntityElectricMachine
 {

src/minecraft/mekanism/common/TileEntityElectricMachine.java

@@ -4,16 +4,10 @@ import ic2.api.ElectricItem;
 import ic2.api.IElectricItem;
 import mekanism.api.EnumColor;
 import mekanism.api.SideData;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.item.ElectricItemHelper;
 
-import com.google.common.io.ByteArrayDataInput;
-
 import dan200.computer.api.IComputerAccess;
 
 public abstract class TileEntityElectricMachine extends TileEntityBasicMachine

src/minecraft/mekanism/common/TileEntityEnergizedSmelter.java

@@ -7,8 +7,6 @@ import java.util.Map;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 
-import mekanism.common.RecipeHandler.Recipe;
-
 public class TileEntityEnergizedSmelter extends TileEntityElectricMachine
 {
 	public TileEntityEnergizedSmelter()

src/minecraft/mekanism/common/TileEntityEnergyCube.java

@@ -5,7 +5,6 @@ import ic2.api.ElectricItem;
 import ic2.api.IElectricItem;
 import ic2.api.energy.tile.IEnergyConductor;
 import ic2.api.IEnergyStorage;
-import ic2.api.energy.EnergyNet;
 import ic2.api.energy.event.EnergyTileSourceEvent;
 import ic2.api.energy.tile.IEnergySink;
 import ic2.api.energy.tile.IEnergySource;
@@ -14,19 +13,13 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashSet;
 
-import mekanism.api.EnumGas;
-import mekanism.api.GasTransmission;
 import mekanism.api.ICableOutputter;
 import mekanism.api.IUniversalCable;
-import mekanism.api.IEnergyCube;
 import mekanism.api.IStrictEnergyAcceptor;
 import mekanism.api.Tier.EnergyCubeTier;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.common.MinecraftForge;
@@ -35,13 +28,11 @@ import universalelectricity.core.block.IVoltage;
 import universalelectricity.core.electricity.ElectricityNetworkHelper;
 import universalelectricity.core.electricity.IElectricityNetwork;
 import universalelectricity.core.item.ElectricItemHelper;
-import universalelectricity.core.item.IItemElectric;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
 import universalelectricity.core.block.IConductor;
 import buildcraft.api.power.IPowerProvider;
 import buildcraft.api.power.IPowerReceptor;
-import buildcraft.api.power.PowerFramework;
 import buildcraft.api.power.PowerProvider;
 
 import com.google.common.io.ByteArrayDataInput;

src/minecraft/mekanism/common/TileEntityEnrichmentChamber.java

@@ -1,10 +1,8 @@
 package mekanism.common;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import mekanism.common.RecipeHandler.Recipe;
-import net.minecraft.item.ItemStack;
 
 public class TileEntityEnrichmentChamber extends TileEntityElectricMachine
 {

src/minecraft/mekanism/common/TileEntityFactory.java

@@ -1,7 +1,6 @@
 package mekanism.common;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
 
 import ic2.api.Direction;
 import ic2.api.ElectricItem;
@@ -17,18 +16,12 @@ import mekanism.api.Tier.FactoryTier;
 import mekanism.client.IHasSound;
 import mekanism.client.Sound;
 import mekanism.common.IFactory.RecipeType;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import net.minecraftforge.common.MinecraftForge;
 import universalelectricity.core.item.ElectricItemHelper;
-import universalelectricity.core.vector.Vector3;
 
 import com.google.common.io.ByteArrayDataInput;
 

src/minecraft/mekanism/common/TileEntityGasTank.java

@@ -8,11 +8,8 @@ import mekanism.api.IGasAcceptor;
 import mekanism.api.IGasStorage;
 import mekanism.api.IStorageTank;
 import mekanism.api.ITubeConnection;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.vector.Vector3;
@@ -174,6 +171,12 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasS
 			gasStored = Math.max(Math.min(amount, MAX_GAS), 0);
 		}
 	}
+	
+	@Override
+	public int getMaxGas(EnumGas type)
+	{
+		return MAX_GAS;
+	}
 
 	@Override
 	public int transferGasToAcceptor(int amount, EnumGas type) 

src/minecraft/mekanism/common/TileEntityMetallurgicInfuser.java

@@ -6,9 +6,6 @@ import ic2.api.IElectricItem;
 import ic2.api.energy.tile.IEnergySink;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
 
 import mekanism.api.EnumColor;
 import mekanism.api.IActiveState;
@@ -23,17 +20,12 @@ import mekanism.api.SideData;
 import mekanism.client.IHasSound;
 import mekanism.client.Sound;
 import mekanism.common.RecipeHandler.Recipe;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import net.minecraftforge.oredict.OreDictionary;
 import universalelectricity.core.item.ElectricItemHelper;
-import universalelectricity.core.vector.Vector3;
 
 import com.google.common.io.ByteArrayDataInput;
 

src/minecraft/mekanism/common/TileEntityOsmiumCompressor.java

@@ -1,6 +1,5 @@
 package mekanism.common;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import mekanism.common.RecipeHandler.Recipe;

src/minecraft/mekanism/common/TileEntityPurificationChamber.java

@@ -1,12 +1,9 @@
 package mekanism.common;
 
-import java.util.HashMap;
 import java.util.Map;
 
-import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.ForgeDirection;
 
 import mekanism.api.EnumGas;
@@ -56,6 +53,17 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac
 			setSecondaryEnergy(amount);
 		}
 	}
+	
+	@Override
+	public int getMaxGas(EnumGas type)
+	{
+		if(type == EnumGas.OXYGEN)
+		{
+			return MAX_SECONDARY_ENERGY;
+		}
+		
+		return 0;
+	}
 
 	@Override
 	public int transferGasToAcceptor(int amount, EnumGas type) 
@@ -75,6 +83,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac
 	    	}
 	    	return rejects;
 		}
+		
 		return amount;
 	}
 

src/minecraft/mekanism/common/TileEntityTeleporter.java

@@ -6,33 +6,23 @@ import ic2.api.IElectricItem;
 import ic2.api.energy.tile.IEnergySink;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
 import java.util.List;
-import java.util.Random;
 
 import universalelectricity.core.item.ElectricItemHelper;
-import universalelectricity.core.vector.Vector3;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import cpw.mods.fml.server.FMLServerHandler;
 import dan200.computer.api.IComputerAccess;
 import dan200.computer.api.IPeripheral;
 
 import mekanism.api.EnumColor;
 import mekanism.api.IStrictEnergyAcceptor;
-import mekanism.common.Teleporter.Coords;
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.ForgeDirection;

src/minecraft/mekanism/common/TileEntityTheoreticalElementizer.java

@@ -2,7 +2,6 @@ package mekanism.common;
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.Random;
 
 import cpw.mods.fml.relauncher.Side;

src/minecraft/mekanism/common/TileEntityUniversalCable.java

@@ -1,10 +1,6 @@
 package mekanism.common;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -13,12 +9,8 @@ import buildcraft.api.power.IPowerProvider;
 import buildcraft.api.power.IPowerReceptor;
 import buildcraft.api.power.PowerFramework;
 import buildcraft.api.power.PowerProvider;
-import buildcraft.api.transport.IPipeConnection;
 import universalelectricity.core.vector.Vector3;
 import universalelectricity.core.vector.VectorHelper;
-import universalelectricity.core.block.IConnectionProvider;
-import universalelectricity.core.electricity.ElectricityPack;
-import universalelectricity.core.electricity.IElectricityNetwork;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraftforge.common.ForgeDirection;

src/minecraft/mekanism/generators/client/BlockRenderingHandler.java

@@ -6,7 +6,6 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.client.ForgeHooksClient;
 
 import org.lwjgl.opengl.GL11;
 

src/minecraft/mekanism/generators/client/GeneratorsClientProxy.java

@@ -11,7 +11,6 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import net.minecraftforge.client.MinecraftForgeClient;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 

src/minecraft/mekanism/generators/client/ModelAdvancedSolarGenerator.java

@@ -1,6 +1,5 @@
 package mekanism.generators.client;
 
-import cpw.mods.fml.client.FMLClientHandler;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;

src/minecraft/mekanism/generators/client/ModelBioGenerator.java

@@ -1,7 +1,5 @@
 package mekanism.generators.client;
 
-import java.util.Random;
-
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;

src/minecraft/mekanism/generators/client/RenderAdvancedSolarGenerator.java

@@ -6,8 +6,6 @@ import net.minecraft.tileentity.TileEntity;
 
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.FMLClientHandler;
-
 public class RenderAdvancedSolarGenerator extends TileEntitySpecialRenderer
 {
 	private ModelAdvancedSolarGenerator arrayModel;

src/minecraft/mekanism/generators/client/RenderBioGenerator.java

@@ -6,8 +6,6 @@ import net.minecraft.tileentity.TileEntity;
 
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.FMLClientHandler;
-
 public class RenderBioGenerator extends TileEntitySpecialRenderer
 {
 	private ModelBioGenerator model = new ModelBioGenerator();

src/minecraft/mekanism/generators/common/BlockGenerator.java

@@ -1,19 +1,16 @@
 package mekanism.generators.common;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
 import buildcraft.api.tools.IToolWrench;
 
 import mekanism.api.IActiveState;
-import mekanism.api.IEnergyCube;
 import mekanism.common.IBoundingBlock;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismUtils;
 import mekanism.common.TileEntityBasicBlock;
 import mekanism.common.TileEntityElectricBlock;
-import mekanism.common.TileEntityEnergyCube;
 import mekanism.generators.client.GeneratorsClientProxy;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;

src/minecraft/mekanism/generators/common/ContainerElectrolyticSeparator.java

@@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.liquids.LiquidContainerRegistry;
 import net.minecraftforge.liquids.LiquidStack;

src/minecraft/mekanism/generators/common/ContainerHydrogenGenerator.java

@@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import universalelectricity.core.item.IItemElectric;
 

src/minecraft/mekanism/generators/common/ItemBlockGenerator.java

@@ -11,7 +11,6 @@ import mekanism.common.Mekanism;
 import mekanism.common.TileEntityElectricBlock;
 import mekanism.generators.common.BlockGenerator.GeneratorType;
 import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;

src/minecraft/mekanism/generators/common/TileEntityAdvancedSolarGenerator.java

@@ -1,10 +1,7 @@
 package mekanism.generators.common;
 
 import mekanism.common.IBoundingBlock;
-import mekanism.common.Mekanism;
 import mekanism.common.MekanismUtils;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.tileentity.TileEntity;
 
 public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock
 {

src/minecraft/mekanism/generators/common/TileEntityBioGenerator.java

@@ -12,13 +12,9 @@ import mekanism.client.Sound;
 import mekanism.common.LiquidSlot;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismUtils;
-import mekanism.common.PacketHandler;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.liquids.ILiquidTank;
 import net.minecraftforge.liquids.ITankContainer;

src/minecraft/mekanism/generators/common/TileEntityElectrolyticSeparator.java

@@ -6,7 +6,6 @@ import ic2.api.IElectricItem;
 import ic2.api.energy.tile.IEnergySink;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
 
 import mekanism.api.EnumGas;
 import mekanism.api.GasTransmission;
@@ -18,23 +17,16 @@ import mekanism.api.ITubeConnection;
 import mekanism.common.LiquidSlot;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismUtils;
-import mekanism.common.PacketHandler;
 import mekanism.common.TileEntityElectricBlock;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.liquids.ILiquidTank;
 import net.minecraftforge.liquids.ITankContainer;
-import net.minecraftforge.liquids.LiquidContainerData;
 import net.minecraftforge.liquids.LiquidContainerRegistry;
-import net.minecraftforge.liquids.LiquidDictionary;
 import net.minecraftforge.liquids.LiquidStack;
 import net.minecraftforge.liquids.LiquidTank;
 import universalelectricity.core.item.ElectricItemHelper;
@@ -371,6 +363,12 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 		return data;
 	}
 	
+	@Override
+	public int getMaxGas(EnumGas type)
+	{
+		return MAX_GAS;
+	}
+	
 	@Override
 	public void setGas(EnumGas type, int amount)
 	{

src/minecraft/mekanism/generators/common/TileEntityGenerator.java

@@ -3,7 +3,6 @@ package mekanism.generators.common;
 import ic2.api.Direction;
 import ic2.api.energy.tile.IEnergyConductor;
 import ic2.api.IEnergyStorage;
-import ic2.api.energy.EnergyNet;
 import ic2.api.energy.event.EnergyTileSourceEvent;
 import ic2.api.energy.tile.IEnergySource;
 
@@ -37,7 +36,6 @@ import universalelectricity.core.vector.VectorHelper;
 import universalelectricity.core.block.IConductor;
 import buildcraft.api.power.IPowerProvider;
 import buildcraft.api.power.IPowerReceptor;
-import buildcraft.api.power.PowerFramework;
 import buildcraft.api.power.PowerProvider;
 import dan200.computer.api.IComputerAccess;
 import dan200.computer.api.IPeripheral;

src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java

@@ -6,19 +6,13 @@ import java.util.Map;
 
 import ic2.api.ElectricItem;
 import ic2.api.IElectricItem;
-import mekanism.client.Sound;
 import mekanism.common.LiquidSlot;
 import mekanism.common.Mekanism;
-import mekanism.common.MekanismHooks;
 import mekanism.common.MekanismUtils;
-import mekanism.common.PacketHandler;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.liquids.ILiquidTank;
@@ -30,10 +24,6 @@ import universalelectricity.core.item.ElectricItemHelper;
 
 import com.google.common.io.ByteArrayDataInput;
 
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 import dan200.computer.api.IComputerAccess;
 
 public class TileEntityHeatGenerator extends TileEntityGenerator implements ITankContainer

src/minecraft/mekanism/generators/common/TileEntityHydrogenGenerator.java

@@ -11,12 +11,8 @@ import mekanism.api.IStorageTank;
 import mekanism.api.ITubeConnection;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismUtils;
-import mekanism.common.PacketHandler;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraftforge.common.ForgeDirection;
 import universalelectricity.core.UniversalElectricity;
 import universalelectricity.core.item.ElectricItemHelper;
@@ -243,7 +239,8 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements
 	    	
 	    	return rejects;
 		}
-		return 0;
+		
+		return amount;
 	}
 	
 	@Override
@@ -273,4 +270,15 @@ public class TileEntityHydrogenGenerator extends TileEntityGenerator implements
 	{
 		return side != ForgeDirection.getOrientation(facing);
 	}
+
+	@Override
+	public int getMaxGas(EnumGas type) 
+	{
+		if(type == EnumGas.HYDROGEN)
+		{
+			return MAX_HYDROGEN;
+		}
+		
+		return 0;
+	}
 }

src/minecraft/mekanism/generators/common/TileEntitySolarGenerator.java

@@ -7,12 +7,8 @@ import universalelectricity.core.item.ElectricItemHelper;
 import ic2.api.ElectricItem;
 import ic2.api.IElectricItem;
 import mekanism.common.Mekanism;
-import mekanism.common.PacketHandler;
 import mekanism.generators.common.BlockGenerator.GeneratorType;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraftforge.common.ForgeDirection;
 
 import com.google.common.io.ByteArrayDataInput;

src/minecraft/mekanism/nei/AdvancedMachineRecipeHandler.java

@@ -1,7 +1,6 @@
 package mekanism.nei;
 
 import java.awt.Rectangle;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;

src/minecraft/mekanism/nei/CombinerRecipeHandler.java

@@ -1,14 +1,11 @@
 package mekanism.nei;
 
-import java.util.List;
 import java.util.Set;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 
-import mekanism.client.GuiAdvancedElectricMachine;
 import mekanism.client.GuiCombiner;
-import mekanism.common.TileEntityCombiner;
 import mekanism.common.RecipeHandler.Recipe;
 
 public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler

src/minecraft/mekanism/nei/CrusherRecipeHandler.java

@@ -3,8 +3,6 @@ package mekanism.nei;
 import java.util.Set;
 
 import mekanism.client.GuiCrusher;
-import mekanism.client.GuiElectricMachine;
-import mekanism.common.TileEntityCrusher;
 import mekanism.common.RecipeHandler.Recipe;
 
 public class CrusherRecipeHandler extends MachineRecipeHandler

src/minecraft/mekanism/nei/EnrichmentChamberRecipeHandler.java

@@ -2,9 +2,7 @@ package mekanism.nei;
 
 import java.util.Set;
 
-import mekanism.client.GuiElectricMachine;
 import mekanism.client.GuiEnrichmentChamber;
-import mekanism.common.TileEntityEnrichmentChamber;
 import mekanism.common.RecipeHandler.Recipe;
 
 public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler

src/minecraft/mekanism/nei/FactoryRecipeHandler.java

@@ -9,14 +9,8 @@ import mekanism.common.IFactory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.ShapedRecipes;
-import codechicken.core.ReflectionManager;
-import codechicken.nei.NEICompatibility;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.ShapedRecipeHandler;
-import codechicken.nei.recipe.weakDependancy_Forge;
-import codechicken.nei.recipe.ShapedRecipeHandler.CachedShapedRecipe;
-import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe;
 
 public class FactoryRecipeHandler extends ShapedRecipeHandler 
 {

src/minecraft/mekanism/nei/MachineRecipeHandler.java

@@ -1,7 +1,6 @@
 package mekanism.nei;
 
 import java.awt.Rectangle;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;

src/minecraft/mekanism/nei/MetallurgicInfuserRecipeHandler.java

@@ -1,7 +1,6 @@
 package mekanism.nei;
 
 import java.awt.Rectangle;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -12,10 +11,8 @@ import mekanism.api.InfusionType;
 import mekanism.client.GuiMetallurgicInfuser;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismUtils;
-import mekanism.common.TileEntityMetallurgicInfuser;
 import mekanism.common.RecipeHandler.Recipe;
 import mekanism.generators.common.MekanismGenerators;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import org.lwjgl.opengl.GL11;

src/minecraft/mekanism/nei/OsmiumCompressorRecipeHandler.java

@@ -4,10 +4,8 @@ import java.util.Set;
 
 import net.minecraft.item.ItemStack;
 
-import mekanism.client.GuiAdvancedElectricMachine;
 import mekanism.client.GuiOsmiumCompressor;
 import mekanism.common.Mekanism;
-import mekanism.common.TileEntityOsmiumCompressor;
 import mekanism.common.RecipeHandler.Recipe;
 
 public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler

src/minecraft/mekanism/nei/PurificationChamberRecipeHandler.java

@@ -2,9 +2,7 @@ package mekanism.nei;
 
 import java.util.Set;
 
-import mekanism.client.GuiAdvancedElectricMachine;
 import mekanism.client.GuiPurificationChamber;
-import mekanism.common.Mekanism;
 import mekanism.common.RecipeHandler.Recipe;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/minecraft/mekanism/tools/common/MekanismTools.java

@@ -2,7 +2,6 @@ package mekanism.tools.common;
 
 import java.util.Random;
 
-import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntitySkeleton;
 import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.item.EnumArmorMaterial;
@@ -10,7 +9,6 @@ import net.minecraft.item.EnumToolMaterial;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.src.*;
 import net.minecraftforge.common.EnumHelper;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.ForgeSubscribe;
@@ -19,11 +17,9 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
 import mekanism.common.Mekanism;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.Mod.Init;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.network.NetworkMod;
-import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 
 @Mod(modid = "MekanismTools", name = "MekanismTools", version = "5.5.0", dependencies = "required-after:Mekanism")