+ Added conversion recipe for phtalic acids. Closes #540.

+ Multiblock Mixer now has separate recipe processing for each input bus. Closes #560.
% Buffed Dehydrator input tanks. Closes #537.
% Buffed Algae Farm output to be 6-8x.
$ Fixed Algae Farm not consuming compost.
$ Adjusted Large Sifter Tooltip. Closes #535.
$ Fixed Waste collector recipes. Closes #545.
$ Fixed casing count in Volcanus structure check.

3 files changed, 53 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 8428328f37..981bfed479 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -272,6 +272,8 @@ public class CoalTar extends ItemPackage {
 		recipePhthalicAcidToPhthalicAnhydride();
 		
 		recipeEthylBenzineFuelsIntoHeavyFuel();		
+		
+		recipePhthalicAcidConversion();
 
 		//Burn the coal gas!
 		GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellCoalGas", 1), null, 96, 1);
@@ -282,6 +284,14 @@ public class CoalTar extends ItemPackage {
 		return true;
 	}
 
+	private void recipePhthalicAcidConversion() {
+		FluidStack aMyAcid = FluidUtils.getFluidStack(Phthalic_Acid, 500);
+		FluidStack aGtAcid = FluidUtils.getFluidStack("phtalicacid", 500);
+		if (aMyAcid != null && aGtAcid != null) {
+			CORE.RA.addDistilleryRecipe(CI.getNumberedBioCircuit(8), aMyAcid, aGtAcid, null, 50, 16, false);
+		}
+	}
+
 	@Override
 	public void items() {
 		//Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
@@ -347,7 +357,7 @@ public class CoalTar extends ItemPackage {
 		Naphthalene = FluidUtils.generateFluidNonMolten("Naphthalene", "Naphthalene", 115, new short[]{210, 185, 135, 100}, null, null);
 		// v - Oxidize with mercury and nitric acid
 		//Create Phthalic Acid
-		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phthalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
+		Phthalic_Acid = FluidUtils.generateFluidNonMolten("PhthalicAcid", "Phtalic Acid", 207, new short[]{210, 220, 210, 100}, null, null);
 		// v - Dehydrate at 180C+
 		//Create Phthalic Anhydride
 		//ItemUtils.generateSpecialUseDusts("PhthalicAnhydride", "Phthalic Anhydride", "C6H4(CO)2O", Utils.rgbtoHexValue(175, 175, 175));
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 8225a40c29..d703bb9637 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -22,6 +22,7 @@ import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.dimension.Dimension_Everglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
 import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
 import net.minecraft.block.Block;
@@ -540,13 +541,15 @@ public class RECIPES_Machines {
 					20 * 30, 
 					30);
 
+			ItemStack aFluidRegulator1 = ItemUtils.getItemListObject("FluidRegulator_MV", "Pump_HV", GTNH ? 4 : 2);
+			ItemStack aFluidRegulator2 = ItemUtils.getItemListObject("FluidRegulator_IV", "Pump_LuV", GTNH ? 4 : 2);
+			
 			//Poo Collector		
 			CORE.RA.addSixSlotAssemblingRecipe(
 					new ItemStack[] {
 							CI.machineHull_MV,
-							CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2),
+							aFluidRegulator1,
 							CI.getTieredComponent(OrePrefixes.pipeMedium, 2, GTNH ? 4 : 2),
-							CI.getElectricPump(2, GTNH ? 4 : 2),
 							ALLOY.EGLIN_STEEL.getPlate(GTNH ? 8 : 4),
 							ALLOY.POTIN.getScrew(GTNH ? 12 : 6)
 					}, 
@@ -560,9 +563,8 @@ public class RECIPES_Machines {
 					new ItemStack[] {
 							CI.getTieredMachineHull(-1),
 							ItemUtils.getSimpleStack(ModBlocks.blockPooCollector),
-							CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 8 : 4),
+							aFluidRegulator2,
 							CI.getTieredComponent(OrePrefixes.pipeHuge, 6, GTNH ? 8 : 4),
-							CI.getElectricPump(5, GTNH ? 12 : 6),
 							CI.getTieredComponent(OrePrefixes.screw, 6, GTNH ? 32 : 16)
 					}, 
 					CI.getAlternativeTieredFluid(5, 144 * 9), 
@@ -886,6 +888,7 @@ public class RECIPES_Machines {
 						"plateDoubleGrisium", "rotorGrisium", "plateDoubleGrisium",
 						RECIPE_IndustrialMultiTankController);
 			}
+			//TODO
 
 			//Semi-Fluid Generators
 			ItemStack mSemiFluidgen = ItemUtils.getItemStackFromFQRN("IC2:blockGenerator:7", 1);
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 720da1692b..485436011f 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1268,5 +1268,40 @@ public class ItemUtils {
 		}
 		return getNullStack();
 	}
+	
+	public static ItemStack getItemListObject(String aObjectFromExperimentalName, String aReplacementName, int aAmount) {
+		ItemList aItemListObject = getItemListObject(aReplacementName, aReplacementName);
+		if (aItemListObject == ItemList.NULL || aItemListObject == null) {
+			return null;
+		}
+		else {
+			return aItemListObject.get(aAmount);
+		}
+	}
+	
+	public static ItemStack getItemListObject(ItemList aItemListObject, int aAmount) {
+		if (aItemListObject == ItemList.NULL || aItemListObject == null) {
+			return null;
+		}
+		else {
+			return aItemListObject.get(aAmount);
+		}
+	}
+
+	public static ItemList getItemListObject(String aObjectFromExperimentalName, String aReplacementName) {
+		ItemList aVal = ItemList.valueOf(aObjectFromExperimentalName);
+		if (aVal != null) {
+			return aVal;
+		}
+		else {
+			aVal = ItemList.valueOf(aReplacementName);
+			if (aVal != null) {
+				return aVal;
+			}
+			else {
+				return ItemList.NULL;
+			}
+		}		
+	}
 
 }