From dde7a2c8c7daabc31b577d5876ef654340658bf7 Mon Sep 17 00:00:00 2001
From: Jordan Byrne <draknyte1@hotmail.com>
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.

---
 .../gtPlusPlus/core/recipe/RECIPES_General.java    | 37 +++++++++++-----------
 .../xmod/forestry/bees/items/FR_ItemRegistry.java  | 10 +++++-
 .../xmod/forestry/bees/items/MB_FrameType.java     |  3 +-
 .../forestry/bees/recipe/FR_Gregtech_Recipes.java  | 20 ++++++++----
 4 files changed, 43 insertions(+), 27 deletions(-)

(limited to 'src/Java/gtPlusPlus')

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index e56d1b57f9..e42b169c60 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -114,7 +114,7 @@ public class RECIPES_General {
 		if (ModBlocks.blockOreFluorite != null){
 			RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(ModBlocks.blockOreFluorite)}, FLUORIDES.FLUORITE.getOre(1));
 		}
-		
+
 		//Iron bars
 		final ItemStack ironBars;
 		if (CORE.GTNH) {
@@ -131,22 +131,23 @@ public class RECIPES_General {
 				ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))){
 			Logger.INFO("Added a recipe for the Fish Trap.");
 		}
-		
+
 		//Small Gear Extruder Shape
 		if (!CORE.GTNH) {
 			GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_SmallGear.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Gear, Character.valueOf('X'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.Steel)});
-		}
-		
-		String[] ironTypes = {"", "Wrought", "Pig", "Any"};
-		for (int y=0;y<ironTypes.length;y++) {
-			//Iron bars
-			String ironRecipe = "stick"+ironTypes[y]+"Iron";
-			if (RecipeUtils.recipeBuilder(
-					null, CI.craftingToolWrench, null,
-					ironRecipe, ironRecipe, ironRecipe,
-					ironRecipe, ironRecipe, ironRecipe,
-					ItemUtils.getItemStack("minecraft:iron_bars", 8))) {
-				Logger.INFO("Re-added old GT recipe for Iron Bars.");			
+
+
+			String[] ironTypes = {"", "Wrought", "Pig", "Any"};
+			for (int y=0;y<ironTypes.length;y++) {
+				//Iron bars
+				String ironRecipe = "stick"+ironTypes[y]+"Iron";
+				if (RecipeUtils.recipeBuilder(
+						null, CI.craftingToolWrench, null,
+						ironRecipe, ironRecipe, ironRecipe,
+						ironRecipe, ironRecipe, ironRecipe,
+						ItemUtils.getItemStack("minecraft:iron_bars", 8))) {
+					Logger.INFO("Re-added old GT recipe for Iron Bars.");			
+				}
 			}
 		}
 
@@ -167,7 +168,7 @@ public class RECIPES_General {
 				ItemUtils.getSimpleStack(Dimension_DarkWorld.blockPortalFrame, 2))){
 			Logger.INFO("Added a recipe for the Toxic Everglades Portal frame");
 		}
-		
+
 		//Alkalus Coin
 		if (RecipeUtils.recipeBuilder(
 				"gemExquisiteRuby", "gemFlawlessDiamond", "gemExquisiteDiamond",
@@ -204,9 +205,9 @@ public class RECIPES_General {
 				getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle),
 				ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1));
 
-		
-		
-		
+
+
+
 		// Rope/Fiber/Net
 		RecipeUtils.addShapelessGregtechRecipe(
 				new ItemStack[]{
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
index e21852f2cf..5cab7d99b9 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandomChestContent;
 
 import forestry.core.utils.StringUtil;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import net.minecraftforge.common.ChestGenHooks;
 
@@ -52,8 +53,15 @@ public class FR_ItemRegistry {
 		//frameProven = registerItem(new FR_ItemHiveFrame(720, 0.3f), "frameProven");
 
 		//Magic Bee like Frames
+		
+		if (!CORE.GTNH) {
+			hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare, "Makes your bee die in the blink of an eye.");
+		}
+		else {
+			hiveFrameVoid = new MB_ItemFrame(MB_FrameType.USELESS, EnumRarity.common, "No more cheaty frames for GTNH players.");
+		}
+		
 		hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED, "Longevity for bees isn't very common, especially if they're working harder.");
-		hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare, "Makes your bee die in the blink of an eye.");
 		hiveFrameMutagenic = new MB_ItemFrame(MB_FrameType.MUTAGENIC, EnumRarity.epic, "Evolution of the fittest, finest and fastest.");
 		hiveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Your bee will work harder and longer than you expected.");
 		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14));
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
index f49d9379a9..36d4073c50 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
@@ -18,7 +18,8 @@ public enum MB_FrameType implements IBeeModifier
 	ACCELERATED("Accelerated", 175, 1f, 1.2f, 0.9f, 1.8f, 1f),
 	VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f),
 	MUTAGENIC("Mutagenic", 3, 1f, 5f, 0.0001f, 10f, 1f),
-	BUSY("Busy", 2000, 1f, 0f, 3f, 4f, 1f);
+	BUSY("Busy", 2000, 1f, 0f, 3f, 4f, 1f),
+	USELESS("Useless", 100, 1f, 0f, 1f, 1f, 1f);
 
 	private final String frameName;
 	public final int maxDamage;
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