% Tweaks to recipe handling for null cases which weren't actually null.

+ Re-enabled the Industrial Centrifuge by default.

4 files changed, 24 insertions, 10 deletions

diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index 8d0fb907b2..6719ebf470 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -1,7 +1,6 @@
 package miscutil;
 
 import static miscutil.core.lib.CORE.DEBUG;
-import static miscutil.core.lib.CORE.configSwitches.disableCentrifugeFormation;
 import static miscutil.core.lib.CORE.configSwitches.disableEnderIOIntegration;
 import static miscutil.core.lib.CORE.configSwitches.disableIC2Recipes;
 import static miscutil.core.lib.CORE.configSwitches.disableStaballoyBlastFurnaceRecipe;
@@ -54,7 +53,7 @@ implements ActionListener
 		DEBUG = config.getBoolean("debugMode", "debug", false, "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)");
 		disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration.");
 		disableStaballoyBlastFurnaceRecipe = config.getBoolean("disableStaballoyBlastFurnaceRecipe", "debug", false, "Disables Staballoy Blast Furnace Recipe.");
-		disableCentrifugeFormation = config.getBoolean("disableCentrifuge", "debug", true, "Keeps the Items around, just stops the multiblock forming. (It's broken currently, needs in depth testing)");
+		//disableCentrifugeFormation = config.getBoolean("disableCentrifuge", "debug", false, "Keeps the Items around, just stops the multiblock forming. (It's broken currently, needs in depth testing)");
 		
 		//Machines
 		enableSolarGenerators = config.getBoolean("enableSolarGenerators", "machines", false, "These may be overpowered, Consult a local electrician.");
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
index de84c739bb..0435bd4f10 100644
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
@@ -217,8 +217,16 @@ public class BaseItemDust extends Item{
 		if (tempIngot != null && tempIngot != "" && outputStacks[1] != null){
 			tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
 			tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1);
+			ItemStack tempStackOutput2;
+			int chance = mTier*10/Utils.randInt(10, 20);
+			if (outputStacks[1] != null && !outputStacks[1].getUnlocalizedName().toLowerCase().contains("aaa_broken")){
+				tempStackOutput2 = outputStacks[1];
+			}
+			else {
+				tempStackOutput2 = null;
+			}
 			if (null != tempOutputStack && null != tempInputStack){
-				GT_ModHandler.addPulverisationRecipe(tempInputStack, outputStacks[0], outputStacks[1], mTier*10/Utils.randInt(10, 20));
+				GT_ModHandler.addPulverisationRecipe(tempInputStack, outputStacks[0], tempStackOutput2, chance);
 			}
 		}	
 		if (tempIngot != null && tempIngot != ""){
@@ -283,7 +291,14 @@ public class BaseItemDust extends Item{
 	private void addBlastFurnaceRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int tempRequired){
 		//Special Cases
 		if (input1.getUnlocalizedName().toLowerCase().contains("tantalloy61")){
+			Utils.LOG_INFO("Adding Special handler for Staballoy-61 in the Blast Furnace");
 			input2 = UtilsItems.getItemStackOfAmountFromOreDict("dustTantalloy60", 2);
+			if (input2 == null){
+				Utils.LOG_INFO("invalid itemstack.");
+			}
+			else {
+				Utils.LOG_INFO("Found "+input2.getDisplayName());
+			}
 		}
 		GT_Values.RA.addBlastRecipe(
 				input1,
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 4f1826093f..f07235a1e0 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -75,7 +75,7 @@ public class CORE {
 		//Debug
 		public static boolean disableEnderIOIntegration = false;
 		public static boolean disableStaballoyBlastFurnaceRecipe = false;
-		public static boolean disableCentrifugeFormation = true;
+		public static boolean disableCentrifugeFormation = false;
 		
 		//Machine Related
 		public static boolean enableSolarGenerators = false;
diff --git a/src/Java/miscutil/core/lib/MaterialInfo.java b/src/Java/miscutil/core/lib/MaterialInfo.java
index b520af62d0..f76166eb49 100644
--- a/src/Java/miscutil/core/lib/MaterialInfo.java
+++ b/src/Java/miscutil/core/lib/MaterialInfo.java
@@ -9,8 +9,8 @@ public enum MaterialInfo {
 	ENERGYCRYSTAL(getStack("dustInfusedFire", 8), getStack("dustInfusedEarth", 8), getStack("dustInfusedEntropy", 8), getStack("dustInfusedOrder", 8), "dustEnergyCrystal", 1, noItem, 0),
 	BLOODSTEEL(null, null, null, null, noItem, 0, noItem, 0),
 	STABALLOY(getStack("dustTitanium", 1), getStack("dustUranium", 8), null, null, "dustStaballoy", 1, noItem, 0),
-	TANTALLOY60(getStack("dustTungsten", 1), getStack("dustTantalum", 8),	null, null,	"dustTantalloy60", 1, noItem, 0),
-	TANTALLOY61(getStack("dustTantalum", 2), getStack("dustSmallTitanium", 1),	getStack("dustSmallTungsten", 2), getStack("dustTantalum", 5),	"dustTantalloy61", 1, "dustTantalloy60", 1),
+	TANTALLOY60(getStack("dustTungsten", 1), getStack("dustTantalum", 8), getStack("dustTinyTitanium", 5), null,	"dustTantalloy60", 1, noItem, 0),
+	TANTALLOY61(getStack("dustTungsten", 1), getStack("dustSmallTitanium", 3),	getStack("dustSmallYttrium", 2), getStack("dustTantalum", 9),	"dustTantalloy61", 1, noItem, 0),
 	QUANTUM(null, null,	null, null, noItem, 0, noItem, 0),
 	TUMBAGA(getStack("dustGold", 6), getStack("dustCopper", 3),	null, null,	"dustTumbaga", 1, noItem, 0),
 	POTIN(getStack("dustBronze", 3), getStack("dustTin", 2), getStack("dustLead", 4), null, "dustPotin", 1, noItem, 0),	
@@ -20,10 +20,10 @@ public enum MaterialInfo {
 	INCONEL792(getStack("dustNickel", 5), getStack("dustChrome", 1), getStack("dustAluminium", 2), getStack("dustNiobium", 1), "dustInconel792", 2, "dustTinyDarkAsh", 1),
 	TUNGSTENCARBIDE(getStack("dustTungsten", 16), getStack("dustCarbon", 16), null, null, "dustTungstenCarbide", 4, noItem, 0),
 	SILICONCARBIDE(getStack("dustSilicon", 16), getStack("dustCarbon", 16), null, null, "dustSiliconCarbide", 4, noItem, 0),
-	ZERON100(getStack("dustChrome", 5), getStack("dustSmallNickel", 6), getStack("dustSmallMolybdenum", 3), getStack("dustSteel", 14), "dustZeron100", 4, noItem, 0),
-	MARAGING250(getStack("dustSteel", 4), getStack("dustNickel", 2), getStack("dustCobalt", 1), getStack("dustTinyTitanium", 1), "dustMaragingSteel250", 2, noItem, 0),
-	MARAGING300(getStack("dustSteel", 5), getStack("dustNickel", 2), getStack("dustCobalt", 2), getStack("dustSmallTitanium", 1), "dustMaragingSteel300", 2, noItem, 0),
-	MARAGING350(getStack("dustSteel", 6), getStack("dustNickel", 3), getStack("dustCobalt", 3), getStack("dustTitanium", 1), "dustMaragingSteel350", 2, noItem, 0),
+	ZERON100(getStack("dustChrome", 5), getStack("dustSmallNickel", 6), getStack("dustSmallMolybdenum", 3), getStack("dustSteel", 14), "dustZeron100", 5, noItem, 0),
+	MARAGING250(getStack("dustSteel", 4), getStack("dustNickel", 2), getStack("dustCobalt", 1), getStack("dustTinyTitanium", 1), "dustMaragingSteel250", 6, noItem, 0),
+	MARAGING300(getStack("dustSteel", 5), getStack("dustNickel", 2), getStack("dustCobalt", 2), getStack("dustSmallTitanium", 1), "dustMaragingSteel300", 5, noItem, 0),
+	MARAGING350(getStack("dustSteel", 6), getStack("dustNickel", 3), getStack("dustCobalt", 3), getStack("dustTitanium", 1), "dustMaragingSteel350", 4, noItem, 0),
 	STELLITE(getStack("dustCobalt", 4), getStack("dustChrome", 4), getStack("dustManganese", 2), getStack("dustTitanium", 1), "dustStellite", 2, noItem, 0),
 	TALONITE(getStack("dustCobalt", 4), getStack("dustChrome", 4), getStack("dustPhosphorus", 1), getStack("dustMolybdenum", 1), "dustTalonite", 2, noItem, 0);