Merge pull request #156 from draknyte1/Multiblock-Fix

Multiblock fix for #141, other misc. fixes & a few new additions.

1 files changed, 95 insertions, 95 deletions

diff --git a/src/Java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java b/src/Java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java
index 401bd19e83..ce4ec38a09 100644
--- a/src/Java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java
+++ b/src/Java/gtPlusPlus/xmod/mekanism/HANDLER_Mekanism.java
@@ -27,180 +27,180 @@ public class HANDLER_Mekanism {
 	}
 
 	public static void postInit(){
-		if (LoadedMods.Mekanism){
-			
+		if (LoadedMods.Mekanism && !LoadedMods.RedTech){
+
 			Utils.LOG_INFO("Performing GT recipe balance for Mek. now that it's Osmium is useless.");
-			
+
 			//Steel Casing
-			ItemStack tSteelCasing = ItemUtils.simpleMetaStack("Mekanism:BasicBlock:8", 8, 1);
+			final ItemStack tSteelCasing = ItemUtils.simpleMetaStack("Mekanism:BasicBlock:8", 8, 1);
 			addNewRecipe(
-					"plateSteel", "blockGlass", "plateSteel", 
-					"blockGlass", "plateStainlessSteel", "blockGlass", 
+					"plateSteel", "blockGlass", "plateSteel",
+					"blockGlass", "plateStainlessSteel", "blockGlass",
 					"plateSteel", "blockGlass", "plateSteel",
 					tSteelCasing);
 
 			//Energy Storage
-			ItemStack tAdvancedEnergyCube = ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy();
+			final ItemStack tAdvancedEnergyCube = ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy();
 			NBTUtils.setString(tAdvancedEnergyCube, "tier", "Advanced");
-			ItemStack tBasicEnergyCube = ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy();
+			final ItemStack tBasicEnergyCube = ItemUtils.simpleMetaStack("Mekanism:EnergyCube", 0, 1).copy();
 			NBTUtils.setString(tBasicEnergyCube, "tier", "Basic");
 
 			//Gas tanks
-			ItemStack tBasicGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
+			final ItemStack tBasicGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
 			NBTUtils.setInteger(tBasicGasTank, "tier", 0);
-			ItemStack tAdvancedGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
+			final ItemStack tAdvancedGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
 			NBTUtils.setInteger(tAdvancedGasTank, "tier", 1);
-			ItemStack tEliteGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
+			final ItemStack tEliteGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
 			NBTUtils.setInteger(tEliteGasTank, "tier", 2);
-			ItemStack tMasterGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
+			final ItemStack tMasterGasTank = ItemUtils.simpleMetaStack("Mekanism:GasTank", 0, 1).copy();
 			NBTUtils.setInteger(tMasterGasTank, "tier", 3);
 
 			//Machines that use Osmium
-			ItemStack tMachineBlock_Basic = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:5", 5, 1);
-			ItemStack tMachineBlock = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:6", 6, 1);
+			final ItemStack tMachineBlock_Basic = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:5", 5, 1);
+			final ItemStack tMachineBlock = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:6", 6, 1);
 
 			//Smelting
-			ItemStack tMachineBlock_0_Basic = tMachineBlock_Basic.copy();
+			final ItemStack tMachineBlock_0_Basic = tMachineBlock_Basic.copy();
 			NBTUtils.setInteger(tMachineBlock_0_Basic, "recipeType", 0);
-			ItemStack tMachineBlock_0 = tMachineBlock.copy();
+			final ItemStack tMachineBlock_0 = tMachineBlock.copy();
 			NBTUtils.setInteger(tMachineBlock_0, "recipeType", 0);
 			//Enriching
-			ItemStack tMachineBlock_1_Basic = tMachineBlock_Basic.copy();
+			final ItemStack tMachineBlock_1_Basic = tMachineBlock_Basic.copy();
 			NBTUtils.setInteger(tMachineBlock_1_Basic, "recipeType", 1);
-			ItemStack tMachineBlock_1 = tMachineBlock.copy();
+			final ItemStack tMachineBlock_1 = tMachineBlock.copy();
 			NBTUtils.setInteger(tMachineBlock_1, "recipeType", 1);
 			//Crushing
-			ItemStack tMachineBlock_2_Basic = tMachineBlock_Basic.copy();
+			final ItemStack tMachineBlock_2_Basic = tMachineBlock_Basic.copy();
 			NBTUtils.setInteger(tMachineBlock_2_Basic, "recipeType", 2);
-			ItemStack tMachineBlock_2 = tMachineBlock.copy();
+			final ItemStack tMachineBlock_2 = tMachineBlock.copy();
 			NBTUtils.setInteger(tMachineBlock_2, "recipeType", 2);
 			//Compressing
-			ItemStack tMachineBlock_3_Basic = tMachineBlock_Basic.copy();
+			final ItemStack tMachineBlock_3_Basic = tMachineBlock_Basic.copy();
 			NBTUtils.setInteger(tMachineBlock_3_Basic, "recipeType", 3);
-			ItemStack tMachineBlock_3 = tMachineBlock.copy();
+			final ItemStack tMachineBlock_3 = tMachineBlock.copy();
 			NBTUtils.setInteger(tMachineBlock_3, "recipeType", 3);
 			//Combining
-			ItemStack tMachineBlock_4_Basic = tMachineBlock_Basic.copy();
+			final ItemStack tMachineBlock_4_Basic = tMachineBlock_Basic.copy();
 			NBTUtils.setInteger(tMachineBlock_4_Basic, "recipeType", 4);
-			ItemStack tMachineBlock_4 = tMachineBlock.copy();
+			final ItemStack tMachineBlock_4 = tMachineBlock.copy();
 			NBTUtils.setInteger(tMachineBlock_4, "recipeType", 4);
 			//Purifying
-			ItemStack tMachineBlock_5_Basic = tMachineBlock_Basic.copy();
+			final ItemStack tMachineBlock_5_Basic = tMachineBlock_Basic.copy();
 			NBTUtils.setInteger(tMachineBlock_5_Basic, "recipeType", 5);
-			ItemStack tMachineBlock_5 = tMachineBlock.copy();
+			final ItemStack tMachineBlock_5 = tMachineBlock.copy();
 			NBTUtils.setInteger(tMachineBlock_5, "recipeType", 5);
 			//Injecting
-			ItemStack tMachineBlock_6_Basic = tMachineBlock_Basic.copy();
+			final ItemStack tMachineBlock_6_Basic = tMachineBlock_Basic.copy();
 			NBTUtils.setInteger(tMachineBlock_6_Basic, "recipeType", 6);
-			ItemStack tMachineBlock_6 = tMachineBlock.copy();
+			final ItemStack tMachineBlock_6 = tMachineBlock.copy();
 			NBTUtils.setInteger(tMachineBlock_6, "recipeType", 6);
 			//Infusing
-			ItemStack tMachineBlock_7_Basic = tMachineBlock_Basic.copy();
+			final ItemStack tMachineBlock_7_Basic = tMachineBlock_Basic.copy();
 			NBTUtils.setInteger(tMachineBlock_7_Basic, "recipeType", 7);
-			ItemStack tMachineBlock_7 = tMachineBlock.copy();
+			final ItemStack tMachineBlock_7 = tMachineBlock.copy();
 			NBTUtils.setInteger(tMachineBlock_7, "recipeType", 7);
 
 			//Infuser
-			ItemStack tMachineBlock_8 = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:8", 8, 1);
+			final ItemStack tMachineBlock_8 = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:8", 8, 1);
 			//Purification
-			ItemStack tMachineBlock_9 = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:9", 9, 1);
+			final ItemStack tMachineBlock_9 = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:9", 9, 1);
 			//Pump
-			ItemStack tMachineBlock_12 = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:12", 12, 1);
+			final ItemStack tMachineBlock_12 = ItemUtils.simpleMetaStack("Mekanism:MachineBlock:12", 12, 1);
 
 			//<Mekanism:ElectrolyticCore>
-			ItemStack tItem_1 = ItemUtils.simpleMetaStack("Mekanism:ElectrolyticCore", 0, 1);
+			final ItemStack tItem_1 = ItemUtils.simpleMetaStack("Mekanism:ElectrolyticCore", 0, 1);
 			//<Mekanism:FactoryInstaller:1>
-			ItemStack tItem_2 = ItemUtils.simpleMetaStack("Mekanism:FactoryInstaller:1", 1, 1);
+			final ItemStack tItem_2 = ItemUtils.simpleMetaStack("Mekanism:FactoryInstaller:1", 1, 1);
 			//<Mekanism:SpeedUpgrade>
-			ItemStack tItem_3 = ItemUtils.simpleMetaStack("Mekanism:SpeedUpgrade", 0, 1);
+			final ItemStack tItem_3 = ItemUtils.simpleMetaStack("Mekanism:SpeedUpgrade", 0, 1);
 
 			//MiscItems
-			String tAdvancedAlloy = "alloyAdvanced";
-			String tCircuitAdvanced = "circuitAdvanced";
-			ItemStack tMekBatterySimple = ItemUtils.simpleMetaStack("Mekanism:EnergyTablet", 0, 1);
+			final String tAdvancedAlloy = "alloyAdvanced";
+			final String tCircuitAdvanced = "circuitAdvanced";
+			final ItemStack tMekBatterySimple = ItemUtils.simpleMetaStack("Mekanism:EnergyTablet", 0, 1);
 
 			//Items
 			addNewRecipe(
-					tAdvancedAlloy, "plateTitanium", tAdvancedAlloy, 
-					"dustIron", tAdvancedAlloy, "dustGold", 
-					tAdvancedAlloy, "plateTitanium", tAdvancedAlloy, 
+					tAdvancedAlloy, "plateTitanium", tAdvancedAlloy,
+					"dustIron", tAdvancedAlloy, "dustGold",
+					tAdvancedAlloy, "plateTitanium", tAdvancedAlloy,
 					tItem_1);
 			addNewRecipe(
-					tAdvancedAlloy, "circuitAdvanced", tAdvancedAlloy, 
-					"plateStainlessSteel", "plankWood", "plateStainlessSteel", 
-					tAdvancedAlloy, "circuitAdvanced", tAdvancedAlloy, 
+					tAdvancedAlloy, "circuitAdvanced", tAdvancedAlloy,
+					"plateStainlessSteel", "plankWood", "plateStainlessSteel",
+					tAdvancedAlloy, "circuitAdvanced", tAdvancedAlloy,
 					tItem_2);
 			addNewRecipe(
-					null, "blockGlass", null, 
-					tAdvancedAlloy, "plateTungsten", tAdvancedAlloy, 
-					null, "blockGlass", null, 
+					null, "blockGlass", null,
+					tAdvancedAlloy, "plateTungsten", tAdvancedAlloy,
+					null, "blockGlass", null,
 					tItem_3);
 
 			//Power Storage
 			addNewRecipe(
-					tAdvancedAlloy, tMekBatterySimple, tAdvancedAlloy, 
-					"plateAluminium", tBasicEnergyCube, "plateAluminium", 
-					tAdvancedAlloy, tMekBatterySimple, tAdvancedAlloy, 
+					tAdvancedAlloy, tMekBatterySimple, tAdvancedAlloy,
+					"plateAluminium", tBasicEnergyCube, "plateAluminium",
+					tAdvancedAlloy, tMekBatterySimple, tAdvancedAlloy,
 					tAdvancedEnergyCube);
 
 			//Blocks
 			addNewRecipe(
-					"plateSteel", "craftingFurnace", "plateSteel", 
-					"plateRedstone", "platePlatinum", "plateRedstone", 
-					"plateSteel", "craftingFurnace", "plateSteel", 
+					"plateSteel", "craftingFurnace", "plateSteel",
+					"plateRedstone", "platePlatinum", "plateRedstone",
+					"plateSteel", "craftingFurnace", "plateSteel",
 					tMachineBlock_8);
 			addNewRecipe(
-					tAdvancedAlloy, "circuitAdvanced", tAdvancedAlloy, 
-					"plateTitanium", ItemUtils.simpleMetaStack("Mekanism:MachineBlock", 0, 1), "plateTitanium", 
-					tAdvancedAlloy, "circuitAdvanced", tAdvancedAlloy, 
+					tAdvancedAlloy, "circuitAdvanced", tAdvancedAlloy,
+					"plateTitanium", ItemUtils.simpleMetaStack("Mekanism:MachineBlock", 0, 1), "plateTitanium",
+					tAdvancedAlloy, "circuitAdvanced", tAdvancedAlloy,
 					tMachineBlock_9);
 			addNewRecipe(
-					null, ItemUtils.getSimpleStack(Items.bucket), null, 
-					tAdvancedAlloy, tSteelCasing, tAdvancedAlloy, 
-					"plateStainlessSteel", "plateStainlessSteel", "plateStainlessSteel", 
+					null, ItemUtils.getSimpleStack(Items.bucket), null,
+					tAdvancedAlloy, tSteelCasing, tAdvancedAlloy,
+					"plateStainlessSteel", "plateStainlessSteel", "plateStainlessSteel",
 					tMachineBlock_12);
 
 			//Machines
 			addNewRecipe(
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
-					"plateStainlessSteel", tMachineBlock_0_Basic, "plateStainlessSteel", 
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
+					"plateStainlessSteel", tMachineBlock_0_Basic, "plateStainlessSteel",
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
 					tMachineBlock_0);
 			addNewRecipe(
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
-					"plateStainlessSteel", tMachineBlock_1_Basic, "plateStainlessSteel", 
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
+					"plateStainlessSteel", tMachineBlock_1_Basic, "plateStainlessSteel",
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
 					tMachineBlock_1);
 			addNewRecipe(
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
-					"plateStainlessSteel", tMachineBlock_2_Basic, "plateStainlessSteel", 
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,  
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
+					"plateStainlessSteel", tMachineBlock_2_Basic, "plateStainlessSteel",
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
 					tMachineBlock_2);
 			addNewRecipe(
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
-					"plateStainlessSteel", tMachineBlock_3_Basic, "plateStainlessSteel", 
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,  
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
+					"plateStainlessSteel", tMachineBlock_3_Basic, "plateStainlessSteel",
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
 					tMachineBlock_3);
 			addNewRecipe(
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,  
-					"plateStainlessSteel", tMachineBlock_4_Basic, "plateStainlessSteel", 
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,  
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
+					"plateStainlessSteel", tMachineBlock_4_Basic, "plateStainlessSteel",
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
 					tMachineBlock_4);
 			addNewRecipe(
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
-					"plateStainlessSteel", tMachineBlock_5_Basic, "plateStainlessSteel", 
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
+					"plateStainlessSteel", tMachineBlock_5_Basic, "plateStainlessSteel",
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
 					tMachineBlock_5);
 			addNewRecipe(
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,  
-					"plateStainlessSteel", tMachineBlock_6_Basic, "plateStainlessSteel", 
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
+					"plateStainlessSteel", tMachineBlock_6_Basic, "plateStainlessSteel",
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
 					tMachineBlock_6);
 			addNewRecipe(
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy, 
-					"plateStainlessSteel", tMachineBlock_7_Basic, "plateStainlessSteel", 
-					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,  
-					tMachineBlock_7);	
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
+					"plateStainlessSteel", tMachineBlock_7_Basic, "plateStainlessSteel",
+					tAdvancedAlloy, tCircuitAdvanced, tAdvancedAlloy,
+					tMachineBlock_7);
 
 			//Gas Tanks
 			addNewRecipe(
@@ -222,7 +222,7 @@ public class HANDLER_Mekanism {
 					"alloyUltimate", "plateTungsten", "alloyUltimate",
 					"plateTungsten", tEliteGasTank, "plateTungsten",
 					"alloyUltimate", "plateTungsten", "alloyUltimate",
-					tMasterGasTank);			
+					tMasterGasTank);
 		}
 	}
 
@@ -234,34 +234,34 @@ public class HANDLER_Mekanism {
 
 		/*if (removeRecipe(OutputItem)){
 			return RecipeUtils.recipeBuilder(
-					InputItem1, InputItem2, InputItem3, 
-					InputItem4, InputItem5, InputItem6, 
-					InputItem7, InputItem8, InputItem9, 
+					InputItem1, InputItem2, InputItem3,
+					InputItem4, InputItem5, InputItem6,
+					InputItem7, InputItem8, InputItem9,
 					OutputItem);
 		}*/
 
 		removeRecipe(OutputItem);
 		return RecipeUtils.recipeBuilder(
-				InputItem1, InputItem2, InputItem3, 
-				InputItem4, InputItem5, InputItem6, 
-				InputItem7, InputItem8, InputItem9, 
+				InputItem1, InputItem2, InputItem3,
+				InputItem4, InputItem5, InputItem6,
+				InputItem7, InputItem8, InputItem9,
 				OutputItem);
 	}
 
-	private static boolean removeRecipe(ItemStack item){
+	private static boolean removeRecipe(final ItemStack item){
 		Class<?> mekUtils;
 		boolean removed = false;
 		try {
 			mekUtils = Class.forName("mekanism.common.util.RecipeUtils");
 			if (mekUtils != null){
-				Method mRemoveRecipe = mekUtils.getDeclaredMethod("removeRecipes", ItemStack.class);
+				final Method mRemoveRecipe = mekUtils.getDeclaredMethod("removeRecipes", ItemStack.class);
 				if (mRemoveRecipe != null){
 					removed = (boolean) mRemoveRecipe.invoke(null, item);
 					if (!removed) {
 						removed = (boolean) mRemoveRecipe.invoke(mekUtils, item);
 					}
 				}
-			}		
+			}
 		} catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
 			Utils.LOG_INFO("[Mek] Failed to use the built-in recipe remover from Mekanism.");
 		}