From dde7a2c8c7daabc31b577d5876ef654340658bf7 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Tue, 13 Mar 2018 22:34:32 +1000 Subject: % Made Void Frames useless in GTNH because Oblivion Frames will always exist. $ Stopped old Iron Bar recipes being added in GTNH. --- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/forestry/bees/recipe') diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java index 2e0bcc9c2b..30b7099de8 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java @@ -4,6 +4,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -50,13 +51,18 @@ public class FR_Gregtech_Recipes { rod_LongUranium, foil_Uranium235, rod_LongUranium, rod_Uranium, rod_Uranium, rod_Uranium, hiveFrameMutagenic); - - RecipeUtils.addShapedGregtechRecipe( - "stickLongThaumium", "stickThaumium", "stickLongThaumium", - "stickLongThaumium", ItemUtils.getSimpleStack(Items.ender_pearl), "stickLongThaumium", - "stickThaumium", "stickThaumium", "stickThaumium", - hiveFrameVoid); - + if (!CORE.GTNH) { + RecipeUtils.addShapedGregtechRecipe( + "stickLongThaumium", "stickThaumium", "stickLongThaumium", + "stickLongThaumium", ItemUtils.getSimpleStack(Items.ender_pearl), "stickLongThaumium", + "stickThaumium", "stickThaumium", "stickThaumium", + hiveFrameVoid); + } + else { + if (LoadedMods.MagicBees) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {hiveFrameVoid}, ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1)); + } + } RecipeUtils.addShapedGregtechRecipe( "stickLongBlueSteel", "stickBlueSteel", "stickLongBlueSteel", "stickLongBlueSteel", ItemUtils.getSimpleStack(Items.nether_star), "stickLongBlueSteel", -- cgit