+ Added recipes for all GT++ alveary frames.

% Tweaked frame tooltips to better reflect what they do.
- Toned down mutation rate of Accelerated Frames from 2.5F to 1.2F.

3 files changed, 30 insertions, 16 deletions

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 f1d13784c3..baa49ef826 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -29,7 +29,7 @@ public class FR_ItemRegistry {
 	public static MB_ItemFrame hiveFrameAccelerated;
 	public static MB_ItemFrame hiveFrameVoid;
 	public static MB_ItemFrame hiveFrameMutagenic;
-	public static MB_ItemFrame haveFrameBusy;
+	public static MB_ItemFrame hiveFrameBusy;
 
 	//Extra Bee Frame Items
 	public static MB_ItemFrame hiveFrameCocoa;
@@ -48,10 +48,10 @@ public class FR_ItemRegistry {
 		//frameProven = registerItem(new FR_ItemHiveFrame(720, 0.3f), "frameProven");
 
 		//Magic Bee like Frames
-		hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED, "Longevity for bees isn't very common.");
-		hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare, "??? (Dungeon Loot)");
+		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.");
-		haveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Busy bee, Busy Bee, make more honey please for me.");
+		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));
 		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 18));
 		ChestGenHooks.addItem(ChestGenHooks.DUNGEON_CHEST, 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 9074c28940..f49d9379a9 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
@@ -15,7 +15,7 @@ public enum MB_FrameType implements IBeeModifier
 
 
 	//Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (1f)
-	ACCELERATED("Accelerated", 175, 1f, 2.5f, 0.9f, 1.8f, 1f),
+	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);
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 32dbaa50c9..f897736a4a 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
@@ -10,14 +10,16 @@ import net.minecraft.item.ItemStack;
 
 public class FR_Gregtech_Recipes {
 
-	private static String rod_ElectrumFlux = "stickElectrumFlux";
-	private static String rod_LongElectrumFlux = "stickLongElectrumFlux";
+	private static String rod_Electrum = "stickElectrum";
+	private static String rod_LongElectrum = "stickLongElectrum";
 	private static String foil_Electrum = "foilElectrum";
 	private static String rod_Uranium = "stickUranium";
 	private static String rod_LongUranium = "stickLongUranium";
 	private static String foil_Uranium235 = "foilUranium235";
 	private static ItemStack hiveFrameAccelerated = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameAccelerated);
 	private static ItemStack hiveFrameMutagenic = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameMutagenic);
+	private static ItemStack hiveFrameVoid = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameVoid);
+	private static ItemStack hiveFrameBusy = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameBusy);
 
 
 	private static ItemStack hiveFrameCocoa = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCocoa);
@@ -36,39 +38,51 @@ public class FR_Gregtech_Recipes {
 	public static void registerItems(){
 
 		//Magic Bee Like Frames
-		RecipeUtils.recipeBuilder(
-				rod_LongElectrumFlux, rod_ElectrumFlux, rod_LongElectrumFlux,
-				rod_LongElectrumFlux, foil_Electrum, rod_LongElectrumFlux,
-				rod_ElectrumFlux, rod_ElectrumFlux, rod_ElectrumFlux,
+		RecipeUtils.addShapedGregtechRecipe(
+				rod_LongElectrum, rod_Electrum, rod_LongElectrum,
+				rod_LongElectrum, foil_Electrum, rod_LongElectrum,
+				rod_Electrum, rod_Electrum, rod_Electrum,
 				hiveFrameAccelerated);
 
-		RecipeUtils.recipeBuilder(
+		RecipeUtils.addShapedGregtechRecipe(
 				rod_LongUranium, rod_Uranium, rod_LongUranium,
 				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",
+				hiveFrameMutagenic);
+		
+		RecipeUtils.addShapedGregtechRecipe(
+				"stickLongBlueSteel", "stickBlueSteel", "stickLongBlueSteel",
+				"stickLongBlueSteel", ItemUtils.getSimpleStack(Items.nether_star), "stickLongBlueSteel",
+				"stickBlueSteel", "stickBlueSteel", "stickBlueSteel",
+				hiveFrameBusy);
 
 		if (!LoadedMods.ExtraBees){
 			//Extra Bee Like Frames
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedGregtechRecipe(
 					null, itemCocoaBeans, null,
 					itemCocoaBeans, hiveFrameImpregnated, itemCocoaBeans,
 					null, itemCocoaBeans, null,
 					hiveFrameCocoa);
 
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedGregtechRecipe(
 					hiveFrameImpregnated, blockIronBars, null,
 					null, null, null,
 					null, null, null,
 					hiveFrameCaged);
 
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedGregtechRecipe(
 					hiveFrameImpregnated, blockSoulSand, null,
 					null, null, null,
 					null, null, null,
 					hiveFrameSoul);
 
-			RecipeUtils.recipeBuilder(
+			RecipeUtils.addShapedGregtechRecipe(
 					null, itemClayDust, null,
 					itemClayDust, hiveFrameImpregnated, itemClayDust,
 					null, itemClayDust, null,