Reorganizing and stuff

src/main/java/fox/spiteful/forbidden/FMEventHandler.java

@@ -3,16 +3,13 @@ package fox.spiteful.forbidden;
 import java.util.*;
 
 import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
-import baubles.api.BaublesApi;
 import baubles.common.lib.PlayerHandler;
 import cpw.mods.fml.common.eventhandler.EventPriority;
-import fox.spiteful.forbidden.blocks.BlockBlackFlower;
 import fox.spiteful.forbidden.compat.Compat;
-import fox.spiteful.forbidden.items.ItemRidingCrop;
-import fox.spiteful.forbidden.items.ItemSubCollar;
-import fox.spiteful.forbidden.items.ItemTaintPickaxe;
+import fox.spiteful.forbidden.items.tools.ItemRidingCrop;
+import fox.spiteful.forbidden.items.baubles.ItemSubCollar;
+import fox.spiteful.forbidden.items.tools.ItemTaintPickaxe;
 import fox.spiteful.forbidden.potions.DarkPotions;
-import fox.spiteful.forbidden.tiles.SubTileEuclidaisy;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -30,27 +27,23 @@ import net.minecraft.entity.monster.EntitySilverfish;
 import net.minecraft.entity.monster.EntitySkeleton;
 import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.entity.monster.IMob;
-import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemSword;
-import net.minecraft.item.ItemTool;
+import net.minecraft.item.*;
 import net.minecraft.util.StatCollector;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.living.*;
 import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed;
+import net.minecraftforge.event.entity.player.PlayerUseItemEvent;
 import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent;
 
 import org.apache.logging.log4j.Level;
@@ -61,11 +54,9 @@ import thaumcraft.common.items.wands.ItemWandCasting;
 import thaumcraft.common.lib.utils.Utils;
 
 import com.google.common.collect.Multimap;
-import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
 import fox.spiteful.forbidden.enchantments.DarkEnchantments;
 import fox.spiteful.forbidden.items.ForbiddenItems;
 
-import cpw.mods.fml.common.eventhandler.Event.Result;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class FMEventHandler {
@@ -176,6 +167,7 @@ public class FMEventHandler {
         if (event.recentlyHit && event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer && !(event.source.getEntity() instanceof FakePlayer)) {
             if (event.entityLiving instanceof IMob) {
                 int wrath = 2;
+                int greed = 0;
                 ItemStack heldItem = ((EntityPlayer) event.source.getEntity()).getCurrentEquippedItem();
                 if (heldItem != null) {
                     if (heldItem.getItem() instanceof ItemTool) {
@@ -203,6 +195,13 @@ public class FMEventHandler {
                     if (event.entityLiving.getCreatureAttribute() == EnumCreatureAttribute.ARTHROPOD) {
                         wrath += EnchantmentHelper.getEnchantmentLevel(Enchantment.baneOfArthropods.effectId, heldItem);
                     }
+
+                    if(heldItem.getItem() instanceof ItemWandCasting){
+                        wrath += ((ItemWandCasting)(heldItem.getItem())).getFocusPotency(heldItem);
+                        greed += ((ItemWandCasting)(heldItem.getItem())).getFocusTreasure(heldItem);
+                    }
+
+                    greed += EnchantmentHelper.getEnchantmentLevel(Enchantment.looting.effectId, heldItem);
                 }
 
                 if (randy.nextInt(61) <= wrath) {
@@ -212,6 +211,10 @@ public class FMEventHandler {
                 if (event.entityLiving instanceof IBossDisplayData) {
                     addDrop(event, new ItemStack(ForbiddenItems.deadlyShards, 2 + randy.nextInt(1 + event.lootingLevel), 3));
                 }
+
+                if(greed > 0 && randy.nextInt(20) <= greed){
+                    addDrop(event, new ItemStack(ForbiddenItems.deadlyShards, 1, 6));
+                }
             }
 
             if (event.entityLiving instanceof EntityPigZombie && !(event.source.getEntity() instanceof FakePlayer)) {
@@ -340,6 +343,32 @@ public class FMEventHandler {
                     event.drops.add((ItemStack) (current.next()));
                 }
             }
+            if(player.worldObj.provider.dimensionId == -1 && event.block == Blocks.quartz_ore){
+                int fortune = EnchantmentHelper.getFortuneModifier(player);
+                if(fortune > 0 && randy.nextInt(20) <= fortune){
+                    event.drops.add(new ItemStack(ForbiddenItems.deadlyShards, 1, 6));
+                }
+            }
+        }
+    }
+
+    @SubscribeEvent
+    public void onEat(PlayerUseItemEvent.Finish event){
+        if(event.entityPlayer.worldObj.isRemote)
+            return;
+        if(event.item.getItem() instanceof ItemFood){
+            if(event.entityPlayer.worldObj.provider.dimensionId == -1 && event.item.getItem() != ForbiddenItems.gluttonyShard
+                    && randy.nextInt(10) < 2){
+                EntityItem ent = event.entityPlayer.entityDropItem(new ItemStack(ForbiddenItems.gluttonyShard, 1), 1.0F);
+                ent.motionY += randy.nextFloat() * 0.05F;
+                ent.motionX += (randy.nextFloat() - randy.nextFloat()) * 0.1F;
+                ent.motionZ += (randy.nextFloat() - randy.nextFloat()) * 0.1F;
+            }
+            ItemStack ring = PlayerHandler.getPlayerBaubles(event.entityPlayer).getStackInSlot(1);
+            ItemStack ring2 = PlayerHandler.getPlayerBaubles(event.entityPlayer).getStackInSlot(2);
+            if((ring != null && ring.getItem() == ForbiddenItems.ringFood) || (ring2 != null && ring2.getItem() == ForbiddenItems.ringFood)){
+                event.entityPlayer.getFoodStats().addStats(2, 4.0F);
+            }
         }
     }
 

src/main/java/fox/spiteful/forbidden/FauxResearchItem.java

@@ -1,72 +0,0 @@
-package fox.spiteful.forbidden;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.research.ResearchCategories;
-import thaumcraft.api.research.ResearchCategoryList;
-import thaumcraft.api.research.ResearchItem;
-import thaumcraft.api.research.ResearchPage;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class FauxResearchItem extends ResearchItem {
-    public ResearchItem original;
-
-    public FauxResearchItem(String name, String cat, String origin, String originCategory, int x, int y, ResourceLocation icon) {
-        super(name, cat, new AspectList(), x, y, 1, icon);
-        original = ((ResearchCategoryList) ResearchCategories.researchCategories.get(originCategory)).research.get(origin);
-        bindToOriginal();
-        setStub();
-        setHidden();
-    }
-
-    public FauxResearchItem(String name, String cat, String origin, String originCategory, int x, int y, ItemStack icon) {
-        super(name, cat, new AspectList(), x, y, 1, icon);
-        original = ((ResearchCategoryList) ResearchCategories.researchCategories.get(originCategory)).research.get(origin);
-        bindToOriginal();
-        setStub();
-        setHidden();
-    }
-
-    private void bindToOriginal() {
-        if (original.siblings == null)
-            original.setSiblings(new String[] { key });
-        else {
-            String[] family = original.siblings;
-            String[] newFamily = new String[family.length + 1];
-            for (int x = 0; x < family.length; x++) {
-                newFamily[x] = family[x];
-            }
-            newFamily[family.length] = key;
-            original.setSiblings(newFamily);
-        }
-    }
-
-    public ResearchPage[] getPages() {
-        return original.getPages();
-    }
-
-    @SideOnly(Side.CLIENT)
-    public String getName() {
-        return original.getName();
-    }
-
-    @SideOnly(Side.CLIENT)
-    public String getText() {
-        return original.getText();
-    }
-
-    public boolean isStub() {
-        return true;
-    }
-
-    public boolean isHidden() {
-        return true;
-    }
-
-    public int getComplexity() {
-        return 1;
-    }
-
-}

src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java

@@ -28,7 +28,8 @@ public class ForbiddenRecipes {
         ForbiddenResearch.recipes.put("SkullAxe", ThaumcraftApi.addInfusionCraftingRecipe("SKULLAXE", new ItemStack(ForbiddenItems.skullAxe), 1, (new AspectList()).add(DarkAspects.WRATH, 8).add(Aspect.WEAPON, 8).add(DarkAspects.NETHER, 8), ItemApi.getItem("itemAxeThaumium", 0), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(Items.diamond), new ItemStack(Items.skull, 1, 1) }));
         if(!Config.noLust)
             ForbiddenResearch.recipes.put("SubCollar", ThaumcraftApi.addInfusionCraftingRecipe("SUBCOLLAR", new ItemStack(ForbiddenItems.subCollar), 1, (new AspectList()).add(DarkAspects.LUST, 8).add(Aspect.TRAP, 8).add(DarkAspects.NETHER, 4).add(Aspect.FLESH, 4), new ItemStack(ConfigItems.itemAmuletVis, 1, 1), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(ForbiddenItems.deadlyShards, 1, 4), new ItemStack(Items.lead, 1), new ItemStack(ConfigItems.itemBaubleBlanks, 1, 2) }));
-        ForbiddenResearch.recipes.put("ArcaneCake", ThaumcraftApi.addInfusionCraftingRecipe("ARCANECAKE", new ItemStack(ForbiddenItems.arcaneCakeItem), 3, (new AspectList()).add(DarkAspects.GLUTTONY, 12).add(Aspect.HUNGER, 24).add(Aspect.CRAFT, 24), new ItemStack(Items.cake), new ItemStack[] { ItemApi.getItem("itemResource", 14), new ItemStack(Items.egg), new ItemStack(Items.milk_bucket), new ItemStack(Items.egg), new ItemStack(Items.sugar), new ItemStack(Items.sugar) }));
+        ForbiddenResearch.recipes.put("ArcaneCake", ThaumcraftApi.addInfusionCraftingRecipe("ARCANECAKE", new ItemStack(ForbiddenItems.arcaneCakeItem), 3, (new AspectList()).add(DarkAspects.GLUTTONY, 12).add(Aspect.HUNGER, 24).add(Aspect.CRAFT, 24), new ItemStack(Items.cake), new ItemStack[] { ItemApi.getItem("itemResource", 14), new ItemStack(Items.egg), new ItemStack(Items.milk_bucket), new ItemStack(Items.egg), new ItemStack(ForbiddenItems.gluttonyShard), new ItemStack(ForbiddenItems.gluttonyShard) }));
+        ForbiddenResearch.recipes.put("RingFood", ThaumcraftApi.addArcaneCraftingRecipe("RINGFOOD", new ItemStack(ForbiddenItems.ringFood), (new AspectList()).add(Aspect.ENTROPY, 10).add(Aspect.WATER, 20).add(Aspect.EARTH, 20), new Object[]{" D ", "SXS", " S ", Character.valueOf('S'), new ItemStack(ForbiddenItems.gluttonyShard, 1), Character.valueOf('X'), new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), Character.valueOf('D'), new ItemStack(Items.diamond)}));
         ForbiddenResearch.recipes.put("MorphPick", ThaumcraftApi.addInfusionCraftingRecipe("MORPHTOOLS", new ItemStack(ForbiddenItems.morphPickaxe), 6, (new AspectList()).add(Aspect.EXCHANGE, 32).add(DarkAspects.ENVY, 16).add(Aspect.TOOL, 16), ItemApi.getItem("itemPickThaumium", 0), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(Items.diamond), ItemApi.getItem("itemResource", 3), ItemApi.getBlock("blockMagicalLog", 1) }));
         ForbiddenResearch.recipes.put("MorphSword", ThaumcraftApi.addInfusionCraftingRecipe("MORPHTOOLS", new ItemStack(ForbiddenItems.morphSword), 6, (new AspectList()).add(Aspect.EXCHANGE, 32).add(DarkAspects.ENVY, 16).add(Aspect.WEAPON, 16), ItemApi.getItem("itemSwordThaumium", 0), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(Items.diamond), ItemApi.getItem("itemResource", 3), ItemApi.getBlock("blockMagicalLog", 1) }));
         ForbiddenResearch.recipes.put("MorphShovel", ThaumcraftApi.addInfusionCraftingRecipe("MORPHTOOLS", new ItemStack(ForbiddenItems.morphShovel), 6, (new AspectList()).add(Aspect.EXCHANGE, 32).add(DarkAspects.ENVY, 16).add(Aspect.TOOL, 16), ItemApi.getItem("itemShovelThaumium", 0), new ItemStack[] { new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(Items.diamond), ItemApi.getItem("itemResource", 3), ItemApi.getBlock("blockMagicalLog", 1) }));

src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java

@@ -56,7 +56,8 @@ public class ForbiddenResearch {
 
         (new DarkResearchItem("SKULLAXE", "FORBIDDEN", (new AspectList()).add(Aspect.WEAPON, 3).add(DarkAspects.WRATH, 4).add(DarkAspects.NETHER, 1), -11, -7, 2, new ItemStack(ForbiddenItems.skullAxe))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.SKULLAXE.1"), new ResearchPage((InfusionRecipe) recipes.get("SkullAxe")) }).setParents(new String[] { "NETHERSHARDS", "THAUMIUM", "INFUSION" }).setConcealed().registerResearchItem();
         ThaumcraftApi.addWarpToResearch("SKULLAXE", 1);
-        (new DarkResearchItem("ARCANECAKE", "FORBIDDEN", (new AspectList()).add(DarkAspects.GLUTTONY, 4).add(Aspect.HUNGER, 3).add(Aspect.CRAFT, 2), -11, -6, 1, new ItemStack(ForbiddenItems.arcaneCakeItem))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ARCANECAKE.1"), new ResearchPage((InfusionRecipe) recipes.get("ArcaneCake")) }).setParents(new String[] { "NETHERSHARDS", "INFUSION" }).setAspectTriggers(new Aspect[] { DarkAspects.GLUTTONY }).registerResearchItem();
+        (new DarkResearchItem("RINGFOOD", "FORBIDDEN", (new AspectList()).add(DarkAspects.GLUTTONY, 4).add(Aspect.HUNGER, 3).add(Aspect.LIFE, 2), -11, -6, 2, new ItemStack(ForbiddenItems.ringFood))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.RINGFOOD.1"), new ResearchPage((IArcaneRecipe) recipes.get("RingFood")) }).setParents(new String[] { "NETHERSHARDS", }).registerResearchItem();
+        (new DarkResearchItem("ARCANECAKE", "FORBIDDEN", (new AspectList()).add(DarkAspects.GLUTTONY, 6).add(Aspect.HUNGER, 3).add(Aspect.CRAFT, 2), -12, -6, 2, new ItemStack(ForbiddenItems.arcaneCakeItem))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ARCANECAKE.1"), new ResearchPage((InfusionRecipe) recipes.get("ArcaneCake")) }).setParents(new String[] { "NETHERSHARDS", "INFUSION" }).setAspectTriggers(new Aspect[] { DarkAspects.GLUTTONY }).registerResearchItem();
         (new DarkResearchItem("MORPHTOOLS", "FORBIDDEN", (new AspectList()).add(Aspect.TOOL, 2).add(DarkAspects.ENVY, 3).add(Aspect.EXCHANGE, 2), -9, -3, 4, new ItemStack(ForbiddenItems.morphPickaxe))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.MORPHTOOLS.1"), new ResearchPage((InfusionRecipe) recipes.get("MorphPick")), new ResearchPage((InfusionRecipe) recipes.get("MorphSword")), new ResearchPage((InfusionRecipe) recipes.get("MorphShovel")), new ResearchPage((InfusionRecipe) recipes.get("MorphAxe")) }).setParentsHidden(new String[] { "THAUMIUM", "INFUSIONENCHANTMENT" }).setParents(new String[] { "NETHERSHARDS" }).setConcealed().registerResearchItem();
         ThaumcraftApi.addWarpToResearch("MORPHTOOLS", 4);
         (new DarkResearchItem("ROD_infernal", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 4).add(Aspect.FIRE, 3).add(Aspect.TOOL, 1), -11, -4, 3, new ItemStack(ForbiddenItems.wandCore, 1, 1))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_infernal.1"), new ResearchPage((InfusionRecipe) recipes.get("WandRodInfernal")), new ResearchPage("forbidden.research_page.ROD_infernal.2") }).setParents(new String[] { "ROD_silverwood", "INFUSION", "NETHERSHARDS" }).setConcealed().registerResearchItem();

src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java

@@ -76,7 +76,7 @@ public class BloodMagic {
             ThaumcraftApi.addWarpToResearch("BLOODRAPIER", 2);
             ThaumcraftApi.addWarpToItem(new ItemStack(ForbiddenItems.bloodRapier), 2);
 
-            InfusionRecipe eldritch_orb = ThaumcraftApi.addInfusionCraftingRecipe("ELDRITCHORB", new ItemStack(ForbiddenItems.bloodOrb, 1, 0), 12, (new AspectList()).add(Aspect.LIFE, 64).add(Aspect.ELDRITCH, 48).add(Aspect.DARKNESS, 32).add(Aspect.VOID, 64), new ItemStack(kamiOrb), new ItemStack[] { new ItemStack(ConfigItems.itemEldritchObject, 1, 3), new ItemStack(ConfigItems.itemEldritchObject, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(Items.nether_star), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemEldritchObject, 1, 0) });
+            InfusionRecipe eldritch_orb = ThaumcraftApi.addInfusionCraftingRecipe("ELDRITCHORB", new ItemStack(ForbiddenItems.bloodOrb, 1, 0), 2, (new AspectList()).add(Aspect.LIFE, 64).add(Aspect.ELDRITCH, 48).add(Aspect.DARKNESS, 32).add(Aspect.VOID, 64), new ItemStack(kamiOrb), new ItemStack[] { new ItemStack(ConfigItems.itemEldritchObject, 1, 3), new ItemStack(ConfigItems.itemEldritchObject, 1, 0), new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(Items.nether_star), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemShard, 1, 6), new ItemStack(ConfigItems.itemEldritchObject, 1, 0) });
             (new DarkResearchItem("ELDRITCHORB", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 24).add(Aspect.VOID, 32).add(Aspect.CRYSTAL, 24).add(Aspect.ELDRITCH, 12), 1, -3, 4, new ItemStack(ForbiddenItems.bloodOrb, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ELDRITCHORB.1"), new ResearchPage(eldritch_orb) }).setParents(new String[] { "BLOODMAGIC", "INFUSION", "PRIMPEARL", "VOIDMETAL" }).setConcealed().setSpecial().registerResearchItem();
             ThaumcraftApi.addWarpToResearch("ELDRITCHORB", 3);
             ThaumcraftApi.addWarpToItem(new ItemStack(ForbiddenItems.bloodOrb), 5);

src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentCluster.java

@@ -1,6 +1,6 @@
 package fox.spiteful.forbidden.enchantments;
 
-import fox.spiteful.forbidden.items.ItemMorphPickaxe;
+import fox.spiteful.forbidden.items.tools.ItemMorphPickaxe;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnumEnchantmentType;
 import net.minecraft.item.ItemStack;

src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentImpact.java

@@ -1,9 +1,7 @@
 package fox.spiteful.forbidden.enchantments;
 
-import fox.spiteful.forbidden.items.ItemMorphAxe;
-import fox.spiteful.forbidden.items.ItemMorphPickaxe;
-import fox.spiteful.forbidden.items.ItemMorphShovel;
-import fox.spiteful.forbidden.items.ItemMorphSword;
+import fox.spiteful.forbidden.items.tools.ItemMorphPickaxe;
+import fox.spiteful.forbidden.items.tools.ItemMorphShovel;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnumEnchantmentType;
 import net.minecraft.item.ItemStack;

src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentVoid.java

@@ -1,13 +1,13 @@
 package fox.spiteful.forbidden.enchantments;
 
-import fox.spiteful.forbidden.items.ItemMorphAxe;
-import fox.spiteful.forbidden.items.ItemMorphPickaxe;
-import fox.spiteful.forbidden.items.ItemMorphSword;
+import fox.spiteful.forbidden.items.tools.ItemMorphAxe;
+import fox.spiteful.forbidden.items.tools.ItemMorphPickaxe;
+import fox.spiteful.forbidden.items.tools.ItemMorphSword;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnumEnchantmentType;
 import net.minecraft.item.ItemStack;
 
-import fox.spiteful.forbidden.items.ItemMorphShovel;
+import fox.spiteful.forbidden.items.tools.ItemMorphShovel;
 
 public class EnchantmentVoid extends Enchantment {
     public EnchantmentVoid(int id) {

src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java

@@ -3,6 +3,11 @@ package fox.spiteful.forbidden.items;
 import java.util.Arrays;
 
 import fox.spiteful.forbidden.compat.Compat;
+import fox.spiteful.forbidden.items.baubles.*;
+import fox.spiteful.forbidden.items.scribes.*;
+import fox.spiteful.forbidden.items.tools.*;
+import fox.spiteful.forbidden.Config;
+import fox.spiteful.forbidden.items.wands.*;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.ToolMaterial;
@@ -15,19 +20,6 @@ import thaumcraft.api.wands.StaffRod;
 import thaumcraft.api.wands.WandCap;
 import thaumcraft.api.wands.WandRod;
 
-import fox.spiteful.forbidden.Config;
-import fox.spiteful.forbidden.items.wands.BloodStaffUpdate;
-import fox.spiteful.forbidden.items.wands.BloodWandUpdate;
-import fox.spiteful.forbidden.items.wands.CreativeWandUpdate;
-import fox.spiteful.forbidden.items.wands.DarkWandCap;
-import fox.spiteful.forbidden.items.wands.InfernalWandUpdate;
-import fox.spiteful.forbidden.items.wands.ItemWandCaps;
-import fox.spiteful.forbidden.items.wands.ItemWandCores;
-import fox.spiteful.forbidden.items.wands.ManaStaffUpdate;
-import fox.spiteful.forbidden.items.wands.ManaWandUpdate;
-import fox.spiteful.forbidden.items.wands.TaintedWandUpdate;
-import fox.spiteful.forbidden.items.wands.YandereWandUpdate;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ForbiddenItems {
@@ -49,8 +41,8 @@ public class ForbiddenItems {
     public static Item crystalwell;
     public static Item ridingCrop;
     public static Item subCollar;
+    public static Item ringFood;
 
-    public static Item boundShears;
     public static Item bloodRapier;
     public static Item bloodwell;
     public static Item bloodOrb;
@@ -181,8 +173,8 @@ public class ForbiddenItems {
             GameRegistry.registerItem(subCollar, "SubCollar");
         }
 
-        // boundShears = new ItemBoundShears(Config.boundShearsID,
-        // ThaumcraftApi.toolMatThaumium).setUnlocalizedName("BoundShears");
-        // GameRegistry.registerItem(boundShears, "BoundSHears");
+        ringFood = new ItemRingNutrition().setUnlocalizedName("RingNutrition");
+        GameRegistry.registerItem(ringFood, "RingNutrition");
+
     }
 }

src/main/java/fox/spiteful/forbidden/items/ItemBoundShears.java

@@ -1,63 +0,0 @@
-package fox.spiteful.forbidden.items;
-
-import fox.spiteful.forbidden.Forbidden;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.EnumAction;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemSword;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ItemBoundShears extends ItemSword implements IBindable {
-
-    public IIcon icon;
-
-    public ItemBoundShears(ToolMaterial mat) {
-        super(mat);
-        this.setCreativeTab(Forbidden.tab);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister ir) {
-        this.icon = ir.registerIcon("forbidden:bound_shears");
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IIcon getIconFromDamage(int meta) {
-        return this.icon;
-    }
-
-    @Override
-    public float getDigSpeed(ItemStack stack, Block block, int meta) {
-        return block != Blocks.web && block != Blocks.leaves && block != Blocks.leaves2 ? (block == Blocks.wool ? 5.0F : super.func_150893_a(stack, block)) : 15.0F;
-    }
-
-    @Override
-    public EnumAction getItemUseAction(ItemStack stack) {
-        return EnumAction.none;
-    }
-
-    @Override
-    public int getMaxItemUseDuration(ItemStack stack) {
-        return 0;
-    }
-
-    @Override
-    public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
-        return stack;
-    }
-
-    @Override
-    public boolean canHarvestBlock(Block block, ItemStack stack) {
-        return block == Blocks.web || block == Blocks.redstone_wire || block == Blocks.tripwire;
-    }
-}

src/main/java/fox/spiteful/forbidden/items/baubles/ItemRingNutrition.java

@@ -0,0 +1,55 @@
+package fox.spiteful.forbidden.items.baubles;
+
+import baubles.api.BaubleType;
+import baubles.api.IBauble;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import fox.spiteful.forbidden.Forbidden;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import thaumcraft.api.IRunicArmor;
+
+public class ItemRingNutrition extends Item implements IRunicArmor, IBauble {
+    IIcon icon;
+
+    public ItemRingNutrition(){
+        super();
+        maxStackSize = 1;
+        setCreativeTab(Forbidden.tab);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister ir) {
+        icon = ir.registerIcon("forbidden:ring_nutrition");
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIconFromDamage(int par1) {
+        return icon;
+    }
+
+    public BaubleType getBaubleType(ItemStack itemstack){
+        return BaubleType.RING;
+    }
+
+    public void onWornTick(ItemStack itemstack, EntityLivingBase player){}
+    public void onEquipped(ItemStack itemstack, EntityLivingBase player){}
+    public void onUnequipped(ItemStack itemstack, EntityLivingBase player){}
+
+    public boolean canEquip(ItemStack itemstack, EntityLivingBase player){
+        return true;
+    }
+
+    public boolean canUnequip(ItemStack itemstack, EntityLivingBase player){
+        return true;
+    }
+
+    public int getRunicCharge(ItemStack itemstack){
+        return 0;
+    }
+}

src/main/java/fox/spiteful/forbidden/items/baubles/ItemSubCollar.java

@@ -1,4 +1,4 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.baubles;
 
 import baubles.common.lib.PlayerHandler;
 import cpw.mods.fml.relauncher.Side;

src/main/java/fox/spiteful/forbidden/items/scribes/ItemBloodwell.java

@@ -1,4 +1,4 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.scribes;
 
 import java.util.List;
 

src/main/java/fox/spiteful/forbidden/items/scribes/ItemBoundwell.java

@@ -1,4 +1,4 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.scribes;
 
 import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
 import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;

src/main/java/fox/spiteful/forbidden/items/scribes/ItemCrystalwell.java

@@ -1,4 +1,4 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.scribes;
 
 import java.util.Iterator;
 

src/main/java/fox/spiteful/forbidden/items/tools/ItemBloodRapier.java

@@ -1,4 +1,4 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
 import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
 import cpw.mods.fml.relauncher.Side;

src/main/java/fox/spiteful/forbidden/items/tools/ItemDiabolistFork.java

@@ -1,4 +1,4 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
 import fox.spiteful.forbidden.Forbidden;
 import net.minecraft.block.Block;

src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphAxe.java

@@ -1,6 +1,7 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
 import fox.spiteful.forbidden.Forbidden;
+import fox.spiteful.forbidden.items.ForbiddenItems;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;

src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java

@@ -1,5 +1,6 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
+import fox.spiteful.forbidden.items.ForbiddenItems;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.enchantment.EnchantmentHelper;

src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java

@@ -1,7 +1,8 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
 import fox.spiteful.forbidden.Forbidden;
 import fox.spiteful.forbidden.enchantments.DarkEnchantments;
+import fox.spiteful.forbidden.items.ForbiddenItems;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.PlayerControllerMP;

src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphSword.java

@@ -1,6 +1,7 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
 import fox.spiteful.forbidden.Forbidden;
+import fox.spiteful.forbidden.items.ForbiddenItems;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;

src/main/java/fox/spiteful/forbidden/items/tools/ItemRidingCrop.java

@@ -1,6 +1,7 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
 import fox.spiteful.forbidden.Forbidden;
+import fox.spiteful.forbidden.items.ForbiddenItems;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;

src/main/java/fox/spiteful/forbidden/items/tools/ItemSkullAxe.java

@@ -1,4 +1,4 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
 import fox.spiteful.forbidden.Forbidden;
 import net.minecraft.block.Block;

src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintPickaxe.java

@@ -1,4 +1,4 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;

src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintShovel.java

@@ -1,4 +1,4 @@
-package fox.spiteful.forbidden.items;
+package fox.spiteful.forbidden.items.tools;
 
 import fox.spiteful.forbidden.Forbidden;
 import net.minecraft.block.Block;

src/main/resources/assets/forbidden/lang/en_US.lang

@@ -44,6 +44,7 @@ item.BoundShears.name=Bound Shears
 item.BloodRapier.name=Rapier of the Strix
 item.Boundwell.name=Bound Scribing Tools
 item.SubCollar.name=Collar of Pain
+item.RingNutrition.name=Ring of Nutrition
 #
 # Wand components
 item.Wand.tainted.rod=Tainted
@@ -126,12 +127,16 @@ forbidden.research_text.NETHERSHARDS=Aim to misbehave.
 forbidden.research_page.NETHERSHARDS.1=Strange energies swirl through the Nether. On occasion, they have been known to solidify into crystal shards when certain sympathetic events occur.
 forbidden.research_page.NETHERSHARDS.2=These crystals are imbued with different vices and have many uses for more unscrupulous Thaumaturges.<BR>There are seven documented types of nether shard, each attuned to a different "deadly sin."<BR><BR><IMG>forbidden:textures/misc/research.png:0:0:111:16:1</IMG><BR>
 forbidden.research_page.NETHERSHARDS.2b=These crystals are imbued with different vices and have many uses for more unscrupulous Thaumaturges.<BR>There are six documented types of nether shard, each attuned to a different "deadly sin."<BR><BR><IMG>forbidden:textures/misc/research.png:0:16:95:16:1</IMG><BR>
-forbidden.research_page.NETHERSHARDS.3=Wrath Shards crystallize around acts of violence. The more excessive the physical force used, the more likely it is for a Wrath Shard to appear.<BR><BR>Sloth Shards congeal when proxies and accidents are used to collect resources without effort.<BR><BR>Envy Shards are taken from those who have them by those that covet them.<BR><BR>Pride Shards materialize when a creature of truly great power is cut down to size.<BR><BR>More sympathetic events may reveal themselves as time goes on.
+forbidden.research_page.NETHERSHARDS.3=Wrath Shards crystallize around acts of violence. The more excessive the physical force used, the more likely it is for a Wrath Shard to appear.<BR><BR>Sloth Shards congeal when proxies and accidents are used to collect resources without effort.<BR><BR>Envy Shards are taken from those who have them by those that covet them.<BR><BR>Pride Shards materialize when a creature of truly great power is cut down to size.<BR><BR>Gluttony Shards crystallize when someone feasts.<BR><BR>Greed Shards appear when enchantment is used to turn a profit.
 #
 forbidden.research_name.SKULLAXE=Axe of the Skulltaker
 forbidden.research_text.SKULLAXE=Off with their heads!
 forbidden.research_page.SKULLAXE.1=Some monsters just really boil your blood. Skeletons! Always clacking around and using you for target practice. Or those Creepers! They just creep around blowing things up like they own the place! You wish you could just chop all their smug heads off and place them on pikes.<BR><BR>Fortunately, you've discovered an item that will let you do just that.  The Axe of the Skulltaker has a chance to remove the heads of monsters it slays. It might even work on other humans! Unfortunately, the infusion leaves the axe far too bloodthirsty to effectively cleave through boring plant matter.
 #
+forbidden.research_name.RINGFOOD=Ring of Nutrition
+forbidden.research_text.RINGFOOD=Cheese puffs prevent scurvy, right?
+forbidden.research_page.RINGFOOD.1=People keep scolding you. They insist that you can't just eat cookies all day or that "nutrition doesn't work like that." Well, you've had it with these naysayers.<BR><BR>The Ring of Nutrition provides a boost to the food and saturation values of most foods you eat as long as the ring is worn on your finger.<BR><BR>Side effects may include nausea, headaches, cramping, vertigo, diabetes, and sudden interest in homeopathy.
+#
 forbidden.research_name.ARCANECAKE=Thaumic Cake
 forbidden.research_text.ARCANECAKE=Let them eat cake.
 forbidden.research_page.ARCANECAKE.1=If there's one thing you love, it's cake. You would eat its delicious goodness all day if you could, but it always runs out in the end.<BR><BR>To remedy this, you have devised a recipe to infuse a cake with longevity-enhancing magic.  The Thaumic Cake lasts significantly longer than a mundane one and will slowly repair itself as long as there's at least a sliver left.  The enchantments are unstable, however, and the cake cannot be moved again through conventional means once placed down.

src/main/resources/assets/forbidden/textures/items/prideshard.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}