From 1f8fa07f97efb92cbc53489ce084a50774984920 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Sun, 8 Feb 2015 17:00:34 -0800 Subject: [PATCH] Reorganizing and stuff --- .../spiteful/forbidden/FMEventHandler.java | 57 ++++++++++---- .../spiteful/forbidden/FauxResearchItem.java | 72 ------------------ .../spiteful/forbidden/ForbiddenRecipes.java | 3 +- .../spiteful/forbidden/ForbiddenResearch.java | 3 +- .../spiteful/forbidden/compat/BloodMagic.java | 2 +- .../enchantments/EnchantmentCluster.java | 2 +- .../enchantments/EnchantmentImpact.java | 6 +- .../enchantments/EnchantmentVoid.java | 8 +- .../forbidden/items/ForbiddenItems.java | 26 +++---- .../forbidden/items/ItemBoundShears.java | 63 --------------- .../items/baubles/ItemRingNutrition.java | 55 +++++++++++++ .../items/{ => baubles}/ItemSubCollar.java | 2 +- .../items/{ => scribes}/ItemBloodwell.java | 2 +- .../items/{ => scribes}/ItemBoundwell.java | 2 +- .../items/{ => scribes}/ItemCrystalwell.java | 2 +- .../items/{ => tools}/ItemBloodRapier.java | 2 +- .../items/{ => tools}/ItemDiabolistFork.java | 2 +- .../items/{ => tools}/ItemMorphAxe.java | 3 +- .../items/{ => tools}/ItemMorphPickaxe.java | 3 +- .../items/{ => tools}/ItemMorphShovel.java | 3 +- .../items/{ => tools}/ItemMorphSword.java | 3 +- .../items/{ => tools}/ItemRidingCrop.java | 3 +- .../items/{ => tools}/ItemSkullAxe.java | 2 +- .../items/{ => tools}/ItemTaintPickaxe.java | 2 +- .../items/{ => tools}/ItemTaintShovel.java | 2 +- .../assets/forbidden/lang/en_US.lang | 7 +- .../forbidden/textures/items/prideshard.png | Bin 515 -> 2149 bytes .../textures/items/prideshard.png.mcmeta | 5 ++ .../textures/items/ring_nutrition.png | Bin 0 -> 300 bytes 29 files changed, 149 insertions(+), 193 deletions(-) delete mode 100644 src/main/java/fox/spiteful/forbidden/FauxResearchItem.java delete mode 100644 src/main/java/fox/spiteful/forbidden/items/ItemBoundShears.java create mode 100644 src/main/java/fox/spiteful/forbidden/items/baubles/ItemRingNutrition.java rename src/main/java/fox/spiteful/forbidden/items/{ => baubles}/ItemSubCollar.java (99%) rename src/main/java/fox/spiteful/forbidden/items/{ => scribes}/ItemBloodwell.java (98%) rename src/main/java/fox/spiteful/forbidden/items/{ => scribes}/ItemBoundwell.java (98%) rename src/main/java/fox/spiteful/forbidden/items/{ => scribes}/ItemCrystalwell.java (98%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemBloodRapier.java (98%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemDiabolistFork.java (97%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemMorphAxe.java (98%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemMorphPickaxe.java (98%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemMorphShovel.java (98%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemMorphSword.java (98%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemRidingCrop.java (97%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemSkullAxe.java (96%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemTaintPickaxe.java (96%) rename src/main/java/fox/spiteful/forbidden/items/{ => tools}/ItemTaintShovel.java (98%) create mode 100644 src/main/resources/assets/forbidden/textures/items/prideshard.png.mcmeta create mode 100644 src/main/resources/assets/forbidden/textures/items/ring_nutrition.png diff --git a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java index 9ccc5ed..ef0f4b6 100644 --- a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java +++ b/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); + } } } diff --git a/src/main/java/fox/spiteful/forbidden/FauxResearchItem.java b/src/main/java/fox/spiteful/forbidden/FauxResearchItem.java deleted file mode 100644 index d842294..0000000 --- a/src/main/java/fox/spiteful/forbidden/FauxResearchItem.java +++ /dev/null @@ -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; - } - -} diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java index 0d415d0..f4f81cd 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java +++ b/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) })); diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java b/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java index 4dce3ec..c375b68 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java +++ b/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(); diff --git a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java b/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java index 1b16960..0bf76e0 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/BloodMagic.java +++ b/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); diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentCluster.java b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentCluster.java index edada8d..c77d2ff 100644 --- a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentCluster.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentImpact.java b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentImpact.java index 9b72c78..68aa8c2 100644 --- a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentImpact.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentVoid.java b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentVoid.java index fb7a66c..4b03a0c 100644 --- a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentVoid.java +++ b/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) { diff --git a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java index ebc4bde..2ad2ebf 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java +++ b/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"); + } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemBoundShears.java b/src/main/java/fox/spiteful/forbidden/items/ItemBoundShears.java deleted file mode 100644 index ac96934..0000000 --- a/src/main/java/fox/spiteful/forbidden/items/ItemBoundShears.java +++ /dev/null @@ -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; - } -} \ No newline at end of file diff --git a/src/main/java/fox/spiteful/forbidden/items/baubles/ItemRingNutrition.java b/src/main/java/fox/spiteful/forbidden/items/baubles/ItemRingNutrition.java new file mode 100644 index 0000000..33d577c --- /dev/null +++ b/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; + } +} diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemSubCollar.java b/src/main/java/fox/spiteful/forbidden/items/baubles/ItemSubCollar.java similarity index 99% rename from src/main/java/fox/spiteful/forbidden/items/ItemSubCollar.java rename to src/main/java/fox/spiteful/forbidden/items/baubles/ItemSubCollar.java index 4657dff..be47c64 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemSubCollar.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemBloodwell.java b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBloodwell.java similarity index 98% rename from src/main/java/fox/spiteful/forbidden/items/ItemBloodwell.java rename to src/main/java/fox/spiteful/forbidden/items/scribes/ItemBloodwell.java index ac89930..8ac0567 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemBloodwell.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemBoundwell.java b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemBoundwell.java similarity index 98% rename from src/main/java/fox/spiteful/forbidden/items/ItemBoundwell.java rename to src/main/java/fox/spiteful/forbidden/items/scribes/ItemBoundwell.java index 22dba0b..f10fe65 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemBoundwell.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemCrystalwell.java b/src/main/java/fox/spiteful/forbidden/items/scribes/ItemCrystalwell.java similarity index 98% rename from src/main/java/fox/spiteful/forbidden/items/ItemCrystalwell.java rename to src/main/java/fox/spiteful/forbidden/items/scribes/ItemCrystalwell.java index 763ecdc..e5d93e9 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemCrystalwell.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemBloodRapier.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemBloodRapier.java similarity index 98% rename from src/main/java/fox/spiteful/forbidden/items/ItemBloodRapier.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemBloodRapier.java index d509a3a..49a6d8d 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemBloodRapier.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemDiabolistFork.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemDiabolistFork.java similarity index 97% rename from src/main/java/fox/spiteful/forbidden/items/ItemDiabolistFork.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemDiabolistFork.java index 99ace04..1bf0319 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemDiabolistFork.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemMorphAxe.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphAxe.java similarity index 98% rename from src/main/java/fox/spiteful/forbidden/items/ItemMorphAxe.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphAxe.java index 54b6a82..804e895 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemMorphAxe.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemMorphPickaxe.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java similarity index 98% rename from src/main/java/fox/spiteful/forbidden/items/ItemMorphPickaxe.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphPickaxe.java index 371c7aa..944cbe3 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemMorphPickaxe.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemMorphShovel.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java similarity index 98% rename from src/main/java/fox/spiteful/forbidden/items/ItemMorphShovel.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphShovel.java index e722c98..077c0ee 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemMorphShovel.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemMorphSword.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphSword.java similarity index 98% rename from src/main/java/fox/spiteful/forbidden/items/ItemMorphSword.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemMorphSword.java index 875b172..0af6b7b 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemMorphSword.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemRidingCrop.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemRidingCrop.java similarity index 97% rename from src/main/java/fox/spiteful/forbidden/items/ItemRidingCrop.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemRidingCrop.java index cceaeee..608cffc 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemRidingCrop.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemSkullAxe.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemSkullAxe.java similarity index 96% rename from src/main/java/fox/spiteful/forbidden/items/ItemSkullAxe.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemSkullAxe.java index 566e127..3894016 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemSkullAxe.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemTaintPickaxe.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintPickaxe.java similarity index 96% rename from src/main/java/fox/spiteful/forbidden/items/ItemTaintPickaxe.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintPickaxe.java index f10d77d..42721ab 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemTaintPickaxe.java +++ b/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; diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemTaintShovel.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintShovel.java similarity index 98% rename from src/main/java/fox/spiteful/forbidden/items/ItemTaintShovel.java rename to src/main/java/fox/spiteful/forbidden/items/tools/ItemTaintShovel.java index 7f56a5f..b5eb22c 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemTaintShovel.java +++ b/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; diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang index f34d520..34bab3e 100644 --- a/src/main/resources/assets/forbidden/lang/en_US.lang +++ b/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.
There are seven documented types of nether shard, each attuned to a different "deadly sin."

forbidden:textures/misc/research.png:0:0:111:16:1
forbidden.research_page.NETHERSHARDS.2b=These crystals are imbued with different vices and have many uses for more unscrupulous Thaumaturges.
There are six documented types of nether shard, each attuned to a different "deadly sin."

forbidden:textures/misc/research.png:0:16:95:16:1
-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.

Sloth Shards congeal when proxies and accidents are used to collect resources without effort.

Envy Shards are taken from those who have them by those that covet them.

Pride Shards materialize when a creature of truly great power is cut down to size.

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.

Sloth Shards congeal when proxies and accidents are used to collect resources without effort.

Envy Shards are taken from those who have them by those that covet them.

Pride Shards materialize when a creature of truly great power is cut down to size.

Gluttony Shards crystallize when someone feasts.

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.

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.

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.

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.

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. diff --git a/src/main/resources/assets/forbidden/textures/items/prideshard.png b/src/main/resources/assets/forbidden/textures/items/prideshard.png index eb79d7f7e04eeae54b1179429fd71cb920cf6700..df62e3a30a9f4ed528f37b9d11683b07ccfeea11 100644 GIT binary patch delta 2056 zcmV+j2>17c1mzHr7Yc9)1^@s67YFb=ks)Az2hK@EK~z{rrI}wyTxS-*&u+S#H0F<1 zlTK{ZSd*C1T5StkYocv!s#P=Uwl209$D}ldguu3eu4Ert7Fp6piZ8`h^H3zP7fsQ;7k!&J= ztIhUc7Z4KB8X`<&l93B&X5$iZo#-Jt0)kvX9UE>E_la@h4ABw*;yHshHmp0Fbdoqv zG!czkfINV17T($f7-X85BCZitDIgv|ghiK$dz+9AUgwA##PJ{iJN?$pO_qVh3UP%P zAZmReNpoOj3=?;Vh0QZr<@G9YiD-X+1mZhL{VW>!tkyTk-xB?bc6qD~g~5<|o+ahn(+>JuP=?t*ovj~F9nh{U-F1c;|>gVsRgW}3lP zmrGPNtB?m5xzbsLyE(KI9~9t&Jld22&;>LX;e*ro;8lj@C_X3+266#)A$-t(gbyy@ zgV*rEF?>**9^$FLtpp#Oi*3@$R(w#256GTiGxrugIEfD^(eH4RTG&b%wke*)N)#VFj}M;12TvwLk^ol5@Ckgt z#)Y??Gg&>04{Gs26+R%##7umDhp4{-AH0GOXzSX$PB!yh_@K;baaw>ah?e7n7oCG# z?!^ayCg_Zn7zkjCIvJ*3Ktpt4wi6#v*2v5F;J`yjpnG85=>s%ISu-8pxd;S^r)-1P zP>2t4IliB55B?&^t|Pb^bpS(v@vPx|BY?Z$*=JN_n_%@`i`YiW#a*K{{bI-;{YtC zr|`kI_}~+K@Qgpi1BkTYgZJ^le;mNZFI?^K@WD7fV4VH3NNQtii?b=7#mW*s7{CV~ z;sY+%qmU$kl`;GoK3K+o2R}Gxvic)F_$xl(TDP0>5@yGDkow=l2VdZWf8c|EJK4;C zj}P8-TAUVO3!=zm@Gs6mE-&JPpYXxo@c|_U0@$KXWYXJ%4?e{QGx*?N_~3JVfb!yy zKzG5q(}$JDzQhO9-nj?_h(FB+t)U(t#PeZAEBPu{cB%{zwLXv}fR!=4OXUt57xJ7lS>^pz%D6;!?T;L+Z(aQy z-Y97=($+OLTQ>8+x`11Y6VD>$=|+JJ@>Dy>Wk7cUP4M1I31!2ty=q@g6R{7%+lXjhp)1y+}5e(!4it3oOn<^jOSNZ)ob~>YSxFtQrlkSl= zl|QfBCY5(4RbDu+Qr4tW+L#*T0aSLYoWA7%ETYr=Jf-sbHI@BU{tyq~Xhh|u%VcqH z6SAT5-ki#Rn>SR7jt2l(JCC$Fo8nn~u%dF}3PKrBIar$vNotvu@y0M_x}$P&!8wx; zS5;14Rr%c|y3_83`1bsTewD~5ZCzCP)0&gbxp|d}E~mwbgO_q>s-xVxLFXXfUj}rS z&P-^m#6SRBbgWb5*q;hsv<%8QQZ6hkh^$#I`fyUOlQ{6{dV|Zc4I~Rcf@sw@Q zN*YvlAeH!M83FumZT3E>=CHB}ck^TT;BkDg10Q4pbQkZ&2Vs0rgb(rH4!3SvpwqOsJ#WuyW2;+nO_+URi z*ohAwg(Q7oWfbCr3VcwG59~}T@xcLnP=F8i;DbbnZ(8~I;2=H-!@@j)p*uo43SY|&nSe2|9^3h}{Vd{BW84&s9xd=Q7E9hBI? z(w#hfa1bAq;e*7v2n2{f%?2$8A8f-18D+55IA`sHi~LhGn{YSpl#mukjpj*MGXc7Q zB5BssvZSxdbv-IQS}GlZKrSF8b$k_YQ!mJUeND#on4HmKX-Nz5)L$ZPdQR4D6aT?~ zp43V?uSL?NPf24+kOy#By7iRYiUBOzWm+RLrFC*m^QFoc;sG3zh*ryGvbYxmT#yZY zOXl>X+|ZC5PYDY9ij^9*H>hewl3;(yRsI`rc36vOuAw%PMnjJQ&=uheNhHu2iYsj zfbP5Q7Ae7YYyv1^@s6AM^iVks)Az0c=S`K~y+TrPEC)gK-=O@GpfNHX3=! z>*Vzya*!sh&K_uuP5#j#O*tOvARXrmI=$G0m)b-ELe$yO5*B~h23S~9LJsN@bDB+00000NkvWtM6N<$ Ef*PK&SO5S3 diff --git a/src/main/resources/assets/forbidden/textures/items/prideshard.png.mcmeta b/src/main/resources/assets/forbidden/textures/items/prideshard.png.mcmeta new file mode 100644 index 0000000..24f9c2f --- /dev/null +++ b/src/main/resources/assets/forbidden/textures/items/prideshard.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/forbidden/textures/items/ring_nutrition.png b/src/main/resources/assets/forbidden/textures/items/ring_nutrition.png new file mode 100644 index 0000000000000000000000000000000000000000..abb8fe4ac8bb7c96b7d8d1fb080037597b3dd683 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DDyK$uZbZ`*dDAbW|YuPggK7DjeG&U+pk!+}ClC9V-A!TD(=<%vb93;~Imc_n&& zt|1C##(JiDhKBB+oy>u%rh2+KhFJI~CrH#Ci17Vo&!KLe(PVg{J^Is}2RVD}+A>)( zD>m-r?{Rz+zCP|RJL8N-3*N??T*a&&#uqpfc#K$7`mVDoFgwgT(#m>(%TX$U?LdtC z1@04U2Y47IJ%TI}j9J9=6lNt{Vzd;Wt+>EJRbqm{<%ztEm5j&KB_^CW=jL(I7B-#g5IP0&K7*&LpUXO@geCxK*;}6g literal 0 HcmV?d00001