Frames by bartimaeusnek (#247)

> Frames by bartimaeusnek
+ Added some frames
+ Added recipes for frames
+ Added localisation for frames (US-EN, DE-DE)
$ Fixed Useless Frame

3 files changed, 57 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 5cab7d99b9..e1d37ab463 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -42,8 +42,13 @@ public class FR_ItemRegistry {
 	public static MB_ItemFrame hiveFrameSoul;
 	public static MB_ItemFrame hiveFrameClay;
 	public static MB_ItemFrame hiveFrameNova;
-
-
+	
+	// Frame Items added by bartimaeusnek
+	public static MB_ItemFrame hiveFrameDecay; 
+	public static MB_ItemFrame hiveFrameSlow;
+	public static MB_ItemFrame hiveFrameStalilize;
+	public static MB_ItemFrame hiveFrameArborist;
+	
 	@Optional.Method(modid = "Forestry")
 	public static void Register() {
 
@@ -81,10 +86,14 @@ public class FR_ItemRegistry {
 			hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common, "");
 			hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame.");
 		}
-
-
-
-
+		
+		// Frame Items added by bartimaeusnek
+		hiveFrameDecay = new MB_ItemFrame(MB_FrameType.DECAYING, EnumRarity.uncommon, "Who really needs stable genetics?");
+		hiveFrameSlow = new MB_ItemFrame(MB_FrameType.SLOWING, EnumRarity.common, "The journey is its own reward.");
+		hiveFrameStalilize = new MB_ItemFrame(MB_FrameType.STABILIZING, EnumRarity.rare, "If you wish your bees to keep their form.");
+		hiveFrameArborist = new MB_ItemFrame(MB_FrameType.ARBORISTS, EnumRarity.common, "Who need Bees when you can have Trees?");
+		ChestGenHooks.addItem(ChestGenHooks.PYRAMID_JUNGLE_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameArborist), 1, 4, 24));
+		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameSlow), 1, 4, 24));
 	}
 
 	protected static <T extends Item> T registerItem(final T item, final String name) {
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 36d4073c50..1016021e44 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java
@@ -13,13 +13,19 @@ public enum MB_FrameType implements IBeeModifier
 	CLAY("Healing",    240, 1.0f, 0.5f, 1.50f, 0.75f, 1f),
 	NOVA("Nova",       240, 1.0f, 100.0f, 0.0001f, 1.00f, 1f),
 
-
+	
 	//Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (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),
-	USELESS("Useless", 100, 1f, 0f, 1f, 1f, 1f);
+	USELESS("Useless", 100, 1f, 0f, 1f, 1f, 1f),
+	
+	// Frame Items added by bartimaeusnek
+	DECAYING("Decaying", 240, 1f, 1f, 1f, 1f, 10f), //enhanches decay to 10x
+	SLOWING("Slowing", 175, 1f, 0.5f, 2f, 0.5f, 1f), //reduces mutation, production rate and enhanches lifespan
+	STABILIZING("Stabilizing", 60, 1f, 0.1f, 1f, 0.1f, 0.5f), //reduces mutation, production and decay
+	ARBORISTS("Arborists", 240, 3f, 0f, 3f, 0f, 1f); //3x territory and lifespan, sets mutation and production to zero
 
 	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 30b7099de8..1df25261d1 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
@@ -3,9 +3,11 @@ package gtPlusPlus.xmod.forestry.bees.recipe;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry;
@@ -23,7 +25,6 @@ public class FR_Gregtech_Recipes {
 	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);
 	private static ItemStack hiveFrameCaged = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameCaged);
 	private static ItemStack hiveFrameSoul = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameSoul);
@@ -36,9 +37,12 @@ public class FR_Gregtech_Recipes {
 	private static ItemStack itemClayDust = new ItemStack(Items.clay_ball, 1);
 	private static ItemStack itemCocoaBeans = new ItemStack(Items.dye, 1, 3);
 
-
-	public static void registerItems(){
-
+	private static ItemStack hiveFrameDecay = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameDecay);
+	private static ItemStack hiveFrameSlow = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameSlow);
+	private static ItemStack hiveFrameStalilize = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameStalilize);
+	private static ItemStack hiveFrameArborist = ItemUtils.getSimpleStack(FR_ItemRegistry.hiveFrameArborist);
+	
+	public static void registerItems(){	
 		//Magic Bee Like Frames
 		RecipeUtils.addShapedGregtechRecipe(
 				rod_LongElectrum, rod_Electrum, rod_LongElectrum,
@@ -95,9 +99,31 @@ public class FR_Gregtech_Recipes {
 					null, itemClayDust, null,
 					hiveFrameClay);
 		}
-
-
-
+		
+		// Frame Items added by bartimaeusnek
+				RecipeUtils.addShapedGregtechRecipe(
+						ItemUtils.getItemStackOfAmountFromOreDict("stickLongTumbaga", 1),ItemUtils.getItemStackOfAmountFromOreDict("stickTumbaga", 1),ItemUtils.getItemStackOfAmountFromOreDict("stickLongTumbaga", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("stickLongTumbaga", 1),foil_Electrum,ItemUtils.getItemStackOfAmountFromOreDict("stickLongTumbaga", 1),
+						ItemUtils.getItemStackOfAmountFromOreDict("stickTumbaga", 1),ItemUtils.getItemStackOfAmountFromOreDict("stickTumbaga", 1),ItemUtils.getItemStackOfAmountFromOreDict("stickTumbaga", 1),
+						hiveFrameSlow);
+				
+				RecipeUtils.addShapedGregtechRecipe(
+						"stickLongWroughtIron","stickWroughtIron","stickLongWroughtIron",
+						"stickLongWroughtIron","foilWroughtIron","stickLongWroughtIron",
+						"stickWroughtIron","stickWroughtIron","stickWroughtIron",
+						hiveFrameDecay);
+				
+				RecipeUtils.addShapedGregtechRecipe(
+						"stickLongOsmiridium","stickOsmiridium","stickLongOsmiridium",
+						"stickLongOsmiridium","foilOsmiridium","stickLongOsmiridium",
+						"stickOsmiridium","stickOsmiridium","stickOsmiridium",
+						hiveFrameStalilize);
+				
+				RecipeUtils.addShapedGregtechRecipe(
+						"stickLongWoodSealed","stickWoodSealed","stickLongWoodSealed",
+						"stickLongWoodSealed",Items.paper,"stickLongWoodSealed",
+						"stickWoodSealed","stickWoodSealed","stickWoodSealed",
+						hiveFrameArborist);
 	}
 
 }