%Renamed xmod handlers.

+Added in a new Bee Frame - The Mutagenic Frame.

9 files changed, 41 insertions, 14 deletions

diff --git a/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java b/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java
index 50b07e7535..e00d0d541b 100644
--- a/src/Java/miscutil/core/xmod/forestry/HANDLER_Forestry.java
+++ b/src/Java/miscutil/core/xmod/forestry/HANDLER_FR.java
@@ -1,9 +1,9 @@
 package miscutil.core.xmod.forestry;
 
 import miscutil.core.lib.LoadedMods;
-import miscutil.core.xmod.forestry.apiculture.items.FR_ItemRegistry;
+import miscutil.core.xmod.forestry.bees.items.FR_ItemRegistry;
 
-public class HANDLER_Forestry {
+public class HANDLER_FR {
 
 	public static void preInit(){		
 		if (LoadedMods.Forestry){
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistry.java b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java
index 3772d70918..87657bdc4c 100644
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/FR_ItemRegistry.java
+++ b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_ItemRegistry.java
@@ -8,9 +8,8 @@
  * Various Contributors including, but not limited to:
  * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
  ******************************************************************************/
-package miscutil.core.xmod.forestry.apiculture.items;
-import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_FrameType;
-import miscutil.core.xmod.forestry.apiculture.items.magicbees.MB_ItemFrame;
+package miscutil.core.xmod.forestry.bees.items;
+import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.WeightedRandomChestContent;
@@ -29,6 +28,7 @@ public class FR_ItemRegistry {
 	//Magic Bee Frame Items
 	public static MB_ItemFrame hiveFrameAccelerated;
 	public static MB_ItemFrame hiveFrameVoid;
+	public static MB_ItemFrame hiveFrameMutagenic;
 
 	public static void Register() {		
 
@@ -39,9 +39,12 @@ public class FR_ItemRegistry {
 
 		//Magic Bee like Frames
 		hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED);
-		hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID);
+		hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare);
+		hiveFrameMutagenic = new MB_ItemFrame(MB_FrameType.MUTAGENIC, EnumRarity.epic);
 		ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 18));
 		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));
 
 
 
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringUtil.java b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_StringUtil.java
index 235566f4ef..324fd79a55 100644
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/FR_StringUtil.java
+++ b/src/Java/miscutil/core/xmod/forestry/bees/items/FR_StringUtil.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.apiculture.items.magicbees;
+package miscutil.core.xmod.forestry.bees.items;
 
 import net.minecraft.util.StatCollector;
 
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_FrameType.java b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java
index 0d322d4498..af618eaccf 100644
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_FrameType.java
+++ b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_FrameType.java
@@ -1,4 +1,4 @@
-package miscutil.core.xmod.forestry.apiculture.items.magicbees;
+package miscutil.core.xmod.forestry.bees.items;
 
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeModifier;
@@ -6,7 +6,8 @@ import forestry.api.apiculture.IBeeModifier;
 public enum MB_FrameType implements IBeeModifier
 {
 	ACCELERATED("Accelerated", 175, 1f, 2.5f, 0.9f, 1.8f, 1f),
-	VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f);
+	VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f),
+	MUTAGENIC("Mutagenic", 3, 1f, 10f, 0.0001f, 10f, 1f);
 
 	private final String frameName;
 	public final int maxDamage;
diff --git a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemFrame.java b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java
index b12f29340c..c400b65be2 100644
--- a/src/Java/miscutil/core/xmod/forestry/apiculture/items/magicbees/MB_ItemFrame.java
+++ b/src/Java/miscutil/core/xmod/forestry/bees/items/MB_ItemFrame.java
@@ -1,8 +1,9 @@
-package miscutil.core.xmod.forestry.apiculture.items.magicbees;
+package miscutil.core.xmod.forestry.bees.items;
 
 import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.lib.CORE;
 import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -17,15 +18,22 @@ import forestry.api.apiculture.IHiveFrame;
 public class MB_ItemFrame extends Item implements IHiveFrame
 {
 	private MB_FrameType type;
+	private EnumRarity rarity_value = EnumRarity.uncommon;
 
 	public MB_ItemFrame(MB_FrameType frameType)
 	{
+		this(frameType, EnumRarity.uncommon);
+	}
+	
+	public MB_ItemFrame(MB_FrameType frameType, EnumRarity rarity)
+	{
 		super();
 		this.type = frameType;
 		this.setMaxDamage(this.type.maxDamage);
 		this.setMaxStackSize(1);
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setUnlocalizedName("frame" + frameType.getName());
+		this.rarity_value = rarity;
 		GameRegistry.registerItem(this, "frame" + frameType.getName());
 	}
 	
@@ -49,6 +57,21 @@ public class MB_ItemFrame extends Item implements IHiveFrame
 
 		return frame;
 	}
+	
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(ItemStack par1ItemStack){
+		return rarity_value;
+	}
+	
+	@Override
+	public boolean hasEffect(ItemStack par1ItemStack){
+		if (rarity_value == EnumRarity.uncommon){
+			return false;
+		}
+		return true;
+	}
 
 	public IBeeModifier getBeeModifier() {
 		return type;
diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_Gregtech.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
index 3bfb136edf..1218f06c4a 100644
--- a/src/Java/miscutil/core/xmod/gregtech/HANDLER_Gregtech.java
+++ b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
@@ -4,7 +4,7 @@ import gregtech.api.util.GT_Config;
 import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
 
-public class HANDLER_Gregtech {
+public class HANDLER_GT {
 	
 	public static GT_Config mMaterialProperties = null;
 
diff --git a/src/Java/miscutil/core/xmod/growthcraft/HANDLER_Growthcraft.java b/src/Java/miscutil/core/xmod/growthcraft/HANDLER_GC.java
index f56830bbb9..b0c82406d3 100644
--- a/src/Java/miscutil/core/xmod/growthcraft/HANDLER_Growthcraft.java
+++ b/src/Java/miscutil/core/xmod/growthcraft/HANDLER_GC.java
@@ -3,7 +3,7 @@ package miscutil.core.xmod.growthcraft;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.xmod.growthcraft.booze.Register_Booze;
 
-public class HANDLER_Growthcraft {
+public class HANDLER_GC {
 	
 
 	  //Run me during Pre-Init
diff --git a/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psychedelicraft.java b/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psych.java
index b4facc6a2d..278a572f0f 100644
--- a/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psychedelicraft.java
+++ b/src/Java/miscutil/core/xmod/psychedelicraft/HANDLER_Psych.java
@@ -4,7 +4,7 @@ import miscutil.core.lib.LoadedMods;
 import miscutil.core.xmod.psychedelicraft.fluids.PS_Fluids;
 
 
-public class HANDLER_Psychedelicraft {
+public class HANDLER_Psych {
 
 	public static void preInit(){
 		if (LoadedMods.Psychedelicraft){
diff --git a/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_ThermalFoundation.java b/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_TF.java
index 7c77d413e5..30c16860ba 100644
--- a/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_ThermalFoundation.java
+++ b/src/Java/miscutil/core/xmod/thermalfoundation/HANDLER_TF.java
@@ -6,7 +6,7 @@ import miscutil.core.xmod.thermalfoundation.fluid.TF_Fluids;
 import miscutil.core.xmod.thermalfoundation.item.TF_Items;
 import miscutil.core.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes;
 
-public class HANDLER_ThermalFoundation {
+public class HANDLER_TF {
 
 	public static void preInit(){		
 		if (LoadedMods.CoFHCore){