Merge pull request #1 from GTNewHorizons/experimental

sync

14 files changed, 3918 insertions, 3816 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 2ce3b111f3..198be34b0a 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -63,7 +63,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-@Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false, dependencies = "required-after:dreamcraft; required-after:IC2; after:Forestry; after:PFAAGeologica; after:Thaumcraft; after:Railcraft; after:appliedenergistics2; after:ThermalExpansion; after:TwilightForest; after:harvestcraft; after:magicalcrops; after:BuildCraft|Transport; after:BuildCraft|Silicon; after:BuildCraft|Factory; after:BuildCraft|Energy; after:BuildCraft|Core; after:BuildCraft|Builders; after:GalacticraftCore; after:GalacticraftMars; after:GalacticraftPlanets; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; after:RedPowerCore; after:RedPowerBase; after:RedPowerMachine; after:RedPowerCompat; after:RedPowerWiring; after:RedPowerLogic; after:RedPowerLighting; after:RedPowerWorld; after:RedPowerControl; after:UndergroundBiomes;")
+@Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false, dependencies = "required-after:dreamcraft; required-after:IC2; after:Forestry; after:PFAAGeologica; after:Thaumcraft; after:Railcraft; after:appliedenergistics2; after:ThermalExpansion; after:TwilightForest; after:harvestcraft; after:magicalcrops; after:BuildCraft|Transport; after:BuildCraft|Silicon; after:BuildCraft|Factory; after:BuildCraft|Energy; after:BuildCraft|Core; after:BuildCraft|Builders; after:GalacticraftCore; after:GalacticraftMars; after:GalacticraftPlanets; after:ThermalExpansion|Transport; after:ThermalExpansion|Energy; after:ThermalExpansion|Factory; after:RedPowerCore; after:RedPowerBase; after:RedPowerMachine; after:RedPowerCompat; after:RedPowerWiring; after:RedPowerLogic; after:RedPowerLighting; after:RedPowerWorld; after:RedPowerControl; after:UndergroundBiomes; after:TConstruct; after:Translocator;")
 public class GT_Mod implements IGT_Mod {
     public static final int VERSION = 509, SUBVERSION = 31;
     public static final int TOTAL_VERSION = calculateTotalGTVersion(VERSION, SUBVERSION);
@@ -137,7 +137,12 @@ public class GT_Mod implements IGT_Mod {
         GregTech_API.mIC2Classic = Loader.isModLoaded("IC2-Classic-Spmod");
         GregTech_API.mMagneticraft = Loader.isModLoaded("Magneticraft");
         GregTech_API.mImmersiveEngineering = Loader.isModLoaded("ImmersiveEngineering");
-        GregTech_API.mGTPlusPlus = Loader.isModLoaded("miscutils");        
+        GregTech_API.mGTPlusPlus = Loader.isModLoaded("miscutils");
+        GregTech_API.mTranslocator = Loader.isModLoaded("Translocator");
+        GregTech_API.mTConstruct = Loader.isModLoaded("TConstruct");
+        GT_Log.out.println("GT_Mod: Are you there Translocator? " + GregTech_API.mTranslocator);
+        GT_Log.out.println("GT_Mod: Are you there TConstruct? " + GregTech_API.mTConstruct);
+        
         GT_Log.mLogFile = new File(aEvent.getModConfigurationDirectory().getParentFile(), "logs/GregTech.log");
         if (!GT_Log.mLogFile.exists()) {
             try {
@@ -325,6 +330,10 @@ public class GT_Mod implements IGT_Mod {
                 tPrefix.mDefaultStackSize = ((byte) Math.min(64, Math.max(16, tMainConfig.get("features", "MaxOtherBlockStackSize", 64).getInt())));
             }
         }
+
+        new Enchantment_EnderDamage();
+        new Enchantment_Radioactivity();
+
         //GT_Config.troll = (Calendar.getInstance().get(2) + 1 == 4) && (Calendar.getInstance().get(5) >= 1) && (Calendar.getInstance().get(5) <= 2);
         Materials.init();
 
@@ -460,9 +469,6 @@ public class GT_Mod implements IGT_Mod {
         }else{System.out.println("noMaterial "+reEnable);}
         }else{System.out.println("noPrefix "+reEnable);}}
         
-        new Enchantment_EnderDamage();
-        new Enchantment_Radioactivity();
-
         new GT_Loader_OreProcessing().run();
         new GT_Loader_OreDictionary().run();
         new GT_Loader_ItemData().run();
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 2d29c44bdf..150e1fb798 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -196,6 +196,8 @@ public class GregTech_API {
     public static boolean mMagneticraft = false;

     public static boolean mImmersiveEngineering = false;

     public static boolean mGTPlusPlus = false;

+    public static boolean mTranslocator = false;

+    public static boolean mTConstruct = false;

 

     public static boolean mUseOnlyGoodSolderingMaterials = false;

 

diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
index 966ba03cd4..5165856917 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
@@ -329,6 +329,14 @@ public interface IGT_RecipeAdder {
     public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt);
 
     /**
+     * Adds a Assemblyline Recipe
+     * @param aInputs   elements should be: ItemStack for single item;
+     *                                      ItemStack[] for multiple equivalent items;
+     *                                      {OreDict, amount} for oredict.
+     */
+    public boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, Object[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt);
+
+    /**
      * Adds a Forge Hammer Recipe
      *
      * @param aInput1   must be != null
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
index eb403aa5f0..e2bf7342fb 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
@@ -369,7 +369,11 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                 if (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaPipeEntity_Fluid) {

                 	tFluidPipe = (GT_MetaPipeEntity_Fluid) ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();

                 }

+            } else if(GregTech_API.mTranslocator == true && tTileEntity instanceof tconstruct.smeltery.logic.FaucetLogic) {

+                // Tinker Construct Faucets return a null tank info, so check the class

+                rConnect = 1;

             }

+            

             FluidTankInfo[] tInfo = tTileEntity.getTankInfo(ForgeDirection.getOrientation(aSide).getOpposite());

             if (tInfo != null) {

             	if (tInfo.length > 0) {

@@ -390,7 +394,10 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
                     			GT_Utility.areStacksEqual(tCover, ItemList.FluidRegulator_IV.get(1, new Object[]{},true)))) {

                     		rConnect = 1;

                     	}

-                    }  

+                    } else if(GregTech_API.mTranslocator == true && tTileEntity instanceof codechicken.translocator.TileLiquidTranslocator) {

+                        // Translocators return a TankInfo, but it's of 0 length - so check the class if we see this pattern

+                        rConnect = 1;

+                    }

             	}

             }

         }

@@ -418,7 +425,6 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         if (aIndex == 9) {

             GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(4), 5, 1.0F, aX, aY, aZ);

             for (byte i = 0; i < 6; i++)

-                for (int l = 0; l < 2; ++l)

                     getBaseMetaTileEntity().getWorld().spawnParticle("largesmoke", aX - 0.5 + XSTR_INSTANCE.nextFloat(), aY - 0.5 + XSTR_INSTANCE.nextFloat(), aZ - 0.5 + XSTR_INSTANCE.nextFloat(), ForgeDirection.getOrientation(i).offsetX / 5.0, ForgeDirection.getOrientation(i).offsetY / 5.0, ForgeDirection.getOrientation(i).offsetZ / 5.0);

         }

     }

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java
index 7d266c1067..5864abc6d3 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java
@@ -1,6 +1,7 @@
 package gregtech.api.metatileentity.implementations;
 
 import gregtech.GT_Mod;
+import gregtech.api.GregTech_API;
 import gregtech.api.enums.*;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -231,6 +232,8 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
                 if (((IGregTechTileEntity) tTileEntity).getMetaTileEntity().connectsToItemPipe(tSide)) {
                 	rConnect = 1;
                 }
+            } else if(GregTech_API.mTranslocator == true && tTileEntity instanceof codechicken.translocator.TileItemTranslocator) {
+                rConnect = 1;
             }
             if (rConnect == 0) {
             	if (tTileEntity instanceof IInventory) {
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index aaa05f823c..9d2e7216f7 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -1,1677 +1,1714 @@
-package gregtech.api.util;
-
-import codechicken.nei.PositionedStack;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.*;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords;
-import gregtech.api.objects.GT_FluidStack;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.ItemData;
-import gregtech.api.objects.MaterialStack;
-import gregtech.nei.GT_NEI_DefaultHandler.FixedPositionedStack;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntityFurnace;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidContainerItem;
-
-import java.util.*;
-
-import static gregtech.api.enums.GT_Values.*;
-
-/**
- * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
- * <p/>
- * This File contains the functions used for Recipes. Please do not include this File AT ALL in your Moddownload as it ruins compatibility
- * This is just the Core of my Recipe System, if you just want to GET the Recipes I add, then you can access this File.
- * Do NOT add Recipes using the Constructors inside this Class, The GregTech_API File calls the correct Functions for these Constructors.
- * <p/>
- * I know this File causes some Errors, because of missing Main Functions, but if you just need to compile Stuff, then remove said erroreous Functions.
- */
-public class GT_Recipe implements Comparable<GT_Recipe> {
-    public static volatile int VERSION = 509;
-    /**
-     * If you want to change the Output, feel free to modify or even replace the whole ItemStack Array, for Inputs, please add a new Recipe, because of the HashMaps.
-     */
-    public ItemStack[] mInputs, mOutputs;
-    /**
-     * If you want to change the Output, feel free to modify or even replace the whole ItemStack Array, for Inputs, please add a new Recipe, because of the HashMaps.
-     */
-    public FluidStack[] mFluidInputs, mFluidOutputs;
-    /**
-     * If you changed the amount of Array-Items inside the Output Array then the length of this Array must be larger or equal to the Output Array. A chance of 10000 equals 100%
-     */
-    public int[] mChances;
-    /**
-     * An Item that needs to be inside the Special Slot, like for example the Copy Slot inside the Printer. This is only useful for Fake Recipes in NEI, since findRecipe() and containsInput() don't give a shit about this Field. Lists are also possible.
-     */
-    public Object mSpecialItems;
-    public int mDuration, mEUt, mSpecialValue;
-    /**
-     * Use this to just disable a specific Recipe, but the Configuration enables that already for every single Recipe.
-     */
-    public boolean mEnabled = true;
-    /**
-     * If this Recipe is hidden from NEI
-     */
-    public boolean mHidden = false;
-    /**
-     * If this Recipe is Fake and therefore doesn't get found by the findRecipe Function (It is still in the HashMaps, so that containsInput does return T on those fake Inputs)
-     */
-    public boolean mFakeRecipe = false;
-    /**
-     * If this Recipe can be stored inside a Machine in order to make Recipe searching more Efficient by trying the previously used Recipe first. In case you have a Recipe Map overriding things and returning one time use Recipes, you have to set this to F.
-     */
-    public boolean mCanBeBuffered = true;
-    /**
-     * If this Recipe needs the Output Slots to be completely empty. Needed in case you have randomised Outputs
-     */
-    public boolean mNeedsEmptyOutput = false;
-    /**
-     * Used for describing recipes that do not fit the default recipe pattern (for example Large Boiler Fuels)
-     */
-    private String[] neiDesc = null;
-    
-    private GT_Recipe(GT_Recipe aRecipe) {
-        mInputs = GT_Utility.copyStackArray((Object[]) aRecipe.mInputs);
-        mOutputs = GT_Utility.copyStackArray((Object[]) aRecipe.mOutputs);
-        mSpecialItems = aRecipe.mSpecialItems;
-        mChances = aRecipe.mChances;
-        mFluidInputs = GT_Utility.copyFluidArray(aRecipe.mFluidInputs);
-        mFluidOutputs = GT_Utility.copyFluidArray(aRecipe.mFluidOutputs);
-        mDuration = aRecipe.mDuration;
-        mSpecialValue = aRecipe.mSpecialValue;
-        mEUt = aRecipe.mEUt;
-        mNeedsEmptyOutput = aRecipe.mNeedsEmptyOutput;
-        mCanBeBuffered = aRecipe.mCanBeBuffered;
-        mFakeRecipe = aRecipe.mFakeRecipe;
-        mEnabled = aRecipe.mEnabled;
-        mHidden = aRecipe.mHidden;
-    }
-    protected GT_Recipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
-        if (aInputs == null) aInputs = new ItemStack[0];
-        if (aOutputs == null) aOutputs = new ItemStack[0];
-        if (aFluidInputs == null) aFluidInputs = new FluidStack[0];
-        if (aFluidOutputs == null) aFluidOutputs = new FluidStack[0];
-        if (aChances == null) aChances = new int[aOutputs.length];
-        if (aChances.length < aOutputs.length) aChances = Arrays.copyOf(aChances, aOutputs.length);
-
-        aInputs = GT_Utility.getArrayListWithoutTrailingNulls(aInputs).toArray(new ItemStack[0]);
-        aOutputs = GT_Utility.getArrayListWithoutTrailingNulls(aOutputs).toArray(new ItemStack[0]);
-        aFluidInputs = GT_Utility.getArrayListWithoutNulls(aFluidInputs).toArray(new FluidStack[0]);
-        aFluidOutputs = GT_Utility.getArrayListWithoutNulls(aFluidOutputs).toArray(new FluidStack[0]);
-
-        GT_OreDictUnificator.setStackArray(true, aInputs);
-        GT_OreDictUnificator.setStackArray(true, aOutputs);
-
-        for (ItemStack tStack : aOutputs) GT_Utility.updateItemStack(tStack);
-
-        for (int i = 0; i < aChances.length; i++) if (aChances[i] <= 0) aChances[i] = 10000;
-        for (int i = 0; i < aFluidInputs.length; i++) aFluidInputs[i] = new GT_FluidStack(aFluidInputs[i]);
-        for (int i = 0; i < aFluidOutputs.length; i++) aFluidOutputs[i] = new GT_FluidStack(aFluidOutputs[i]);
-
-        for (int i = 0; i < aInputs.length; i++)
-            if (aInputs[i] != null && Items.feather.getDamage(aInputs[i]) != W)
-                for (int j = 0; j < aOutputs.length; j++) {
-                    if (GT_Utility.areStacksEqual(aInputs[i], aOutputs[j])) {
-                        if (aInputs[i].stackSize >= aOutputs[j].stackSize) {
-                            aInputs[i].stackSize -= aOutputs[j].stackSize;
-                            aOutputs[j] = null;
-                        } else {
-                            aOutputs[j].stackSize -= aInputs[i].stackSize;
-                        }
-                    }
-                }
-
-        if (aOptimize && aDuration >= 32) {
-            ArrayList<ItemStack> tList = new ArrayList<ItemStack>();
-            tList.addAll(Arrays.asList(aInputs));
-            tList.addAll(Arrays.asList(aOutputs));
-            for (int i = 0; i < tList.size(); i++) if (tList.get(i) == null) tList.remove(i--);
-
-            for (byte i = (byte) Math.min(64, aDuration / 16); i > 1; i--)
-                if (aDuration / i >= 16) {
-                    boolean temp = true;
-                    for (int j = 0, k = tList.size(); temp && j < k; j++)
-                        if (tList.get(j).stackSize % i != 0) temp = false;
-                    for (int j = 0; temp && j < aFluidInputs.length; j++)
-                        if (aFluidInputs[j].amount % i != 0) temp = false;
-                    for (int j = 0; temp && j < aFluidOutputs.length; j++)
-                        if (aFluidOutputs[j].amount % i != 0) temp = false;
-                    if (temp) {
-                        for (int j = 0, k = tList.size(); j < k; j++) tList.get(j).stackSize /= i;
-                        for (int j = 0; j < aFluidInputs.length; j++) aFluidInputs[j].amount /= i;
-                        for (int j = 0; j < aFluidOutputs.length; j++) aFluidOutputs[j].amount /= i;
-                        aDuration /= i;
-                    }
-                }
-        }
-
-        mInputs = aInputs;
-        mOutputs = aOutputs;
-        mSpecialItems = aSpecialItems;
-        mChances = aChances;
-        mFluidInputs = aFluidInputs;
-        mFluidOutputs = aFluidOutputs;
-        mDuration = aDuration;
-        mSpecialValue = aSpecialValue;
-        mEUt = aEUt;
-
-//		checkCellBalance();
-    }
-
-    public GT_Recipe(ItemStack aInput1, ItemStack aOutput1, int aFuelValue, int aType) {
-        this(aInput1, aOutput1, null, null, null, aFuelValue, aType);
-    }
-
-    // aSpecialValue = EU per Liter! If there is no Liquid for this Object, then it gets multiplied with 1000!
-    public GT_Recipe(ItemStack aInput1, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aSpecialValue, int aType) {
-        this(true, new ItemStack[]{aInput1}, new ItemStack[]{aOutput1, aOutput2, aOutput3, aOutput4}, null, null, null, null, 0, 0, Math.max(1, aSpecialValue));
-
-        if (mInputs.length > 0 && aSpecialValue > 0) {
-            switch (aType) {
-                // Diesel Generator
-                case 0:
-                    GT_Recipe_Map.sDieselFuels.addRecipe(this);
-                    GT_Recipe_Map.sLargeBoilerFakeFuels.addDieselRecipe(this);
-                    break;
-                // Gas Turbine
-                case 1:
-                    GT_Recipe_Map.sTurbineFuels.addRecipe(this);
-                    break;
-                // Thermal Generator
-                case 2:
-                    GT_Recipe_Map.sHotFuels.addRecipe(this);
-                    break;
-                // Plasma Generator
-                case 4:
-                    GT_Recipe_Map.sPlasmaFuels.addRecipe(this);
-                    break;
-                // Magic Generator
-                case 5:
-                    GT_Recipe_Map.sMagicFuels.addRecipe(this);
-                    break;
-                // Fluid Generator. Usually 3. Every wrong Type ends up in the Semifluid Generator
-                default:
-                    GT_Recipe_Map.sDenseLiquidFuels.addRecipe(this);
-                    GT_Recipe_Map.sLargeBoilerFakeFuels.addDenseLiquidRecipe(this);
-                    break;
-            }
-        }
-    }
-
-    public GT_Recipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aDuration, int aEUt, int aSpecialValue) {
-        this(true, null, null, null, null, new FluidStack[]{aInput1, aInput2}, new FluidStack[]{aOutput1}, Math.max(aDuration, 1), aEUt, Math.max(Math.min(aSpecialValue, 160000000), 0));
-        if (mInputs.length > 1) {
-            GT_Recipe_Map.sFusionRecipes.addRecipe(this);
-        }
-    }
-
-    public GT_Recipe(ItemStack aInput1, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt) {
-        this(true, new ItemStack[]{aInput1}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, aDuration, aEUt, 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            GT_Recipe_Map.sLatheRecipes.addRecipe(this);
-        }
-    }
-
-    public GT_Recipe(ItemStack aInput1, int aCellAmount, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aDuration, int aEUt) {
-        this(true, new ItemStack[]{aInput1, aCellAmount > 0 ? ItemList.Cell_Empty.get(Math.min(64, Math.max(1, aCellAmount))) : null}, new ItemStack[]{aOutput1, aOutput2, aOutput3, aOutput4}, null, null, null, null, Math.max(aDuration, 1), Math.max(aEUt, 1), 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            GT_Recipe_Map.sDistillationRecipes.addRecipe(this);
-        }
-    }
-
-    public GT_Recipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2) {
-        this(true, new ItemStack[]{aInput1, GT_ModHandler.getIC2Item("industrialTnt", aInput2 > 0 ? aInput2 < 64 ? aInput2 : 64 : 1, new ItemStack(Blocks.tnt, aInput2 > 0 ? aInput2 < 64 ? aInput2 : 64 : 1))}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, 20, 30, 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            GT_Recipe_Map.sImplosionRecipes.addRecipe(this);
-        }
-    }
-
-    public GT_Recipe(int aEUt, int aDuration, ItemStack aInput1, ItemStack aOutput1) {
-        this(true, new ItemStack[]{aInput1, ItemList.Circuit_Integrated.getWithDamage(0, aInput1.stackSize)}, new ItemStack[]{aOutput1}, null, null, null, null, Math.max(aDuration, 1), Math.max(aEUt, 1), 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            GT_Recipe_Map.sBenderRecipes.addRecipe(this);
-        }
-    }
-
-    public GT_Recipe(ItemStack aInput1, ItemStack aInput2, int aEUt, int aDuration, ItemStack aOutput1) {
-        this(true, aInput2 == null ? new ItemStack[]{aInput1} : new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput1}, null, null, null, null, Math.max(aDuration, 1), Math.max(aEUt, 1), 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            GT_Recipe_Map.sAlloySmelterRecipes.addRecipe(this);
-        }
-    }
-
-    public GT_Recipe(ItemStack aInput1, int aEUt, ItemStack aInput2, int aDuration, ItemStack aOutput1, ItemStack aOutput2) {
-        this(true, aInput2 == null ? new ItemStack[]{aInput1} : new ItemStack[]{aInput1, aInput2}, new ItemStack[]{aOutput1, aOutput2}, null, null, null, null, Math.max(aDuration, 1), Math.max(aEUt, 1), 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            GT_Recipe_Map.sCannerRecipes.addRecipe(this);
-        }
-    }
-
-    public GT_Recipe(ItemStack aInput1, ItemStack aOutput1, int aDuration) {
-        this(true, new ItemStack[]{aInput1}, new ItemStack[]{aOutput1}, null, null, null, null, Math.max(aDuration, 1), 120, 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            GT_Recipe_Map.sVacuumRecipes.addRecipe(this);
-        }
-    }
-
-    public GT_Recipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt, int VACUUM) {
-        this(true, new ItemStack[]{aInput1}, new ItemStack[]{aOutput1}, null, null, null, null, Math.max(aDuration, 1), aEUt, 0);
-        if (mInputs.length > 0 && mOutputs[0] != null) {
-            GT_Recipe_Map.sVacuumRecipes.addRecipe(this);
-        }
-    }
-
-    //Dummy GT_Recipe maker...
-    public GT_Recipe(ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue){
-        this(true, aInputs, aOutputs, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
-    }
-
-    public static void reInit() {
-        GT_Log.out.println("GT_Mod: Re-Unificating Recipes.");
-        for (GT_Recipe_Map tMapEntry : GT_Recipe_Map.sMappings) tMapEntry.reInit();
-    }
-
-    // -----
-    // Old Constructors, do not use!
-    // -----
-
-    public ItemStack getRepresentativeInput(int aIndex) {
-        if (aIndex < 0 || aIndex >= mInputs.length) return null;
-        return GT_Utility.copy(mInputs[aIndex]);
-    }
-
-    public ItemStack getOutput(int aIndex) {
-        if (aIndex < 0 || aIndex >= mOutputs.length) return null;
-        return GT_Utility.copy(mOutputs[aIndex]);
-    }
-
-    public int getOutputChance(int aIndex) {
-        if (aIndex < 0 || aIndex >= mChances.length) return 10000;
-        return mChances[aIndex];
-    }
-
-    public FluidStack getRepresentativeFluidInput(int aIndex) {
-        if (aIndex < 0 || aIndex >= mFluidInputs.length || mFluidInputs[aIndex] == null) return null;
-        return mFluidInputs[aIndex].copy();
-    }
-
-    public FluidStack getFluidOutput(int aIndex) {
-        if (aIndex < 0 || aIndex >= mFluidOutputs.length || mFluidOutputs[aIndex] == null) return null;
-        return mFluidOutputs[aIndex].copy();
-    }
-
-    public void checkCellBalance() {
-        if (!D2 || mInputs.length < 1) return;
-
-        int tInputAmount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(mInputs);
-        int tOutputAmount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(mOutputs);
-
-        if (tInputAmount < tOutputAmount) {
-            if (!Materials.Tin.contains(mInputs)) {
-                GT_Log.err.println("You get more Cells, than you put in? There must be something wrong.");
-                new Exception().printStackTrace(GT_Log.err);
-            }
-        } else if (tInputAmount > tOutputAmount) {
-            if (!Materials.Tin.contains(mOutputs)) {
-                GT_Log.err.println("You get less Cells, than you put in? GT Machines usually don't destroy Cells.");
-                new Exception().printStackTrace(GT_Log.err);
-            }
-        }
-    }
-
-    public GT_Recipe copy() {
-        return new GT_Recipe(this);
-    }
-
-    public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, FluidStack[] aFluidInputs, ItemStack... aInputs) {
-        return isRecipeInputEqual(aDecreaseStacksizeBySuccess, false, aFluidInputs, aInputs);
-    }
-
-    public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, boolean aDontCheckStackSizes, FluidStack[] aFluidInputs, ItemStack... aInputs) {
-        if (mFluidInputs.length > 0 && aFluidInputs == null) return false;
-        int amt;
-        for (FluidStack tFluid : mFluidInputs)
-            if (tFluid != null) {
-                boolean temp = true;
-                amt = tFluid.amount;
-                for (FluidStack aFluid : aFluidInputs)
-                    if (aFluid != null && aFluid.isFluidEqual(tFluid)) {
-                        if (aDontCheckStackSizes) {
-                            temp = false;
-                            break;
-                        }
-                        amt -= aFluid.amount;
-                        if (amt < 1) {
-                            temp = false;
-                            break;
-                        }
-                    }
-                if (temp) return false;
-            }
-
-        if (mInputs.length > 0 && aInputs == null) return false;
-
-        for (ItemStack tStack : mInputs) {
-            if (tStack != null) {
-                amt = tStack.stackSize;
-                boolean temp = true;
-                for (ItemStack aStack : aInputs) {
-                    if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) {
-                        if (aDontCheckStackSizes) {
-                            temp = false;
-                            break;
-                        }
-                        amt -= aStack.stackSize;
-                        if (amt < 1) {
-                            temp = false;
-                            break;
-                        }
-                    }
-                }
-                if (temp) return false;
-            }
-        }
-        if (aDecreaseStacksizeBySuccess) {
-            if (aFluidInputs != null) {
-                for (FluidStack tFluid : mFluidInputs) {
-                    if (tFluid != null) {
-                        amt = tFluid.amount;
-                        for (FluidStack aFluid : aFluidInputs) {
-                            if (aFluid != null && aFluid.isFluidEqual(tFluid)) {
-                                if (aDontCheckStackSizes) {
-                                    aFluid.amount -= amt;
-                                    break;
-                                }
-                                if (aFluid.amount < amt) {
-                                    amt -= aFluid.amount;
-                                    aFluid.amount = 0;
-                                } else {
-                                    aFluid.amount -= amt;
-                                    amt = 0;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (aInputs != null) {
-                for (ItemStack tStack : mInputs) {
-                    if (tStack != null) {
-                        amt = tStack.stackSize;
-                        for (ItemStack aStack : aInputs) {
-                            if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) {
-                                if (aDontCheckStackSizes){
-                                    aStack.stackSize -= amt;
-                                    break;
-                                }
-                                if (aStack.stackSize < amt){
-                                    amt -= aStack.stackSize;
-                                    aStack.stackSize = 0;
-                                }else{
-                                    aStack.stackSize -= amt;
-                                    amt = 0;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public int compareTo(GT_Recipe recipe) {
-        // first lowest tier recipes
-        // then fastest
-        // then with lowest special value
-        // then dry recipes
-        // then with fewer inputs
-        if (this.mEUt != recipe.mEUt) {
-            return this.mEUt - recipe.mEUt;
-        } else if (this.mDuration != recipe.mDuration) {
-            return this.mDuration - recipe.mDuration;
-        } else if (this.mSpecialValue != recipe.mSpecialValue) {
-            return this.mSpecialValue - recipe.mSpecialValue;
-        } else if (this.mFluidInputs.length != recipe.mFluidInputs.length) {
-            return this.mFluidInputs.length - recipe.mFluidInputs.length;
-        } else if (this.mInputs.length != recipe.mInputs.length) {
-            return this.mInputs.length - recipe.mInputs.length;
-        }
-        return 0;
-    }
-
-    public String[] getNeiDesc() {
-        return neiDesc;
-    }
-
-    protected void setNeiDesc(String... neiDesc) {
-        this.neiDesc = neiDesc;
-    }
-
-    /**
-     * Overriding this method and getOutputPositionedStacks allows for custom NEI stack placement
-     * @return A list of input stacks
-     */
-    public ArrayList<PositionedStack> getInputPositionedStacks(){
-    	return null;
-    }
-
-    /**
-     * Overriding this method and getInputPositionedStacks allows for custom NEI stack placement
-     * @return A list of output stacks
-     */
-    public ArrayList<PositionedStack> getOutputPositionedStacks(){
-    	return null;
-    }
-
-	public static class GT_Recipe_AssemblyLine{
-        public static final ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes = new ArrayList<GT_Recipe_AssemblyLine>();
-        
-        public ItemStack mResearchItem;
-        public int mResearchTime;
-        public ItemStack[] mInputs;
-        public FluidStack[] mFluidInputs;
-        public ItemStack mOutput;
-        public int mDuration;
-        public int mEUt;
-        
-        public GT_Recipe_AssemblyLine(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt) {
-        	mResearchItem = aResearchItem;
-        	mResearchTime = aResearchTime;
-        	mInputs = aInputs;
-        	mFluidInputs = aFluidInputs;
-        	mOutput = aOutput;
-        	mDuration = aDuration;
-        	mEUt = aEUt;
-        }
-        
-    }
-
-    public static class GT_Recipe_Map {
-        /**
-         * Contains all Recipe Maps
-         */
-        public static final Collection<GT_Recipe_Map> sMappings = new ArrayList<GT_Recipe_Map>();
-
-        public static final GT_Recipe_Map sOreWasherRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(120), "gt.recipe.orewasher", "Ore Washing Plant", null, RES_PATH_GUI + "basicmachines/OreWasher", 1, 3, 1, 1, 1, E, 1, E, true, true);
-        public static final GT_Recipe_Map sThermalCentrifugeRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(120), "gt.recipe.thermalcentrifuge", "Thermal Centrifuge", null, RES_PATH_GUI + "basicmachines/ThermalCentrifuge", 1, 3, 1, 0, 2, E, 1, E, true, true);
-        public static final GT_Recipe_Map sCompressorRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(1000), "gt.recipe.compressor", "Compressor", null, RES_PATH_GUI + "basicmachines/Compressor", 1, 1, 1, 0, 1, E, 1, E, true, true);
-        public static final GT_Recipe_Map sExtractorRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(30), "gt.recipe.extractor", "Extractor", null, RES_PATH_GUI + "basicmachines/Extractor", 1, 1, 1, 0, 1, E, 1, E, true, true);
-        public static final GT_Recipe_Map sRecyclerRecipes = new GT_Recipe_Map_Recycler(new HashSet<GT_Recipe>(0), "ic.recipe.recycler", "Recycler", "ic2.recycler", RES_PATH_GUI + "basicmachines/Recycler", 1, 1, 1, 0, 1, E, 1, E, true, false);
-        public static fin