From 1388d8b86df8630f6af1261a8c84c0b7b934c005 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 10 Jul 2016 14:47:43 +1000 Subject: + Added in the Frames from ExtraBees (Because Binnie never updates) % Reused his textures and names. --- .../miscutil/core/xmod/forestry/HANDLER_FR.java | 3 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 14 ++++ .../xmod/forestry/bees/items/MB_FrameType.java | 13 +++- .../xmod/forestry/bees/items/MB_ItemFrame.java | 2 +- .../forestry/bees/recipe/FR_Gregtech_Recipes.java | 79 ++++++++++++++++++++++ 5 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java (limited to 'src/Java/miscutil/core') diff --git a/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java b/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java index e00d0d541b..f7837826a7 100644 --- a/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java +++ b/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java @@ -2,6 +2,7 @@ package miscutil.core.xmod.forestry; import miscutil.core.lib.LoadedMods; import miscutil.core.xmod.forestry.bees.items.FR_ItemRegistry; +import miscutil.core.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; public class HANDLER_FR { @@ -20,7 +21,7 @@ public class HANDLER_FR { public static void postInit(){ if (LoadedMods.Forestry){ - + FR_Gregtech_Recipes.registerItems(); } } } diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java index 87657bdc4c..3282950fbe 100644 --- a/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -29,6 +29,13 @@ public class FR_ItemRegistry { public static MB_ItemFrame hiveFrameAccelerated; public static MB_ItemFrame hiveFrameVoid; public static MB_ItemFrame hiveFrameMutagenic; + + //Extra Bee Frame Items + public static MB_ItemFrame hiveFrameCocoa; + public static MB_ItemFrame hiveFrameCaged; + public static MB_ItemFrame hiveFrameSoul; + public static MB_ItemFrame hiveFrameClay; + public static MB_ItemFrame hiveFrameNova; public static void Register() { @@ -45,6 +52,13 @@ public class FR_ItemRegistry { ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_LIBRARY, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 3, 23)); ChestGenHooks.addItem(ChestGenHooks.PYRAMID_DESERT_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 1, 18)); ChestGenHooks.addItem(ChestGenHooks.PYRAMID_JUNGLE_CHEST, new WeightedRandomChestContent(new ItemStack(hiveFrameMutagenic), 1, 3, 23)); + + //Extra Bee like Frames + hiveFrameCocoa = new MB_ItemFrame(MB_FrameType.COCOA, EnumRarity.common); + hiveFrameCaged = new MB_ItemFrame(MB_FrameType.CAGE, EnumRarity.common); + hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common); + hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common); + hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic); diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java index af618eaccf..40443dc566 100644 --- a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java +++ b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java @@ -5,9 +5,20 @@ import forestry.api.apiculture.IBeeModifier; public enum MB_FrameType implements IBeeModifier { + //ExtraBees Clone Frames + //Name, FrameHP, territory (1f), Mutation rate, lifespan rate, production rate, genetic decay (1f) + COCOA("Chocolate", 240, 1.0f, 1.0f, 0.50f, 1.50f, 1f), + CAGE("Restraint", 240, 0.5f, 1.0f, 0.75f, 0.75f, 1f), + SOUL("Soul", 80, 1.0f, 1.5f, 0.75f, 0.25f, 1f), + 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, 2.5f, 0.9f, 1.8f, 1f), VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f), - MUTAGENIC("Mutagenic", 3, 1f, 10f, 0.0001f, 10f, 1f); + MUTAGENIC("Mutagenic", 3, 1f, 10f, 0.0001f, 10f, 1f), + BUSY("Busy", 2000, 1f, 0f, 3f, 4f, 1f); private final String frameName; public final int maxDamage; diff --git a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java index c400b65be2..ea4e93177b 100644 --- a/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java +++ b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java @@ -67,7 +67,7 @@ public class MB_ItemFrame extends Item implements IHiveFrame @Override public boolean hasEffect(ItemStack par1ItemStack){ - if (rarity_value == EnumRarity.uncommon){ + if (rarity_value == EnumRarity.uncommon || rarity_value == EnumRarity.common){ return false; } return true; diff --git a/src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java new file mode 100644 index 0000000000..6fc95f5afa --- /dev/null +++ b/src/Java/miscutil/core/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java @@ -0,0 +1,79 @@ +package miscutil.core.xmod.forestry.bees.recipe; + +import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.recipe.UtilsRecipe; +import miscutil.core.xmod.forestry.bees.items.FR_ItemRegistry; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +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 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 = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameAccelerated); + private static ItemStack hiveFrameMutagenic = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameMutagenic); + + + private static ItemStack hiveFrameCocoa = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameCocoa); + private static ItemStack hiveFrameCaged = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameCaged); + private static ItemStack hiveFrameSoul = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameSoul); + private static ItemStack hiveFrameClay = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameClay); + private static ItemStack hiveFrameNova = UtilsItems.getSimpleStack(FR_ItemRegistry.hiveFrameNova); + + private static ItemStack hiveFrameImpregnated = UtilsItems.getItemStack("Forestry:frameImpregnated", 1); + private static ItemStack blockSoulSand = new ItemStack(Blocks.soul_sand, 1); + private static ItemStack blockIronBars = new ItemStack (Blocks.iron_bars, 1); + private static ItemStack itemClayDust = new ItemStack(Items.clay_ball, 1); + private static ItemStack itemCocoaBeans = new ItemStack(Items.dye, 1, 3); + + + public static void registerItems(){ + + //Magic Bee Like Frames + UtilsRecipe.recipeBuilder( + rod_LongElectrumFlux, rod_ElectrumFlux, rod_LongElectrumFlux, + rod_LongElectrumFlux, foil_Electrum, rod_LongElectrumFlux, + rod_ElectrumFlux, rod_ElectrumFlux, rod_ElectrumFlux, + hiveFrameAccelerated); + + UtilsRecipe.recipeBuilder( + rod_LongUranium, rod_Uranium, rod_LongUranium, + rod_LongUranium, foil_Uranium235, rod_LongUranium, + rod_Uranium, rod_Uranium, rod_Uranium, + hiveFrameMutagenic); + + //Extra Bee Like Frames + UtilsRecipe.recipeBuilder( + null, itemCocoaBeans, null, + itemCocoaBeans, hiveFrameImpregnated, itemCocoaBeans, + null, itemCocoaBeans, null, + hiveFrameCocoa); + + UtilsRecipe.recipeBuilder( + hiveFrameImpregnated, blockIronBars, null, + null, null, null, + null, null, null, + hiveFrameCaged); + + UtilsRecipe.recipeBuilder( + hiveFrameImpregnated, blockSoulSand, null, + null, null, null, + null, null, null, + hiveFrameSoul); + + UtilsRecipe.recipeBuilder( + null, itemClayDust, null, + itemClayDust, hiveFrameImpregnated, itemClayDust, + null, itemClayDust, null, + hiveFrameClay); + + + + } + +} -- cgit