Bring in experimental branch

71 files changed, 4182 insertions, 1517 deletions

diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 5e6e2498c5..26f2b673ff 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -157,6 +157,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
 	public int mFlintChance = 30;
 	public int mItemDespawnTime = 6000;
 	public int mUpgradeCount = 4;
+	public boolean mGTBees = true;
 
 	public static class OreDictEventContainer {
 		public final OreDictionary.OreRegisterEvent mEvent;
@@ -1633,22 +1634,22 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
 			rFuelValue = (short) Math.max(rFuelValue, 888);
 		}
 		if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemLignite")) {
-			rFuelValue = (short) Math.max(rFuelValue, 300);
+			rFuelValue = (short) Math.max(rFuelValue, 1200);
 		}
 		if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedLignite")) {
-			rFuelValue = (short) Math.max(rFuelValue, 300);
+			rFuelValue = (short) Math.max(rFuelValue, 1200);
 		}
 		if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureLignite")) {
-			rFuelValue = (short) Math.max(rFuelValue, 300);
+			rFuelValue = (short) Math.max(rFuelValue, 1200);
 		}
 		if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustLignite")) {
-			rFuelValue = (short) Math.max(rFuelValue, 300);
+			rFuelValue = (short) Math.max(rFuelValue, 1200);
 		}
 		if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallLignite")) {
-			rFuelValue = (short) Math.max(rFuelValue, 75);
+			rFuelValue = (short) Math.max(rFuelValue, 375);
 		}
 		if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyLignite")) {
-			rFuelValue = (short) Math.max(rFuelValue, 33);
+			rFuelValue = (short) Math.max(rFuelValue, 166);
 		}
 		if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCoal")) {
 			rFuelValue = (short) Math.max(rFuelValue, 1600);
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index bb9a173288..a1ccbcc05c 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -82,6 +82,11 @@ public class GT_RecipeAdder
   
   public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration)
   {
+	  return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, 30);
+  }
+  
+  public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUtick)
+  {
     if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput == null) && (aFluidOutput == null))) {
       return false;
     }
@@ -91,7 +96,10 @@ public class GT_RecipeAdder
     if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("chemicalreactor", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
       return false;
     }
-    GT_Recipe.GT_Recipe_Map.sChemicalRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 }, new ItemStack[] { aOutput }, null, null, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, 30, 0);
+    if(aEUtick<=0){
+    	return false;
+    }
+    GT_Recipe.GT_Recipe_Map.sChemicalRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2 }, new ItemStack[] { aOutput }, null, null, new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUtick, 0);
     return true;
   }
   
@@ -296,6 +304,19 @@ public class GT_RecipeAdder
 //    return true;
 	return false;
   }
+  
+
+@Override
+public boolean addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt) {
+	if(aOutputs.length>0){addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 0L, new Object[0]), aInput, aOutputs[0], aDuration*2, aEUt/4, false);}
+	if(aOutputs.length>1){addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), aInput, aOutputs[1], aDuration*2, aEUt/4, false);}
+	if(aOutputs.length>2){addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L, new Object[0]), aInput, aOutputs[2], aDuration*2, aEUt/4, false);}
+	if(aOutputs.length>3){addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 3L, new Object[0]), aInput, aOutputs[3], aDuration*2, aEUt/4, false);}
+	if(aOutputs.length>4){addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), aInput, aOutputs[4], aDuration*2, aEUt/4, false);}
+	if(aOutputs.length>5){addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 5L, new Object[0]), aInput, aOutputs[5], aDuration*2, aEUt/4, false);}
+	
+	return addDistillationTowerRecipe(aInput, aOutputs, aOutput2, aDuration, aEUt);
+}
 
 				public boolean addDistillationTowerRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt){
 					if(aInput==null||aOutputs==null||aOutputs.length<1||aOutputs.length>5){return false;}
@@ -446,12 +467,11 @@ public class GT_RecipeAdder
       return false;
     }
     if(aInput.isFluidEqual(Materials.PhasedGold.getMolten(144))){
-    	aInput = Materials.VibrantAlloy.getMolten(aInput.amount);
-    }
-    if(aInput.isFluidEqual(Materials.PhasedIron.getMolten(144))){
-    	aInput = Materials.PulsatingIron.getMolten(aInput.amount);
-    }
-    
+    		aInput = Materials.VibrantAlloy.getMolten(aInput.amount);
+    	   }
+    	   if(aInput.isFluidEqual(Materials.PhasedIron.getMolten(144))){
+    	   	aInput = Materials.PulsatingIron.getMolten(aInput.amount);
+    	   }
     if ((aDuration = GregTech_API.sRecipeFile.get("fluidsolidifier", aOutput, aDuration)) <= 0) {
       return false;
     }
@@ -465,11 +485,11 @@ public class GT_RecipeAdder
       return false;
     }
     if(aOutput.isFluidEqual(Materials.PhasedGold.getMolten(1))){
-    	aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount);
-    }
-    if(aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))){
-    	aOutput = Materials.PulsatingIron.getMolten(aOutput.amount);
-    }
+	   	aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount);
+	   }
+	   if(aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))){
+	   	aOutput = Materials.PulsatingIron.getMolten(aOutput.amount);
+	   }
     if ((aDuration = GregTech_API.sRecipeFile.get("fluidsmelter", aInput, aDuration)) <= 0) {
       return false;
     }
@@ -483,15 +503,14 @@ public class GT_RecipeAdder
       return false;
     }
     if(aOutput.isFluidEqual(Materials.PhasedGold.getMolten(1))){
-    	aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount);
-    }
-    if(aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))){
-    	aOutput = Materials.PulsatingIron.getMolten(aOutput.amount);
-    }
+    	   	aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount);
+    	   }
+    	   if(aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))){
+    	   	aOutput = Materials.PulsatingIron.getMolten(aOutput.amount);
+    	   }
     if ((aDuration = GregTech_API.sRecipeFile.get("fluidextractor", aInput, aDuration)) <= 0) {
       return false;
     }
-    
     GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(true, new ItemStack[] { aInput }, new ItemStack[] { aRemains }, null, new int[] { aChance }, null, new FluidStack[] { aOutput }, aDuration, aEUt, 0);
     return true;
   }
@@ -691,22 +710,22 @@ public class GT_RecipeAdder
   }
   
   public boolean addPlasmaArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt)
-  {
-    if ((aInput == null) || (aOutputs == null)||aFluidInput==null) {
-      return false;
-    }
-    for (ItemStack tStack : aOutputs) {
-      if (tStack != null)
-      {
-        if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", aInput, aDuration)) <= 0) {
-          return false;
+    {
+      if ((aInput == null) || (aOutputs == null)||aFluidInput==null) {
+        return false;
+      }
+      for (ItemStack tStack : aOutputs) {
+        if (tStack != null)
+        {
+          if ((aDuration = GregTech_API.sRecipeFile.get("arcfurnace", aInput, aDuration)) <= 0) {
+            return false;
+          }
+          GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes.addRecipe(true, new ItemStack[] { aInput }, aOutputs, null, aChances, new FluidStack[] { aFluidInput }, new FluidStack[]{aFluidOutput}, Math.max(1, aDuration), Math.max(1, aEUt), 0);
+          return true;
         }
-        GT_Recipe.GT_Recipe_Map.sPlasmaArcFurnaceRecipes.addRecipe(true, new ItemStack[] { aInput }, aOutputs, null, aChances, new FluidStack[] { aFluidInput }, new FluidStack[]{aFluidOutput}, Math.max(1, aDuration), Math.max(1, aEUt), 0);
-        return true;
       }
+      return false;
     }
-    return false;
-  }
 
   public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt)
   {
@@ -726,4 +745,26 @@ public class GT_RecipeAdder
     return false;
   }
 
+@Override
+public boolean addPyrolyseRecipe(ItemStack aInput, FluidStack aFluidInput, int intCircuit, ItemStack aOutput, FluidStack aFluidOutput, int aDuration, int aEUt) {
+	if (aInput == null) {return false;}
+	if ((aDuration = GregTech_API.sRecipeFile.get("pyrolyse", aInput, aDuration)) <= 0) {
+        return false;
+      }
+	 GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes.addRecipe(false, new ItemStack[] { aInput, ItemList.Circuit_Integrated.getWithDamage(0L, intCircuit, new Object[0]) }, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
+     return true;
+}
+
+@Override
+public boolean addCrackingRecipe(FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt) {
+	if ((aInput == null) || (aOutput == null)) {return false;}
+	if ((aDuration = GregTech_API.sRecipeFile.get("cracking", aInput.getUnlocalizedName(), aDuration)) <= 0) {
+        return false;
+      }
+	 GT_Recipe.GT_Recipe_Map.sCrakingRecipes.addRecipe(true, null, null , null, null , new FluidStack[]{aInput}, new FluidStack[]{aOutput}, aDuration, aEUt, 0);
+	 GT_Recipe.GT_Recipe_Map.sCrakingRecipes.addRecipe(true, null, null , null, null , new FluidStack[]{aInput, GT_ModHandler.getSteam(aInput.amount)}, new FluidStack[]{aOutput, Materials.Hydrogen.getGas(aInput.amount)}, aDuration, aEUt, 0);
+	 GT_Recipe.GT_Recipe_Map.sCrakingRecipes.addRecipe(true, null, null , null, null , new FluidStack[]{aInput, Materials.Hydrogen.getGas(aInput.amount)}, new FluidStack[]{new FluidStack(aOutput.getFluid(),(int) (aOutput.amount*1.3))}, aDuration, aEUt, 0);
+     return true;
+}
+
  }
diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
index aa00217020..a0c0e2c438 100644
--- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
+++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
@@ -200,12 +200,12 @@ public class GT_ThaumcraftCompat
   }
   
   public Object addInfusionRecipe(String aResearch, ItemStack aMainInput,ItemStack[] aSideInputs, ItemStack aOutput,int aInstability, List<TC_Aspects.TC_AspectStack> aAspects)
-  {
-    if ((GT_Utility.isStringInvalid(aResearch)) || (aMainInput == null)|| (aSideInputs==null) || (aOutput == null) || (aAspects == null) || (aAspects.isEmpty())) {
-      return null;
+    {
+      if ((GT_Utility.isStringInvalid(aResearch)) || (aMainInput == null)|| (aSideInputs==null) || (aOutput == null) || (aAspects == null) || (aAspects.isEmpty())) {
+        return null;
+      }
+      return ThaumcraftApi.addInfusionCraftingRecipe(aResearch, GT_Utility.copy(new Object[] { aOutput }), aInstability, getAspectList(aAspects), aMainInput, aSideInputs);
     }
-    return ThaumcraftApi.addInfusionCraftingRecipe(aResearch, GT_Utility.copy(new Object[] { aOutput }), aInstability, getAspectList(aAspects), aMainInput, aSideInputs);
-  }
   
   public boolean registerThaumcraftAspectsToItem(ItemStack aExampleStack, List<TC_Aspects.TC_AspectStack> aAspects, String aOreDict)
   {
diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
index f92806b3a9..d0766311a7 100644
--- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
+++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java
@@ -32,6 +32,7 @@ public class GT_Worldgen_GT_Ore_Layer
   public final boolean mOverworld;

   public final boolean mNether;

   public final boolean mEnd;

+  public final boolean mEndAsteroid;

   

   public GT_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize, boolean aOverworld, boolean aNether, boolean aEnd, Materials aPrimary, Materials aSecondary, Materials aBetween, Materials aSporadic)

   {

@@ -39,6 +40,7 @@ public class GT_Worldgen_GT_Ore_Layer
     this.mOverworld = GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Overworld", aOverworld);

     this.mNether = GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Nether", aNether);

     this.mEnd = GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "TheEnd", aEnd);

+    this.mEndAsteroid = GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "EndAsteroid", aEnd);

     this.mMinY = ((short)GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MinHeight", aMinY));