%Renamed xmod handlers.

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

3 files changed, 70 insertions, 27 deletions

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) {