From cb3da864549f8c45c6d70ddeda4d3b56c804af5d Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Wed, 31 Jan 2018 21:37:20 +0100 Subject: change recipe of the tree farm to be hv --- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index d2907cca17..cec3c058f3 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -758,7 +758,7 @@ public class RECIPES_Machines { RECIPE_IndustrialSieveGrate); } - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){ + if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer|| !CORE.GTNH){ //Industrial Tree Farmer RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); RECIPE_TreeFarmFrame = GregtechItemList.TreeFarmer_Structural.get(Casing_Amount); @@ -774,6 +774,24 @@ public class RECIPES_Machines { "plankWood", "frameGtTumbaga", "plankWood", "plankWood", "plankWood", "plankWood", RECIPE_TreeFarmFrame); + + if (CORE.GTNH) { + //Industrial Tree Farmer + RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); + RECIPE_TreeFarmFrame = GregtechItemList.TreeFarmer_Structural.get(Casing_Amount); + //Industrial Tree Farm Controller + RecipeUtils.addShapedGregtechRecipe( + "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", + "cableGt02Steel", "pipeMediumStainlessSteel", "cableGt02Steel", + "plateEglinSteel", CI.machineCasing_HV, "plateEglinSteel", + RECIPE_TreeFarmController); + //Industrial Tree Farm Frame + RecipeUtils.addShapedGregtechRecipe( + ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), + "plankWood", "frameGtTumbaga", "plankWood", + "plankWood", "plankWood", "plankWood", + RECIPE_TreeFarmFrame); + } } if (CORE.ConfigSwitches.enableMachine_Tesseracts){ -- cgit From 6b494959f8fb7124be378fc3703704f93e8b5704 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Wed, 31 Jan 2018 22:02:29 +0100 Subject: Revert "change recipe of the tree farm to be hv" This reverts commit cb3da864549f8c45c6d70ddeda4d3b56c804af5d. --- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index cec3c058f3..d2907cca17 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -758,7 +758,7 @@ public class RECIPES_Machines { RECIPE_IndustrialSieveGrate); } - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer|| !CORE.GTNH){ + if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer){ //Industrial Tree Farmer RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); RECIPE_TreeFarmFrame = GregtechItemList.TreeFarmer_Structural.get(Casing_Amount); @@ -774,24 +774,6 @@ public class RECIPES_Machines { "plankWood", "frameGtTumbaga", "plankWood", "plankWood", "plankWood", "plankWood", RECIPE_TreeFarmFrame); - - if (CORE.GTNH) { - //Industrial Tree Farmer - RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); - RECIPE_TreeFarmFrame = GregtechItemList.TreeFarmer_Structural.get(Casing_Amount); - //Industrial Tree Farm Controller - RecipeUtils.addShapedGregtechRecipe( - "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", - "cableGt02Steel", "pipeMediumStainlessSteel", "cableGt02Steel", - "plateEglinSteel", CI.machineCasing_HV, "plateEglinSteel", - RECIPE_TreeFarmController); - //Industrial Tree Farm Frame - RecipeUtils.addShapedGregtechRecipe( - ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), - "plankWood", "frameGtTumbaga", "plankWood", - "plankWood", "plankWood", "plankWood", - RECIPE_TreeFarmFrame); - } } if (CORE.ConfigSwitches.enableMachine_Tesseracts){ -- cgit From 10eae2e0677397c4ef30a5e9ac96b5eafa0c8d3a Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Wed, 31 Jan 2018 22:42:16 +0100 Subject: change Tree Farmer Control Block recipes to HV for GTNH --- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index d2907cca17..653094cdda 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -15,6 +15,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import static gtPlusPlus.core.lib.CORE.GTNH; + public class RECIPES_Machines { //Outputs @@ -763,11 +765,20 @@ public class RECIPES_Machines { RECIPE_TreeFarmController = GregtechItemList.Industrial_TreeFarm.get(1); RECIPE_TreeFarmFrame = GregtechItemList.TreeFarmer_Structural.get(Casing_Amount); //Industrial Tree Farm Controller - RecipeUtils.addShapedGregtechRecipe( - "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", - "cableGt02Steel", "pipeMediumSteel", "cableGt02Steel", - "plateEglinSteel", CI.machineCasing_MV, "plateEglinSteel", - RECIPE_TreeFarmController); + if (!CORE.GTNH) { + RecipeUtils.addShapedGregtechRecipe( + "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", + "cableGt02Steel", "pipeMediumSteel", "cableGt02Steel", + "plateEglinSteel", CI.machineCasing_MV, "plateEglinSteel", + RECIPE_TreeFarmController); + } + if (CORE.GTNH) { + RecipeUtils.addShapedGregtechRecipe( + "plateEglinSteel", "rotorEglinSteel", "plateEglinSteel", + "cableGt02Silver", "pipeMediumStainlessSteel", "cableGt02Silver", + "plateEglinSteel", CI.machineCasing_HV, "plateEglinSteel", + RECIPE_TreeFarmController); + } //Industrial Tree Farm Frame RecipeUtils.addShapedGregtechRecipe( ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), ItemUtils.getSimpleStack(Blocks.dirt), -- cgit From c48e1b1600fba54889219719c104e02acee4e6a8 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Wed, 31 Jan 2018 22:59:54 +0100 Subject: remove shapless recipes which you can make a ingot out of 9 nuggets (GTNH) --- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 32 ++++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'src/Java') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java index a04206ec62..4386807f4d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java @@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.loaders; import gregtech.api.util.GT_ModHandler; import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.recipe.RecipeUtils; @@ -23,21 +24,22 @@ public class RecipeGen_ShapedCrafting implements Runnable{ public static void generateRecipes(final Material material){ Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO - - //Nuggets - GT_ModHandler.addShapelessCraftingRecipe( - material.getIngot(1), - new Object[]{ - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1), - material.getNugget(1) - }); + if (!CORE.GTNH) { + //Nuggets + GT_ModHandler.addShapelessCraftingRecipe( + material.getIngot(1), + new Object[]{ + material.getNugget(1), + material.getNugget(1), + material.getNugget(1), + material.getNugget(1), + material.getNugget(1), + material.getNugget(1), + material.getNugget(1), + material.getNugget(1), + material.getNugget(1) + }); + } //Plates -- cgit