base stuff for the crystallizer, removed unnecessary argument from slots

com/hbm/blocks/ModBlocks.java

@@ -375,6 +375,9 @@ public class ModBlocks {
 	public static Block machine_gascent;
 	public static final int guiID_gascent = 71;
 	
+	public static Block machine_crystallizer;
+	public static final int guiID_crystallizer = 94;
+	
 	public static Block machine_uf6_tank;
 	public static final int guiID_uf6_tank = 7;
 	
@@ -1031,6 +1034,7 @@ public class ModBlocks {
 		
 		machine_centrifuge = new MachineCentrifuge(Material.iron).setBlockName("machine_centrifuge").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 		machine_gascent = new MachineGasCent(Material.iron).setBlockName("machine_gascent").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
+		machine_crystallizer = new MachineCrystallizer(Material.iron).setBlockName("machine_crystallizer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 		
 		machine_uf6_tank = new MachineUF6Tank(Material.iron).setBlockName("machine_uf6_tank").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab);
 		
@@ -1701,6 +1705,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(machine_difurnace_on, machine_difurnace_on.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_centrifuge, machine_centrifuge.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_gascent, machine_gascent.getUnlocalizedName());
+		GameRegistry.registerBlock(machine_crystallizer, machine_crystallizer.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_uf6_tank, machine_uf6_tank.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_puf6_tank, machine_puf6_tank.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_reactor, machine_reactor.getUnlocalizedName());

com/hbm/blocks/machine/BlockMachineBase.java

@@ -20,8 +20,8 @@ public abstract class BlockMachineBase extends BlockContainer {
 	int guiID = -1;
 	boolean rotatable = false;
 
-	protected BlockMachineBase(Material p_i45386_1_, int guiID) {
-		super(p_i45386_1_);
+	protected BlockMachineBase(Material mat, int guiID) {
+		super(mat);
 		this.guiID = guiID;
 	}
 	

com/hbm/blocks/machine/MachineCrystallizer.java

@@ -0,0 +1,21 @@
+package com.hbm.blocks.machine;
+
+import com.hbm.blocks.ModBlocks;
+import com.hbm.tileentity.machine.TileEntityMachineCrystallizer;
+
+import net.minecraft.block.material.Material;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class MachineCrystallizer extends BlockMachineBase {
+
+	public MachineCrystallizer(Material mat) {
+		super(mat, ModBlocks.guiID_crystallizer);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		return new TileEntityMachineCrystallizer();
+	}
+
+}

com/hbm/handler/GUIHandler.java

@@ -1,6 +1,7 @@
 package com.hbm.handler;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.interfaces.Spaghetti;
 import com.hbm.inventory.container.*;
 import com.hbm.inventory.gui.*;
 import com.hbm.inventory.inv.InventoryLeadBox;
@@ -13,6 +14,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import cpw.mods.fml.common.network.IGuiHandler;
 
+@Spaghetti("ew")
 public class GUIHandler implements IGuiHandler {
 
 	@Override
@@ -840,6 +842,15 @@ public class GUIHandler implements IGuiHandler {
 					}
 					return null;
 				}
+	
+				case ModBlocks.guiID_crystallizer:
+				{
+					if(entity instanceof TileEntityMachineCrystallizer)
+					{
+						return new ContainerCrystallizer(player.inventory, (TileEntityMachineCrystallizer) entity);
+					}
+					return null;
+				}
 			}
 		} else {
 			//NON-TE CONTAINERS
@@ -1679,6 +1690,15 @@ public class GUIHandler implements IGuiHandler {
 					}
 					return null;
 				}
+				
+				case ModBlocks.guiID_crystallizer:
+				{
+					if(entity instanceof TileEntityMachineCrystallizer)
+					{
+						return new GUICrystallizer(player.inventory, (TileEntityMachineCrystallizer) entity);
+					}
+					return null;
+				}
 			}
 		} else {
 			//CLIENTONLY GUIS

com/hbm/inventory/CrystallizerRecipes.java

@@ -0,0 +1,64 @@
+package com.hbm.inventory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import com.hbm.inventory.RecipesCommon.ComparableStack;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+//This time we're doing this right
+//...right?
+public class CrystallizerRecipes {
+	
+	//'Object' is either a ComparableStack or the key for th ore dict
+	private static HashMap<Object, ItemStack> recipes = new HashMap();
+	
+	public static void register() {
+		
+		recipes.put("oreIron", new ItemStack(Items.iron_ingot));
+	}
+	
+	public static ItemStack getOutput(ItemStack stack) {
+		
+		if(stack == null || stack.getItem() == null)
+			return null;
+		
+		ComparableStack comp = new ComparableStack(stack.getItem(), 1, stack.getItemDamage());
+		
+		if(recipes.containsKey(comp))
+			return recipes.get(comp);
+		
+		String[] dictKeys = comp.getDictKeys();
+		
+		for(String key : dictKeys) {
+
+			if(recipes.containsKey(key))
+				return recipes.get(key);
+		}
+		
+		return null;
+	}
+
+	public Map<Object, Object> getRecipes() {
+		
+		Map<Object, Object> recipes = new HashMap<Object, Object>();
+		
+		for(Entry<Object, ItemStack> entry : CrystallizerRecipes.recipes.entrySet()) {
+			
+			if(entry.getKey() instanceof String) {
+				List<ItemStack> ingredients = OreDictionary.getOres((String)entry.getKey());
+				recipes.put(ingredients, entry.getValue());
+			} else {
+				recipes.put(((ComparableStack)entry.getKey()).toStack(), entry.getValue());
+			}
+		}
+		
+		return recipes;
+	}
+
+}

com/hbm/inventory/RecipesCommon.java

@@ -0,0 +1,85 @@
+package com.hbm.inventory;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+public class RecipesCommon {
+	
+	public static class ComparableStack {
+
+		Item item;
+		int stacksize;
+		int meta;
+		
+		public ComparableStack(Item item) {
+			this.item = item;
+			this.stacksize = 1;
+			this.meta = 0;
+		}
+		
+		public ComparableStack(Item item, int stacksize) {
+			this(item);
+			this.stacksize = stacksize;
+		}
+		
+		public ComparableStack(Item item, int stacksize, int meta) {
+			this(item, stacksize);
+			this.meta = meta;
+		}
+		
+		public ItemStack toStack() {
+			
+			return new ItemStack(item, stacksize, meta);
+		}
+		
+		public String[] getDictKeys() {
+			
+			int[] ids = OreDictionary.getOreIDs(toStack());
+			
+			if(ids == null || ids.length == 0)
+				return new String[0];
+			
+			String[] entries = new String[ids.length];
+			
+			for(int i = 0; i < ids.length; i++) {
+				
+				entries[i] = OreDictionary.getOreName(ids[i]);
+			}
+			
+			return entries;
+		}
+		
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = prime * result + Item.getIdFromItem(item);
+			result = prime * result + meta;
+			result = prime * result + stacksize;
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj)
+				return true;
+			if (obj == null)
+				return false;
+			if (getClass() != obj.getClass())
+				return false;
+			ComparableStack other = (ComparableStack) obj;
+			if (item == null) {
+				if (other.item != null)
+					return false;
+			} else if (!item.equals(other.item))
+				return false;
+			if (meta != other.meta)
+				return false;
+			if (stacksize != other.stacksize)
+				return false;
+			return true;
+		}
+	}
+
+}

com/hbm/inventory/SlotMachineOutput.java

@@ -1,13 +1,12 @@
 package com.hbm.inventory;
 
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 public class SlotMachineOutput extends Slot {
 
-	public SlotMachineOutput(EntityPlayer player, IInventory inventory, int i, int j, int k) {
+	public SlotMachineOutput(IInventory inventory, int i, int j, int k) {
 		super(inventory, i, j, k);
 	}
 	

com/hbm/inventory/container/ContainerCentrifuge.java

@@ -19,10 +19,10 @@ public class ContainerCentrifuge extends Container {
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 26, 17));
 		this.addSlotToContainer(new Slot(tedf, 1, 26, 53));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 134, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 152, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134, 53));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 152, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 134, 17));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 152, 17));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 134, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 152, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerCoreAdvanced.java

@@ -34,26 +34,26 @@ public class ContainerCoreAdvanced extends Container {
 		this.addSlotToContainer(new Slot(tedf, 9, 8, 54));
 		this.addSlotToContainer(new Slot(tedf, 10, 8, 72));
 		//Outputs
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 134, 54));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 134, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 134, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 134, 72));
 		//Output Storage
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 8, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 26, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 44, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 16, 62, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 17, 80, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 18, 98, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 19, 116, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 20, 134, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 21, 152, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 8, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 26, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 44, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 16, 62, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 17, 80, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 18, 98, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 19, 116, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 20, 134, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 21, 152, 108));
 		//Power Cell
 		this.addSlotToContainer(new Slot(tedf, 22, 44, 72));
 		//More Inputs
 		this.addSlotToContainer(new Slot(tedf, 23, 26, 54));
 		this.addSlotToContainer(new Slot(tedf, 24, 26, 72));
 		//More Outputs
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 25, 152, 54));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 26, 152, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 25, 152, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 26, 152, 72));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerCoreInjector.java

@@ -18,9 +18,9 @@ public class ContainerCoreInjector extends Container {
 		nukeBoy = tedf;
 
 		this.addSlotToContainer(new Slot(tedf, 0, 26, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 26, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 26, 53));
 		this.addSlotToContainer(new Slot(tedf, 2, 134, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 134, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 134, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerCoreTitanium.java

@@ -34,18 +34,18 @@ public class ContainerCoreTitanium extends Container {
 		this.addSlotToContainer(new Slot(tedf, 9, 8, 54));
 		this.addSlotToContainer(new Slot(tedf, 10, 8, 72));
 		//Outputs
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 152, 54));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 152, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 152, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 152, 72));
 		//Output Storage
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 8, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 26, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 44, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 16, 62, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 17, 80, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 18, 98, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 19, 116, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 20, 134, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 21, 152, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 8, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 26, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 44, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 16, 62, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 17, 80, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 18, 98, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 19, 116, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 20, 134, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 21, 152, 108));
 		//Power Cell
 		this.addSlotToContainer(new Slot(tedf, 22, 44, 72));
 		

com/hbm/inventory/container/ContainerCrystallizer.java

@@ -0,0 +1,77 @@
+package com.hbm.inventory.container;
+
+import com.hbm.inventory.SlotMachineOutput;
+import com.hbm.tileentity.machine.TileEntityMachineCrystallizer;
+
+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.ItemStack;
+
+public class ContainerCrystallizer extends Container {
+	
+	private TileEntityMachineCrystallizer diFurnace;
+	
+	public ContainerCrystallizer(InventoryPlayer invPlayer, TileEntityMachineCrystallizer tedf) {
+		diFurnace = tedf;
+
+
+		this.addSlotToContainer(new Slot(tedf, 0, 80, 35));
+		this.addSlotToContainer(new Slot(tedf, 1, 8, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 140, 35));
+		
+		for(int i = 0; i < 3; i++)
+		{
+			for(int j = 0; j < 9; j++)
+			{
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
+			}
+		}
+		
+		for(int i = 0; i < 9; i++)
+		{
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
+		}
+	}
+	
+	@Override
+    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
+    {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+		
+		if (var4 != null && var4.getHasStack())
+		{
+			ItemStack var5 = var4.getStack();
+			var3 = var5.copy();
+			
+            if (par2 <= diFurnace.getSizeInventory() - 1) {
+				if (!this.mergeItemStack(var5, diFurnace.getSizeInventory(), this.inventorySlots.size(), true))
+				{
+					return null;
+				}
+			}
+			else if (!this.mergeItemStack(var5, 0, diFurnace.getSizeInventory(), false))
+			{
+					return null;
+			}
+			
+			if (var5.stackSize == 0)
+			{
+				var4.putStack((ItemStack) null);
+			}
+			else
+			{
+				var4.onSlotChanged();
+			}
+		}
+		
+		return var3;
+    }
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return diFurnace.isUseableByPlayer(player);
+	}
+}

com/hbm/inventory/container/ContainerDiFurnace.java

@@ -27,7 +27,7 @@ public class ContainerDiFurnace extends Container {
 		this.addSlotToContainer(new Slot(tedf, 0, 80, 18));
 		this.addSlotToContainer(new Slot(tedf, 1, 80, 54));
 		this.addSlotToContainer(new Slot(tedf, 2, 8, 36));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 134, 36));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 134, 36));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerElectricFurnace.java

@@ -20,7 +20,7 @@ public class ContainerElectricFurnace extends Container {
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 56, 53));
 		this.addSlotToContainer(new Slot(tedf, 1, 56, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 116, 35));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 116, 35));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerGenerator.java

@@ -32,8 +32,8 @@ public class ContainerGenerator extends Container {
 		this.addSlotToContainer(new Slot(tedf, 9, 8, 90));
 		this.addSlotToContainer(new Slot(tedf, 10, 26, 90));
 		this.addSlotToContainer(new Slot(tedf, 11, 62, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 8, 90 + 18));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 26, 90 + 18));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 8, 90 + 18));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 26, 90 + 18));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerIGenerator.java

@@ -43,7 +43,7 @@ public class ContainerIGenerator extends Container {
 		//Fluid Slot
 		this.addSlotToContainer(new Slot(tedf, 13, 98, 108));
 		//Container Slot
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 98, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 98, 72));
 		//Battery Slot
 		this.addSlotToContainer(new Slot(tedf, 15, 152, 108));
 		

com/hbm/inventory/container/ContainerMachineArcFurnace.java

@@ -18,7 +18,7 @@ public class ContainerMachineArcFurnace extends Container {
 		diFurnace = tedf;
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 56, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 116, 35));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 116, 35));
 		this.addSlotToContainer(new Slot(tedf, 2, 38, 53));
 		this.addSlotToContainer(new Slot(tedf, 3, 56, 53));
 		this.addSlotToContainer(new Slot(tedf, 4, 74, 53));

com/hbm/inventory/container/ContainerMachineAssembler.java

@@ -30,7 +30,7 @@ private TileEntityMachineAssembler nukeBoy;
 		//Schematic
 		this.addSlotToContainer(new Slot(tedf, 4, 80, 54));
 		//Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 134, 90));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 134, 90));
 		//Input
 		this.addSlotToContainer(new Slot(tedf, 6, 8, 18));
 		this.addSlotToContainer(new Slot(tedf, 7, 26, 18));

com/hbm/inventory/container/ContainerMachineBoiler.java

@@ -19,15 +19,15 @@ public class ContainerMachineBoiler extends Container {
 
 		//Fluid ID
 		this.addSlotToContainer(new Slot(tedf, 0, 8, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 8, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 8, 53));
 		//Input IO
 		this.addSlotToContainer(new Slot(tedf, 2, 44, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 44, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 44, 53));
 		//Fuel
 		this.addSlotToContainer(new Slot(tedf, 4, 98, 53));
 		//Output IO
 		this.addSlotToContainer(new Slot(tedf, 5, 152, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineBoilerElectric.java

@@ -20,15 +20,15 @@ public class ContainerMachineBoilerElectric extends Container {
 
 		//Fluid ID
 		this.addSlotToContainer(new Slot(tedf, 0, 8, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 8, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 8, 53));
 		//Input IO
 		this.addSlotToContainer(new Slot(tedf, 2, 44, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 44, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 44, 53));
 		//Battery
 		this.addSlotToContainer(new Slot(tedf, 4, 98, 53));
 		//Output IO
 		this.addSlotToContainer(new Slot(tedf, 5, 152, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineCMBFactory.java

@@ -23,8 +23,8 @@ public class ContainerMachineCMBFactory extends Container {
 		this.addSlotToContainer(new Slot(tedf, 1, 80 + 9, 17));
 		this.addSlotToContainer(new Slot(tedf, 2, 62 + 9, 53));
 		this.addSlotToContainer(new Slot(tedf, 3, 80 + 9, 53));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134 + 9, 35));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 62 - 9, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 134 + 9, 35));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 62 - 9, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineChemplant.java

@@ -30,16 +30,16 @@ private TileEntityMachineChemplant nukeBoy;
 		//Schematic
 		this.addSlotToContainer(new Slot(tedf, 4, 80, 54));
 		//Outputs
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 134, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 7, 134, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 8, 152, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 134, 90));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 90));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 7, 134, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 8, 152, 108));
 		//Fluid Output In
 		this.addSlotToContainer(new Slot(tedf, 9, 134, 54));
 		this.addSlotToContainer(new Slot(tedf, 10, 152, 54));
 		//Fluid Outputs Out
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 134, 72));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 152, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 134, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 152, 72));
 		//Input
 		this.addSlotToContainer(new Slot(tedf, 13, 8, 90));
 		this.addSlotToContainer(new Slot(tedf, 14, 26, 90));
@@ -49,8 +49,8 @@ private TileEntityMachineChemplant nukeBoy;
 		this.addSlotToContainer(new Slot(tedf, 17, 8, 54));
 		this.addSlotToContainer(new Slot(tedf, 18, 26, 54));
 		//Fluid Input Out
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 19, 8, 72));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 20, 26, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 19, 8, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 20, 26, 72));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineCoal.java

@@ -20,7 +20,7 @@ public class ContainerMachineCoal extends Container {
 		this.addSlotToContainer(new Slot(tedf, 0, 44, 53 - 36));
 		this.addSlotToContainer(new Slot(tedf, 1, 80, 53));
 		this.addSlotToContainer(new Slot(tedf, 2, 116, 53));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 44, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 44, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineCyclotron.java

@@ -37,11 +37,11 @@ public class ContainerMachineCyclotron extends Container {
 		//Cell
 		this.addSlotToContainer(new Slot(tedf, 10, 8, 108));
 		//Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 44, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 62, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 80, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 98, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 116, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 44, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 62, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 80, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 98, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 116, 108));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineDeuterium.java

@@ -27,7 +27,7 @@ private TileEntityMachineDeuterium nukeBoy;
 		this.addSlotToContainer(new Slot(tedf, 1, 26, 90));
 		this.addSlotToContainer(new Slot(tedf, 2, 44, 90));
 		this.addSlotToContainer(new Slot(tedf, 3, 80, 54));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 140, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 140, 54));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineDiesel.java

@@ -19,10 +19,10 @@ public class ContainerMachineDiesel extends Container {
 		diFurnace = tedf;
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 44, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 44, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 44, 53));
 		this.addSlotToContainer(new Slot(tedf, 2, 116, 53));
 		this.addSlotToContainer(new Slot(tedf, 3, 8, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 8, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 8, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineEPress.java

@@ -26,7 +26,7 @@ private TileEntityMachineEPress nukeBoy;
 		//Input
 		this.addSlotToContainer(new Slot(tedf, 2, 80, 53));
 		//Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 140, 35));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 140, 35));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineGasCent.java

@@ -22,15 +22,15 @@ public class ContainerMachineGasCent extends Container {
 		this.addSlotToContainer(new Slot(tedf, 0, 8, 53));
 		//Fluid ID IO
 		this.addSlotToContainer(new Slot(tedf, 1, 35, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 35, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 35, 53));
 		//Fluid IO
 		this.addSlotToContainer(new Slot(tedf, 3, 71, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 71, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 71, 53));
 		//Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 134, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 7, 134, 53));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 8, 152, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 134, 17));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 17));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 7, 134, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 8, 152, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineGasFlare.java

@@ -20,7 +20,7 @@ public class ContainerMachineGasFlare extends Container {
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 44, 53));
 		this.addSlotToContainer(new Slot(tedf, 1, 134, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 134, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 134, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineInserter.java

@@ -17,13 +17,13 @@ public class ContainerMachineInserter extends Container {
 
 		this.addSlotToContainer(new Slot(tedf, 0, 8, 17));
 		this.addSlotToContainer(new Slot(tedf, 1, 26, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 26, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 26, 53));
 		this.addSlotToContainer(new Slot(tedf, 3, 62, 17));
 		this.addSlotToContainer(new Slot(tedf, 4, 80, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 80, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 80, 53));
 		this.addSlotToContainer(new Slot(tedf, 6, 116, 17));
 		this.addSlotToContainer(new Slot(tedf, 7, 134, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 8, 134, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 8, 134, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineMissileAssembly.java

@@ -22,7 +22,7 @@ public class ContainerMachineMissileAssembly extends Container {
 		this.addSlotToContainer(new Slot(tedf, 2, 44, 36));
 		this.addSlotToContainer(new Slot(tedf, 3, 62, 36));
 		this.addSlotToContainer(new Slot(tedf, 4, 80, 36));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 152, 36));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 152, 36));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineOilWell.java

@@ -27,11 +27,11 @@ public class ContainerMachineOilWell extends Container {
 		//Canister Input
 		this.addSlotToContainer(new Slot(tedf, 1, 134, 18));
 		//Canister Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 134, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 134, 54));
 		//Gas Input
 		this.addSlotToContainer(new Slot(tedf, 3, 134, 72));
 		//Gas Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 134, 108));
 		//Chip
 		this.addSlotToContainer(new Slot(tedf, 5, 8, 90));
 		

com/hbm/inventory/container/ContainerMachinePress.java

@@ -30,7 +30,7 @@ private TileEntityMachinePress nukeBoy;
 		//Input
 		this.addSlotToContainer(new Slot(tedf, 2, 80, 53));
 		//Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 140, 35));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 140, 35));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachinePumpjack.java

@@ -27,11 +27,11 @@ public class ContainerMachinePumpjack extends Container {
 		//Canister Input
 		this.addSlotToContainer(new Slot(tedf, 1, 134, 18));
 		//Canister Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 134, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 134, 54));
 		//Gas Input
 		this.addSlotToContainer(new Slot(tedf, 3, 134, 72));
 		//Gas Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 134, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 134, 108));
 		//Chip
 		this.addSlotToContainer(new Slot(tedf, 5, 8, 90));
 		

com/hbm/inventory/container/ContainerMachineReactorSmall.java

@@ -32,9 +32,9 @@ private TileEntityMachineReactorSmall seleniumEngine;
 		
 		//Fluid IO
 		this.addSlotToContainer(new Slot(tedf, 12, 8, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 8, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 8, 108));
 		this.addSlotToContainer(new Slot(tedf, 14, 26, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 26, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 26, 108));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineReactorSmallOld.java

@@ -33,9 +33,9 @@ private TileEntityMachineReactorSmallOld seleniumEngine;
 		
 		//Fluid IO
 		this.addSlotToContainer(new Slot(tedf, 12, 8, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 8, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 8, 108));
 		this.addSlotToContainer(new Slot(tedf, 14, 26, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 26, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 26, 108));
 		
 		//Battery
 		this.addSlotToContainer(new Slot(tedf, 16, 62, 108));

com/hbm/inventory/container/ContainerMachineRefinery.java

@@ -23,25 +23,25 @@ public class ContainerMachineRefinery extends Container {
 		//Canister Input
 		this.addSlotToContainer(new Slot(tedf, 1, 35, 90));
 		//Canister Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 35, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 35, 108));
 		//Heavy Oil Input
 		this.addSlotToContainer(new Slot(tedf, 3, 80, 90));
 		//Heavy Oil Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 80, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 80, 108));
 		//Nahptha Input
 		this.addSlotToContainer(new Slot(tedf, 5, 98, 90));
 		//Nahptha Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 98, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 98, 108));
 		//Light Oil Input
 		this.addSlotToContainer(new Slot(tedf, 7, 116, 90));
 		//Light Oil Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 8, 116, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 8, 116, 108));
 		//Petroleum Input
 		this.addSlotToContainer(new Slot(tedf, 9, 134, 90));
 		//Petroleum Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 10, 134, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 10, 134, 108));
 		//Sulfur Output
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 152, 36));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 152, 36));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java

@@ -23,7 +23,7 @@ private TileEntityMachineSchrabidiumTransmutator nukeBoy;
 		nukeBoy = tedf;
 
 		this.addSlotToContainer(new Slot(tedf, 0, 44, 63));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 134, 63));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 134, 63));
 		this.addSlotToContainer(new Slot(tedf, 2, 26, 18));
 		this.addSlotToContainer(new Slot(tedf, 3, 8, 108));
 		

com/hbm/inventory/container/ContainerMachineSelenium.java

@@ -30,11 +30,11 @@ private TileEntityMachineSeleniumEngine seleniumEngine;
 		
 		//Fluid IO
 		this.addSlotToContainer(new Slot(tedf, 9, 80, 18));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 10, 80, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 10, 80, 54));
 		
 		//Fluid IDs
 		this.addSlotToContainer(new Slot(tedf, 11, 152, 18));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 152, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 152, 54));
 		
 		//Battery
 		this.addSlotToContainer(new Slot(tedf, 13, 116, 90));

com/hbm/inventory/container/ContainerMachineShredder.java

@@ -28,24 +28,24 @@ public class ContainerMachineShredder extends Container {
 		this.addSlotToContainer(new Slot(tedf, 6, 44, 54));
 		this.addSlotToContainer(new Slot(tedf, 7, 62, 54));
 		this.addSlotToContainer(new Slot(tedf, 8, 80, 54));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 9, 116, 18));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 10, 134, 18));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 11, 152, 18));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 12, 116, 36));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 13, 134, 36));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 14, 152, 36));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 15, 116, 54));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 16, 134, 54));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 17, 152, 54));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 18, 116, 72));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 19, 134, 72));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 20, 152, 72));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 21, 116, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 22, 134, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 23, 152, 90));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 24, 116, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 25, 134, 108));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 26, 152, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 9, 116, 18));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 10, 134, 18));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 11, 152, 18));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 12, 116, 36));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 13, 134, 36));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 14, 152, 36));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 15, 116, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 16, 134, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 17, 152, 54));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 18, 116, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 19, 134, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 20, 152, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 21, 116, 90));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 22, 134, 90));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 23, 152, 90));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 24, 116, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 25, 134, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 26, 152, 108));
 		this.addSlotToContainer(new Slot(tedf, 27, 44, 108));
 		this.addSlotToContainer(new Slot(tedf, 28, 80, 108));
 		this.addSlotToContainer(new Slot(tedf, 29, 8, 108));

com/hbm/inventory/container/ContainerMachineTurbine.java

@@ -20,15 +20,15 @@ public class ContainerMachineTurbine extends Container {
 
 		//Fluid ID
 		this.addSlotToContainer(new Slot(tedf, 0, 8, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 8, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 8, 53));
 		//Input IO
 		this.addSlotToContainer(new Slot(tedf, 2, 44, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 44, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 44, 53));
 		//Battery
 		this.addSlotToContainer(new Slot(tedf, 4, 98, 53));
 		//Output IO
 		this.addSlotToContainer(new Slot(tedf, 5, 152, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 6, 152, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 6, 152, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerMachineTurbofan.java

@@ -21,7 +21,7 @@ public class ContainerMachineTurbofan extends Container {
 		diFurnace = tedf;
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 17, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 17, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 17, 53));
 		this.addSlotToContainer(new Slot(tedf, 2, 107, 17));
 		
 		for(int i = 0; i < 3; i++)

com/hbm/inventory/container/ContainerNukeFurnace.java

@@ -26,7 +26,7 @@ public class ContainerNukeFurnace extends Container {
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 56, 53));
 		this.addSlotToContainer(new Slot(tedf, 1, 56, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 116, 35));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 116, 35));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerPuF6Tank.java

@@ -18,9 +18,9 @@ public class ContainerPuF6Tank extends Container {
 		testNuke = tedf;
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 44, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 44, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 44, 53));
 		this.addSlotToContainer(new Slot(tedf, 2, 116, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 116, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 116, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerReactor.java

@@ -26,7 +26,7 @@ public class ContainerReactor extends Container {
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 56, 53));
 		this.addSlotToContainer(new Slot(tedf, 1, 56, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 2, 116, 35));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 116, 35));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerReactorMultiblock.java

@@ -21,20 +21,20 @@ public class ContainerReactorMultiblock extends Container {
 		//Water in
 		this.addSlotToContainer(new Slot(tedf, 0, 8, 90));
 		//Water out
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 8, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 8, 108));
 		//Coolant in
 		this.addSlotToContainer(new Slot(tedf, 2, 26, 90));
 		//Coolant out
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 26, 108));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 26, 108));
 		
 		//Fuel in
 		this.addSlotToContainer(new Slot(tedf, 4, 80, 36));
 		//Fuel out
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 5, 80, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 5, 80, 72));
 		//Waste in
 		this.addSlotToContainer(new Slot(tedf, 6, 152, 36));
 		//Waste out
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 7, 152, 72));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 7, 152, 72));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerRtgFurnace.java

@@ -26,7 +26,7 @@ public class ContainerRtgFurnace extends Container {
 		this.addSlotToContainer(new Slot(tedf, 1, 38, 53));
 		this.addSlotToContainer(new Slot(tedf, 2, 56, 53));
 		this.addSlotToContainer(new Slot(tedf, 3, 74, 53));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 4, 116, 35));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 116, 35));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/container/ContainerUF6Tank.java

@@ -18,9 +18,9 @@ public class ContainerUF6Tank extends Container {
 		testNuke = tedf;
 		
 		this.addSlotToContainer(new Slot(tedf, 0, 44, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 1, 44, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 44, 53));
 		this.addSlotToContainer(new Slot(tedf, 2, 116, 17));
-		this.addSlotToContainer(new SlotMachineOutput(invPlayer.player, tedf, 3, 116, 53));
+		this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 116, 53));
 		
 		for(int i = 0; i < 3; i++)
 		{

com/hbm/inventory/gui/GUICrystallizer.java

@@ -0,0 +1,41 @@
+package com.hbm.inventory.gui;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.inventory.container.ContainerCrystallizer;
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.machine.TileEntityMachineCrystallizer;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+public class GUICrystallizer extends GuiInfoContainer {
+
+	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_crystallizer.png");
+	private TileEntityMachineCrystallizer acidomatic;
+	
+	public GUICrystallizer(InventoryPlayer invPlayer, TileEntityMachineCrystallizer acidomatic) {
+		super(new ContainerCrystallizer(invPlayer, acidomatic));
+		this.acidomatic = acidomatic;
+
+		this.xSize = 176;
+		this.ySize = 168;
+	}
+	
+	@Override
+	protected void drawGuiContainerForegroundLayer(int i, int j) {
+		String name = this.acidomatic.hasCustomInventoryName() ? this.acidomatic.getInventoryName() : I18n.format(this.acidomatic.getInventoryName());
+		
+		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
+		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
+	}
+	
+	@Override
+	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
+		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
+	}
+}

com/hbm/main/MainRegistry.java

@@ -560,6 +560,7 @@ public class MainRegistry
 		GameRegistry.registerTileEntity(TileEntityBarrel.class, "tileentity_fluid_barrel");
 		GameRegistry.registerTileEntity(TileEntityCyberCrab.class, "tileentity_crabs");
 		GameRegistry.registerTileEntity(TileEntitySoyuzCapsule.class, "tileentity_soyuz_capsule");
+		GameRegistry.registerTileEntity(TileEntityMachineCrystallizer.class, "tileentity_acidomatic");
 
 	    EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
 	    EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);
@@ -1321,6 +1322,7 @@ public class MainRegistry
 	public static void PostLoad(FMLPostInitializationEvent PostEvent)
 	{
 		MachineRecipes.registerShredder();
+		CrystallizerRecipes.register();
 
 		MachineRecipes.overridePreSetRecipe(new ItemStack(ModItems.scrap), new ItemStack(ModItems.dust));
 		MachineRecipes.overridePreSetRecipe(new ItemStack(ModItems.dust), new ItemStack(ModItems.dust));

com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java

@@ -0,0 +1,24 @@
+package com.hbm.tileentity.machine;
+
+import com.hbm.tileentity.TileEntityMachineBase;
+
+public class TileEntityMachineCrystallizer extends TileEntityMachineBase {
+
+	public TileEntityMachineCrystallizer() {
+		super(3);
+	}
+
+	@Override
+	public String getName() {
+		return "container.crystallizer";
+	}
+
+	@Override
+	public void updateEntity() {
+		
+		if(!worldObj.isRemote) {
+			
+		}
+	}
+
+}