+ Added Chemical Plant.

+ Added more Bio Recipes.
$ Fixed Strontium Hydroxide generating before it's components.
$ Fixed existing Bio Recipes not working.

8 files changed, 268 insertions, 46 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index fd30457b46..0b1078366a 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -135,6 +135,7 @@ public class COMPAT_HANDLER {
 			GregtechSolarTower.run();
 			GregtechLargeTurbinesAndHeatExchanger.run();
 			GregtechPowerBreakers.run();
+			GregtechFluidReactor.run();
 
 			//New Horizons Content
 			NewHorizonsAccelerator.run();
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 96fe5694cc..8bfcfe2d70 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -1055,10 +1055,10 @@ public final class ModItems {
 			GT_OreDictUnificator.registerOre("platePhasedIron", ItemUtils.getSimpleStack(itemPlatePulsatingIron));
 			GT_OreDictUnificator.registerOre("blockVibrantAlloy", ItemUtils.getItemStackOfAmountFromOreDict("blockPhasedGold", 1));			
 
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(16), 16, 4);
-			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), null, MaterialEIO.REDSTONE_ALLOY.getFluid(1294), 16, 4*9*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getPlate(1), MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getIngot(1), MaterialEIO.REDSTONE_ALLOY.getFluid(144), 16, 4*9);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getNugget(1), MaterialEIO.REDSTONE_ALLOY.getFluid(16), 16, 4);
+			CORE.RA.addFluidExtractionRecipe(MaterialEIO.REDSTONE_ALLOY.getBlock(1), MaterialEIO.REDSTONE_ALLOY.getFluid(1294), 16, 4*9*9);
 			
 		}
 		else {
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index fd0d044c05..324a3aa9ee 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.item.chemistry;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.List;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
@@ -15,6 +16,11 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.plugin.agrichem.BioRecipes;
+import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
+import gtPlusPlus.plugin.agrichem.item.algae.ItemAlgaeBase;
+import gtPlusPlus.plugin.agrichem.item.algae.ItemBioChip;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -71,6 +77,60 @@ public class AgriculturalChem extends ItemPackage {
 	// Fertilizer
 
 
+	
+	public static Item mAlgae;
+	public static Item mBioCircuit;
+	public static Item mAgrichemItem1;
+	
+	/*
+	 * 0 - Algae Biomass
+	 * 1 - Green Algae Biomass
+	 * 2 - Brown Algae Biomass
+	 * 3 - Golden-Brown Algae Biomass
+	 * 4 - Red Algae Biomass
+	 * 5 - Cellulose Fiber
+	 * 6 - Golden-Brown Cellulose Fiber
+	 * 7 - Red Cellulose Fiber
+	 * 8 - Compost
+	 * 9 - Wood Pellet
+	 * 10 - Wood Brick
+	 * 11 - Cellulose Pulp
+	 * 12 - Raw Bio Resin
+	 * 13 - Catalyst Carrier
+	 * 14 - Green Metal Catalyst
+	 * 15 - Alginic Acid
+	 * 16 - Alumina
+	 * 17 - Aluminium Pellet
+	 * 18 - Sodium Aluminate
+	 * 19 - Sodium Hydroxide // Exists in Newer GT
+	 * 20 - Sodium Carbonate
+	 * 21 - Lithium Chloride
+	 */
+
+	public static ItemStack mAlgaeBiosmass;
+	public static ItemStack mGreenAlgaeBiosmass;
+	public static ItemStack mBrownAlgaeBiosmass;
+	public static ItemStack mGoldenBrownAlgaeBiosmass;
+	public static ItemStack mRedAlgaeBiosmass;
+	public static ItemStack mCelluloseFiber;
+	public static ItemStack mGoldenBrownCelluloseFiber;
+	public static ItemStack mRedCelluloseFiber;
+	public static ItemStack mCompost;
+	public static ItemStack mWoodPellet;
+	public static ItemStack mWoodBrick;
+	public static ItemStack mCellulosePulp;
+	public static ItemStack mRawBioResin;
+	public static ItemStack mCatalystCarrier;
+	public static ItemStack mGreenCatalyst;
+	public static ItemStack mAlginicAcid;
+	public static ItemStack mAlumina;
+	public static ItemStack mAluminiumPellet;
+	public static ItemStack mSodiumAluminate;
+	public static ItemStack mSodiumHydroxide;
+	public static ItemStack mSodiumCarbonate;
+	public static ItemStack mLithiumChloride;
+	
+
 	@Override
 	public void items() {
 		// Nitrogen, Ammonium Nitrate, Phosphates, Calcium, Copper, Carbon
@@ -82,7 +142,91 @@ public class AgriculturalChem extends ItemPackage {
 				"Ca5(PO4)3(OH)", Utils.rgbtoHexValue(240, 240, 240))[0];
 
 		// Dirt Dust :)
-		dustDirt = ItemUtils.generateSpecialUseDusts("Dirt", "Dried Earth", Utils.rgbtoHexValue(65, 50, 15))[0];		
+		dustDirt = ItemUtils.generateSpecialUseDusts("Dirt", "Dried Earth", Utils.rgbtoHexValue(65, 50, 15))[0];	
+		
+		mAlgae = new ItemAlgaeBase();
+		mAgrichemItem1 = new ItemAgrichemBase();
+		mBioCircuit = new ItemBioChip();		
+		GregtechItemList.Circuit_BioRecipeSelector.set(mBioCircuit);
+		
+		
+
+		mAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 0, 1);
+		mGreenAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 1, 1);
+		mBrownAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 2, 1);
+		mGoldenBrownAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 3, 1);
+		mRedAlgaeBiosmass = ItemUtils.simpleMetaStack(mAgrichemItem1, 4, 1);
+		mCelluloseFiber = ItemUtils.simpleMetaStack(mAgrichemItem1, 5, 1);
+		mGoldenBrownCelluloseFiber = ItemUtils.simpleMetaStack(mAgrichemItem1, 6, 1);
+		mRedCelluloseFiber = ItemUtils.simpleMetaStack(mAgrichemItem1, 7, 1);
+		mCompost = ItemUtils.simpleMetaStack(mAgrichemItem1, 8, 1);
+		mWoodPellet = ItemUtils.simpleMetaStack(mAgrichemItem1, 9, 1);
+		mWoodBrick = ItemUtils.simpleMetaStack(mAgrichemItem1, 10, 1);
+		mCellulosePulp = ItemUtils.simpleMetaStack(mAgrichemItem1, 11, 1);
+		mRawBioResin = ItemUtils.simpleMetaStack(mAgrichemItem1, 12, 1);
+		mCatalystCarrier = ItemUtils.simpleMetaStack(mAgrichemItem1, 13, 1);
+		mGreenCatalyst = ItemUtils.simpleMetaStack(mAgrichemItem1, 14, 1);
+		mAlginicAcid = ItemUtils.simpleMetaStack(mAgrichemItem1, 15, 1);
+		mAlumina = ItemUtils.simpleMetaStack(mAgrichemItem1, 16, 1);
+		mAluminiumPellet = ItemUtils.simpleMetaStack(mAgrichemItem1, 17, 1);
+		mSodiumAluminate = ItemUtils.simpleMetaStack(mAgrichemItem1, 18, 1);
+		
+		/**
+		 * If It exists, don't add a new one.
+		 */
+		if (OreDictionary.doesOreNameExist("dustSodiumHydroxide_GT5U") || OreDictionary.doesOreNameExist("dustSodiumHydroxide")) {
+			List<ItemStack> aTest = OreDictionary.getOres("dustSodiumHydroxide", false);
+			ItemStack aTestStack;
+			if (aTest.isEmpty()) {
+				aTest = OreDictionary.getOres("dustSodiumHydroxide_GT5U", false);
+				if (aTest.isEmpty()) {
+					aTestStack = ItemUtils.simpleMetaStack(mAgrichemItem1, 19, 1);	
+				}
+				else {
+					aTestStack = aTest.get(0);
+				}
+			}
+			else {
+				aTestStack = aTest.get(0);
+			}
+			mSodiumHydroxide = aTestStack;
+		}
+		else {
+			mSodiumHydroxide = ItemUtils.simpleMetaStack(mAgrichemItem1, 19, 1);			
+		}		
+		mSodiumCarbonate = ItemUtils.simpleMetaStack(mAgrichemItem1, 20, 1);
+		mLithiumChloride = ItemUtils.simpleMetaStack(mAgrichemItem1, 21, 1);
+
+		ItemUtils.addItemToOreDictionary(mGreenAlgaeBiosmass, "biomassGreenAlgae");
+		ItemUtils.addItemToOreDictionary(mBrownAlgaeBiosmass, "biomassBrownAlgae");
+		ItemUtils.addItemToOreDictionary(mGoldenBrownAlgaeBiosmass, "biomassGoldenBrownAlgae");
+		ItemUtils.addItemToOreDictionary(mRedAlgaeBiosmass, "biomassRedAlgae");
+
+		ItemUtils.addItemToOreDictionary(mCelluloseFiber, "fiberCellulose");
+		ItemUtils.addItemToOreDictionary(mGoldenBrownCelluloseFiber, "fiberCellulose");
+		ItemUtils.addItemToOreDictionary(mGoldenBrownCelluloseFiber, "fiberGoldenBrownCellulose");
+		ItemUtils.addItemToOreDictionary(mRedCelluloseFiber, "fiberCellulose");
+		ItemUtils.addItemToOreDictionary(mRedCelluloseFiber, "fiberRedCellulose");
+		
+		ItemUtils.addItemToOreDictionary(mWoodPellet, "pelletWood");
+		ItemUtils.addItemToOreDictionary(mWoodBrick, "brickWood");
+		ItemUtils.addItemToOreDictionary(mCellulosePulp, "pulpCellulose");
+
+		ItemUtils.addItemToOreDictionary(mCatalystCarrier, "catalystEmpty");
+		ItemUtils.addItemToOreDictionary(mGreenCatalyst, "catalystAluminiumSilver");
+		ItemUtils.addItemToOreDictionary(mAlginicAcid, "dustAlginicAcid");
+		ItemUtils.addItemToOreDictionary(mAlumina, "dustAlumina");
+		ItemUtils.addItemToOreDictionary(mAluminiumPellet, "pelletAluminium");
+
+		ItemUtils.addItemToOreDictionary(mSodiumAluminate, "dustSodiumAluminate");
+		if (mSodiumHydroxide.getItem() instanceof ItemAgrichemBase) {
+			ItemUtils.addItemToOreDictionary(mSodiumHydroxide, "dustSodiumHydroxide");			
+		}
+		ItemUtils.addItemToOreDictionary(mSodiumCarbonate, "dustSodiumCarbonate");
+		ItemUtils.addItemToOreDictionary(mLithiumChloride, "dustLithiumChloride");	
+		
+		
+		
 	}
 
 	@Override
@@ -156,20 +300,20 @@ public class AgriculturalChem extends ItemPackage {
 
 	}
 
-	private static AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mFish = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mVege = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mSeeds = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mPeat = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mBones = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mBoneMeal = new AutoMap<ItemStack>();
-
-	private static AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mList_Master_Bones = new AutoMap<ItemStack>();
-	private static AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+	public final static AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>();
+	public final static AutoMap<ItemStack> mFish = new AutoMap<ItemStack>();
+	public final static AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>();
+	public final static AutoMap<ItemStack> mVege = new AutoMap<ItemStack>();
+	public final static AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>();
+	public final static AutoMap<ItemStack> mSeeds = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mPeat = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mBones = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mBoneMeal = new AutoMap<ItemStack>();
+
+	public final static AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>();
+	public final static AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>();
+	public final static AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>();
+	private final static AutoMap<ItemStack> mList_Master_Bones = new AutoMap<ItemStack>();
 
 	private static void processAllOreDict() {
 		processOreDict("listAllmeatraw", mMeats);
@@ -323,6 +467,10 @@ public class AgriculturalChem extends ItemPackage {
 			}
 		}
 	}
+	
+	public static ItemStack aFertForestry;
+	public static ItemStack aFertIC2;
+	
 
 	private static void addMiscRecipes() {
 
@@ -342,6 +490,7 @@ public class AgriculturalChem extends ItemPackage {
 					Field aFertField = ReflectionUtils.getField(aItemRegInstance.getClass(), "fertilizerCompound");	
 					Object aItemInstance = aFertField.get(aItemRegInstance);
 					if (aItemInstance instanceof Item) {
+						aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance);
 						Item aForestryFert = (Item) aItemInstance;
 						CORE.RA.addDehydratorRecipe(
 								new ItemStack[] { CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
@@ -359,6 +508,7 @@ public class AgriculturalChem extends ItemPackage {
 		 * IC2 Support
 		 */
 		if (LoadedMods.IndustrialCraft2) {
+			aFertIC2 = ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 1);
 			CORE.RA.addDehydratorRecipe(
 					new ItemStack[] { CI.getNumberedCircuit(12), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, null,
 					null, new ItemStack[] { ItemUtils.getItemStackFromFQRN("IC2:itemFertilizer", 3), aManureByprod,
@@ -414,6 +564,9 @@ public class AgriculturalChem extends ItemPackage {
 		addAdvancedOrganiseFertRecipes();
 
 		addMiscRecipes();
+		
+		BioRecipes.init();
+		
 		return true;
 	}
 }
diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index b38451bba3..8dad69f70a 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -38,24 +38,6 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
 			});
 
-	public static final Material STRONTIUM_HYDROXIDE = new Material(
-			"Strontium Hydroxide", 
-			MaterialState.SOLID, 
-			TextureSet.SET_METALLIC,
-			null,
-			-1,
-			-1,
-			-1,
-			-1, 
-			false, 
-			"Sr(OH)2",
-			0, 
-			false,
-			new MaterialStack[]{
-					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
-					new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
-			});
-
 	public static final Material SELENIUM_DIOXIDE = new Material(
 			"Selenium Dioxide",
 			MaterialState.PURE_LIQUID, //State
@@ -303,6 +285,24 @@ public final class MISC_MATERIALS {
 					new MaterialStack(SODIUM_CHLORIDE, 2),
 			});
 
+	public static final Material STRONTIUM_HYDROXIDE = new Material(
+			"Strontium Hydroxide", 
+			MaterialState.SOLID, 
+			TextureSet.SET_METALLIC,
+			null,
+			-1,
+			-1,
+			-1,
+			-1, 
+			false, 
+			"Sr(OH)2",
+			0, 
+			false,
+			new MaterialStack[]{
+					new MaterialStack(ELEMENT.getInstance().STRONTIUM, 1),
+					new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
+			});
+
 
 
 }
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index f237eb9f37..3f631e0bca 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1588,18 +1588,18 @@ public class RECIPES_GREGTECH {
 
 	private static void fluidExtractorRecipes() {		
 		//FLiBe fuel
-		CORE.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 1), null,
+		CORE.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLi2BeF4", 1),
 				FluidUtils.getFluidStack("li2bef4", 144), 100, 500);
 		//LFTR Fuel 1
-		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4U235.getDust(1), null,
+		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4U235.getDust(1),
 				NUCLIDE.LiFBeF2ZrF4U235.getFluid(144), 250, 1000);
-		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4UF4.getDust(1), null,
+		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4UF4.getDust(1),
 				NUCLIDE.LiFBeF2ZrF4UF4.getFluid(144), 150, 2000);
-		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ThF4UF4.getDust(1), null,
+		CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ThF4UF4.getDust(1),
 				NUCLIDE.LiFBeF2ThF4UF4.getFluid(144), 200, 1500);
 
 		//ZIRCONIUM_TETRAFLUORIDE
-		CORE.RA.addFluidExtractionRecipe(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1), null,
+		CORE.RA.addFluidExtractionRecipe(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1),
 				FluidUtils.getFluidStack(ModItems.fluidZrF4, 144), 200, 512+256);
 
 
diff --git a/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java b/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
new file mode 100644
index 0000000000..6cd13dc209
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java
@@ -0,0 +1,45 @@
+package gtPlusPlus.core.slots;
+
+import gregtech.api.util.Recipe_GT;
+import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+public class SlotChemicalPlantInput extends Slot {
+
+	public SlotChemicalPlantInput(final IInventory inventory, final int index, final int x, final int y) {
+		super(inventory, index, x, y);
+	}
+
+	@Override
+	public boolean isItemValid(final ItemStack itemstack) {
+		return isItemValidForChemicalPlantSlot(itemstack);
+	}
+	
+	public static boolean isItemValidForChemicalPlantSlot(ItemStack aStack) {
+		boolean validItem = Gregtech_Recipe_Map.sFluidChemicalReactorRecipes.containsInput(aStack);		
+		if (!validItem) {
+			for (Recipe_GT f : Gregtech_Recipe_Map.sFluidChemicalReactorRecipes.mRecipeList) {
+				if (f.mFluidInputs.length > 0) {
+					for (FluidStack g : f.mFluidInputs) {
+						if (g != null) {
+							if (FluidContainerRegistry.containsFluid(aStack, g)) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+		}		
+		return validItem;
+	}
+
+	@Override
+	public int getSlotStackLimit() {
+		return 64;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java b/src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java
new file mode 100644
index 0000000000..42bc7ce346
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/slots/SlotNoInputLogging.java
@@ -0,0 +1,25 @@
+package gtPlusPlus.core.slots;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+
+public class SlotNoInputLogging extends SlotNoInput {
+
+	private final int aSlotIndex;
+	
+	public SlotNoInputLogging(final IInventory inventory, final int index, final int x, final int y) {
+		super(inventory, index, x, y);
+		aSlotIndex = index;
+	}
+
+	@Override
+	public boolean isItemValid(final ItemStack itemstack) {
+		if (ItemUtils.checkForInvalidItems(itemstack)) {
+			Logger.INFO("Tried Inserting "+ItemUtils.getItemName(itemstack)+" into slot "+aSlotIndex);
+		}		
+		return false;
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index 8902947c0d..d7b6bc0a30 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -463,8 +463,7 @@ public class FluidUtils {
 
 			if (dustStack != null){
 				CORE.RA.addFluidExtractionRecipe(
-						dustStack, //Input
-						null, //Input 2
+						dustStack, //Input 2
 						FluidUtils.getFluidStack(gtFluid, amountPerItem), //Fluid Output
 						1*20, //Duration
 						16 //Eu Tick
@@ -472,8 +471,7 @@ public class FluidUtils {
 			}
 			if (dustStack2 != null){
 				CORE.RA.addFluidExtractionRecipe(
-						dustStack2, //Input
-						null, //Input 2
+						dustStack2, //Input 2
 						FluidUtils.getFluidStack(gtFluid, amountPerItem), //Fluid Output
 						1*20, //Duration
 						16 //Eu Tick