Merged in MultiFixes (pull request #11)

MultiFixes

58 files changed, 4846 insertions, 885 deletions

diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
index 7e011a808e..ddc401f752 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java
@@ -75,25 +75,25 @@ public class FR_Gregtech_Recipes {
 
 		if (!LoadedMods.ExtraBees){
 			//Extra Bee Like Frames
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedRecipe(
 					null, itemCocoaBeans, null,
 					itemCocoaBeans, hiveFrameImpregnated, itemCocoaBeans,
 					null, itemCocoaBeans, null,
 					hiveFrameCocoa);
 
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedRecipe(
 					hiveFrameImpregnated, blockIronBars, null,
 					null, null, null,
 					null, null, null,
 					hiveFrameCaged);
 
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedRecipe(
 					hiveFrameImpregnated, blockSoulSand, null,
 					null, null, null,
 					null, null, null,
 					hiveFrameSoul);
 
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedRecipe(
 					null, itemClayDust, null,
 					itemClayDust, hiveFrameImpregnated, itemClayDust,
 					null, itemClayDust, null,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index b7662ca25e..9e62d05df2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -94,6 +94,10 @@ public enum GregtechItemList implements GregtechItemContainer {
 
 	//Debug
 	TESTITEM, 
+	
+	// Larger Volumetric Flasks
+	VOLUMETRIC_FLASK_8k,
+	VOLUMETRIC_FLASK_32k,
 
 	//RTG Fuels
 	Pellet_RTG_PU238, Pellet_RTG_SR90,
@@ -392,7 +396,22 @@ public enum GregtechItemList implements GregtechItemContainer {
 	
 	// Flotation Cell
 	Controller_Flotation_Cell,
+	
+	// Elemental Duplicator
+	Controller_ElementalDuplicator,
+	Casing_ElementalDuplicator,
+	
+	// Big Steam Macerator
+	Controller_SteamMaceratorMulti,
 
+	// Custom Machine Casings
+	Casing_Machine_Custom_1,
+	Casing_Machine_Custom_2,
+	Casing_Machine_Custom_3,
+	Casing_Machine_Custom_4,
+	Casing_Machine_Custom_5,
+	Casing_Machine_Custom_6,
+	
 
 	//----------------------------------------------------------------------------
 
@@ -426,7 +445,19 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Hatch_Input_Cryotheum,
 	Hatch_Input_Pyrotheum,	
 	Hatch_Input_Naquadah, 
+	Hatch_Input_Steam,
+	
+	//Steam Multi Buses
+	Hatch_Input_Bus_Steam,
+	Hatch_Output_Bus_Steam,	
 
+	//Elemental Duplicator Data Orb Bus
+	Hatch_Input_Elemental_Duplicator,
+	
+	//RTG Hatch 
+	Hatch_RTG_LV,
+	Hatch_RTG_MV,
+	Hatch_RTG_HV,
 
 	//Battery hatches for PSS
 	Hatch_Input_Battery_MV, 
@@ -678,12 +709,15 @@ public enum GregtechItemList implements GregtechItemContainer {
 	//Fluid Void Covers
 	Cover_Overflow_ULV, Cover_Overflow_LV, Cover_Overflow_MV, Cover_Overflow_HV, Cover_Overflow_EV, Cover_Overflow_IV, 
 	
+	//Item Void Covers
+	Cover_Overflow_Item_ULV, Cover_Overflow_Item_LV, Cover_Overflow_Item_MV, Cover_Overflow_Item_HV, Cover_Overflow_Item_EV, Cover_Overflow_Item_IV, 
+	
 	//Fake Hull Covers
 	FakeMachineCasingPlate_ULV, FakeMachineCasingPlate_LV,
 	FakeMachineCasingPlate_MV, FakeMachineCasingPlate_HV,
 	FakeMachineCasingPlate_EV, FakeMachineCasingPlate_IV,
 	FakeMachineCasingPlate_LuV, FakeMachineCasingPlate_ZPM,
-	FakeMachineCasingPlate_UV, FakeMachineCasingPlate_MAX,
+	FakeMachineCasingPlate_UV, FakeMachineCasingPlate_MAX, 
 	
 	
 	
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java
index e3365935aa..79d1033bd0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java
@@ -14,6 +14,8 @@ import net.minecraft.item.ItemStack;
 import gregtech.api.gui.*;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.slots.SlotPollutionScrubber;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaAtmosphericReconditioner;
 
 /**
@@ -23,132 +25,81 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaA
  */
 public class CONTAINER_PollutionCleaner extends GT_Container_BasicTank {
 
-    public boolean mFluidTransfer = false, mItemTransfer = false, mStuttering = false;
-    public int mReduction = 0;
-
-    public CONTAINER_PollutionCleaner(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
-        super(aInventoryPlayer, aTileEntity);
-    }
-
-    @Override
-    public void addSlots(InventoryPlayer aInventoryPlayer) {
-        addSlotToContainer(new GT_Slot_Holo(mTileEntity, 0, 8, 63, false, true, 1));
-        addSlotToContainer(new GT_Slot_Holo(mTileEntity, 0, 26, 63, false, true, 1));
-        addSlotToContainer(new GT_Slot_Render(mTileEntity, 2, 107, 63));
-
-        int tStartIndex = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).getInputSlot();
-
-        switch (((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mInputSlotCount) {
-            case 2: //Pollution Scrubber
-            	//Add 2 Item Slots
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 25));
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 107, 25));            	
-                break;            
-            default:
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 7));
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 7));
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 7));
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 25));
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 25));
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 25));
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 17, 43));
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 35, 43));
-                addSlotToContainer(new Slot(mTileEntity, tStartIndex++, 53, 43));
-                break;
-        }
-
-        tStartIndex = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).getOutputSlot();
-
-        switch (((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mOutputItems.length) {
-            case 0:
-                break;
-            default:
-                break;
-        }
-
-        addSlotToContainer(new Slot(mTileEntity, 1, 80, 63));
-        addSlotToContainer(new Slot(mTileEntity, 3, 125, 63));
-        //addSlotToContainer(new GT_Slot_Render(mTileEntity, tStartIndex++, 53, 63));
-    }
-
-    @Override
-    public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
-        switch (aSlotIndex) {
-            case 0:
-                if (mTileEntity.getMetaTileEntity() == null) return null;
-                ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mFluidTransfer = !((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mFluidTransfer;
-                return null;
-            case 1:
-                if (mTileEntity.getMetaTileEntity() == null) return null;
-                ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mItemTransfer = !((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mItemTransfer;
-                return null;
-            default:
-                return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
-        }
-    }
-
-    @Override
-    public void detectAndSendChanges() {
-        super.detectAndSendChanges();
-        if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
-
-        mFluidTransfer = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mFluidTransfer;
-        mItemTransfer = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mItemTransfer;
-        mStuttering = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mStuttering;
-        mReduction = ((GregtechMetaAtmosphericReconditioner) mTileEntity.getMetaTileEntity()).mPollutionReduction;
-
-        Iterator var2 = this.crafters.iterator();
-        while (var2.hasNext()) {
-            ICrafting var1 = (ICrafting) var2.next();
-            var1.sendProgressBarUpdate(this, 102, mFluidTransfer ? 1 : 0);
-            var1.sendProgressBarUpdate(this, 103, mItemTransfer ? 1 : 0);
-            var1.sendProgressBarUpdate(this, 104, mStuttering ? 1 : 0);
-            var1.sendProgressBarUpdate(this, 105, mReduction);
-        }
-    }
-
-    @Override
-    public void addCraftingToCrafters(ICrafting par1ICrafting) {
-        super.addCraftingToCrafters(par1ICrafting);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void updateProgressBar(int par1, int par2) {
-        super.updateProgressBar(par1, par2);
-        switch (par1) {
-            case 102:
-                mFluidTransfer = (par2 != 0);
-                break;
-            case 103:
-                mItemTransfer = (par2 != 0);
-                break;
-            case 104:
-                mStuttering = (par2 != 0);
-                break;
-            case 105:
-            	mReduction = (par2);
-                break;
-        }
-    }
-
-    @Override
-    public int getSlotStartIndex() {
-        return 3;
-    }
-
-    @Override
-    public int getShiftClickStartIndex() {
-        return 3;
-    }
-
-    @Override
-    public int getSlotCount() {
-        return getShiftClickSlotCount() + ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mOutputItems.length + 2;
-    }
-
-    @Override
-    public int getShiftClickSlotCount() {
-        return ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mInputSlotCount;
-    }
+	public boolean mFluidTransfer = false, mItemTransfer = false, mStuttering = false;
+	public int mReduction = 0;
+
+	public CONTAINER_PollutionCleaner(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	@Override
+	public void addSlots(InventoryPlayer aInventoryPlayer) {
+
+		int tStartIndex = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).getInputSlot();
+		int aTier = ((GT_MetaTileEntity_BasicMachine) mTileEntity.getMetaTileEntity()).mTier;
+
+
+		//Add 2 Item Slots
+		addSlotToContainer(new SlotPollutionScrubber(0, aTier, mTileEntity, tStartIndex++, 53, 25));
+		addSlotToContainer(new SlotPollutionScrubber(1, aTier, mTileEntity, tStartIndex++, 107, 25));   
+		// Upgrade Slot
+		addSlotToContainer(new SlotPollutionScrubber(2, aTier, mTileEntity, tStartIndex++, 125, 63));           	   
+
+	}
+
+	@Override
+	public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
+		Logger.INFO("Clicked on slot "+aSlotIndex);
+		return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+	}
+
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) return;
+
+		mReduction = ((GregtechMetaAtmosphericReconditioner) mTileEntity.getMetaTileEntity()).mPollutionReduction;
+
+		Iterator var2 = this.crafters.iterator();
+		while (var2.hasNext()) {
+			ICrafting var1 = (ICrafting) var2.next();
+			var1.sendProgressBarUpdate(this, 105, mReduction);
+		}
+	}
+
+	@Override
+	public void addCraftingToCrafters(ICrafting par1ICrafting) {
+		super.addCraftingToCrafters(par1ICrafting);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void updateProgressBar(int par1, int par2) {
+		super.updateProgressBar(par1, par2);
+		switch (par1) {			
+			case 105:
+				mReduction = (par2);
+				break;
+		}
+	}
+
+	@Override
+	public int getSlotStartIndex() {
+		return 0;
+	}
+
+	@Override
+	public int getShiftClickStartIndex() {
+		return 0;
+	}
+
+	@Override
+	public int getSlotCount() {
+		return getShiftClickSlotCount();
+	}
+
+	@Override
+	public int getShiftClickSlotCount() {
+		return 3;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java
index 2c1601cee2..7a9417eeb6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/basic/GUI_PollutionCleaner.java
@@ -3,16 +3,10 @@ package gtPlusPlus.xmod.gregtech.api.gui.basic;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.entity.player.InventoryPlayer;
-
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ControlCore;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaAtmosphericReconditioner;
+import net.minecraft.entity.player.InventoryPlayer;
 
 public class GUI_PollutionCleaner extends GT_GUIContainerMetaTile_Machine {
 	public final String mName;
@@ -48,13 +42,7 @@ public class GUI_PollutionCleaner extends GT_GUIContainerMetaTile_Machine {
 		final int x3 = x2 - xStart;
 		final int y3 = y2 - yStart + 5;
 		final List<String> list = new ArrayList<String>();
-		if (y3 >= 67 && y3 <= 84) {
-			if (x3 >= 7 && x3 <= 24) {
-				list.add("Fluid Auto-Output");
-			}
-			if (x3 >= 25 && x3 <= 42) {
-				list.add("Item Auto-Output");
-			}
+		if (y3 >= 67 && y3 <= 84) {			
 			if (x3 >= 77 && x3 <= 95) {					
 				//Do Dumb shit				
 				CONTAINER_PollutionCleaner aContainerCast = (CONTAINER_PollutionCleaner) this.mContainer;				
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index bf36b56015..229bc234e9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -293,6 +293,9 @@ public interface IGregtech_RecipeAdder {
 	public boolean addFlotationRecipe(Materials aMat, ItemStack aXanthate, FluidStack[] aInputFluids, FluidStack[] aOutputFluids, int aTime, int aEU);
 	public boolean addFlotationRecipe(Material aMat, ItemStack aXanthate, FluidStack[] aInputFluids, FluidStack[] aOutputFluids, int aTime, int aEU);
 
-	
+	public boolean addpackagerRecipe(ItemStack aRecipeType, ItemStack aInput1, ItemStack aInput2, ItemStack aOutputStack1);
+
+	public boolean addFuelForRTG(ItemStack aFuelPellet, int aFuelDays, int aVoltage);
+
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
index 4e6e2bc35b..3a0c101375 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileen