% Rebalanced AgroChem recipes a bit.

$ Fixed AgroChem fuels being worth 1000x the intended EU total.
$ Fixed Unique Dusts not having recipes for their Small/Tiny forms.

5 files changed, 115 insertions, 32 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index fd69c97ff5..ceeff7e655 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -82,12 +82,7 @@ public class BaseItemComponent extends Item{
 		// Handles .'s from fluid internal names.
 		String aFormattedNameForFluids;
 		if (unlocalName.contains(".")) {			
-			if (StringUtils.characterCount(unlocalName, '.') > 1) {
-				aFormattedNameForFluids = StringUtils.splitAndUppercase(unlocalName, ".");			
-			}
-			else {
-				aFormattedNameForFluids = unlocalName.replace(".", "");
-			}			
+			aFormattedNameForFluids = StringUtils.splitAndUppercase(unlocalName, ".");						
 		}
 		else {
 			aFormattedNameForFluids = unlocalName;
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index bd8630da69..a8753677be 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 
 import forestry.plugins.PluginCore;
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
@@ -20,6 +21,7 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
+import scala.xml.dtd.ELEMENTS;
 
 public class AgriculturalChem {
 
@@ -144,10 +146,7 @@ public class AgriculturalChem {
 		
 		//Sewage
 		FertileManureSlurry = FluidUtils.generateFluidNonMolten("fertile.manure.slurry", "Fertile Manure Slurry", 45+175, new short[]{65, 50, 15, 100}, null, null, 0, true);
-		
-		
-		
-		//Ca5(PO4)3(OH)
+	
 		
 		
 		// Nitrogen, Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
@@ -276,8 +275,9 @@ public class AgriculturalChem {
 	
 	
 	private static void addBasicSlurryRecipes() {
-		
-		ItemStack aManureByprod = ItemUtils.getSimpleStack(dustManureByproducts, 1);	
+
+		ItemStack aManureByprod1 = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyManureByproducts", 1);
+		ItemStack aManureByprod2 = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallManureByproducts", 1);	
 		ItemStack aDirtDust = ItemUtils.getSimpleStack(dustDirt, 1);
 		
 		//Poop Juice to Basic Slurry
@@ -288,10 +288,10 @@ public class AgriculturalChem {
 				FluidUtils.getFluidStack(ManureSlurry, 250), //Out Fluid
 				aDirtDust, 
 				aDirtDust,
-				aManureByprod, 
-				aManureByprod, 
-				aManureByprod,
-				aManureByprod, 
+				aManureByprod1, 
+				aManureByprod1, 
+				aManureByprod1,
+				aManureByprod1, 
 				new int[]{2000, 2000, 500, 500, 250, 250}, //Chances
 				10*20, //Time
 				30); //EU
@@ -304,10 +304,10 @@ public class AgriculturalChem {
 				FluidUtils.getFluidStack(ManureSlurry, 50), //Out Fluid
 				aDirtDust, 
 				aDirtDust,
-				aManureByprod, 
-				aManureByprod, 
-				aManureByprod,
-				aManureByprod, 
+				aManureByprod1, 
+				aManureByprod1, 
+				aManureByprod2,
+				aManureByprod2, 
 				new int[]{4000, 3000, 1250, 1250, 675, 675}, //Chances
 				20*20, //Time
 				60); //EU
@@ -429,10 +429,30 @@ public class AgriculturalChem {
 		// Dirt Production
 		CORE.RA.addCompressorRecipe(ItemUtils.getSimpleStack(dustDirt, 9), ItemUtils.getSimpleStack(Blocks.dirt), 20 * 2, 8);
 		
+		//Centrifuge Byproducts
+
+
+		// Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
+		GT_Values.RA.addCentrifugeRecipe(
+				CI.getNumberedCircuit(20),
+				ItemUtils.getSimpleStack(aManureByprod, 4),
+				FluidUtils.getFluidStack("sulfuricacid", 250), //In Fluid
+				FluidUtils.getFluidStack("sulfuricapatite", 50), //Out Fluid
+				Materials.Phosphorus.getDustSmall(2), 
+				Materials.Calcium.getDustSmall(2), 
+				Materials.Copper.getDustTiny(1), 
+				Materials.Carbon.getDust(1), 
+				ItemUtils.getSimpleStack(dustDirt, 1), 
+				ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAmmoniumNitrate", 1),
+				new int[]{2500, 2500, 750, 1000, 5000, 250}, //Chances
+				20*20, //Time
+				60); //EU
+		
+		
 		// Add Fuel Usages
-		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(PoopJuice, 1000), 12000);
-		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(ManureSlurry, 1000), 24000);
-		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(FertileManureSlurry, 1000), 32000);
+		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(PoopJuice, 1000), 12);
+		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(ManureSlurry, 1000), 24);
+		CORE.RA.addSemifluidFuel(FluidUtils.getFluidStack(FertileManureSlurry, 1000), 32);
 		
 		
 	}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 50778e1285..9ce51d5858 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -396,6 +396,61 @@ public class ItemUtils {
 				new BaseItemDustUnique("itemDust" + unlocalizedName, materialName, mChemForm, Colour, "Dust"),
 				new BaseItemDustUnique("itemDustSmall" + unlocalizedName, materialName, mChemForm, Colour, "Small"),
 				new BaseItemDustUnique("itemDustTiny" + unlocalizedName, materialName, mChemForm, Colour, "Tiny") };
+		
+		//Generate Shaped/Shapeless Recipes
+
+		final ItemStack normalDust = ItemUtils.getSimpleStack(output[0]);
+		final ItemStack smallDust = ItemUtils.getSimpleStack(output[1]);
+		final ItemStack tinyDust = ItemUtils.getSimpleStack(output[2]);
+
+
+		if (ItemUtils.checkForInvalidItems(tinyDust) && ItemUtils.checkForInvalidItems(normalDust)) {
+			if (RecipeUtils.recipeBuilder(
+					tinyDust,	tinyDust, tinyDust,
+					tinyDust, tinyDust, tinyDust,
+					tinyDust, tinyDust, tinyDust,
+					normalDust)){
+				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+materialName+" - Success");
+			}
+			else {
+				Logger.WARNING("9 Tiny dust to 1 Dust Recipe: "+materialName+" - Failed");
+			}
+
+			if (RecipeUtils.recipeBuilder(
+					normalDust, null, null,
+					null, null, null,
+					null, null, null,
+					ItemUtils.getSimpleStack(tinyDust, 9))){
+				Logger.WARNING("9 Tiny dust from 1 Recipe: "+materialName+" - Success");
+			}
+			else {
+				Logger.WARNING("9 Tiny dust from 1 Recipe: "+materialName+" - Failed");
+			}
+		}
+
+		if (ItemUtils.checkForInvalidItems(smallDust) && ItemUtils.checkForInvalidItems(normalDust)) {
+			if (RecipeUtils.recipeBuilder(
+					smallDust, smallDust, null,
+					smallDust, smallDust, null,
+					null, null, null,
+					normalDust)){
+				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+materialName+" - Success");
+			}
+			else {
+				Logger.WARNING("4 Small dust to 1 Dust Recipe: "+materialName+" - Failed");
+			}
+			if (RecipeUtils.recipeBuilder(
+					null, normalDust, null,
+					null, null, null,
+					null, null, null,
+					ItemUtils.getSimpleStack(smallDust, 4))){
+				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+materialName+" - Success");
+			}
+			else {
+				Logger.WARNING("4 Small dust from 1 Dust Recipe: "+materialName+" - Failed");
+			}
+		}
+		
 		return output;
 	}
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index 664ab40e6f..cc71b910c6 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -5,12 +5,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.item.crafting.IRecipe;
-
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
@@ -22,9 +16,12 @@ import gtPlusPlus.api.objects.minecraft.ShapedRecipe;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
 import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
@@ -33,7 +30,8 @@ public class RecipeUtils {
 public static int mInvalidID = 1;
 	public static boolean recipeBuilder(final Object slot_1, final Object slot_2, final Object slot_3, final Object slot_4, final Object slot_5, final Object slot_6, final Object slot_7, final Object slot_8, final Object slot_9, ItemStack resultItem){
 		
-		if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) {
+		//Old Debug Code, useful for finding recipes loading too early.
+		/*if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) {
 			Logger.INFO(ReflectionUtils.getMethodName(1));
 			Logger.INFO(ReflectionUtils.getMethodName(2));
 			Logger.INFO(ReflectionUtils.getMethodName(3));
@@ -44,7 +42,7 @@ public static int mInvalidID = 1;
 			Logger.INFO(ReflectionUtils.getMethodName(8));
 			Logger.INFO(ReflectionUtils.getMethodName(9));
 			System.exit(1);
-		}
+		}*/
 		
 		if (resultItem == null){
 			Logger.RECIPE("[Fix] Found a recipe with an invalid output, yet had a valid inputs. Using Dummy output so recipe can be found..");
@@ -395,6 +393,7 @@ public static int mInvalidID = 1;
 				else {
 					Logger.RECIPE("[Fix] Output is Null for a recipe. Report to Alkalus.");
 					output = ItemUtils.getItemStackOfAmountFromOreDict("sadibasdkjnad", 1);
+					RegistrationHandler.recipesFailed++;
 				}
 			}
 		}
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 9eebeb5560..721facd8d0 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
@@ -141,7 +141,21 @@ public interface IGregtech_RecipeAdder {
 	public boolean addLFTRRecipe(ItemStack aInput1, FluidStack aInput2, ItemStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt);
 	public boolean addLFTRRecipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aDuration, int aEUt);
 
+	
+	/**
+	 * Adds a custom Semifluid fuel for the GT++ SemiFluid Generators.
+	 * @param aFuelItem - A Fluidstack to be consumed.
+	 * @param aFuelValue - Fuel value in thousands (1 = 1000)
+	 * @return - Was the Fuel added?
+	 */
 	public boolean addSemifluidFuel(FluidStack aFuelItem, int aFuelValue);
+	
+	/**
+	 * Adds a custom Semifluid fuel for the GT++ SemiFluid Generators.
+	 * @param aFuelItem - A Fluidstack to be consumed.
+	 * @param aFuelValue - Fuel value in thousands (1 = 1000)
+	 * @return - Was the Fuel added?
+	 */
 	public boolean addSemifluidFuel(ItemStack aFuelItem, int aFuelValue);
 	
 	public boolean addFissionFuel(