%Renamed xmod handlers.

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

18 files changed, 407 insertions, 63 deletions

diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index c3e14c5a8d..f5208d10ed 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -10,7 +10,7 @@ import miscutil.core.commands.CommandMath;
 import miscutil.core.common.CommonProxy;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.HANDLER_Gregtech;
+import miscutil.core.xmod.gregtech.HANDLER_GT;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -42,7 +42,7 @@ implements ActionListener
 		Utils.LOG_INFO("Loading "+CORE.MODID+" V"+CORE.VERSION);
 		proxy.registerTileEntities();
 		proxy.registerRenderThings();
-		HANDLER_Gregtech.mMaterialProperties = new GT_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "MiscUtils"), "MaterialProperties.cfg")));
+		HANDLER_GT.mMaterialProperties = new GT_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "MiscUtils"), "MaterialProperties.cfg")));
 		proxy.preInit(event);
 	}
 
diff --git a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
index 035049e40d..6681e8264a 100644
--- a/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/miscutil/core/handler/COMPAT_IntermodStaging.java
@@ -1,34 +1,34 @@
 package miscutil.core.handler;
 
-import miscutil.core.xmod.forestry.HANDLER_Forestry;
-import miscutil.core.xmod.gregtech.HANDLER_Gregtech;
-import miscutil.core.xmod.growthcraft.HANDLER_Growthcraft;
-import miscutil.core.xmod.psychedelicraft.HANDLER_Psychedelicraft;
-import miscutil.core.xmod.thermalfoundation.HANDLER_ThermalFoundation;
+import miscutil.core.xmod.forestry.HANDLER_FR;
+import miscutil.core.xmod.gregtech.HANDLER_GT;
+import miscutil.core.xmod.growthcraft.HANDLER_GC;
+import miscutil.core.xmod.psychedelicraft.HANDLER_Psych;
+import miscutil.core.xmod.thermalfoundation.HANDLER_TF;
 
 public class COMPAT_IntermodStaging {
 
 	public static void preInit(){
-		HANDLER_Gregtech.preInit();
-		HANDLER_Growthcraft.preInit();	
-		HANDLER_ThermalFoundation.preInit();
-		HANDLER_Forestry.preInit();
-		HANDLER_Psychedelicraft.preInit();
+		HANDLER_GT.preInit();
+		HANDLER_GC.preInit();	
+		HANDLER_TF.preInit();
+		HANDLER_FR.preInit();
+		HANDLER_Psych.preInit();
 		
 	}
 
 	public static void init(){
-		HANDLER_Gregtech.init();
-		HANDLER_ThermalFoundation.init();
-		HANDLER_Forestry.Init();
-		HANDLER_Psychedelicraft.init();
+		HANDLER_GT.init();
+		HANDLER_TF.init();
+		HANDLER_FR.Init();
+		HANDLER_Psych.init();
 	}
 
 	public static void postInit(){
-		HANDLER_Gregtech.postInit();
-		HANDLER_ThermalFoundation.postInit();
-		HANDLER_Forestry.postInit();
-		HANDLER_Psychedelicraft.postInit();
+		HANDLER_GT.postInit();
+		HANDLER_TF.postInit();
+		HANDLER_FR.postInit();
+		HANDLER_Psych.postInit();
 	}
 
 
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 093c8bc6e0..2fe53c94d3 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -2,7 +2,9 @@ package miscutil.core.item;
 import static miscutil.core.creative.AddToCreativeTab.tabMachines;
 import static miscutil.core.creative.AddToCreativeTab.tabMisc;
 import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT;
+import gregtech.api.GregTech_API;
 import miscutil.core.creative.AddToCreativeTab;
+import miscutil.core.item.base.CoreItem;
 import miscutil.core.item.effects.RarityUncommon;
 import miscutil.core.item.general.BufferCore;
 import miscutil.core.item.general.fuelrods.FuelRod_Base;
@@ -15,6 +17,7 @@ import miscutil.core.util.Utils;
 import miscutil.core.util.debug.DEBUG_INIT;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.EnumHelper;
 import cpw.mods.fml.common.registry.GameRegistry;
 public final class ModItems {
@@ -275,7 +278,7 @@ Gold Tool: 22*/
 		itemPlateBatteryAlloy = new Item().setUnlocalizedName("itemPlateBatteryAlloy").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemPlateBatteryAlloy");
 		GameRegistry.registerItem(itemPlateBatteryAlloy, "itemPlateBatteryAlloy");
 		
-		itemHeliumBlob = new Item().setUnlocalizedName("itemHeliumBlob").setCreativeTab(tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
+		itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
 		GameRegistry.registerItem(itemHeliumBlob, "itemHeliumBlob");
 				
 		itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit");
@@ -283,6 +286,7 @@ Gold Tool: 22*/
 		//Try some New Tools from GT
 		//GT_Tool_Item x = null;
 		//x = GregTech_API.constructHardHammerItem("rockBelter", "Sandstone Hammer", 5000 /**Max Damage**/,50 /**Entity Damage**/);
-		//GregTech_API.registerHardHammer(x);
+		//Item hardHammer = itemSandstoneHammer.
+		GregTech_API.registerHardHammer(new ItemStack(itemSandstoneHammer, 1));
 	}
 }
\ No newline at end of file
diff --git a/src/Java/miscutil/core/item/base/CoreItem.java b/src/Java/miscutil/core/item/base/CoreItem.java
new file mode 100644
index 0000000000..a9929998a8
--- /dev/null
+++ b/src/Java/miscutil/core/item/base/CoreItem.java
@@ -0,0 +1,91 @@
+package miscutil.core.item.base;
+
+import java.util.List;
+
+import miscutil.core.lib.CORE;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class CoreItem extends Item
+{
+
+	private final EnumRarity rarity;
+	private final EnumChatFormatting descColour;
+	private final String itemDescription;
+	private final boolean hasEffect;
+
+	//0
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab)
+	{
+		this(unlocalizedName, creativeTab, 64, 0); //Calls 3
+	}
+	//1
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize)
+	{
+		this(unlocalizedName, creativeTab, stackSize, 0); //Calls 3
+	}
+	//2
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, String description)
+	{
+		this(unlocalizedName, creativeTab, stackSize, 0, description); //Calls 4
+	}	
+	//3
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg)
+	{
+		this(unlocalizedName, creativeTab, stackSize, maxDmg, ""); //Calls 4
+	}
+	//4 //Not Rare + basic tooltip
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description)
+	{
+		this(unlocalizedName, creativeTab, stackSize, maxDmg, EnumRarity.common, description, EnumChatFormatting.GRAY, false); //Calls 4.5
+	}
+	//4.5
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description, EnumChatFormatting colour)
+	{
+		this(unlocalizedName, creativeTab, stackSize, maxDmg, EnumRarity.common, description, colour, false); //Calls 5
+	}
+
+	//4.75
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String description, EnumRarity rarity)
+	{
+		this(unlocalizedName, creativeTab, stackSize, maxDmg, rarity, description, EnumChatFormatting.GRAY, false); //Calls 5
+	}
+
+	//5	
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, EnumRarity regRarity, String description, EnumChatFormatting colour, boolean Effect)
+	{
+		setUnlocalizedName(CORE.MODID + "_" + unlocalizedName);
+		setTextureName(CORE.MODID + ":" + unlocalizedName);
+		setCreativeTab(creativeTab);
+		setMaxStackSize(stackSize);
+		setMaxDamage(maxDmg);
+		this.rarity = regRarity;
+		this.itemDescription = description;
+		this.descColour = colour;
+		this.hasEffect = Effect;
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+		list.add(descColour+itemDescription);
+		super.addInformation(stack, aPlayer, list, bool);
+	}	
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(ItemStack par1ItemStack){
+		return rarity;
+	}
+
+	@Override
+	public boolean hasEffect(ItemStack par1ItemStack){
+		return hasEffect;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/item/tool/misc/SandstoneHammer.java b/src/Java/miscutil/core/item/tool/misc/SandstoneHammer.java
index 6f4f40aed5..b3b1684e23 100644
--- a/src/Java/miscutil/core/item/tool/misc/SandstoneHammer.java
+++ b/src/Java/miscutil/core/item/tool/misc/SandstoneHammer.java
@@ -5,8 +5,11 @@ import java.util.List;
 import miscutil.core.item.base.BaseItemWithDamageValue;
 import miscutil.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class SandstoneHammer extends BaseItemWithDamageValue{
 
@@ -17,7 +20,7 @@ public class SandstoneHammer extends BaseItemWithDamageValue{
 	public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
 		//Figure Out Damage
 
-		
+
 		return super.getColorFromItemStack(stack, HEX_OxFFFFFF);
 	}
 
@@ -27,37 +30,49 @@ public class SandstoneHammer extends BaseItemWithDamageValue{
 		this.setMaxStackSize(1);
 		this.setMaxDamage(2500);
 	}
-	
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
 		list.add(EnumChatFormatting.GRAY+"Allows you to craft sand from cobble, or sandstone from sand.");
 		super.addInformation(stack, aPlayer, list, bool);
 	}	
-	
-	   @Override
-	    public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack)
-	    {
-	        return false;
-	    }
-
-	    @Override
-	    public boolean getShareTag()
-	    {
-	        return true;
-	    }
-
-	    @Override
-		public boolean hasContainerItem(ItemStack itemStack)
-	    {
-	       return true;
-	    }
-	    @Override
-	    public ItemStack getContainerItem(ItemStack itemStack)
-	    {
-	    	itemStack.setItemDamage(itemStack.getItemDamage() + 8);
-
-	        return itemStack;
-	    }
+
+	@Override
+	public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack)
+	{
+		return false;
+	}
+
+	@Override
+	public boolean getShareTag()
+	{
+		return true;
+	}
+
+	@Override
+	public boolean hasContainerItem(ItemStack itemStack)
+	{
+		return true;
+	}
+	@Override
+	public ItemStack getContainerItem(ItemStack itemStack)
+	{
+		itemStack.setItemDamage(itemStack.getItemDamage() + 8);
+
+		return itemStack;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(ItemStack par1ItemStack){
+		return EnumRarity.uncommon;
+	}
+
+	@Override
+	public boolean hasEffect(ItemStack par1ItemStack){
+		return false;
+	}
+
 
 }
diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java b/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java
index 9637787e93..088d8cc446 100644
--- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java
+++ b/src/Java/miscutil/core/item/tool/staballoy/StaballoyAxe.java
@@ -23,10 +23,13 @@ import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemAxe;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class StaballoyAxe extends ItemAxe{
 	public String mat;
@@ -261,4 +264,15 @@ public class StaballoyAxe extends ItemAxe{
 		}
 		return super.onBlockDestroyed(itm, wld, blk, x, y, z, plr);
 	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(ItemStack par1ItemStack){
+		return EnumRarity.rare;
+	}
+
+	@Override
+	public boolean hasEffect(ItemStack par1ItemStack){
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java
index 4ade1914d9..7da0455408 100644
--- a/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java
+++ b/src/Java/miscutil/core/item/tool/staballoy/StaballoyPickaxe.java
@@ -9,12 +9,15 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemPickaxe;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class StaballoyPickaxe extends ItemPickaxe{
 
@@ -278,6 +281,17 @@ public class StaballoyPickaxe extends ItemPickaxe{
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
+	@Override
+	@SideOnly(Side.CLIENT)
+	public EnumRarity getRarity(ItemStack par1ItemStack){
+		return EnumRarity.rare;
+	}
+
+	@Override
+	public boolean hasEffect(ItemStack par1ItemStack){
+		return true;
+	}
+
 
 	@Override
 	public boolean onBlockStartBreak(ItemStack itemstack, int X, int Y, int Z, EntityPlayer aPlayer) {
diff --git a/src/Java/miscutil/core/util/UtilsChatFormatting.java b/src/Java/miscutil/core/util/UtilsChatFormatting.java
new file mode 100644
index 0000000000..5a7691f8aa
--- /dev/null
+++ b/src/Java/miscutil/core/util/UtilsChatFormatting.java
@@ -0,0 +1,156 @@
+package miscutil.core.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public enum UtilsChatFormatting
+{
+    BLACK('0'),
+    DARK_BLUE('1'),
+    DARK_GREEN('2'),
+    DARK_AQUA('3'),
+    DARK_RED('4'),
+    DARK_PURPLE('5'),
+    GOLD('6'),
+    GRAY('7'),
+    DARK_GRAY('8'),
+    BLUE('9'),
+    GREEN('a'),
+    AQUA('b'),
+    RED('c'),
+    LIGHT_PURPLE('d'),
+    YELLOW('e'),
+    WHITE('f'),
+    OBFUSCATED('k', true),
+    BOLD('l', true),
+    STRIKETHROUGH('m', true),
+    UNDERLINE('n', true),
+    ITALIC('o', true),
+    RESET('r');
+    /** Maps a formatting code (e.g., 'f') to its corresponding enum value (e.g., WHITE). */
+    private static final Map<Character, UtilsChatFormatting> formattingCodeMapping = new HashMap<Character, UtilsChatFormatting>();
+    /** Maps a name (e.g., 'underline') to its corresponding enum value (e.g., UNDERLINE). */
+    private static final Map<String, UtilsChatFormatting> nameMapping = new HashMap<String, UtilsChatFormatting>();
+    /**
+     * Matches formatting codes that indicate that the client should treat the following text as bold, recolored,
+     * obfuscated, etc.
+     */
+    private static final Pattern formattingCodePattern = Pattern.compile("(?i)" + String.valueOf('\u00a7') + "[0-9A-FK-OR]");
+    /** The formatting code that produces this format. */
+    private final char formattingCode;
+    private final boolean fancyStyling;
+    /**
+     * The control string (section sign + formatting code) that can be inserted into client-side text to display
+     * subsequent text in this format.
+     */
+    private final String controlString;
+
+    private UtilsChatFormatting(char p_i1336_3_)
+    {
+        this(p_i1336_3_, false);
+    }
+
+    private UtilsChatFormatting(char p_i1337_3_, boolean p_i1337_4_)
+    {
+        this.formattingCode = p_i1337_3_;
+        this.fancyStyling = p_i1337_4_;
+        this.controlString = "\u00a7" + p_i1337_3_;
+    }
+
+    /**
+     * Gets the formatting code that produces this format.
+     */
+    public char getFormattingCode()
+    {
+        return this.formattingCode;
+    }
+
+    /**
+     * False if this is just changing the color or resetting; true otherwise.
+     */
+    public boolean isFancyStyling()
+    {
+        return this.fancyStyling;
+    }
+
+    /**
+     * Checks if typo is a color.
+     */
+    public boolean isColor()
+    {
+        return !this.fancyStyling && this != RESET;
+    }
+
+    /**
+     * Gets the friendly name of this value.
+     */
+    public String getFriendlyName()
+    {
+        return this.name().toLowerCase();
+    }
+
+    @Override
+	public String toString()
+    {
+        return this.controlString;
+    }
+
+    /**
+     * Returns a copy of the given string, with formatting codes stripped away.
+     */
+    @SideOnly(Side.CLIENT)
+    public static String getTextWithoutFormattingCodes(String p_110646_0_)
+    {
+        return p_110646_0_ == null ? null : formattingCodePattern.matcher(p_110646_0_).replaceAll("");
+    }
+
+    /**
+     * Gets a value by its friendly name; null if the given name does not map to a defined value.
+     */
+    public static UtilsChatFormatting getValueByName(String p_96300_0_)
+    {
+        return p_96300_0_ == null ? null : (UtilsChatFormatting)nameMapping.get(p_96300_0_.toLowerCase());
+    }
+
+    /**
+     * Gets all the valid values. Args: @param par0: Whether or not to include color values. @param par1: Whether or not
+     * to include fancy-styling values (anything that isn't a color value or the "reset" value).
+     */
+    public static Collection<String> getValidValues(boolean p_96296_0_, boolean p_96296_1_)
+    {
+        ArrayList<String> arraylist = new ArrayList<String>();
+        UtilsChatFormatting[] aenumchatformatting = values();
+        int i = aenumchatformatting.length;
+
+        for (int j = 0; j < i; ++j)
+        {
+            UtilsChatFormatting enumchatformatting = aenumchatformatting[j];
+
+            if ((!enumchatformatting.isColor() || p_96296_0_) && (!enumchatformatting.isFancyStyling() || p_96296_1_))
+            {
+                arraylist.add(enumchatformatting.getFriendlyName());
+            }
+        }
+
+        return arraylist;
+    }
+
+    static
+    {
+        UtilsChatFormatting[] var0 = values();
+        int var1 = var0.length;
+
+        for (int var2 = 0; var2 < var1; ++var2)
+        {
+            UtilsChatFormatting var3 = var0[var2];
+            formattingCodeMapping.put(Character.valueOf(var3.getFormattingCode()), var3);
+            nameMapping.put(var3.getFriendlyName(), var3);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/util/UtilsRarity.java b/src/Java/miscutil/core/util/UtilsRarity.java
new file mode 100644
index 0000000000..9369e3b534
--- /dev/null
+++ b/src/Java/miscutil/core/util/UtilsRarity.java
@@ -0,0 +1,23 @@
+package miscutil.core.util;
+
+import net.minecraft.util.EnumChatFormatting;
+
+public enum UtilsRarity
+{
+    T1_poor(EnumChatFormatting.GRAY, "Poor"),
+    T2_normal(EnumChatFormatting.WHITE, "Common"),
+    T3_uncommon(EnumChatFormatting.GREEN, "Uncommon"),
+    T4_magic(EnumChatFormatting.BLUE, "Magic"),
+    T5_rare(EnumChatFormatting.LIGHT_PURPLE, "Rare"),
+    T6_epic(EnumChatFormatting.YELLOW, "Epic"),
+    T8_unique(EnumChatFormatting.GOLD, "Unique");
+   
+    public final EnumChatFormatting rarityColor;
+    public final String rarityName;
+
+    private UtilsRarity(EnumChatFormatting rarity, String name)
+    {
+        this.rarityColor = rarity;
+        this.rarityName = name;
+    }
+}
\ No newline at end of file
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){