% Adjusted Build Script, renamed some libs. (Soon to be available via Maven)

$ Fixed Multis not working.

6 files changed, 46 insertions, 32 deletions

diff --git a/build.gradle b/build.gradle
index 381e6dab71..bf7de16b25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,9 @@ buildscript {
 		maven {
 			url = "https://plugins.gradle.org/m2/"
 		}
+		flatDir {
+        	dirs 'libs'
+    	}
     }
     dependencies {
         classpath "net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT"
@@ -26,12 +29,10 @@ buildscript {
 
 // Because Forge is too stupid to fix Deprecation Issues, and we cannot fix it on our end! (until we fork Forge)
 allprojects {
-	tasks.withType(JavaCompile) {
+	tasks.withType(Javadoc) {
 		//options.compilerArgs << "-Xlint:deprecation"
+		options.addStringOption('Xdoclint:none', '-quiet')
 	}
-	tasks.withType(Javadoc) {
--		options.addStringOption('Xdoclint:none', '-quiet')
--	}
 }
 
 apply plugin: 'eclipse'
@@ -106,14 +107,19 @@ sourceSets {
     }
 }
 
-dependencies {
+dependencies {	
+    
+    //compile (name:'gregtech-5.08.33-dev.jar', ext:'jar')
+    compile (name:'gregtech-5.09.31-dev.jar', ext:'jar')
 
     provided "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"  
+    //compile "ic2:IC2Classic:1.2.1.8:dev" - Does not mirror internal class structure or visibility of IC2, won't ever compile.
     
 	compile "mcp.mobius.waila:Waila:1.5.11-RC2-NONEI_1.7.10:dev"
 	compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
 	compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
 	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
+    compile (name:'PlayerAPI-1.7.10-1.4.jar', ext:'jar')
 	
 	compile "com.enderio.core:EnderCore:1.7.10-0.2.0.39_beta:dev"
 	compile "com.enderio:EnderIO:1.7.10-2.3.0.430_beta:dev"
@@ -122,14 +128,13 @@ dependencies {
 	compile "cofh:CoFHLib:1.7.10R3.0.3:dev"
 	compileOnly "net.sengir.forestry:forestry_1.7.10:4.2.16.64:dev"		
 	compileOnly "mods.railcraft:Railcraft_1.7.10:9.12.3.0:dev"
+    compileOnly (name:'StevesCarts2.0.0.b18-deobf.jar', ext:'jar')
 	
 	//compileOnly "micdoodle8.mods:GalacticraftCore:1.7-3.0.12.504:Dev"
 	//compileOnly "micdoodle8.mods:MicdoodleCore:1.7-3.0.12.504:Dev"
 	
 	compileOnly "thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev"	
 	compile "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"	
-    
-    compile fileTree(dir: 'libs', include: '*.jar')
 }
 
 processResources
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 81e3216917..14858b15aa 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -5,8 +5,6 @@ import static gtPlusPlus.core.lib.CORE.GTNH;
 import java.util.ArrayList;
 
 import cpw.mods.fml.common.Loader;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -2070,25 +2068,6 @@ public class RECIPES_GREGTECH {
 
 	}
 
-	public static boolean addPulverisationRecipe(final ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2,
-			final ItemStack aOutput3) {
-		aOutput1 = GT_OreDictUnificator.get(true, aOutput1);
-		aOutput2 = GT_OreDictUnificator.get(true, aOutput2);
-		if ((GT_Utility.isStackInvalid(aInput)) || (GT_Utility.isStackInvalid(aOutput1))) {
-			return false;
-		}
-		if (GT_Utility.getContainerItem(aInput, false) == null) {
-
-			if (GregTech_API.sRecipeFile.get(ConfigCategories.Machines.maceration, aInput, true)) {
-				GT_Utility.addSimpleIC2MachineRecipe(aInput, GT_ModHandler.getMaceratorRecipeList(), null,
-						new Object[] { aOutput1 });
-			}
-			GT_Values.RA.addPulveriserRecipe(aInput, new ItemStack[] { aOutput1, aOutput2, aOutput3 },
-					new int[] { 10000, 10000, 10000 }, 400, 2);
-		}
-		return true;
-	}
-
 	private static void cyclotronRecipes() {
 
 		// Polonium
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 254d83ecf4..a21200fc10 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -451,7 +451,7 @@ public class RECIPES_Machines {
 
 				//Add recycle recipes for the Iron Plated Bricks
 				//GT_ModHandler.addPulverisationRecipe(RECIPE_IronPlatedBricks, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), true);
-				RECIPES_GREGTECH.addPulverisationRecipe(
+				CORE.RA.addPulverisationRecipe(
 						RECIPE_IronPlatedBricks,
 						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6),
 						ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2),
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 423073f546..83f052a983 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
@@ -281,5 +281,7 @@ public interface IGregtech_RecipeAdder {
 
 	public boolean addDistilleryRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, ItemStack aSolidOutput, int aDuration, int aEUt, boolean aHidden);
 
+	public boolean addPulverisationRecipe(final ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, final ItemStack aOutput3);
+
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 03b8768240..3869adb7ab 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -101,6 +101,8 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
 			calculatePollutionReduction = GT_MetaTileEntity_Hatch_Muffler.class.getDeclaredMethod("calculatePollutionReduction", int.class);
 		} catch (NoSuchMethodException | SecurityException e) {}		
 
+		mCustomBehviours = new HashMap<String, SpecialMultiBehaviour>();
+		
 	}
 
 	//Find Recipe Methods
@@ -119,7 +121,7 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
 	public ArrayList<GT_MetaTileEntity_Hatch_OutputBattery> mDischargeHatches = new ArrayList<GT_MetaTileEntity_Hatch_OutputBattery>();
 
 	// Custom Behaviour Map
-	HashMap<String, SpecialMultiBehaviour> mCustomBehviours;
+	private static final HashMap<String, SpecialMultiBehaviour> mCustomBehviours;
 	
 	
 	public GregtechMeta_MultiBlockBase(final int aID, final String aName,
@@ -1022,8 +1024,8 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
 		 */
 		
 		// First populate the map if we need to.
-		if (mCustomBehviours.isEmpty()) {
-			mCustomBehviours = Multiblock_API.getSpecialBehaviourItemMap();			
+		if (mCustomBehviours == null || mCustomBehviours.isEmpty()) {
+			mCustomBehviours.putAll(Multiblock_API.getSpecialBehaviourItemMap());
 		}
 		
 		// We have a special slot object in the recipe
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 631796eb1f..efac0222af 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -7,10 +7,13 @@ import java.lang.reflect.Method;
 import java.util.List;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.interfaces.internal.IGT_RecipeAdder;
 import gregtech.api.util.CustomRecipeMap;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
@@ -1278,6 +1281,29 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		}
 	}
 
+	@Override
+	public boolean addPulverisationRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3) {
+		//return GT_Values.RA.addPulveriserRecipe(arg0, arg1, arg2, arg3, arg4)
+
+		aOutput1 = GT_OreDictUnificator.get(true, aOutput1);
+		aOutput2 = GT_OreDictUnificator.get(true, aOutput2);
+		aOutput3 = GT_OreDictUnificator.get(true, aOutput3);
+		if ((GT_Utility.isStackInvalid(aInput)) || (GT_Utility.isStackInvalid(aOutput1))) {
+			return false;
+		}
+		if (GT_Utility.getContainerItem(aInput, false) == null) {
+
+			if (GregTech_API.sRecipeFile.get(ConfigCategories.Machines.maceration, aInput, true)) {
+				GT_Utility.addSimpleIC2MachineRecipe(aInput, GT_ModHandler.getMaceratorRecipeList(), null,
+						new Object[] { aOutput1 });
+			}
+			GT_Values.RA.addPulveriserRecipe(aInput, new ItemStack[] { aOutput1, aOutput2, aOutput3 },
+					new int[] { 10000, 10000, 10000 }, 400, 2);
+		}
+		return true;
+	
+	}
+