+ Added GT RF convertor.

$ Fixed Industrial Mixer not working with fluids.
$ Fixed COFH being a hard dependency.
$ Fixed Energy Buffers relying on the Rocket Engine config option.

5 files changed, 26 insertions, 8 deletions

diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
index ecaf031030..61e7045192 100644
--- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
@@ -113,6 +113,9 @@ public class ConfigHandler {
 				"gregtech", true, "Very basic automated cauldron for dust washing.");
 		enableMachine_Pollution = config.getBoolean("enableMachinePollution",
 				"gregtech", true, "Pollution Detector & Scrubbers.");
+		enableMachine_RF_Convetor = config.getBoolean("enableMachineRFConvetor", "gregtech",
+				true, "Converts RF to GTEU. Requires COFH-Core to be installed.");
+		
 	
 		// Multi machines
 		enableMultiblock_AlloyBlastSmelter = config.getBoolean("enableMultiblockAlloyBlastSmelter",
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 114750d2d9..354107147b 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -4,7 +4,6 @@ import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
 import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
@@ -14,7 +13,6 @@ import gtPlusPlus.core.common.compat.COMPAT_Baubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.BaseEuItem;
 import gtPlusPlus.core.item.base.BaseItemBackpack;
-import gtPlusPlus.core.item.base.BaseItemBurnable;
 import gtPlusPlus.core.item.base.BaseItemComponent.ComponentTypes;
 import gtPlusPlus.core.item.base.BaseItemDamageable;
 import gtPlusPlus.core.item.base.BaseItemTCShard;
@@ -55,7 +53,6 @@ import gtPlusPlus.core.item.general.ItemGenericToken;
 import gtPlusPlus.core.item.general.ItemGiantEgg;
 import gtPlusPlus.core.item.general.ItemHalfCompleteCasings;
 import gtPlusPlus.core.item.general.ItemLavaFilter;
-import gtPlusPlus.core.item.general.RF2EU_Battery;
 import gtPlusPlus.core.item.general.books.ItemBaseBook;
 import gtPlusPlus.core.item.general.capture.ItemEntityCatcher;
 import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis;
@@ -97,6 +94,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.everglades.GTplusplus_Everglades;
+import gtPlusPlus.xmod.cofh.HANDLER_COFH;
 import gtPlusPlus.xmod.eio.material.MaterialEIO;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
 import net.minecraft.item.EnumRarity;
@@ -1135,10 +1133,6 @@ public final class ModItems {
 		if (LoadedMods.IndustrialCraft2|| LOAD_ALL_CONTENT){
 			Logger.INFO("IndustrialCraft2 Found - Loading Resources.");
 			
-			if (LoadedMods.CoFHCore) {
-				RfEuBattery = new RF2EU_Battery();				
-			}
-
 			//Baubles Mod Test
 			try {
 				final Class<?> baublesTest = ReflectionUtils.getClass("baubles.api.IBauble");
@@ -1167,7 +1161,7 @@ public final class ModItems {
 
 		//UtilsItems.generateSpawnEgg("ic2", "boatcarbon", Utils.generateSingularRandomHexValue(), Utils.generateSingularRandomHexValue());
 
-
+		HANDLER_COFH.initItems();
 
 		/*
 		 * Misc Items
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 2a267dc16d..34d7475df3 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -237,6 +237,7 @@ public class CORE {
 		public static boolean enableMachine_ComponentAssemblers = false;
 		public static boolean enableCustom_Pipes = true;
 		public static boolean enableCustom_Cables = true;
+		public static boolean enableMachine_RF_Convetor = false;
 
 		//Multiblocks
 		public static boolean enableMultiblock_AlloyBlastSmelter = true;
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 672b50e16b..2165f27ec7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -605,6 +605,16 @@ public class RECIPES_Machines {
 						plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy,
 						RECIPE_SteamCondenser);
 			}
+			
+
+			//Steam Condenser
+			if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor){
+				RecipeUtils.addShapedGregtechRecipe(
+						CI.getPlate(4, 1), CI.getTieredCircuitOreDictName(5), CI.getPlate(4, 1),
+						CI.getTransmissionComponent(3, 1), CI.getTieredGTPPMachineCasing(4, 1), CI.getTransmissionComponent(3, 1),
+						CI.getPlate(4, 1), plateEnergeticAlloy, CI.getPlate(4, 1),
+						GregtechItemList.Energy_Buffer_RF_Convertor.get(1));
+			}
 
 
 			if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace){
diff --git a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
index 3e96220995..6f5bb5b453 100644
--- a/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
+++ b/src/Java/gtPlusPlus/core/util/data/ArrayUtils.java
@@ -10,6 +10,7 @@ import java.util.Set;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
 
 public class ArrayUtils {
 
@@ -88,5 +89,14 @@ public class ArrayUtils {
 		return org.apache.commons.lang3.ArrayUtils.toString(aArray);
 	}
 
+	public static <T> Object[] getArrayFromArrayList(ArrayList<T> aArrayList) {
+		Object[] aGenericArray = new Object[aArrayList.size()];
+		int aIndex = 0;
+		for (T object : aArrayList) {
+			aGenericArray[aIndex++] = object;
+		}
+		return aGenericArray;
+	}
+
 }