Add RemoteIO and EnderIO support to Reservoir Hatch.

Changed Extreme Airtake from 5k/4t to 8k/4t.
Clean up some reflection.
Cleaned up GT_MetaTileEntity_Hatch_FluidGenerator.java.

4 files changed, 16 insertions, 10 deletions

diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
index 1eb8351d65..4f7a10be78 100644
--- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
@@ -60,6 +60,7 @@ public class LoadedMods {
 	public static boolean CropsPlusPlus = false; //Barts Crop Mod
 	public static boolean Reliquary = false;
 	public static boolean SpiceOfLife = false;
+	public static boolean RemoteIO = false;
 
 
 
@@ -322,6 +323,11 @@ public class LoadedMods {
 			Witchery  = true;
 			Logger.INFO("Components enabled for: Witchery");
 			totalMods++;
+		}	
+		if (isModLoaded("RIO")){
+			RemoteIO  = true;
+			Logger.INFO("Components enabled for: RemoteIO");
+			totalMods++;
 		}		
 
 		Logger.INFO("Content found for "+totalMods+" mods");
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 985e783430..f708a99af0 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -2764,11 +2764,11 @@ public class RECIPES_Machines {
 			return;
 		}
 		Class ModBlocksClass = ReflectionUtils.getClass("com.riciJak.Ztones.init.ModBlocks");
-		Block agon = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "agonBlock"));
-		Block korp = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "korpBlock"));
-		Block jelt = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "jeltBlock"));
-		Block bitt = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "bittBlock"));
-		Block iszm = (Block) ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "iszmBlock"));
+		Block agon = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "agonBlock"));
+		Block korp = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "korpBlock"));
+		Block jelt = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "jeltBlock"));
+		Block bitt = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "bittBlock"));
+		Block iszm = ReflectionUtils.getFieldValue( ReflectionUtils.getField(ModBlocksClass, "iszmBlock"));
 
 		// "agon", "iszm", "korp", "jelt", "bitt" 
 
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
index b322036ef7..0e2fff3f35 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
@@ -254,7 +254,7 @@ public class HazmatUtils {
 			aItemFields.add(ReflectionUtils.getField(aItemsGravisuite, "graviChestPlate"));			
 			AutoMap<ItemStack> aGravisuite = new AutoMap<ItemStack>();
 			for (Field aItemField : aItemFields) {
-				Item aItemObject = (Item) ReflectionUtils.getFieldValue(aItemField);
+				Item aItemObject = ReflectionUtils.getFieldValue(aItemField);
 				if (aItemObject != null) {
 					aGravisuite.add(ItemUtils.getSimpleStack(aItemObject));
 				}
@@ -274,7 +274,7 @@ public class HazmatUtils {
 			aItemFields.add(ReflectionUtils.getField(aItemsEMT, "ultimateSolarHelmet"));			
 			AutoMap<ItemStack> aASP = new AutoMap<ItemStack>();
 			for (Field aItemField : aItemFields) {
-				Item aItemObject = (Item) ReflectionUtils.getFieldValue(aItemField);
+				Item aItemObject = ReflectionUtils.getFieldValue(aItemField);
 				if (aItemObject != null) {
 					aASP.add(ItemUtils.getSimpleStack(aItemObject));
 				}
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index 1ef925f793..92804d72ec 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -1060,13 +1060,13 @@ public class ReflectionUtils {
 		return false;
 	}
 
-	public static Object getFieldValue(Field field) {
+	public static <T> T getFieldValue(Field field) {
 		return getFieldValue(field, null);
 	}
 
-	public static Object getFieldValue(Field field, Object instance) {
+	public static <T> T getFieldValue(Field field, Object instance) {
 		try {
-			return field.get(instance);
+			return (T) field.get(instance);
 		} catch (IllegalArgumentException | IllegalAccessException e) {
 		}
 		return null;