From af73524d502922c9f7ea48b588508c26eb613958 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Sat, 27 Jun 2015 14:56:50 -0700 Subject: [PATCH] Stuff and Things EE3 support Fix #77 Heretic villager Profane Wand Enchants work with Primal Crusher Enchants can be disabled Increase Lust Shard drop --- .../java/fox/spiteful/forbidden/Config.java | 8 ++ .../spiteful/forbidden/FMEventHandler.java | 4 +- .../fox/spiteful/forbidden/Forbidden.java | 6 ++ .../spiteful/forbidden/ForbiddenRecipes.java | 20 ++-- .../spiteful/forbidden/ForbiddenResearch.java | 31 +++--- .../forbidden/VillagerHereticManager.java | 61 +++++++++++ .../forbidden/blocks/BlockArcaneCake.java | 3 +- .../forbidden/client/ClientProxy.java | 4 + .../fox/spiteful/forbidden/compat/Compat.java | 102 ++++++++++++++---- .../forbidden/compat/ForbiddenBotany.java | 29 +++-- .../enchantments/DarkEnchantments.java | 3 + .../enchantments/EnchantmentConsuming.java | 3 +- .../enchantments/EnchantmentCorrupting.java | 3 +- .../forbidden/items/ForbiddenItems.java | 6 ++ .../forbidden/items/tools/ItemRidingCrop.java | 2 +- .../forbidden/items/wands/ItemWandCores.java | 36 ++++--- .../items/wands/ProfaneWandUpdate.java | 48 +++++++++ .../assets/forbidden/lang/en_US.lang | 9 +- .../textures/items/wand_rod_profane.png | Bin 0 -> 303 bytes .../forbidden/textures/models/heretic.png | Bin 0 -> 1536 bytes .../textures/models/wand_rod_equivalent.png | Bin 0 -> 1649 bytes .../textures/models/wand_rod_profane.png | Bin 0 -> 2158 bytes .../textures/models/wand_rod_profaned.png | Bin 0 -> 1978 bytes 23 files changed, 311 insertions(+), 67 deletions(-) create mode 100644 src/main/java/fox/spiteful/forbidden/VillagerHereticManager.java create mode 100644 src/main/java/fox/spiteful/forbidden/items/wands/ProfaneWandUpdate.java create mode 100644 src/main/resources/assets/forbidden/textures/items/wand_rod_profane.png create mode 100644 src/main/resources/assets/forbidden/textures/models/heretic.png create mode 100644 src/main/resources/assets/forbidden/textures/models/wand_rod_equivalent.png create mode 100644 src/main/resources/assets/forbidden/textures/models/wand_rod_profane.png create mode 100644 src/main/resources/assets/forbidden/textures/models/wand_rod_profaned.png diff --git a/src/main/java/fox/spiteful/forbidden/Config.java b/src/main/java/fox/spiteful/forbidden/Config.java index d9c3507..86a50ae 100644 --- a/src/main/java/fox/spiteful/forbidden/Config.java +++ b/src/main/java/fox/spiteful/forbidden/Config.java @@ -44,6 +44,8 @@ public class Config { public static boolean emeraldTrans = true; public static boolean wrathCrazy = false; public static byte gluttony = 0; + public static boolean enchanting = true; + public static int hereticID = 666; public static boolean crossMod = true; public static boolean crossWand = true; @@ -54,6 +56,8 @@ public class Config { public static boolean tc = true; public static boolean special = true; public static boolean twilight = true; + public static boolean emc = true; + //public static boolean eewand = true; public static int wrathCost = 5; public static int wrathEff = 4; @@ -91,10 +95,12 @@ public class Config { if (wrathEff < 0) wrathEff = 4; wrathCrazy = conf.get("general", "Wrath Cage Cries Havoc", wrathCrazy, "Enable to let the Wrath Cage imprint on ANY non-boss mob. May break your game or make your game Awesome.").getBoolean(false); + enchanting = conf.get("general", "Enchantments Enabled", enchanting, "Disable if you don't like enchantments.").getBoolean(true); spork = conf.get("silly", "Spork of Doom", spork, "What is this? I don't even...").getBoolean(false); gluttony = (byte)conf.get("general", "Gluttony", gluttony, "Whether gluttony research is enabled. 0 = Enabled, 1 = Disabled, 2 = Hardcore").getInt(0); if(gluttony < 0 || gluttony > 2) gluttony = 0; + hereticID = conf.get("general", "Heretic Villager ID", hereticID).getInt(hereticID); bloodSealPotionID = conf.get("potions", "Blood Seal", bloodSealPotionID).getInt(bloodSealPotionID); @@ -107,6 +113,8 @@ public class Config { tc = conf.get("compatibility", "Tinkers Construct Interaction", tc).getBoolean(true); special = conf.get("compatibility", "Special Mobs Interaction", special).getBoolean(true); twilight = conf.get("compatibility", "Twilight Forest Interaction", twilight).getBoolean(true); + emc = conf.get("compatibility", "Equivalent Exchange 3 EMC", emc, "Disable if you don't want Forbidden Magic to add EMC values to items.").getBoolean(true); + //eewand = conf.get("compatibility", "Equivalent Exchange 3 Wand", eewand, "Disable to specifically disable the EMC to Vis wand.").getBoolean(true); } catch (Exception e) { LogHandler.log(Level.ERROR, e, "Had a problem loading its configuration."); } finally { diff --git a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java index c363783..3e0a851 100644 --- a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java +++ b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java @@ -348,7 +348,7 @@ public class FMEventHandler { } if(player.worldObj.provider.dimensionId == -1 && event.block == Blocks.quartz_ore){ int fortune = EnchantmentHelper.getFortuneModifier(player); - if(fortune > 0 && randy.nextInt(20) <= fortune){ + if(fortune > 0 && randy.nextInt(60) <= fortune){ event.drops.add(new ItemStack(ForbiddenItems.deadlyShards, 1, 6)); } } @@ -465,6 +465,8 @@ public class FMEventHandler { event.toolTip.add(StatCollector.translateToLocal("tooltip.currentowner") + " " + event.itemStack.stackTagCompound.getString("ownerName")); } else if (((ItemWandCasting) event.itemStack.getItem()).getRod(event.itemStack).getTag().startsWith("neutronium")) { event.toolTip.add(StatCollector.translateToLocal("tooltip.creativeonly")); + } else if (((ItemWandCasting) event.itemStack.getItem()).getRod(event.itemStack).getTag().startsWith("profane")) { + event.toolTip.add("Contract: " + event.itemStack.getTagCompound().getInteger("contract")); } } } diff --git a/src/main/java/fox/spiteful/forbidden/Forbidden.java b/src/main/java/fox/spiteful/forbidden/Forbidden.java index 6cad052..352aa9e 100644 --- a/src/main/java/fox/spiteful/forbidden/Forbidden.java +++ b/src/main/java/fox/spiteful/forbidden/Forbidden.java @@ -1,11 +1,13 @@ package fox.spiteful.forbidden; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.registry.VillagerRegistry; import fox.spiteful.forbidden.potions.DarkPotions; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraftforge.common.MinecraftForge; +import org.apache.logging.log4j.Level; import thaumcraft.api.wands.WandTriggerRegistry; import fox.spiteful.forbidden.blocks.ForbiddenBlocks; @@ -21,6 +23,8 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import java.util.Collection; + @Mod(modid = "ForbiddenMagic", name = "Forbidden Magic", dependencies = "required-after:Thaumcraft@[4.2.2.0,);after:ThaumicTinkerer;after:AWWayofTime;after:Botania") public class Forbidden { @Instance("ForbiddenMagic") @@ -64,6 +68,8 @@ public class Forbidden { events = new FMEventHandler(); MinecraftForge.EVENT_BUS.register(events); FMLCommonHandler.instance().bus().register(events); + VillagerRegistry.instance().registerVillagerId(Config.hereticID); + VillagerRegistry.instance().registerVillageTradeHandler(Config.hereticID, new VillagerHereticManager()); } @EventHandler diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java index 3b4f863..143b21d 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java +++ b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java @@ -68,16 +68,18 @@ public class ForbiddenRecipes { ForbiddenResearch.recipes.put("Crystalwell", ThaumcraftApi.addShapelessArcaneCraftingRecipe("CRYSTALWELL", new ItemStack(ForbiddenItems.crystalwell, 1, 0), (new AspectList()).add(Aspect.WATER, 1).add(Aspect.ORDER, 1), new Object[] { new ItemStack(ConfigItems.itemInkwell, 1, 32767), "dyeBlack", new ItemStack(ConfigItems.itemShard, 1, 32767), new ItemStack(ConfigItems.itemShard, 1, 32767) })); ForbiddenResearch.recipes.put("Primewell", ThaumcraftApi.addShapelessArcaneCraftingRecipe("PRIMEWELL", new ItemStack(ForbiddenItems.primewell, 1, 0), (new AspectList()).add(Aspect.WATER, 50).add(Aspect.EARTH, 50).add(Aspect.FIRE, 50).add(Aspect.AIR, 50).add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50), new Object[] { new ItemStack(Items.feather, 1, 0), new ItemStack(ConfigItems.itemEldritchObject, 1, 3), new ItemStack(Items.glass_bottle, 1, 0) })); - if (Config.greedyEnch) - ForbiddenResearch.recipes.put("Greedy", ThaumcraftApi.addInfusionEnchantmentRecipe("GREEDY", DarkEnchantments.greedy, 4, (new AspectList()).add(DarkAspects.NETHER, 16).add(Aspect.WEAPON, 8).add(Aspect.GREED, 16), new ItemStack[] { new ItemStack(Items.golden_sword), new ItemStack(Items.diamond), new ItemStack(ForbiddenItems.deadlyShards, 1, 6), new ItemStack(ForbiddenItems.deadlyShards, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 14) })); - ForbiddenResearch.recipes.put("Consuming", ThaumcraftApi.addInfusionEnchantmentRecipe("CONSUMING", DarkEnchantments.consuming, 3, (new AspectList()).add(Aspect.VOID, 8).add(Aspect.TOOL, 8).add(Aspect.HUNGER, 8), new ItemStack[] { new ItemStack(Items.iron_pickaxe), new ItemStack(Items.lava_bucket), ItemApi.getItem("itemResource", 14) })); - ForbiddenResearch.recipes.put("Wrath", ThaumcraftApi.addInfusionEnchantmentRecipe("WRATH", DarkEnchantments.wrath, 8, (new AspectList()).add(DarkAspects.WRATH, 16).add(Aspect.WEAPON, 16).add(DarkAspects.NETHER, 8), new ItemStack[] { ItemApi.getItem("itemResource", 14), new ItemStack(Items.diamond_sword, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0) })); - ForbiddenResearch.recipes.put("Educational", ThaumcraftApi.addInfusionEnchantmentRecipe("EDUCATIONAL", DarkEnchantments.educational, 3, (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.WEAPON, 4).add(Aspect.MIND, 8), new ItemStack[] { ItemApi.getItem("itemZombieBrain", 0), new ItemStack(Items.book), ItemApi.getItem("itemResource", 14) })); - ForbiddenResearch.recipes.put("Corrupting", ThaumcraftApi.addInfusionEnchantmentRecipe("CORRUPTING", DarkEnchantments.corrupting, 4, (new AspectList()).add(DarkAspects.NETHER, 16).add(Aspect.EXCHANGE, 16).add(Aspect.CRYSTAL, 8), new ItemStack[] { new ItemStack(Items.nether_wart), new ItemStack(Blocks.soul_sand), ItemApi.getItem("itemResource", 14) })); + if(Config.enchanting) { + if (Config.greedyEnch) + ForbiddenResearch.recipes.put("Greedy", ThaumcraftApi.addInfusionEnchantmentRecipe("GREEDY", DarkEnchantments.greedy, 4, (new AspectList()).add(DarkAspects.NETHER, 16).add(Aspect.WEAPON, 8).add(Aspect.GREED, 16), new ItemStack[]{new ItemStack(Items.golden_sword), new ItemStack(Items.diamond), new ItemStack(ForbiddenItems.deadlyShards, 1, 6), new ItemStack(ForbiddenItems.deadlyShards, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 14)})); + ForbiddenResearch.recipes.put("Consuming", ThaumcraftApi.addInfusionEnchantmentRecipe("CONSUMING", DarkEnchantments.consuming, 3, (new AspectList()).add(Aspect.VOID, 8).add(Aspect.TOOL, 8).add(Aspect.HUNGER, 8), new ItemStack[]{new ItemStack(Items.iron_pickaxe), new ItemStack(Items.lava_bucket), ItemApi.getItem("itemResource", 14)})); + ForbiddenResearch.recipes.put("Wrath", ThaumcraftApi.addInfusionEnchantmentRecipe("WRATH", DarkEnchantments.wrath, 8, (new AspectList()).add(DarkAspects.WRATH, 16).add(Aspect.WEAPON, 16).add(DarkAspects.NETHER, 8), new ItemStack[]{ItemApi.getItem("itemResource", 14), new ItemStack(Items.diamond_sword, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0)})); + ForbiddenResearch.recipes.put("Educational", ThaumcraftApi.addInfusionEnchantmentRecipe("EDUCATIONAL", DarkEnchantments.educational, 3, (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.WEAPON, 4).add(Aspect.MIND, 8), new ItemStack[]{ItemApi.getItem("itemZombieBrain", 0), new ItemStack(Items.book), ItemApi.getItem("itemResource", 14)})); + ForbiddenResearch.recipes.put("Corrupting", ThaumcraftApi.addInfusionEnchantmentRecipe("CORRUPTING", DarkEnchantments.corrupting, 4, (new AspectList()).add(DarkAspects.NETHER, 16).add(Aspect.EXCHANGE, 16).add(Aspect.CRYSTAL, 8), new ItemStack[]{new ItemStack(Items.nether_wart), new ItemStack(Blocks.soul_sand), ItemApi.getItem("itemResource", 14)})); - ForbiddenResearch.recipes.put("Cluster", ThaumcraftApi.addInfusionEnchantmentRecipe("CLUSTER", DarkEnchantments.cluster, 3, (new AspectList()).add(Aspect.FIRE, 4).add(Aspect.METAL, 4).add(Aspect.GREED, 4), new ItemStack[] { ItemApi.getItem("itemPickElemental", 0), ItemApi.getItem("itemResource", 14) })); - ForbiddenResearch.recipes.put("Impact", ThaumcraftApi.addInfusionEnchantmentRecipe("IMPACT", DarkEnchantments.impact, 4, (new AspectList()).add(Aspect.ENTROPY, 16).add(Aspect.MINE, 16), new ItemStack[] { ItemApi.getItem("itemResource", 14), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ConfigItems.itemShovelElemental, 1, 0)})); - ForbiddenResearch.recipes.put("Voidtouched", ThaumcraftApi.addInfusionEnchantmentRecipe("VOIDTOUCHED", DarkEnchantments.voidtouched, 8, (new AspectList()).add(Aspect.VOID, 16).add(Aspect.DARKNESS, 16).add(DarkAspects.ENVY, 24).add(Aspect.ELDRITCH, 16), new ItemStack[]{ItemApi.getItem("itemResource", 14), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1)})); + ForbiddenResearch.recipes.put("Cluster", ThaumcraftApi.addInfusionEnchantmentRecipe("CLUSTER", DarkEnchantments.cluster, 3, (new AspectList()).add(Aspect.FIRE, 4).add(Aspect.METAL, 4).add(Aspect.GREED, 4), new ItemStack[]{ItemApi.getItem("itemPickElemental", 0), ItemApi.getItem("itemResource", 14)})); + ForbiddenResearch.recipes.put("Impact", ThaumcraftApi.addInfusionEnchantmentRecipe("IMPACT", DarkEnchantments.impact, 4, (new AspectList()).add(Aspect.ENTROPY, 16).add(Aspect.MINE, 16), new ItemStack[]{ItemApi.getItem("itemResource", 14), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ConfigItems.itemShovelElemental, 1, 0)})); + ForbiddenResearch.recipes.put("Voidtouched", ThaumcraftApi.addInfusionEnchantmentRecipe("VOIDTOUCHED", DarkEnchantments.voidtouched, 8, (new AspectList()).add(Aspect.VOID, 16).add(Aspect.DARKNESS, 16).add(DarkAspects.ENVY, 24).add(Aspect.ELDRITCH, 16), new ItemStack[]{ItemApi.getItem("itemResource", 14), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), ItemApi.getItem("itemResource", 16), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1)})); + } CraftingManager.getInstance().addRecipe(new ItemStack(Items.emerald, 1, 0), new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 0) }); CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 0), new Object[] { "#", Character.valueOf('#'), new ItemStack(Items.emerald, 1, 0) }); diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java b/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java index 550b54a..6ad02fa 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java +++ b/src/main/java/fox/spiteful/forbidden/ForbiddenResearch.java @@ -37,8 +37,10 @@ public class ForbiddenResearch { (new DarkResearchItem("RIDINGCROP", "FORBIDDEN", new AspectList(), 0, -8, 0, new ItemStack(ForbiddenItems.ridingCrop))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.RIDINGCROP.1"), new ResearchPage((IRecipe) recipes.get("RidingCrop")) }).setStub().setRound().setAutoUnlock().registerResearchItem(); - (new DarkResearchItem("CONSUMING", "FORBIDDEN", (new AspectList()).add(Aspect.VOID, 4).add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 2), -4, -8, 1, new ResourceLocation("forbidden", "textures/misc/consuming.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CONSUMING.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Consuming")) }).setParents(new String[] { "INFUSIONENCHANTMENT" }).setSecondary().setConcealed().registerResearchItem(); - (new DarkResearchItem("EDUCATIONAL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 5).add(Aspect.WEAPON, 1).add(Aspect.MAGIC, 3), -4, -7, 2, new ResourceLocation("forbidden", "textures/misc/educational.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.EDUCATIONAL.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Educational")) }).setParents(new String[] { "INFUSIONENCHANTMENT" }).setSecondary().setConcealed().registerResearchItem(); + if(Config.enchanting) { + (new DarkResearchItem("CONSUMING", "FORBIDDEN", (new AspectList()).add(Aspect.VOID, 4).add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 2), -4, -8, 1, new ResourceLocation("forbidden", "textures/misc/consuming.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CONSUMING.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Consuming"))}).setParents(new String[]{"INFUSIONENCHANTMENT"}).setSecondary().setConcealed().registerResearchItem(); + (new DarkResearchItem("EDUCATIONAL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 5).add(Aspect.WEAPON, 1).add(Aspect.MAGIC, 3), -4, -7, 2, new ResourceLocation("forbidden", "textures/misc/educational.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.EDUCATIONAL.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Educational"))}).setParents(new String[]{"INFUSIONENCHANTMENT"}).setSecondary().setConcealed().registerResearchItem(); + } if(Compat.botan || Compat.bm || Compat.am2) (new DarkResearchItem("SCHOOLS", "FORBIDDEN", new AspectList(), -1, 1, 0, new ItemStack(Blocks.enchanting_table))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.SCHOOLS.1") }).setRound().setStub().setAutoUnlock().registerResearchItem(); @@ -52,6 +54,7 @@ public class ForbiddenResearch { (new DarkResearchItem("NETHERSHARDS", "FORBIDDEN", new AspectList(), -8, -5, 0, new ItemStack(ForbiddenItems.deadlyShards, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.NETHERSHARDS.1"), new ResearchPage("forbidden.research_page.NETHERSHARDS.2b"), new ResearchPage("forbidden.research_page.NETHERSHARDS.3") }).setStub().setRound().setAutoUnlock().registerResearchItem(); (new DarkResearchItem("HELLFIRE", "FORBIDDEN", (new AspectList()).add(Aspect.FIRE, 3).add(DarkAspects.NETHER, 4).add(Aspect.TRAVEL, 2), -8, -8, 1, new ItemStack(Blocks.fire))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.HELLFIRE.1") }).setRound().registerResearchItem().setHidden().setAspectTriggers(new Aspect[]{DarkAspects.NETHER}).setParents(new String[] { "NETHERSHARDS" }); + (new DarkResearchItem("ROD_profane", "FORBIDDEN", (new AspectList()), -9, -8, 0, new ItemStack(ForbiddenItems.wandCore, 1, 5))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_profane.1") }).setRound().registerResearchItem().setHidden().setParents(new String[] { "NETHERSHARDS" }).setStub(); if(!Config.noLust) (new DarkResearchItem("SUBCOLLAR", "FORBIDDEN", (new AspectList().add(Aspect.AURA, 3).add(DarkAspects.LUST, 8).add(Aspect.MAGIC, 3).add(Aspect.TRAP, 6).add(Aspect.FLESH, 4)), -11, -5, 2, new ItemStack(ForbiddenItems.subCollar))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.SUBCOLLAR.1"), new ResearchPage((InfusionRecipe) recipes.get("SubCollar")) }).setParents(new String[] { "NETHERSHARDS", "VISAMULET", "INFUSION" }).setHidden().setAspectTriggers(new Aspect[]{DarkAspects.LUST}).registerResearchItem(); @@ -59,24 +62,26 @@ public class ForbiddenResearch { ThaumcraftApi.addWarpToResearch("SKULLAXE", 1); if(Config.gluttony != 1) { (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("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}).setConcealed().registerResearchItem(); } - (new DarkResearchItem("FOCUSBLINK", "FORBIDDEN", (new AspectList()).add(Aspect.TRAVEL, 3).add(Aspect.ENTROPY, 3).add(DarkAspects.NETHER, 3).add(DarkAspects.SLOTH, 6), -11, -3, 2, new ItemStack(ForbiddenItems.blinkFocus))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.FOCUSBLINK.1"), new ResearchPage((InfusionRecipe) recipes.get("FocusBlink"))}).setParents(new String[]{"NETHERSHARDS", "INFUSION"}).registerResearchItem(); + (new DarkResearchItem("FOCUSBLINK", "FORBIDDEN", (new AspectList()).add(Aspect.TRAVEL, 3).add(Aspect.ENTROPY, 3).add(DarkAspects.NETHER, 3).add(DarkAspects.SLOTH, 6), -11, -3, 2, new ItemStack(ForbiddenItems.blinkFocus))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.FOCUSBLINK.1"), new ResearchPage((InfusionRecipe) recipes.get("FocusBlink"))}).setConcealed().setParents(new String[]{"NETHERSHARDS", "INFUSION"}).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(); ThaumcraftApi.addWarpToResearch("ROD_infernal", 2); - (new DarkResearchItem("WRATH", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 16).add(Aspect.WEAPON, 20).add(Aspect.MAGIC, 10), -6, -3, 4, new ResourceLocation("forbidden", "textures/misc/wrath.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.WRATH.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Wrath")) }).setParents(new String[] { "NETHERSHARDS", "INFUSIONENCHANTMENT" }).setConcealed().registerResearchItem(); - ThaumcraftApi.addWarpToResearch("WRATH", 3); - if (Config.greedyEnch) - (new DarkResearchItem("GREEDY", "FORBIDDEN", (new AspectList()).add(Aspect.MAGIC, 2).add(Aspect.WEAPON, 1).add(Aspect.GREED, 3), -6, -5, 2, new ResourceLocation("forbidden", "textures/misc/greedy.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.GREEDY.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Greedy")) }).setParents(new String[] { "NETHERSHARDS", "INFUSIONENCHANTMENT" }).setConcealed().registerResearchItem(); - (new DarkResearchItem("CORRUPTING", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 5).add(Aspect.CRYSTAL, 2).add(Aspect.EXCHANGE, 1), -6, -4, 1, new ResourceLocation("forbidden", "textures/misc/corrupting.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CORRUPTING.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Corrupting")) }).setParents(new String[] { "NETHERSHARDS", "INFUSIONENCHANTMENT" }).setConcealed().registerResearchItem(); + if(Config.enchanting) { + (new DarkResearchItem("WRATH", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 16).add(Aspect.WEAPON, 20).add(Aspect.MAGIC, 10), -6, -3, 4, new ResourceLocation("forbidden", "textures/misc/wrath.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.WRATH.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Wrath"))}).setParents(new String[]{"NETHERSHARDS", "INFUSIONENCHANTMENT"}).setConcealed().registerResearchItem(); + ThaumcraftApi.addWarpToResearch("WRATH", 3); + if (Config.greedyEnch) + (new DarkResearchItem("GREEDY", "FORBIDDEN", (new AspectList()).add(Aspect.MAGIC, 2).add(Aspect.WEAPON, 1).add(Aspect.GREED, 3), -6, -5, 2, new ResourceLocation("forbidden", "textures/misc/greedy.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.GREEDY.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Greedy"))}).setParents(new String[]{"NETHERSHARDS", "INFUSIONENCHANTMENT"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("CORRUPTING", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 5).add(Aspect.CRYSTAL, 2).add(Aspect.EXCHANGE, 1), -6, -4, 1, new ResourceLocation("forbidden", "textures/misc/corrupting.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CORRUPTING.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Corrupting"))}).setParents(new String[]{"NETHERSHARDS", "INFUSIONENCHANTMENT"}).setConcealed().registerResearchItem(); - (new DarkResearchItem("CLUSTER", "FORBIDDEN", (new AspectList()).add(Aspect.METAL, 1).add(Aspect.FIRE, 4).add(DarkAspects.ENVY, 3), -10, -1, 3, new ResourceLocation("forbidden", "textures/misc/lucrative.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CLUSTER.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Cluster")) }).setParents(new String[] { "MORPHTOOLS", "ELEMENTALPICK" }).setSecondary().setConcealed().registerResearchItem(); - (new DarkResearchItem("IMPACT", "FORBIDDEN", (new AspectList()).add(Aspect.ENTROPY, 8).add(Aspect.TOOL, 10).add(Aspect.MINE, 16).add(DarkAspects.ENVY, 10), -9, -1, 3, new ResourceLocation("forbidden", "textures/misc/impact.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.IMPACT.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Impact")) }).setParents(new String[] { "MORPHTOOLS", "ELEMENTALSHOVEL" }).setConcealed().registerResearchItem(); - (new DarkResearchItem("VOIDTOUCHED", "FORBIDDEN", (new AspectList()).add(Aspect.ELDRITCH, 16).add(Aspect.TOOL, 10).add(Aspect.CRAFT, 8).add(DarkAspects.ENVY, 32), -8, -1, 4, new ResourceLocation("forbidden", "textures/misc/voidtouched.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.VOIDTOUCHED.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Voidtouched")) }).setParents(new String[] { "MORPHTOOLS", "VOIDMETAL" }).setConcealed().registerResearchItem(); - ThaumcraftApi.addWarpToResearch("VOIDTOUCHED", 3); + (new DarkResearchItem("CLUSTER", "FORBIDDEN", (new AspectList()).add(Aspect.METAL, 1).add(Aspect.FIRE, 4).add(DarkAspects.ENVY, 3), -10, -1, 3, new ResourceLocation("forbidden", "textures/misc/lucrative.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CLUSTER.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Cluster"))}).setParents(new String[]{"MORPHTOOLS", "ELEMENTALPICK"}).setSecondary().setConcealed().registerResearchItem(); + (new DarkResearchItem("IMPACT", "FORBIDDEN", (new AspectList()).add(Aspect.ENTROPY, 8).add(Aspect.TOOL, 10).add(Aspect.MINE, 16).add(DarkAspects.ENVY, 10), -9, -1, 3, new ResourceLocation("forbidden", "textures/misc/impact.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.IMPACT.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Impact"))}).setParents(new String[]{"MORPHTOOLS", "ELEMENTALSHOVEL"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("VOIDTOUCHED", "FORBIDDEN", (new AspectList()).add(Aspect.ELDRITCH, 16).add(Aspect.TOOL, 10).add(Aspect.CRAFT, 8).add(DarkAspects.ENVY, 32), -8, -1, 4, new ResourceLocation("forbidden", "textures/misc/voidtouched.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.VOIDTOUCHED.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Voidtouched"))}).setParents(new String[]{"MORPHTOOLS", "VOIDMETAL"}).setConcealed().registerResearchItem(); + ThaumcraftApi.addWarpToResearch("VOIDTOUCHED", 3); + } if (Config.wrathCage) { (new DarkResearchItem("FORK", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 3).add(Aspect.MECHANISM, 1).add(Aspect.TOOL, 1), -6, -7, 0, new ItemStack(ForbiddenItems.fork))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.FORK.1"), new ResearchPage((InfusionRecipe) recipes.get("Fork")), new ResearchPage("WRATHCAGE", "forbidden.research_page.FORK.wc") }).setParents(new String[] {"INFUSION", "NETHERSHARDS", "THAUMIUM"}).setSecondary().setConcealed().registerResearchItem(); diff --git a/src/main/java/fox/spiteful/forbidden/VillagerHereticManager.java b/src/main/java/fox/spiteful/forbidden/VillagerHereticManager.java new file mode 100644 index 0000000..78a0580 --- /dev/null +++ b/src/main/java/fox/spiteful/forbidden/VillagerHereticManager.java @@ -0,0 +1,61 @@ +package fox.spiteful.forbidden; + +import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; +import fox.spiteful.forbidden.items.ForbiddenItems; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.village.MerchantRecipe; +import net.minecraft.village.MerchantRecipeList; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.WandCap; +import thaumcraft.api.wands.WandRod; +import thaumcraft.common.config.ConfigItems; +import thaumcraft.common.items.wands.ItemWandCasting; + +import java.util.Random; + +public class VillagerHereticManager implements IVillageTradeHandler { + + public void manipulateTradesForVillager(EntityVillager villager, MerchantRecipeList recipeList, Random random) { + if(villager.getProfession() == Config.hereticID) { + /*recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemResource, 20 + random.nextInt(3), 18), new ItemStack(Items.emerald))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemResource, 1, 9))); + recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemResource, 4 + random.nextInt(3), 3), new ItemStack(Items.emerald))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemResource, 1, 0))); + recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemResource, 4 + random.nextInt(3), 6), new ItemStack(Items.emerald))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemResource, 1, 1))); + recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemNuggetChicken, 24 + random.nextInt(8), 0), new ItemStack(Items.emerald))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.book, 4 + random.nextInt(3), 0), new ItemStack(ConfigItems.itemResource, 1, 9))); + recipeList.add(new MerchantRecipe(new ItemStack(ConfigItems.itemNuggetBeef, 24 + random.nextInt(8), 0), new ItemStack(Items.emerald))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemShard, 2 + random.nextInt(2), random.nextInt(6)))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald), new ItemStack(ConfigItems.itemManaBean, 1 + random.nextInt(2), 0))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemBathSalts, 1, 0))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemRingRunic, 1, 0))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemAmuletVis, 1, 0))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 5 + random.nextInt(3)), new ItemStack(ConfigItems.itemBaubleBlanks, 1, 3 + random.nextInt(6)))); + */ + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 1 + random.nextInt(2)), new ItemStack(ForbiddenItems.deadlyShards, 3 + random.nextInt(2), 6))); + if(!Config.noLust) + recipeList.add(new MerchantRecipe(new ItemStack(ForbiddenItems.deadlyShards, 2 + random.nextInt(4), 4), new ItemStack(Items.emerald))); + recipeList.add(new MerchantRecipe(new ItemStack(ForbiddenItems.deadlyShards, 4 + random.nextInt(6), 0), new ItemStack(Items.emerald))); + recipeList.add(new MerchantRecipe(new ItemStack(ForbiddenItems.gluttonyShard, 4 + random.nextInt(6), 0), new ItemStack(Items.emerald))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 1 + random.nextInt(3)), new ItemStack(Items.skull, 1, 0))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 4 + random.nextInt(4)), new ItemStack(Items.ghast_tear, 1))); + recipeList.add(new MerchantRecipe(new ItemStack(Items.emerald, 1), new ItemStack(Items.glowstone_dust, 8 + random.nextInt(9)))); + + ItemStack wand = new ItemStack(ConfigItems.itemWandCasting, 1, 36); + ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("iron")); + ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("profane")); + ((ItemWandCasting) wand.getItem()).storeAllVis(wand, new AspectList().add(Aspect.FIRE, 5000).add(Aspect.WATER, 5000).add(Aspect.EARTH, 5000).add(Aspect.AIR, 5000).add(Aspect.ORDER, 5000).add(Aspect.ENTROPY, 5000)); + MerchantRecipe profane = new MerchantRecipe(new ItemStack(Items.emerald, 8 + random.nextInt(5)), new ItemStack(Items.stick), wand); + profane.func_82783_a(-6); + recipeList.add(profane); + MerchantRecipe fire = new MerchantRecipe(new ItemStack(Items.emerald, 4 + random.nextInt(5)), new ItemStack(Items.diamond, 1), new ItemStack(ConfigItems.itemFocusFire, 1)); + fire.func_82783_a(-6); + recipeList.add(fire); + } + + } +} diff --git a/src/main/java/fox/spiteful/forbidden/blocks/BlockArcaneCake.java b/src/main/java/fox/spiteful/forbidden/blocks/BlockArcaneCake.java index 92af89a..aaf8fbe 100644 --- a/src/main/java/fox/spiteful/forbidden/blocks/BlockArcaneCake.java +++ b/src/main/java/fox/spiteful/forbidden/blocks/BlockArcaneCake.java @@ -3,6 +3,7 @@ package fox.spiteful.forbidden.blocks; import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.BlockCake; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -133,7 +134,7 @@ public class BlockArcaneCake extends Block { @Override public boolean canPlaceBlockAt(World world, int x, int y, int z) { - return !super.canPlaceBlockAt(world, x, y, z) ? false : this.canBlockStay(world, x, y, z); + return super.canPlaceBlockAt(world, x, y, z) && this.canBlockStay(world, x, y, z); } @Override diff --git a/src/main/java/fox/spiteful/forbidden/client/ClientProxy.java b/src/main/java/fox/spiteful/forbidden/client/ClientProxy.java index cb58930..acc8b23 100644 --- a/src/main/java/fox/spiteful/forbidden/client/ClientProxy.java +++ b/src/main/java/fox/spiteful/forbidden/client/ClientProxy.java @@ -1,15 +1,19 @@ package fox.spiteful.forbidden.client; +import cpw.mods.fml.common.registry.VillagerRegistry; import fox.spiteful.forbidden.CommonProxy; +import fox.spiteful.forbidden.Config; import fox.spiteful.forbidden.tiles.TileEntityWrathCage; import cpw.mods.fml.client.registry.ClientRegistry; +import net.minecraft.util.ResourceLocation; public class ClientProxy extends CommonProxy { @Override public void registerRenderInfo() { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWrathCage.class, new TileEntityWrathCageRenderer()); + VillagerRegistry.instance().registerVillagerSkin(Config.hereticID, new ResourceLocation("forbidden", "textures/models/heretic.png")); } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/forbidden/compat/Compat.java b/src/main/java/fox/spiteful/forbidden/compat/Compat.java index e2eb7f2..b8070a8 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/Compat.java +++ b/src/main/java/fox/spiteful/forbidden/compat/Compat.java @@ -1,42 +1,26 @@ package fox.spiteful.forbidden.compat; +import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; import fox.spiteful.forbidden.*; -import fox.spiteful.forbidden.tiles.SubTileEuclidaisy; -import fox.spiteful.forbidden.tiles.SubTileWhisperweed; +import fox.spiteful.forbidden.blocks.ForbiddenBlocks; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; - import org.apache.logging.log4j.Level; - import thaumcraft.api.ItemApi; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.IArcaneRecipe; -import thaumcraft.api.crafting.InfusionEnchantmentRecipe; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchPage; +import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; -import vazkii.botania.api.BotaniaAPI; - -import fox.spiteful.forbidden.enchantments.DarkEnchantments; import fox.spiteful.forbidden.items.ForbiddenItems; - import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.api.recipe.RecipePetals; -import java.lang.reflect.Constructor; -import java.util.List; public class Compat { public static boolean tt = false; @@ -47,6 +31,7 @@ public class Compat { public static boolean botan = false; public static boolean special = false; public static boolean twilight = false; + public static boolean ee3 = false; public static void initiate() { if(!Config.crossMod) @@ -59,6 +44,7 @@ public class Compat { botan = Config.botan && Loader.isModLoaded("Botania"); special = Config.wrathCage && Config.special && Loader.isModLoaded("SpecialMobs"); twilight = Config.wrathCage && Config.twilight && Loader.isModLoaded("TwilightForest"); + ee3 = (Config.emc /* || Config.eewand*/) && Loader.isModLoaded("EE3"); } public static void compatify() { @@ -176,10 +162,86 @@ public class Compat { } catch (Throwable e){ LogHandler.log(Level.INFO, e, "Forbidden Magic: Botania? Do you wanna build a snowman?"); - Compat.botan = false; + botan = false; } } + if(ee3){ + if(Config.emc){ + try { + for(int x = 0;x < 6;x++) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemShard, 1, x), 256); + } + //EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemShard, 1, 6), 354); + //EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 0), 83); + //EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 1), 459); + //EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 2), 272); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 3), 64); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 4), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 6), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 7), 112); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 8), 2056); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 9), 5120); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 11), 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 12), 32); + //EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 14), 354); + //EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 15), 5986); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigItems.itemResource, 1, 18), 227.556F); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemZombieBrain, 1024); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemWispEssence, 1024); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemManaBean, 32); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemSwordCrimson, 24580); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemHelmetCultistLeaderPlate, 49152); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemChestCultistLeaderPlate, 73728); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemLegsCultistLeaderPlate, 65536); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemBootsCultist, 1280); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemChestCultistPlate, 2048); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemHelmetCultistPlate, 1280); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemLegsCultistPlate, 1792); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemChestCultistRobe, 2304); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemHelmetCultistRobe, 1536); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ConfigItems.itemLegsCultistRobe, 2048); + + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), 64); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 2), 392); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 3), 392); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), 264); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), 264); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 12), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 14), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 0), 64); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 1), 256); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 2), 64); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 3), 768); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCustomPlant, 1, 5), 16); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockMetalDevice, 1, 0), 1792); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockTable, 1, 0), 28); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockTable, 1, 15), 28); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockEldritch, 1, 4), 4); + for(int x = 0;x < 7;x++) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockCrystal, 1, x), 1536); + } + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockMagicalLog, 1, 1), 64); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockMagicalLeaves, 1, 0), 1); + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ConfigBlocks.blockMagicalLeaves, 1, 1), 1); + + EnergyValueRegistryProxy.addPreAssignedEnergyValue(ForbiddenBlocks.starBlock, 221184); + + for(int x = 0;x < 7;x++) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ForbiddenItems.deadlyShards, 1, x), 256); + } + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ForbiddenItems.gluttonyShard, 1), 256); + } + catch(Throwable e){ + LogHandler.log(Level.INFO, e, "Forbidden Magic appears to be having trouble with EE3, eh?"); + ee3 = false; + } + } + + } + if(special){ Config.spawnerMobs.put("SpecialMobs.SpecialCaveSpider", Aspect.POISON); Config.spawnerMobs.put("SpecialMobs.BabyCaveSpider", Aspect.POISON); diff --git a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java index 20dcf2d..796c79c 100644 --- a/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java +++ b/src/main/java/fox/spiteful/forbidden/compat/ForbiddenBotany.java @@ -16,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.Level; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; @@ -27,6 +28,7 @@ import thaumcraft.common.config.ConfigItems; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; +import java.lang.reflect.Field; import java.util.List; public class ForbiddenBotany { @@ -41,11 +43,24 @@ public class ForbiddenBotany { Block dreamwood = GameRegistry.findBlock("Botania", "dreamwood"); Item lexicon = Compat.getItem("Botania", "lexicon"); - CraftingManager.getInstance().addRecipe(new ItemStack(resource, 1, 0), new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 2) }); - CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 2), new Object[] { "#", Character.valueOf('#'), new ItemStack(resource, 1, 0) }); + try { + Class stupidLib = Class.forName("vazkii.botania.common.lib.LibOreDict"); + Field nugget = stupidLib.getDeclaredField("MANASTEEL_NUGGET"); - CraftingManager.getInstance().addRecipe(new ItemStack(resource, 1, 7), new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 4) }); - CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 4), new Object[] { "#", Character.valueOf('#'), new ItemStack(resource, 1, 7) }); + } + catch (Exception e){ + e.printStackTrace(); + LogHandler.log(Level.INFO, "Somebody's using an outdated version of Botania."); + + CraftingManager.getInstance().addRecipe(new ItemStack(resource, 1, 0), new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 2) }); + CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 2), new Object[] { "#", Character.valueOf('#'), new ItemStack(resource, 1, 0) }); + + CraftingManager.getInstance().addRecipe(new ItemStack(resource, 1, 7), new Object[] { "###", "###", "###", Character.valueOf('#'), new ItemStack(ForbiddenItems.resource, 1, 4) }); + CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.resource, 9, 4), new Object[] { "#", Character.valueOf('#'), new ItemStack(resource, 1, 7) }); + } + + OreDictionary.registerOre("nuggetManasteel", new ItemStack(ForbiddenItems.resource, 1, 2)); + OreDictionary.registerOre("nuggetElvenElementium", new ItemStack(ForbiddenItems.resource, 1, 4)); (new DarkResearchItem("BOTANY", "FORBIDDEN", "[B]", new AspectList(), -3, 3, 0, new ItemStack(lexicon))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BOTANY.1")}).setParents(new String [] {"SCHOOLS"}).setRound().setStub().setAutoUnlock().registerResearchItem(); @@ -56,7 +71,7 @@ public class ForbiddenBotany { ThaumcraftApi.addWarpToResearch("ROD_livingwood", 2); BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCore, 1, 7), new ItemStack(ForbiddenItems.wandCore, 1, 8), 10000); - IArcaneRecipe manasteel_cap = ThaumcraftApi.addArcaneCraftingRecipe("CAP_manasteel", new ItemStack(ForbiddenItems.wandCap, 1, 4), (new AspectList()).add(Aspect.ENTROPY, 6).add(Aspect.FIRE, 6).add(Aspect.WATER, 6).add(Aspect.AIR, 6).add(Aspect.EARTH, 6).add(Aspect.ORDER, 6), new Object[]{"NNN", "N N", Character.valueOf('N'), new ItemStack(ForbiddenItems.resource, 1, 2)}); + IArcaneRecipe manasteel_cap = ThaumcraftApi.addArcaneCraftingRecipe("CAP_manasteel", new ItemStack(ForbiddenItems.wandCap, 1, 4), (new AspectList()).add(Aspect.ENTROPY, 6).add(Aspect.FIRE, 6).add(Aspect.WATER, 6).add(Aspect.AIR, 6).add(Aspect.EARTH, 6).add(Aspect.ORDER, 6), new Object[]{"NNN", "N N", Character.valueOf('N'), "nuggetManasteel"}); (new DarkResearchItem("CAP_manasteel", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.AURA, 6).add(Aspect.MAGIC, 4).add(Aspect.METAL, 4), 1, 2, 2, new ItemStack(ForbiddenItems.wandCap, 1, 3))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_manasteel.1"), new ResearchPage(manasteel_cap)}).setParents(new String[]{"ROD_livingwood"}).setSecondary().setConcealed().registerResearchItem(); BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCap, 1, 3), new ItemStack(ForbiddenItems.wandCap, 1, 4), 1000); @@ -66,7 +81,7 @@ public class ForbiddenBotany { (new DarkResearchItem("ROD_dreamwood_staff", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.TREE, 16).add(Aspect.MAGIC, 8).add(Aspect.ELDRITCH, 6), 1, 3, 2, new ItemStack(ForbiddenItems.wandCore, 1, 13))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_dreamwood_staff.1"), new ResearchPage(dreamwood_staff), new ResearchPage(dreamwood_rod)}).setParents(new String[]{"ROD_livingwood", "ROD_silverwood_staff"}).setSiblings(new String[]{"ROD_dreamwood"}).setConcealed().registerResearchItem(); (new DarkResearchItem("ROD_dreamwood", "FORBIDDEN")).setVirtual().registerResearchItem(); - IArcaneRecipe elementium_cap_inert = ThaumcraftApi.addArcaneCraftingRecipe("CAP_elementium", new ItemStack(ForbiddenItems.wandCap, 1, 6), (new AspectList()).add(Aspect.ENTROPY, 27).add(Aspect.FIRE, 27).add(Aspect.WATER, 27).add(Aspect.AIR, 27).add(Aspect.EARTH, 27).add(Aspect.ORDER, 27), new Object[]{"NNN", "N N", Character.valueOf('N'), new ItemStack(ForbiddenItems.resource, 1, 4)}); + IArcaneRecipe elementium_cap_inert = ThaumcraftApi.addArcaneCraftingRecipe("CAP_elementium", new ItemStack(ForbiddenItems.wandCap, 1, 6), (new AspectList()).add(Aspect.ENTROPY, 27).add(Aspect.FIRE, 27).add(Aspect.WATER, 27).add(Aspect.AIR, 27).add(Aspect.EARTH, 27).add(Aspect.ORDER, 27), new Object[]{"NNN", "N N", Character.valueOf('N'), "nuggetElvenElementium"}); InfusionRecipe elementium_cap = ThaumcraftApi.addInfusionCraftingRecipe("CAP_elementium", new ItemStack(ForbiddenItems.wandCap, 1, 5), 1, (new AspectList()).add(Aspect.EARTH, 18).add(Aspect.FIRE, 18).add(Aspect.WATER, 18).add(Aspect.AIR, 18), new ItemStack(ForbiddenItems.wandCap, 1, 6), new ItemStack[]{new ItemStack(resource, 1, 5), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3)}); (new DarkResearchItem("CAP_elementium", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.FIRE, 8).add(Aspect.MAGIC, 12).add(Aspect.WATER, 8).add(Aspect.AIR, 8).add(Aspect.EARTH, 8), 3, 3, 4, new ItemStack(ForbiddenItems.wandCap, 1, 5))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_elementium.1"), new ResearchPage(elementium_cap_inert), new ResearchPage(elementium_cap)}).setParents(new String[]{"ROD_dreamwood_staff"}).setConcealed().registerResearchItem(); @@ -98,7 +113,7 @@ public class ForbiddenBotany { SubTileWhisperweed.lexicon.setIcon(whisperweed); IArcaneRecipe whispercraft = ThaumcraftApi.addShapelessArcaneCraftingRecipe("WHISPERWEED", whisperweed, (new AspectList()).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.EARTH, 10).add(Aspect.AIR, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10), new ItemStack[] { new ItemStack(Blocks.tallgrass, 1, 1), new ItemStack(resource, 1, 2), new ItemStack(resource, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 9), new ItemStack(manaPetal, 1, 7), new ItemStack(manaPetal, 1, 10), new ItemStack(rune, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 6) }); - (new DarkResearchItem("WHISPERWEED", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.PLANT, 8).add(Aspect.MIND, 10).add(Aspect.SENSES, 4), -4, 5, 1, whisperweed)).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.WHISPERWEED.1"), new ResearchPage(whispercraft) }).setParents(new String[] { "BOTANY", "INFUSION" }).setConcealed().registerResearchItem(); + (new DarkResearchItem("WHISPERWEED", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.PLANT, 8).add(Aspect.MIND, 10).add(Aspect.SENSES, 4), -4, 5, 1, whisperweed)).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.WHISPERWEED.1"), new ResearchPage(whispercraft) }).setParents(new String[] { "BOTANY" }).setConcealed().registerResearchItem(); BotaniaAPI.registerSubTile("tainthistle", SubTileTainthistle.class); BotaniaAPI.registerSubTileSignature(SubTileTainthistle.class, new DarkSignature("tainthistle")); diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java b/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java index b6abda1..951dd29 100644 --- a/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java +++ b/src/main/java/fox/spiteful/forbidden/enchantments/DarkEnchantments.java @@ -20,6 +20,9 @@ public class DarkEnchantments { public static Enchantment impact; public static void hex() { + if(!Config.enchanting) + return; + cluster = new EnchantmentCluster(Config.clusterEnchID); wrath = new EnchantmentWrath(Config.wrathEnchID); greedy = new EnchantmentGreedy(Config.greedyEnchID); diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentConsuming.java b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentConsuming.java index 54c5742..d1f81b0 100644 --- a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentConsuming.java +++ b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentConsuming.java @@ -5,6 +5,7 @@ import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; +import thaumcraft.common.items.equipment.ItemPrimalCrusher; public class EnchantmentConsuming extends Enchantment { public EnchantmentConsuming(int id) { @@ -24,7 +25,7 @@ public class EnchantmentConsuming extends Enchantment { @Override public boolean canApply(ItemStack item) { - if (item.getItem() instanceof ItemPickaxe || item.getItem() instanceof ItemSpade) + if (item.getItem() instanceof ItemPickaxe || item.getItem() instanceof ItemSpade || item.getItem() instanceof ItemPrimalCrusher) return true; else return false; diff --git a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentCorrupting.java b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentCorrupting.java index db01d2a..56545da 100644 --- a/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentCorrupting.java +++ b/src/main/java/fox/spiteful/forbidden/enchantments/EnchantmentCorrupting.java @@ -4,6 +4,7 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import thaumcraft.common.items.equipment.ItemPrimalCrusher; public class EnchantmentCorrupting extends Enchantment { public EnchantmentCorrupting(int id) { @@ -28,7 +29,7 @@ public class EnchantmentCorrupting extends Enchantment { @Override public boolean canApply(ItemStack item) { - if (item.getItem() instanceof ItemPickaxe) + if (item.getItem() instanceof ItemPickaxe || item.getItem() instanceof ItemPrimalCrusher) return true; else return false; diff --git a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java index 345277a..8f55b34 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java +++ b/src/main/java/fox/spiteful/forbidden/items/ForbiddenItems.java @@ -62,6 +62,9 @@ public class ForbiddenItems { public static WandRod WAND_ROD_WITCHWOOD; public static WandRod WAND_ROD_LIVINGWOOD; public static WandRod WAND_ROD_DREAMWOOD; + public static WandRod WAND_ROD_EQUIVALENT; + public static WandRod WAND_ROD_PROFANE; + public static WandRod WAND_ROD_PROFANED; public static StaffRod STAFF_ROD_BLOOD; public static StaffRod STAFF_ROD_NEUTRONIUM; public static StaffRod STAFF_ROD_WITCHWOOD; @@ -133,6 +136,9 @@ public class ForbiddenItems { WAND_ROD_WITCHWOOD = new WandRod("witchwood", 100, new ItemStack(wandCore, 1, 4), 12, new ManaWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_witchwood.png")); WAND_ROD_LIVINGWOOD = new WandRod("livingwood", 100, new ItemStack(wandCore, 1, 7), 12, new YandereWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_livingwood.png")); WAND_ROD_DREAMWOOD = new WandRod("dreamwood", 100, new ItemStack(wandCore, 1, 11), 12, new YandereWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_dreamwood.png")); + WAND_ROD_EQUIVALENT = new WandRod("equivalent", 100, new ItemStack(wandCore, 1, 11), 12, new ResourceLocation("forbidden", "textures/models/wand_rod_equivalent.png")); + WAND_ROD_PROFANE = new WandRod("profane", 50, new ItemStack(wandCore, 1, 5), 12, new ProfaneWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_profane.png")); + WAND_ROD_PROFANED = new WandRod("profaned", 50, new ItemStack(Blocks.bedrock, 1), 1000, new ResourceLocation("forbidden", "textures/models/wand_rod_profaned.png")); STAFF_ROD_BLOOD = new StaffRod("blood", 50, new ItemStack(wandCore, 1, 9), 24, new BloodStaffUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_blood.png")); STAFF_ROD_NEUTRONIUM = new StaffRod("neutronium", 9002, new ItemStack(Blocks.bedrock, 1), 1000, new CreativeWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_neutronium.png")); STAFF_ROD_NEUTRONIUM.setGlowing(true); diff --git a/src/main/java/fox/spiteful/forbidden/items/tools/ItemRidingCrop.java b/src/main/java/fox/spiteful/forbidden/items/tools/ItemRidingCrop.java index 4828dc6..2959364 100644 --- a/src/main/java/fox/spiteful/forbidden/items/tools/ItemRidingCrop.java +++ b/src/main/java/fox/spiteful/forbidden/items/tools/ItemRidingCrop.java @@ -50,7 +50,7 @@ public class ItemRidingCrop extends ItemSword { victim.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 200, 1)); victim.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 200, 1)); } - if (!player.worldObj.isRemote && !Config.noLust && player.worldObj.provider.dimensionId == -1 && player.worldObj.rand.nextInt(30) == 1) { + if (!player.worldObj.isRemote && !Config.noLust && player.worldObj.provider.dimensionId == -1 && player.worldObj.rand.nextInt(15) == 1) { EntityItem ent = victim.entityDropItem(new ItemStack(ForbiddenItems.deadlyShards, 1, 4), 1.0F); ent.motionY += player.worldObj.rand.nextFloat() * 0.05F; ent.motionX += (player.worldObj.rand.nextFloat() - player.worldObj.rand.nextFloat()) * 0.1F; diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java index 233e216..2220a64 100644 --- a/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ItemWandCores.java @@ -10,8 +10,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import thaumcraft.api.ItemApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; +import thaumcraft.common.config.ConfigItems; import thaumcraft.common.items.wands.ItemWandCasting; import fox.spiteful.forbidden.compat.Compat; @@ -27,7 +30,7 @@ public class ItemWandCores extends Item { "soul", "blood", "witchwood", - "totem", + "profane", "blood_inert", "livingwood", "livingwood_inert", @@ -66,56 +69,65 @@ public class ItemWandCores extends Item { list.add(new ItemStack(this, 1, x)); } - ItemStack wand = ItemApi.getItem("itemWandCasting", 72); + ItemStack wand = new ItemStack(ConfigItems.itemWandCasting, 1, 72); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("thaumium")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("tainted")); list.add(wand); - wand = ItemApi.getItem("itemWandCasting", 72); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 72); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("thaumium")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("infernal")); list.add(wand); - wand = ItemApi.getItem("itemWandCasting", 2000); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 2000); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("orichalcum")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("neutronium")); list.add(wand); - wand = ItemApi.getItem("itemWandCasting", 2000); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 2000); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("orichalcum")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("neutronium_staff")); list.add(wand); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 36); + ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("iron")); + ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("profane")); + ((ItemWandCasting) wand.getItem()).storeAllVis(wand, new AspectList().add(Aspect.FIRE, 5000).add(Aspect.WATER, 5000).add(Aspect.EARTH, 5000).add(Aspect.AIR, 5000).add(Aspect.ORDER, 5000).add(Aspect.ENTROPY, 5000)); + list.add(wand); if (Compat.bm && Config.crossWand) { - wand = ItemApi.getItem("itemWandCasting", 84); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("alchemical")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("blood")); list.add(wand); - wand = ItemApi.getItem("itemWandCasting", 168); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 168); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("alchemical")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("blood_staff")); list.add(wand); } if (Compat.am2 && Config.crossWand) { - wand = ItemApi.getItem("itemWandCasting", 72); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 72); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("vinteum")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("witchwood")); list.add(wand); - wand = ItemApi.getItem("itemWandCasting", 144); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 144); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("vinteum")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("witchwood_staff")); list.add(wand); } if (Compat.botan && Config.crossWand) { - wand = ItemApi.getItem("itemWandCasting", 84); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("manasteel")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("livingwood")); list.add(wand); - wand = ItemApi.getItem("itemWandCasting", 84); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("elementium")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("dreamwood")); list.add(wand); - wand = ItemApi.getItem("itemWandCasting", 84); + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 144); ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("elementium")); ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("dreamwood_staff")); list.add(wand); } + wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84); + ((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("void")); + ((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("equivalent")); + list.add(wand); } @Override diff --git a/src/main/java/fox/spiteful/forbidden/items/wands/ProfaneWandUpdate.java b/src/main/java/fox/spiteful/forbidden/items/wands/ProfaneWandUpdate.java new file mode 100644 index 0000000..4697ea5 --- /dev/null +++ b/src/main/java/fox/spiteful/forbidden/items/wands/ProfaneWandUpdate.java @@ -0,0 +1,48 @@ +package fox.spiteful.forbidden.items.wands; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.wands.IWandRodOnUpdate; +import thaumcraft.api.wands.WandRod; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.items.wands.ItemWandCasting; + +public class ProfaneWandUpdate implements IWandRodOnUpdate { + + Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]); + + public void onUpdate(ItemStack itemstack, EntityPlayer player) { + + if(player.ticksExisted % 20 == 0){ + + NBTTagCompound tag = itemstack.getTagCompound(); + if(!tag.hasKey("contract")){ + Thaumcraft.proxy.getResearchManager().completeResearch(player, "ROD_profane"); + tag.setInteger("contract", 25000); + } + else if(tag.getInteger("contract") <= 0) + return; + + for(int x = 0;x < primals.length && tag.getInteger("contract") > 0;x++){ + int deficit = ((ItemWandCasting)itemstack.getItem()).getMaxVis(itemstack) - ((ItemWandCasting)itemstack.getItem()).getVis(itemstack, primals[x]); + if(deficit > 0) { + int restore = Math.min(tag.getInteger("contract"), deficit); + ((ItemWandCasting)itemstack.getItem()).addRealVis(itemstack, primals[x], restore, true); + tag.setInteger("contract", tag.getInteger("contract") - restore); + if(player.worldObj.rand.nextInt(2501) < restore) + Thaumcraft.addStickyWarpToPlayer(player, 1); + } + } + + if(tag.getInteger("contract") <= 0) { + ((ItemWandCasting)itemstack.getItem()).setRod(itemstack, WandRod.rods.get("profaned")); + Thaumcraft.addStickyWarpToPlayer(player, 1); + player.worldObj.spawnParticle("largeexplode", player.posX, player.posY + (double)(player.height / 2.0F), player.posZ, 0.0D, 0.0D, 0.0D); + } + itemstack.setTagCompound(tag); + } + + } +} diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang index 6a1c640..ce1f87f 100644 --- a/src/main/resources/assets/forbidden/lang/en_US.lang +++ b/src/main/resources/assets/forbidden/lang/en_US.lang @@ -57,6 +57,9 @@ item.Wand.blood.rod=Blood item.Wand.witchwood.rod=Witchwood item.Wand.livingwood.rod=Livingwood item.Wand.dreamwood.rod=Dreamwood +item.Wand.equivalent.rod=§kAlchemical§r +item.Wand.profane.rod=Profane +item.Wand.profaned.rod=Profane item.Wand.orichalcum.cap=Orichalcum Studded item.Wand.alchemical.cap=Alchemically Crowned item.Wand.vinteum.cap=Vinteum Bossed @@ -67,7 +70,7 @@ item.WandCores.infernal.name=Infernal Rod item.WandCores.soul.name=Eldritch Rod item.WandCores.blood.name=Blood Rod item.WandCores.witchwood.name=Witchwood Rod -item.WandCores.totem.name=Totemic Rod +item.WandCores.profane.name=Profane Rod item.WandCores.blood_inert.name=Inert Blood Rod item.WandCores.livingwood.name=Livingwood Rod item.WandCores.livingwood_inert.name=Dormant Livingwood Rod @@ -187,6 +190,10 @@ forbidden.research_text.ROD_infernal=Devilish vis storage forbidden.research_page.ROD_infernal.1=A great and powerful thaumaturge like you deserves a powerful and imposing wand befitting your station. Some hippy silverwood wand just won't cut it. You need a wand that will serve as your scepter of authority.

You've discovered a way to create a wand infused with the power of the Nether. The Infernal Wand Core can hold up to 150 vis and will slowly replenish its supply of Ignis up to 20%. While within the Nether, the wand will also replenish its other aspects to 10%. forbidden.research_page.ROD_infernal.2=The wand also imbues you with some protection from the Nether's hazards, extinguishing you if you are on fire or protecting you from the effects of Withering as long as it is in your inventory. While the wand is held in your hand, it will completely protect you from all fire damage. # +forbidden.research_name.ROD_profane=Profane Wand +forbidden.research_text.ROD_profane=Sign on the dotted line +forbidden.research_page.ROD_profane.1=Strange villagers have been known to procure these wooden wands carved with blasphemous symbols. Profane Wands draw from a mediocre pool of vis, but they seem to be able to refill themselves very quickly from an unseen source.

The runes on the wand sometimes shift and bleed and the wand itself occasionally whispers of demonic contracts and vile deeds.

Prolonged use is not recommended. +# forbidden.research_name.ROD_soul=Eldritch Wand Core forbidden.research_text.ROD_soul=Corrupting vis storage forbidden.research_page.ROD_soul.1=You've discovered a way to tap the energy flowing through a Player Beacon and turn it into vis. As long as you're in a dimension with an active Player Beacon attuned to yourself, the Eldritch Wand Core will slowly charge all its internal reserves, which can hold up to 100 vis.

Channeling such great amounts of energy through your soul comes at a price, however. Each point of vis creates large amounts of corruption in your soul. It's best not to rely on its recharge abilities too greatly... diff --git a/src/main/resources/assets/forbidden/textures/items/wand_rod_profane.png b/src/main/resources/assets/forbidden/textures/items/wand_rod_profane.png new file mode 100644 index 0000000000000000000000000000000000000000..2f0aed0310be3728f6079e97647ac9e66e6d3984 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85p>QK$!8;-MT+OL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvnZRT^vI!{I5>(=3;Uba4u#(F1)v9Y z1ipkA%f_gZ!>j#PNqxPvi(PMbLg|?;Z=1tSDgu3@5+~nfs9E@+j>GS^V$Ny*gX<#I zTju_>VUuqX*Q}9f%r~hNk6E_Oyz1u6*pF9i-%ifCebB3S)$8{utL3iwuI@6fwmnyU s<@9HfZ9Kmw|6z$fC+q*4pQVODi_uYLzMI=zpi3D%UHx3vIVCg!0GHipUjP6A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forbidden/textures/models/heretic.png b/src/main/resources/assets/forbidden/textures/models/heretic.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c9006721ea2ef96b635bcc281412b440f43750 GIT binary patch literal 1536 zcmV+b2LJhqP)N2bPDNB8 zb~7$DE-^7j^FlWO00n$WL_t(|UhSDNj~qo1h4&AfPF#5DosNqRA%x`YgpqK>UmzeM zI3i2PfdeEWOC19Ere(r;ETWLg_|FOORXi&JuCA{3 zfB>0z9_NPEM$;fH^3PU)O#0ah0P$xhfC%#m_^03kRPal1%&Ml=MAJkvlg=kV5ZMZ` z%&1jOt%>asui&Ilh1}5Em?Z!wAPcgDK)Io{vHiwrNPhLrPob)343wAWgxt{D*wC;5 z87C*ac*I?T=5ijS7Z*ZfI?6KLID;Z(RgsKiiyq8Gi(F8hnjP1c>|i(e@fz8(RTrSZ`B= zAgdoVzrX!{`16<7!{6_I+(L7TDObLpeiD4mJm<08(Aqfo1oAhJ0B>G?xd#`3-0BpF ztj{rzpBq{mdje$g0s>S(fH@*mVrVWmv^F+sSkUo}U#A~zT8njAI};}-H?%fZGZ#dN z>9VOcaWcERyW9Je9EzQvpU*-p_wO?V;Eve4Cwdm(;^Ja(JWgfIGLfvv%U@CeU98^* zxNHUPnn;^(rxbwak^(>;_+=|Z+I(AD0N(r>0#v^_B5l4cDS(rAEGfX)C%|VAY2yab zv$M0O=k4w79z2%g`p3`9%ga3|S5WNw`ugDbYfi{@K(U*fn=ROjv3@@|oUjCF#e??F zAb5-bf|@2KK!k=}1o>liz)3q;&wopZAjjSXn2HDOooUl4f^*^y1R#zGIuTAT*8$=c zR6j*fXvKr}&a~-=2;ebt1m-i=MPmP^i zB>?l}93_BbZafo#fZzlw0jLo?hZ^~;=j0H;Q3>D(+B@^jX~3a5Z!*X8ZO$b~!-A86 zT&@FEjeOPJP0U+sd{#f*QEYr501rYoMFqfg2a(ph9XhycIp@-I6?$aC+LAKM&SF9L{! zlj1l-M&K0a$dBcdLk;;)3Ohaxs33Ycu$PfrK`|{1P?~WpG21dBtyK|XJeBXcIGC?$1c*9mUnjQh$1(xlC`4)e^LRoi3pckew(ZBJh|s*A?q>n0 znNt_r_G7y6oIt)UA%M@D%ypnu7u)t@V*;pYC*fo&0p`}lw*8nBfrOxDX&MrGixBiW zuWi-Ew*8oz_iq`W=GAoeMNVYNrB-Ow#kT!e7Ql(nxSsBd$gy>?Z9nEj9BNij^G=HS zszzwl#kT!eCcvA_L;$yW7LGb6>-lB=JB%t)Z{v9c;a_wkibNQHz>=EBY=Fb&2=&#>-2=%msJ8d m>Gu&J=T5EjzkPJuZ2kfGT1!5xRx%*~0000J0!fTzNU57#d(63n>P}z0=Avmbb z_waPn?nEOo8@JWv{?-JCjQDO$zIWg${yE>^lYs8aJ;S&3a`VB5SzFpzT3NY|yVwGN zeDC4v>=Vu!%JTO==4KG@9dY65ojaSkE;nx8BsDbj^=1>N?dQ#-S1j9{C~~!!v38|j zqOW$lb7}XsU7J&5@yH)3$&sF?v4IJO9ohw&-@jdWzUQ^09l~GO7SeWeLdQIAxeNOL zX2EH_iHRNW%o$5wXsFHCnHlnyxs3257J>u@z!sO3^yTN}dOY&*-Z9|3&MAXwuIBZ6?9g~E-di9ExnVHFAPfu3{YNI-)rk<*1XDd`a{;H0& zgGFVxZmroK?KR-`qD1ucSZVvDt~_xiQ9nmb0*U?Y0G|kcK+5fp zLpWiYR=&>gCTjqm&hLvNo zV~`}_Z!$}wqNK2<2o8E`?Xn(2E%`xUBTZcut4=5F&&pWXL0U_@5H3{ieR&n~_xESO zy2tj@yx&px(zuQ%w0)2EP`VO0+TD+N1UQj_^GkpB%)$Lo4;e)b(@w3SPB~n@e3`+t z@`e+C!g6NSd=e;J5eya1kM=*~f^d2+;8DlZV%S$<45yr;i>Z4er7fZ(O;N_u+&yVI zYF#lZ%zgaBx5(k%-a1UAn)cm}J@j&FaIi5mg*P3G_u8{U3!wwk{7)?{QMz!uAn6Dc z=+hDeL)3DBM=B7+xqD5FKtkya?$45@^t)qrP`qeJW4AM?ii2Hj2(x#?eaa{wjkrF+ zw@Z}q5b$KC*D!+J2=QBB0q0-5cu`+=*Lb)stESb{mgU}ew|!upWmfyflNL-y$m}H} zm|I~v7j%SqAq47tE+Cj4fF{7+yc&X&3K6tTh2TUNX-naQt%`ieW->?Wb9R6~qm|{d z__x{4z8mExO)%=~C~6)==K>!ium;|cLn&R&iTcLfijrF4haie4wr9Y!!T`KL8Kfwi zVSS?biC4&`lGw8MleiO&AM{0-ZkE%S^m*~^IfsC{dGd~xxX^eQct(mY0tW0}QoI44 zF0yuyAJsD_ZrBaq?V2rXWmf$4v|i3D#1ZlnKatM38qyDz`*_Re=YQKCS1XoOhi;WD zc4hz|I$;I<_aH?t5ojX(cBYEe<)%_vB^Ni+wXhc_P=AFSWZu}$gPmm=@#N|kE|sZ=6JPbmNq;Kv``N*)qpjxOYx2fQ9_%IO?`tn`een5ah1 z)zUSG?29li);Y@%R5?tF3xJ24mury= GC-yIwg5(|m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forbidden/textures/models/wand_rod_profane.png b/src/main/resources/assets/forbidden/textures/models/wand_rod_profane.png new file mode 100644 index 0000000000000000000000000000000000000000..64f9ce2b4cdfee1680fb71bf45308a79aa51f30e GIT binary patch literal 2158 zcmZ`*dpy&7AOG#l*05!>CYO_D3T?S;!XakZjLdN4`ZzK+Dx|WqT(Z*tNi3Jr;S5o7c^-yyQX!WT<#M+A27}7xsr;B9WKJQ>&eaY8>aQwqupqLv;%O(pXaLyxSZ<)^?C^P6 za0l1fmA2zQFo?3g;cDJqPgzKlOY`M=Mul=?SZ6taJL|+Lt`U=V6noy($jpdHq_5ap z$o368Q|*rO0_O|k+%P`7y4I1d1^E?TV|VgWx?Ly)d$0I(0al4tj>VU267^g|#)iDB z6WS(fjje3jqQf$uYE=~JRcs72<>V#2mfVcXX%s?M!(^8F{}~&Ji<0t3mz%9$ z_$)22Nzw>|o0y)Sj7o@Boum%*E~9+#r_0T}JNKqunA%`!U01yi8k-iWMTo6Bpd0kr z@#P2|?b)$_rGByQ!hCG&lzY2$fzGJ4c@Pucbyoe>PV=CfKQG!gHts6kQGwga1szN7 zQ?*qlnoZtVj%!8C6e7CC$B}Dyv1+IRiT1d*<^3oZ>n$Us$J3PG9GNN6NHiHfGdf+{ z8c?V`qL!-YGW}E6Fy~+j@hyK5#-Q>Pu7MW6oX%Jz*+D7f^feMcBxC(h7QPOoL0L<& zJE%AjAug8sju?a2;E~EDoJ)A11GzO#`ge!=IbY%1%#kB4#76`rr$U?YKx(r#2BmAB@6fcz*By0I$|-6j@w^7nQS4Fz*y zJLMPh6mmfyJ`Vv^bJszPUh2nqjYSt;wUUT7!iTpcu-tmtIF0z}fW(>cfh+l&`M(?> zO@8Jc+oxA(JLJ7|cJ|Y!j=0Xa;pC7!WDhID3Ts`)>E9Nruz`I&gG!VQmG(F)IlZ66 z=Mb_j!Ap@8D4U<;MgW${?e~5>LIAQ^{-8!(TyYaf$ctiC@db3uuM#*FSJwUD>UXsa z?r!DE-|@^n5t&{NEt-;nPpOTE@UNwR2oO9~WU;mzmDk`84T7PhLgkkv3YCYFex>gY zppoS*?z7{5w#qe~>H$Vov&#?6>zVOSmVC#XfU+mInz9WvOBZ*-yK-klZMWMsMtA4om4^g5;$mP_871`uzbu7|4;gxJfcbQ%cMTvRh38?YZw8d0 zgm1GzEh(@5#86!9;~9;zOzNz^zkI82(7UF1KC^`zOsAQ%S9IFD>IN^jSj06OE?i7q z(YGR;MKixj0yK9rweeag*n~D!38f_M-cNq<_=;}~?Hiu&VsKLf_H1BY;2Q?mTWE=t zCgUO~&;=s|COEdo4#QVecepXdld^AZE|SaajkMqKdinQQet7xYDLmIgSYNn?nCimz zAvl=u`&5aLrC}0ZjSVJ==IC`FYAO|WKa16%yhQJBg^Tit#U>?a8A}Vj?^7RoH)yh+ zojm_ormEqYUg@eYN}UwbXmej@>aRK~M^&Gh5s^OO@GXbB`qWsii{GVaMkt!YcY25$ z;{bkF74th3BEcm78tj5GQhGaS2=LF%$O0V&hOyR{dH^Rg9qZ6neE4{gmH~AhG|BMw z$LXDkZ8TGIok>-ck!hhHhcCJ?pZ7{4_{+p`53*>kg5wUk4T|X?W}7=`<$zi)=77Em z9WE+IqO4?ec!5eAiphOjKyCrTeRWKBc)=b)LXlwdx6m)T#!2P-%dUr~#4osqBhUSd z1|J;V{(JrBw8olen`64)0JpVxK7BiBt=BCWkPE5_?KnFGEaV5L!S8`I#6WhYZ#0C` z`K0V`CCY3Q9*`1;WP(~951QRZ;57BdFDBISbmzD_Q!&U?hXCQ*bU#`*8C=uivVw~9%+25J)jki?0KH0w85^P>FY z8zrl6va2yMF%eb1J41#*OWQE}S{%z)w6b>UZPNTSD?_3wKC!5XY@6Q@DpxT9dk=zZ4EvsccCf=T@m xd;>7HJ^cj4;L8mHWh4p=?=bn_a5#QqT?-s=J|2e2B+EVmfHRFrt+5Zf^bb*zvs?fG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/forbidden/textures/models/wand_rod_profaned.png b/src/main/resources/assets/forbidden/textures/models/wand_rod_profaned.png new file mode 100644 index 0000000000000000000000000000000000000000..9e15aa04cf8fcbd5696069678a5503e6916745d6 GIT binary patch literal 1978 zcmZuyc~Fx{7Vj@45E6{RWK|F}3IZaK0~F9;B7&j;}w2!())2q<6zLi`Mf>n{p$CQ-|Opcu7}p( zba4QHHHV!Xjw70@60AD1k7e>~5QPri@3J3&id*;}ff(eh8Rg^?4FEx`5-4oox+Y@O zh&k-ysPPet!5f<|-QD7jm~>+ty<^-XLt=P=7lMIX;6Ec`ELJd)c3IHrhZgLu zk#`1%9rk^$?sM(qjw;^N-YVir@N>N z|E+E4?c`a~r3RY>vv||bi^FyW(vkWheZPR_ur%ZzR>0-vPRe8-H;i2aiwecnHrpNW z%E}5YKMd%I%+-wCO!MsOeB>n< zQK#4imwiNzHUXJ)6#jl9Xs<}7f^bruScjd0U0Iy!rGGVo^YZd+mN9TpRrqHc8EDqb zmRiADGP4^g#3Gh?4jwx0RkoIFXJ?nUZt*|!G7~{9V{?7{LsooHgvs~nj-tu$j1%{; z{zm*P3EeVF;^T|X?VU<)^Tq*w>UlyxU^vLpMxcF(3U3VOnpRzP`jYZ6qx6K|fkdCVar)hH=*ySRR4BnYxyw0!9rG53Z7Gr*(9i>HRXh`_(E1?M z?TcV$FFSJ>NnU$|DGbt3T<3B1+j*>jjyKzrf>Ua0FO&||@r;r=F3QCvE=_9YH+AFB zok!qfqh&d_N)hmyp#6ktV*wysz`+Z!Azdr6~ir4QYp*;16SyMB?P4^~@{o04771PlmR@v!hW&P<76*?eJeY`G=1l-61 z93a(|$ZfMDphD>Mza*MRf6cX^B&6$vZ34mwl$(Z}i9jB$&d1r-PvjDSP+VSrzS>u? zaj>DFde1UonvJHnDS}IOYcsc2YH6!-p)cMCLEv|ftCxwOrVTJ24Rg5Yky()CLj`D# z=U0?C8XQ6@yeLrGV>86q^$R=rie~W@{}=vO-`SqE-g%}^I&spYxe#w@_bIMW3Go+qmQqT{p7) zGLEUe=6=(=`o^DrkFL$r-fca29Arv@g;MWy^DrDNh5ijAJOUI_*i*G~e*=*|yHz6= zG#2Bh-+7;luioubx_Wol)6qn0pM(HGPg8gS^*OpMtAXxS|D^!8t?SB$HpP~~jEWDx zpeX#1SR5=f0`>*#>PiSlUL#Gt3u+Z9Jy0B|)df^S3BrprSw~wl9|!Y-nF57V@XLKV zGfn)csB+1zCI0*TIkOvYq`7#0_KPBSbvYe^y9?2rAr!2cCh^3;(csa`Y&4)1qPqlY zt;9x>o@eACcaW;h48+4Bw>p?!C4xvE`#kErXPMIn$jz-dK@nL}AE}i(YZ2wVb17 zuYn7{d!qlruC_?fKZVRHQX}a>NbIxJSq*l%uMnG~`1OeVzA;EGU~%ZM7K9MUcFk%o zfe5lB!920?nM>y%X+;^f%QNu(dtCjpCyY)hjQ=~^+wq%BLs3HAIUcz=2R~w(lo6S| zYFg8f+MiE`(?w(ugzlQ(1~$@C10jjGq&&5vL^Zo|x~&%C%mDhxZIQBr&^;S@5iEa% zvc`-jJiqpLb;UWm9PkQ_x*Wjr`($JK(x7P?n6`{$GPPB}(*(U#kUWUarFx+$dhRFE zb&-an&>}$AHiYxR!a+0RsLgn!Q*uyZy|W;zr#n4C9J*% zR(1vLlUza(XpxsPnY@XTcdrEiT`i_R-&uNWQtk|)kD``0xRf`yc zySJ_(tP`^337d)FW}X4opGanc;g;W^(}kMs^}tzv;REzD8P?!$pVyt6dfzlESbo>1 TiC0L-rwR@`x;m8FbA|r{^bB-S literal 0 HcmV?d00001