Merge pull request #36 from GTNewHorizons/structurelib-interation

structurelib interation and disable some multis

2 files changed, 20 insertions, 20 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index f361fc8025..7410a507c4 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -511,7 +511,7 @@ public class RECIPES_GREGTECH {
 				(int) MaterialUtils.getVoltageForTier(6));
 
 		//Slow Fusion Controller
-		CORE.RA.addAssemblylineRecipe(
+		/*CORE.RA.addAssemblylineRecipe(
 				GregtechItemList.COMET_Cyclotron.get(1), 
 				20 * 60 * 30,
 				new ItemStack[] {
@@ -536,11 +536,11 @@ public class RECIPES_GREGTECH {
 				},
 				GregtechItemList.Miniature_Fusion.get(1), 
 				20 * 60 * 5 * (GTNH ? 2 : 1),
-				(int) MaterialUtils.getVoltageForTier(7));
+				(int) MaterialUtils.getVoltageForTier(7));*/
 
 
 		//Plasma Tank
-		CORE.RA.addAssemblylineRecipe(
+		/*CORE.RA.addAssemblylineRecipe(
 				ItemUtils.getOrePrefixStack(OrePrefixes.pipeMedium, Materials.Superconductor, 1), 
 				20 * 60 * 5,
 				new ItemStack[] {
@@ -559,7 +559,7 @@ public class RECIPES_GREGTECH {
 				},
 				GregtechItemList.Plasma_Tank.get(1), 
 				20 * 60 * 1 * (GTNH ? 2 : 1),
-				(int) MaterialUtils.getVoltageForTier(5));
+				(int) MaterialUtils.getVoltageForTier(5));*/
 
 		// Turbine Automation Port
 		CORE.RA.addAssemblylineRecipe(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 0b0bf56a1c..e9c23f9f7d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -95,7 +95,7 @@ public class RECIPES_Machines {
 	public static ItemStack RECIPE_ThermalBoilerCasing;
 
 	//Thorium Reactor
-	public static ItemStack RECIPE_LFTRController;
+	/*public static ItemStack RECIPE_LFTRController;*/
 	public static ItemStack RECIPE_LFTROuterCasing;
 	public static ItemStack RECIPE_LFTRInnerCasing;
 
@@ -975,7 +975,7 @@ public class RECIPES_Machines {
 
 			if (CORE.ConfigSwitches.enableMultiblock_MultiTank){
 				//Industrial Multi Tank
-				RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1);
+				//RECIPE_IndustrialMultiTankController = GregtechItemList.Industrial_MultiTank.get(1);
 				RECIPE_IndustrialMultiTankFrame = GregtechItemList.Casing_MultitankExterior.get(Casing_Amount);
 
 				//Industrial Multi Tank Casing
@@ -1116,22 +1116,22 @@ public class RECIPES_Machines {
 
 			if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){
 				//Industrial Tree Farmer
-				RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1);
+				/*RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1);*/
 				RECIPE_TreeFarmFrame = GregtechItemList.Casing_PLACEHOLDER_TreeFarmer.get(Casing_Amount);
 				//Industrial Tree Farm Controller
 				if (!GTNH) {
-					RecipeUtils.addShapedGregtechRecipe(
+					/*RecipeUtils.addShapedGregtechRecipe(
 							"plateEglinSteel", "rotorEglinSteel", "plateEglinSteel",
 							"cableGt02Steel", "pipeMediumSteel", "cableGt02Steel",
 							"plateEglinSteel", CI.machineCasing_MV, "plateEglinSteel",
-							RECIPE_TreeFarmController);
+							RECIPE_TreeFarmController);*/
 				}
 				else {
-					RecipeUtils.addShapedGregtechRecipe(
+					/*RecipeUtils.addShapedGregtechRecipe(
 							"plateEglinSteel", "rotorEglinSteel", "plateEglinSteel",
 							"cableGt02Silver", "pipeMediumStainlessSteel", "cableGt02Silver",
 							"plateEglinSteel", CI.machineCasing_HV, "plateEglinSteel",
-							RECIPE_TreeFarmController);
+							RECIPE_TreeFarmController);*/
 				}
 				//Industrial Tree Farm Frame
 				RecipeUtils.addShapedGregtechRecipe(
@@ -1374,23 +1374,23 @@ public class RECIPES_Machines {
 			if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor){
 
 				//Thorium Reactor
-				RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);
+				/*RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);*/
 				RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); //Zeron
 				RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); //Hastelloy
 
 				ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
 				if(!GTNH) {
-					RecipeUtils.addShapedGregtechRecipe(
+					/*RecipeUtils.addShapedGregtechRecipe(
 							controlCircuit, "cableGt12NaquadahAlloy", controlCircuit,
 							"plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN",
 							"plateThorium232", CI.machineHull_UV, "plateThorium232",
-							RECIPE_LFTRController);
+							RECIPE_LFTRController);*/
 				} else  {
-					RecipeUtils.addShapedGregtechRecipe(
+					/*RecipeUtils.addShapedGregtechRecipe(
 							controlCircuit, "cableGt12NaquadahAlloy", controlCircuit,
 							"plateDoubleHastelloyN", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDoubleHastelloyN",
 							"plateThorium232", CI.machineHull_LuV, "plateThorium232",
-							RECIPE_LFTRController);
+							RECIPE_LFTRController);*/
 				}
 				RecipeUtils.addShapedGregtechRecipe(
 						"plateDoubleZeron100", CI.craftingToolScrewdriver, "plateDoubleZeron100",
@@ -1411,11 +1411,11 @@ public class RECIPES_Machines {
 
 
 				//Fission Fuel Plant
-				RecipeUtils.addShapedGregtechRecipe(
+				/*RecipeUtils.addShapedGregtechRecipe(
 						CI.getTieredCircuit(5), CI.craftingToolSolderingIron, CI.getTieredCircuit(5),
 						"plateDenseTungstenSteel", GregtechItemList.Gregtech_Computer_Cube.get(1), "plateDenseTungstenSteel",
 						"gearGtStellite", CI.machineHull_LuV, "gearGtStellite",
-						GregtechItemList.Industrial_FuelRefinery.get(1));
+						GregtechItemList.Industrial_FuelRefinery.get(1));*/
 
 				ItemStack mInnerTank;
 
@@ -1875,7 +1875,7 @@ public class RECIPES_Machines {
 				ItemStack aDrillController = ItemUtils.getValueOfItemList("OreDrill4", ItemList.Hull_UV).get(1);				
 
 				//Drilling Platform
-				CORE.RA.addSixSlotAssemblingRecipe(
+				/*CORE.RA.addSixSlotAssemblingRecipe(
 						new ItemStack[] {
 								aDrillController,
 								ItemUtils.getItemStackOfAmountFromOreDict("frameGtTriniumNaquadahCarbonite", 3),
@@ -1886,7 +1886,7 @@ public class RECIPES_Machines {
 						ALLOY.LAFIUM.getFluid(144 * 8  * (GTNH ? 2 : 1)),
 						GregtechItemList.BedrockMiner_MKI.get(1),
 						(int) GT_Values.V[5],
-						(int) GT_Values.V[7]);
+						(int) GT_Values.V[7]);*/
 
 				//Drilling Platform Casings
 				CORE.RA.addSixSlotAssemblingRecipe(