From 9e212a9a906dd1273b35824b4973d1d64efdc83a Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Tue, 1 Apr 2014 16:44:39 -0700 Subject: [PATCH] Removing "No New Aspects" Config, adding Eternal --- src/com/spiteful/forbidden/Compat.java | 23 +++--- src/com/spiteful/forbidden/Config.java | 10 +-- src/com/spiteful/forbidden/DarkAspects.java | 11 +-- .../spiteful/forbidden/FMEventHandler.java | 2 +- src/com/spiteful/forbidden/Forbidden.java | 5 +- .../spiteful/forbidden/ForbiddenRecipes.java | 29 ++++---- .../spiteful/forbidden/ForbiddenResearch.java | 3 - .../forbidden/blocks/ForbiddenBlocks.java | 18 ++--- .../enchantments/DarkEnchantments.java | 13 +++- .../enchantments/EnchantmentEternal.java | 72 +++++++++++++++++++ .../forbidden/items/ForbiddenItems.java | 56 +++++++-------- .../forbidden/items/ItemMorphAxe.java | 14 ++++ .../forbidden/items/ItemMorphPickaxe.java | 23 +++--- .../forbidden/items/ItemMorphShovel.java | 14 ++++ .../forbidden/items/ItemMorphSword.java | 14 ++++ .../forbidden/items/ItemRidingCrop.java | 2 +- 16 files changed, 212 insertions(+), 97 deletions(-) create mode 100644 src/com/spiteful/forbidden/enchantments/EnchantmentEternal.java diff --git a/src/com/spiteful/forbidden/Compat.java b/src/com/spiteful/forbidden/Compat.java index bb15151..0a70f7b 100644 --- a/src/com/spiteful/forbidden/Compat.java +++ b/src/com/spiteful/forbidden/Compat.java @@ -1,6 +1,7 @@ package com.spiteful.forbidden; import com.spiteful.forbidden.items.ForbiddenItems; +import com.spiteful.forbidden.enchantments.DarkEnchantments; import java.util.logging.Level; import java.lang.reflect.Field; @@ -26,6 +27,7 @@ import thaumcraft.api.wands.WandRod; import thaumcraft.api.wands.WandTriggerRegistry; import thaumcraft.api.crafting.IArcaneRecipe; import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.crafting.InfusionEnchantmentRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchCategoryList; import thaumcraft.api.research.ResearchItem; @@ -90,11 +92,14 @@ public class Compat { try { - Item kamiShards = (Item)(Class.forName("vazkii.tinkerer.common.item.ModItems").getField("kamiResource").get(null)); + Item kamiResource = (Item)(Class.forName("vazkii.tinkerer.common.item.ModItems").getField("kamiResource").get(null)); list = new AspectList().add(DarkAspects.NETHER, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1); - ThaumcraftApi.registerObjectTag(kamiShards.itemID, 6, list); + ThaumcraftApi.registerObjectTag(kamiResource.itemID, 6, list); list = new AspectList().add(Aspect.ELDRITCH, 2).add(Aspect.MAGIC, 1).add(Aspect.CRYSTAL, 1); - ThaumcraftApi.registerObjectTag(kamiShards.itemID, 7, list); + ThaumcraftApi.registerObjectTag(kamiResource.itemID, 7, list); + + InfusionEnchantmentRecipe eternal = ThaumcraftApi.addInfusionEnchantmentRecipe("ETERNAL", DarkEnchantments.eternal, 12, (new AspectList()).add(Aspect.CRAFT, 32).add(Aspect.TOOL, 64).add(DarkAspects.ENVY, 76).add(Aspect.MAGIC, 64), new ItemStack[]{new ItemStack(kamiResource.itemID, 1, 0), new ItemStack(kamiResource.itemID, 1, 2), new ItemStack(kamiResource.itemID, 1, 2), new ItemStack(kamiResource.itemID, 1, 2), new ItemStack(kamiResource.itemID, 1, 6), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1)}); + (new DarkResearchItem("ETERNAL", "FORBIDDEN", "[TTKami]", (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TOOL, 10).add(Aspect.CRAFT, 8).add(DarkAspects.ENVY, 32), -5, 7, 6, new ResourceLocation("forbidden", "textures/misc/eternal.png"))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ETERNAL.1"), new ResearchPage(eternal)}).setParents(new String[]{"MORPHTOOLS", "ICHOR_TOOLS"}).setConcealed().registerResearchItem(); } catch(Exception e) @@ -202,7 +207,7 @@ public class Compat { register.invoke(null, new ItemStack(ForbiddenItems.wandCore, 1, 3), new ItemStack(ForbiddenItems.wandCore, 1, 6), 4, 20000, 15, 20, false); InfusionRecipe alchemical_recipe = ThaumcraftApi.addInfusionCraftingRecipe("CAP_alchemical", new ItemStack(ForbiddenItems.wandCap, 1, 0), 3, (new AspectList()).add(Aspect.LIFE, 12).add(Aspect.WATER, 6), ItemApi.getItem("itemWandCap", 1), new ItemStack[]{new ItemStack(magicales), new ItemStack(magicales), new ItemStack(magicales)}); - (new DarkResearchItem("CAP_alchemical", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 4).add(Aspect.TOOL, 1).add(Aspect.WATER, 3), -5, -5, 2, new ItemStack(ForbiddenItems.wandCap, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_alchemical.1"), new ResearchPage(alchemical_recipe)}).setParents(new String[]{"ROD_blood"}).setSecondary().setConcealed().registerResearchItem(); + (new DarkResearchItem("CAP_alchemical", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 4).add(Aspect.TOOL, 1).add(Aspect.WATER, 3), -5, -5, 2, new ItemStack(ForbiddenItems.wandCap, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_alchemical.1"), new ResearchPage(alchemical_recipe)}).setParents(new String[]{"ROD_blood", "CAP_gold"}).setSecondary().setConcealed().registerResearchItem(); IArcaneRecipe bloodwell_recipe = ThaumcraftApi.addShapelessArcaneCraftingRecipe("BLOODWELL", new ItemStack(ForbiddenItems.bloodwell, 1, 0), (new AspectList()).add(Aspect.WATER, 10).add(Aspect.EARTH, 10), new Object[]{new ItemStack(Item.feather, 1, 0), new ItemStack(bloodBucket, 1, 0), new ItemStack(Item.glassBottle, 1, 0), new ItemStack(crapOrb, 1, 0)}); (new DarkResearchItem("BLOODWELL", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 5).add(Aspect.MIND, 4).add(Aspect.SENSES, 3), -10, 4, 1, new ItemStack(ForbiddenItems.bloodwell, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.BLOODWELL.1"), new ResearchPage(bloodwell_recipe)}).setParents(new String[]{"RESEARCH"}).setAspectTriggers(new Aspect[]{Aspect.LIFE}).setConcealed().registerResearchItem(); @@ -214,7 +219,7 @@ public class Compat { Item kamiResource = (Item)(Class.forName("vazkii.tinkerer.common.item.ModItems").getField("kamiResource").get(null)); InfusionRecipe divine_orb = ThaumcraftApi.addInfusionCraftingRecipe("DIVINEORB", new ItemStack(ForbiddenItems.bloodOrb, 1, 0), 12, (new AspectList()).add(Aspect.LIFE, 64).add(Aspect.MAGIC, 48).add(Aspect.WATER, 32).add(Aspect.VOID, 64), new ItemStack(archmasterOrb), new ItemStack[]{new ItemStack(kamiResource.itemID, 1, 0), new ItemStack(kamiResource.itemID, 1, 0), new ItemStack(kamiResource.itemID, 1, 0), new ItemStack(kamiResource.itemID, 1, 2), new ItemStack(kamiResource.itemID, 1, 2), new ItemStack(kamiResource.itemID, 1, 1), new ItemStack(kamiResource.itemID, 1, 6), new ItemStack(kamiResource.itemID, 1, 7), new ItemStack(ForbiddenItems.gluttonyShard)}); - (new DarkResearchItem("DIVINEORB", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.VOID, 24).add(Aspect.CRYSTAL, 24).add(Aspect.MAGIC, 12), -9, 6, 6, new ItemStack(ForbiddenItems.bloodOrb, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.DIVINEORB.1"), new ResearchPage(divine_orb)}).setParents(new String[]{"ICHOR", "INFAUXSION", "ICHOR_CLOTH", "ICHORIUM"}).setAspectTriggers(new Aspect[]{Aspect.LIFE}).setConcealed().setSpecial().registerResearchItem(); + (new DarkResearchItem("DIVINEORB", "FORBIDDEN", "[BM] [TTKami]", (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.VOID, 24).add(Aspect.CRYSTAL, 24).add(Aspect.MAGIC, 12), -9, 6, 6, new ItemStack(ForbiddenItems.bloodOrb, 1, 0))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.DIVINEORB.1"), new ResearchPage(divine_orb)}).setParents(new String[]{"ICHOR", "INFAUXSION", "ICHOR_CLOTH", "ICHORIUM"}).setAspectTriggers(new Aspect[]{Aspect.LIFE}).setConcealed().setSpecial().registerResearchItem(); } catch(Exception e) @@ -307,7 +312,7 @@ public class Compat { (new DarkResearchItem("ROD_witchwood", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 6).add(Aspect.TREE, 5).add(Aspect.MIND, 4), -4, -3, 3, new ItemStack(ForbiddenItems.wandCore, 1, 4))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_witchwood.1"), new ResearchPage(witchwood_recipe)}).setParents(new String[]{"ROD_silverwood", "INFAUXSION"}).setConcealed().registerResearchItem(); InfusionRecipe vinteum_recipe = ThaumcraftApi.addInfusionCraftingRecipe("CAP_vinteum", new ItemStack(ForbiddenItems.wandCap, 1, 1), 5, (new AspectList()).add(Aspect.ENERGY, 12).add(Aspect.MAGIC, 6), ItemApi.getItem("itemWandCap", 6), new ItemStack[]{new ItemStack(amOre.itemID, 1, 0), new ItemStack(amOre.itemID, 1, 0), new ItemStack(amOre.itemID, 1, 0)}); - (new DarkResearchItem("CAP_vinteum", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.TOOL, 1).add(Aspect.ENERGY, 2), -4, -5, 1, new ItemStack(ForbiddenItems.wandCap, 1, 1))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_vinteum.1"), new ResearchPage(vinteum_recipe)}).setParents(new String[]{"ROD_witchwood"}).setSecondary().setConcealed().registerResearchItem(); + (new DarkResearchItem("CAP_vinteum", "FORBIDDEN", "[AM2]", (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.TOOL, 1).add(Aspect.ENERGY, 2), -4, -5, 1, new ItemStack(ForbiddenItems.wandCap, 1, 1))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_vinteum.1"), new ResearchPage(vinteum_recipe)}).setParents(new String[]{"ROD_witchwood", "CAP_thaumium"}).setSecondary().setConcealed().registerResearchItem(); } catch(Exception e) { @@ -322,11 +327,10 @@ public class Compat { { Class totems = Class.forName("totemic_commons.pokefenn.ModItems"); fennCrystal = (Item)(totems.getField("chlorophyllCrystal").get(null)); - Item fennItems = (Item)(totems.getField("subItems").get(null)); Class pokeblocks = Class.forName("totemic_commons.pokefenn.ModBlocks"); Block infusedLog = (Block)(pokeblocks.getField("totemWoods").get(null)); - IArcaneRecipe totem_rod = ThaumcraftApi.addArcaneCraftingRecipe("ROD_totem", new ItemStack(ForbiddenItems.wandCore, 1, 5), (new AspectList()).add(Aspect.ENTROPY, 10).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10), new Object[]{"P", "F", "P", Character.valueOf('P'), new ItemStack(infusedLog.blockID, 1, 0), Character.valueOf('F'), new ItemStack(fennItems.itemID, 1, 1)}); + IArcaneRecipe totem_rod = ThaumcraftApi.addArcaneCraftingRecipe("ROD_totem", new ItemStack(ForbiddenItems.wandCore, 1, 5), (new AspectList()).add(Aspect.ENTROPY, 12).add(Aspect.FIRE, 12).add(Aspect.WATER, 12).add(Aspect.AIR, 12).add(Aspect.EARTH, 12).add(Aspect.ORDER, 12), new Object[]{"PF", "FP", Character.valueOf('F'), new ItemStack(infusedLog.blockID, 1, 0)}); (new DarkResearchItem("ROD_totem", "FORBIDDEN", "[T]", (new AspectList()).add(Aspect.TREE, 8).add(Aspect.MAGIC, 3).add(Aspect.PLANT, 6), -2, -3, 1, new ItemStack(ForbiddenItems.wandCore, 1, 5))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_totem.1"), new ResearchPage(totem_rod)}).setParents(new String[]{"ROD_greatwood"}).setConcealed().registerResearchItem(); @@ -344,7 +348,6 @@ public class Compat { { Class botanItems = Class.forName("vazkii.botania.common.item.ModItems"); Item rune = (Item)(botanItems.getField("rune").get(null)); - Item petal = (Item)(botanItems.getField("manaPetal").get(null)); Item resource = (Item)(botanItems.getField("manaResource").get(null)); Class blocktania = Class.forName("vazkii.botania.common.block.ModBlocks"); Block livingLog = (Block)(blocktania.getField("livingwood").get(null)); @@ -352,7 +355,7 @@ public class Compat { 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)}); - InfusionRecipe livingwood_rod = ThaumcraftApi.addInfusionCraftingRecipe("ROD_livingwood", new ItemStack(ForbiddenItems.wandCore, 1, 8), 3, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TREE, 32).add(Aspect.LIFE, 16).add(Aspect.SENSES, 8).add(Aspect.PLANT, 8), new ItemStack(livingLog), new ItemStack[]{new ItemStack(resource, 1, 2), new ItemStack(rune, 1, 8), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3), new ItemStack(petal, 1, 0), new ItemStack(petal, 1, 15)}); + InfusionRecipe livingwood_rod = ThaumcraftApi.addInfusionCraftingRecipe("ROD_livingwood", new ItemStack(ForbiddenItems.wandCore, 1, 8), 3, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TREE, 32).add(Aspect.LIFE, 16).add(Aspect.SENSES, 8).add(Aspect.PLANT, 8), new ItemStack(livingLog), new ItemStack[]{new ItemStack(resource, 1, 2), new ItemStack(rune, 1, 8), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3), new ItemStack(rune, 1, 4), new ItemStack(rune, 1, 5), new ItemStack(rune, 1, 6), new ItemStack(rune, 1, 7)}); (new DarkResearchItem("ROD_livingwood", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.TREE, 8).add(Aspect.MAGIC, 4).add(Aspect.PLANT, 6), -1, -3, 3, new ItemStack(ForbiddenItems.wandCore, 1, 7))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_livingwood.1"), new ResearchPage(livingwood_rod)}).setParents(new String[]{"ROD_silverwood", "INFAUXSION"}).setConcealed().registerResearchItem(); BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCore, 1, 7), new ItemStack(ForbiddenItems.wandCore, 1, 8), 10000); diff --git a/src/com/spiteful/forbidden/Config.java b/src/com/spiteful/forbidden/Config.java index 03516e4..e6c8ec1 100644 --- a/src/com/spiteful/forbidden/Config.java +++ b/src/com/spiteful/forbidden/Config.java @@ -49,6 +49,7 @@ public class Config public static int arcaneCakeBlockID; public static int blackFlowerBlockID; public static int wrathCageID; + public static int starBlockID; public static int clusterEnchID; public static int pigBaneEnchID; @@ -56,6 +57,7 @@ public class Config public static int consumingEnchID; public static int educationalEnchID; public static int corruptingEnchID; + public static int eternalEnchID; public static int thaumcraftResourceID; public static int thaumcraftTaintBlockID; @@ -65,7 +67,6 @@ public class Config public static int thaumcraftShardID; public static boolean noLust = false; - public static boolean noHell = false; public static boolean silverfishEmeralds = true; public static boolean tagResearch = true; public static boolean wrathCage = true; @@ -111,6 +112,7 @@ public class Config arcaneCakeBlockID = conf.getBlock("Thaumic Cake", blockCount++).getInt(); blackFlowerBlockID = conf.getBlock("Umbral Rose", blockCount++).getInt(); wrathCageID = conf.getBlock("Wrath Cage", blockCount++).getInt(); + starBlockID = conf.getBlock("Nether Star Block", blockCount++).getInt(); int enchCount = 66; clusterEnchID = conf.get("enchantments", "Fiery Core", enchCount++).getInt(); @@ -119,13 +121,11 @@ public class Config consumingEnchID = conf.get("enchantments", "Consuming", enchCount++).getInt(); educationalEnchID = conf.get("enchantments", "Educational", enchCount++).getInt(); corruptingEnchID = conf.get("enchantments", "Corrupting", enchCount++).getInt(); + eternalEnchID = conf.get("enchantments", "Eternal", enchCount++).getInt(); Property nl = conf.get("general", "No Lust", noLust); nl.comment = "Enable to remove Luxuria aspect and related items."; noLust = nl.getBoolean(false); - Property nh = conf.get("general", "No New Aspects", noHell); - nh.comment = "Enable to remove all new aspects and related items."; - noHell = nh.getBoolean(false); Property sf = conf.get("general", "Silverfish Drop Emerald Nuggets", silverfishEmeralds); sf.comment = "Disable to prevent Silverfish from dropping emerald nuggets."; silverfishEmeralds = sf.getBoolean(true); @@ -153,7 +153,7 @@ public class Config cw.comment = "Enable to let the Wrath Cage imprint on ANY non-boss mob. May break your game or make your game Awesome."; wrathCrazy = cw.getBoolean(false); - Property sd = conf.get("general", "Spork of Doom", spork); + Property sd = conf.get("silly", "Spork of Doom", spork); sd.comment = "What is this? I don't even..."; spork = sd.getBoolean(false); } diff --git a/src/com/spiteful/forbidden/DarkAspects.java b/src/com/spiteful/forbidden/DarkAspects.java index 1dfb2b6..6e4a76f 100644 --- a/src/com/spiteful/forbidden/DarkAspects.java +++ b/src/com/spiteful/forbidden/DarkAspects.java @@ -26,8 +26,6 @@ public class DarkAspects public static void initAspects() { - if(Config.noHell) - return; NETHER = new Aspect("infernus", 0xff0000, new Aspect[] {Aspect.FIRE, Aspect.MAGIC}, new ResourceLocation("forbidden", "textures/aspects/infernus.png"), 771); if(!Config.noLust){ LUST = new Aspect("luxuria", 0xffc1ce, new Aspect[] {Aspect.FLESH, Aspect.HUNGER}, new ResourceLocation("forbidden", "textures/aspects/luxuria.png"), 1); @@ -41,9 +39,6 @@ public class DarkAspects public static void addAspects() { - if(Config.noHell) - return; - AspectList list; list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Block.netherrack)); @@ -58,7 +53,7 @@ public class DarkAspects list.add(NETHER, 2); ThaumcraftApi.registerObjectTag(Block.oreNetherQuartz.blockID, -1, list); - list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.netherStar)); + list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.netherStar)).copy(); list.add(NETHER, 8).add(PRIDE, 8); ThaumcraftApi.registerObjectTag(Item.netherStar.itemID, -1, list); @@ -120,7 +115,7 @@ public class DarkAspects list = (new AspectList()).add(Aspect.CRAFT, 3).add(Aspect.CLOTH, 6).add(SLOTH, 4); ThaumcraftApi.registerObjectTag(Item.bed.itemID, -1, list); - list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.eyeOfEnder)); + list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.eyeOfEnder)).copy(); list.add(ENVY, 4); ThaumcraftApi.registerObjectTag(Item.eyeOfEnder.itemID, -1, list); @@ -136,7 +131,7 @@ public class DarkAspects list.add(WRATH, 1); ThaumcraftApi.registerObjectTag(Item.fireballCharge.itemID, -1, list); - list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.comparator)); + list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.comparator)).copy(); list.add(ENVY, 1); ThaumcraftApi.registerObjectTag(Item.comparator.itemID, -1, list); diff --git a/src/com/spiteful/forbidden/FMEventHandler.java b/src/com/spiteful/forbidden/FMEventHandler.java index 01156b7..1871fbc 100644 --- a/src/com/spiteful/forbidden/FMEventHandler.java +++ b/src/com/spiteful/forbidden/FMEventHandler.java @@ -138,7 +138,7 @@ public class FMEventHandler } } - if (Config.noHell || event.entityLiving.worldObj.provider.dimensionId != -1) + if (event.entityLiving.worldObj.provider.dimensionId != -1) return; if (!event.recentlyHit || event.source.getEntity() == null || !(event.source.getEntity() instanceof EntityPlayer) diff --git a/src/com/spiteful/forbidden/Forbidden.java b/src/com/spiteful/forbidden/Forbidden.java index a376003..0eef618 100644 --- a/src/com/spiteful/forbidden/Forbidden.java +++ b/src/com/spiteful/forbidden/Forbidden.java @@ -58,12 +58,11 @@ public class Forbidden { instance = this; Config.configurate(event.getSuggestedConfigurationFile()); - if(!Config.noHell) + if(Config.wrathCage) crysTab = new ForbiddenTab("mobcrystal", true); Compat.initiate(); DarkAspects.initAspects(); - if(!Config.noHell) - Config.spawnilify(); + Config.spawnilify(); ForbiddenItems.addItems(); ForbiddenBlocks.addBlocks(); DarkEnchantments.hex(); diff --git a/src/com/spiteful/forbidden/ForbiddenRecipes.java b/src/com/spiteful/forbidden/ForbiddenRecipes.java index 51542cc..74b335c 100644 --- a/src/com/spiteful/forbidden/ForbiddenRecipes.java +++ b/src/com/spiteful/forbidden/ForbiddenRecipes.java @@ -36,23 +36,20 @@ public class ForbiddenRecipes ForbiddenResearch.recipes.put("TaintPick", ThaumcraftApi.addInfusionCraftingRecipe("TAINTPICK", new ItemStack(ForbiddenItems.taintPickaxe), 1, (new AspectList()).add(Aspect.ENTROPY, 8).add(Aspect.MINE, 8).add(Aspect.TAINT, 12), ItemApi.getItem("itemPickThaumium", 0), new ItemStack[]{ItemApi.getItem("itemShard", 5), ItemApi.getItem("itemShard", 5), new ItemStack(Item.diamond), ItemApi.getBlock("blockMagicalLog", 0)})); ForbiddenResearch.recipes.put("WandRodTainted", ThaumcraftApi.addInfusionCraftingRecipe("ROD_tainted", new ItemStack(ForbiddenItems.wandCore, 1, 0), 5, (new AspectList()).add(Aspect.TAINT, 24).add(Aspect.MAGIC, 12).add(Aspect.ENTROPY, 12), ItemApi.getItem("itemResource", 12), new ItemStack[]{ItemApi.getItem("itemResource", 14), new ItemStack(ForbiddenItems.deadlyShards, 1, 2), new ItemStack(ForbiddenItems.deadlyShards, 1, 2), new ItemStack(ForbiddenItems.deadlyShards, 1, 2), new ItemStack(ForbiddenItems.deadlyShards, 1, 2), new ItemStack(ForbiddenItems.deadlyShards, 1, 2), new ItemStack(ForbiddenItems.deadlyShards, 1, 2)})); - if(!Config.noHell) - { - 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.itemID, 1, 0), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 0), new ItemStack(Item.diamond), new ItemStack(Item.skull.itemID, 1, 1)})); - 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(Item.cake), new ItemStack[] {ItemApi.getItem("itemResource", 14), new ItemStack(Item.egg), new ItemStack(Item.bucketMilk), new ItemStack(Item.egg), new ItemStack(Item.sugar), new ItemStack(Item.sugar)})); - 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.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(Item.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.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(Item.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.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(Item.diamond), ItemApi.getItem("itemResource", 3), ItemApi.getBlock("blockMagicalLog", 1)})); - ForbiddenResearch.recipes.put("MorphAxe", ThaumcraftApi.addInfusionCraftingRecipe("MORPHTOOLS", new ItemStack(ForbiddenItems.morphAxe), 6, (new AspectList()).add(Aspect.EXCHANGE, 32).add(DarkAspects.ENVY, 16).add(Aspect.TOOL, 16), ItemApi.getItem("itemAxeThaumium", 0), new ItemStack[]{new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(Item.diamond), ItemApi.getItem("itemResource", 3), ItemApi.getBlock("blockMagicalLog", 1)})); - ForbiddenResearch.recipes.put("WandRodInfernal", ThaumcraftApi.addInfusionCraftingRecipe("ROD_infernal", new ItemStack(ForbiddenItems.wandCore, 1, 1), 5, (new AspectList()).add(DarkAspects.NETHER, 32).add(Aspect.MAGIC, 12).add(DarkAspects.PRIDE, 12), new ItemStack(Item.blazeRod), new ItemStack[]{ItemApi.getItem("itemResource", 14), new ItemStack(ForbiddenItems.deadlyShards, 1, 3), new ItemStack(ForbiddenItems.deadlyShards, 1, 3), new ItemStack(Block.slowSand), new ItemStack(Item.skull.itemID, 1, 1), new ItemStack(Item.netherQuartz), new ItemStack(Item.blazePowder)})); - if(Config.wrathCage){ - ForbiddenResearch.recipes.put("WrathCage", ThaumcraftApi.addInfusionCraftingRecipe("WRATHCAGE", new ItemStack(ForbiddenBlocks.wrathCage, 1, 0), 10, (new AspectList()).add(DarkAspects.WRATH, 32).add(Aspect.MAGIC, 32).add(Aspect.BEAST, 32).add(Aspect.MECHANISM, 16), ItemApi.getBlock("blockCosmeticSolid", 4), new ItemStack[]{new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(Item.diamond, 1, 0), new ItemStack(Item.diamond, 1, 0), new ItemStack(Item.diamond, 1, 0), new ItemStack(Item.diamond, 1, 0), ItemApi.getBlock("blockJar", 0), ItemApi.getBlock("blockJar", 0), ItemApi.getBlock("blockJar", 0)})); - ForbiddenResearch.recipes.put("MobCrystal", ThaumcraftApi.addCrucibleRecipe("WRATHCAGE", new ItemStack(ForbiddenItems.mobCrystal, 1, 0), new ItemStack(Item.diamond, 1), (new AspectList()).merge(Aspect.MIND, 10).merge(Aspect.ENERGY, 10))); - } - - ForbiddenResearch.recipes.put("Fork", ThaumcraftApi.addInfusionCraftingRecipe("FORK", new ItemStack(ForbiddenItems.fork, 1, 0), 1, (new AspectList()).add(DarkAspects.NETHER, 8).add(Aspect.MECHANISM, 8).add(Aspect.ENERGY, 8), ItemApi.getItem("itemSwordThaumium", 0), new ItemStack[]{new ItemStack(Item.netherQuartz), new ItemStack(Item.netherQuartz), new ItemStack(Item.netherQuartz), new ItemStack(Item.redstone)})); + 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.itemID, 1, 0), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 0), new ItemStack(Item.diamond), new ItemStack(Item.skull.itemID, 1, 1)})); + 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(Item.cake), new ItemStack[] {ItemApi.getItem("itemResource", 14), new ItemStack(Item.egg), new ItemStack(Item.bucketMilk), new ItemStack(Item.egg), new ItemStack(Item.sugar), new ItemStack(Item.sugar)})); + 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.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(Item.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.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(Item.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.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(Item.diamond), ItemApi.getItem("itemResource", 3), ItemApi.getBlock("blockMagicalLog", 1)})); + ForbiddenResearch.recipes.put("MorphAxe", ThaumcraftApi.addInfusionCraftingRecipe("MORPHTOOLS", new ItemStack(ForbiddenItems.morphAxe), 6, (new AspectList()).add(Aspect.EXCHANGE, 32).add(DarkAspects.ENVY, 16).add(Aspect.TOOL, 16), ItemApi.getItem("itemAxeThaumium", 0), new ItemStack[]{new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(ForbiddenItems.deadlyShards.itemID, 1, 1), new ItemStack(Item.diamond), ItemApi.getItem("itemResource", 3), ItemApi.getBlock("blockMagicalLog", 1)})); + ForbiddenResearch.recipes.put("WandRodInfernal", ThaumcraftApi.addInfusionCraftingRecipe("ROD_infernal", new ItemStack(ForbiddenItems.wandCore, 1, 1), 5, (new AspectList()).add(DarkAspects.NETHER, 32).add(Aspect.MAGIC, 12).add(DarkAspects.PRIDE, 12), new ItemStack(Item.blazeRod), new ItemStack[]{ItemApi.getItem("itemResource", 14), new ItemStack(ForbiddenItems.deadlyShards, 1, 3), new ItemStack(ForbiddenItems.deadlyShards, 1, 3), new ItemStack(Block.slowSand), new ItemStack(Item.skull.itemID, 1, 1), new ItemStack(Item.netherQuartz), new ItemStack(Item.blazePowder)})); + if(Config.wrathCage){ + ForbiddenResearch.recipes.put("WrathCage", ThaumcraftApi.addInfusionCraftingRecipe("WRATHCAGE", new ItemStack(ForbiddenBlocks.wrathCage, 1, 0), 10, (new AspectList()).add(DarkAspects.WRATH, 32).add(Aspect.MAGIC, 32).add(Aspect.BEAST, 32).add(Aspect.MECHANISM, 16), ItemApi.getBlock("blockCosmeticSolid", 4), new ItemStack[]{new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(ForbiddenItems.deadlyShards, 1, 0), new ItemStack(Item.diamond, 1, 0), new ItemStack(Item.diamond, 1, 0), new ItemStack(Item.diamond, 1, 0), new ItemStack(Item.diamond, 1, 0), ItemApi.getBlock("blockJar", 0), ItemApi.getBlock("blockJar", 0), ItemApi.getBlock("blockJar", 0)})); + ForbiddenResearch.recipes.put("MobCrystal", ThaumcraftApi.addCrucibleRecipe("WRATHCAGE", new ItemStack(ForbiddenItems.mobCrystal, 1, 0), new ItemStack(Item.diamond, 1), (new AspectList()).merge(Aspect.MIND, 10).merge(Aspect.ENERGY, 10))); } + ForbiddenResearch.recipes.put("Fork", ThaumcraftApi.addInfusionCraftingRecipe("FORK", new ItemStack(ForbiddenItems.fork, 1, 0), 1, (new AspectList()).add(DarkAspects.NETHER, 8).add(Aspect.MECHANISM, 8).add(Aspect.ENERGY, 8), ItemApi.getItem("itemSwordThaumium", 0), new ItemStack[]{new ItemStack(Item.netherQuartz), new ItemStack(Item.netherQuartz), new ItemStack(Item.netherQuartz), new ItemStack(Item.redstone)})); + if(Config.emeraldTrans) ForbiddenResearch.recipes.put("TransEmerald", ThaumcraftApi.addCrucibleRecipe("TRANSEMERALD", new ItemStack(ForbiddenItems.resource, 4, 0), "nuggetEmerald", (new AspectList()).merge(Aspect.CRYSTAL, 2).merge(Aspect.GREED, 2))); ForbiddenResearch.recipes.put("BlackFlower", ThaumcraftApi.addCrucibleRecipe("BLACKFLOWER", new ItemStack(ForbiddenBlocks.blackFlower, 1, 0), new ItemStack(Block.plantRed), (new AspectList()).merge(Aspect.DARKNESS, 5).merge(Aspect.LIFE, 5))); @@ -70,6 +67,8 @@ public class ForbiddenRecipes CraftingManager.getInstance().addRecipe(new ItemStack(Item.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(Item.emerald, 1, 0)}); + CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenBlocks.starBlock, 1, 0), new Object[]{"###", "###", "###", Character.valueOf('#'), new ItemStack(Item.netherStar, 1, 0)}); + CraftingManager.getInstance().addRecipe(new ItemStack(Item.netherStar, 9, 0), new Object[]{"#", Character.valueOf('#'), new ItemStack(ForbiddenBlocks.starBlock, 1, 0)}); ForbiddenResearch.recipes.put("RidingCrop", CraftingManager.getInstance().addRecipe(new ItemStack(ForbiddenItems.ridingCrop, 1, 0), new Object[]{"X", "#", "#", Character.valueOf('#'), Item.stick, Character.valueOf('X'), Item.leather})); ThaumcraftApi.addSmeltingBonus(new ItemStack(Item.emerald), new ItemStack(ForbiddenItems.resource, 0, 0)); diff --git a/src/com/spiteful/forbidden/ForbiddenResearch.java b/src/com/spiteful/forbidden/ForbiddenResearch.java index adf8116..c254fee 100644 --- a/src/com/spiteful/forbidden/ForbiddenResearch.java +++ b/src/com/spiteful/forbidden/ForbiddenResearch.java @@ -60,9 +60,6 @@ public class ForbiddenResearch public static void addInfernalism() { - if(Config.noHell) - return; - if(!Config.noLust) (new DarkResearchItem("NETHERSHARDS", "FORBIDDEN", new AspectList(), -8, -2, 0, new ItemStack(ForbiddenItems.deadlyShards, 1, 0))).setPages(new ResearchPage[] {new ResearchPage("forbidden.research_page.NETHERSHARDS.1"), new ResearchPage("forbidden.research_page.NETHERSHARDS.2"), new ResearchPage("forbidden.research_page.NETHERSHARDS.3")}).setStub().setRound().setAutoUnlock().registerResearchItem(); else diff --git a/src/com/spiteful/forbidden/blocks/ForbiddenBlocks.java b/src/com/spiteful/forbidden/blocks/ForbiddenBlocks.java index 4a8c59e..c7af3ec 100644 --- a/src/com/spiteful/forbidden/blocks/ForbiddenBlocks.java +++ b/src/com/spiteful/forbidden/blocks/ForbiddenBlocks.java @@ -8,6 +8,7 @@ import java.util.Arrays; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApi; @@ -18,19 +19,18 @@ public class ForbiddenBlocks public static Block arcaneCake; public static Block blackFlower; public static Block wrathCage; + public static Block starBlock; public static void addBlocks() { - if(!Config.noHell) - { - arcaneCake = new BlockArcaneCake(Config.arcaneCakeBlockID).setHardness(0.5F).setStepSound(Block.soundClothFootstep).setUnlocalizedName("ArcaneCake"); - GameRegistry.registerBlock(arcaneCake, "ArcaneCake"); - wrathCage = new BlockWrathCage(Config.wrathCageID).setHardness(5.0F).setResistance(2000.0F).setStepSound(Block.soundMetalFootstep).setTextureName("forbidden:spirit_box").setUnlocalizedName("WrathCage"); - GameRegistry.registerBlock(wrathCage, "WrathCage"); - GameRegistry.registerTileEntity(TileEntityWrathCage.class, "WrathCage"); - } - + arcaneCake = new BlockArcaneCake(Config.arcaneCakeBlockID).setHardness(0.5F).setStepSound(Block.soundClothFootstep).setUnlocalizedName("ArcaneCake"); + GameRegistry.registerBlock(arcaneCake, "ArcaneCake"); + wrathCage = new BlockWrathCage(Config.wrathCageID).setHardness(5.0F).setResistance(2000.0F).setStepSound(Block.soundMetalFootstep).setTextureName("forbidden:spirit_box").setUnlocalizedName("WrathCage"); + GameRegistry.registerBlock(wrathCage, "WrathCage"); + GameRegistry.registerTileEntity(TileEntityWrathCage.class, "WrathCage"); blackFlower = new BlockBlackFlower(Config.blackFlowerBlockID).setStepSound(Block.soundGrassFootstep).setTextureName("forbidden:flower_black").setUnlocalizedName("InkFlower"); GameRegistry.registerBlock(blackFlower, "InkFlower"); + starBlock = new Block(Config.starBlockID, Material.rock).setHardness(5.0F).setStepSound(Block.soundMetalFootstep).setTextureName("forbidden:starblock").setUnlocalizedName("StarBlock"); + GameRegistry.registerBlock(starBlock, "StarBlock"); } } \ No newline at end of file diff --git a/src/com/spiteful/forbidden/enchantments/DarkEnchantments.java b/src/com/spiteful/forbidden/enchantments/DarkEnchantments.java index 11ded77..13d9f37 100644 --- a/src/com/spiteful/forbidden/enchantments/DarkEnchantments.java +++ b/src/com/spiteful/forbidden/enchantments/DarkEnchantments.java @@ -4,7 +4,7 @@ import com.spiteful.forbidden.*; import net.minecraft.enchantment.Enchantment; import net.minecraftforge.common.MinecraftForge; -//import vazkii.tinkerer.common.enchantment.core.*; +import vazkii.tinkerer.common.enchantment.core.*; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -16,6 +16,7 @@ public class DarkEnchantments public static Enchantment consuming; public static Enchantment educational; public static Enchantment corrupting; + public static Enchantment eternal; public static void hex() { @@ -25,9 +26,15 @@ public class DarkEnchantments consuming = new EnchantmentConsuming(Config.consumingEnchID); educational = new EnchantmentEducational(Config.educationalEnchID); corrupting = new EnchantmentCorrupting(Config.corruptingEnchID); + eternal = new EnchantmentEternal(Config.eternalEnchID); + + EnchantmentManager.registerExponentialCostData(pigBane, "forbidden:textures/misc/pigbane.png", false, (new AspectList()).add(Aspect.FIRE, 1).add(Aspect.ENTROPY, 1), "PIGBANE"); + EnchantmentManager.registerExponentialCostData(cluster, "forbidden:textures/misc/lucrative.png", false, (new AspectList()).add(Aspect.FIRE, 5).add(Aspect.EARTH, 5).add(Aspect.ORDER, 5), "CLUSTER"); + EnchantmentManager.registerExponentialCostData(greedy, "forbidden:textures/misc/greedy.png", false, (new AspectList()).add(Aspect.ENTROPY, 50).add(Aspect.EARTH, 30).add(Aspect.ORDER, 20), "GREEDY"); + EnchantmentManager.registerExponentialCostData(educational, "forbidden:textures/misc/educational.png", false, new AspectList().add(Aspect.AIR, 10).add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 15).add(Aspect.ENTROPY, 15), "EDUCATIONAL"); + EnchantmentManager.registerExponentialCostData(consuming, "forbidden:textures/misc/consuming.png", false, (new AspectList()).add(Aspect.ENTROPY, 10), "CONSUMING"); + EnchantmentManager.registerExponentialCostData(corrupting, "forbidden:textures/misc/corrupting.png", false, (new AspectList()).add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 15).add(Aspect.EARTH, 10), "CORRUPTING"); - //EnchantmentManager.registerExponentialCostData(pigBane, "forbidden:textures/misc/pigbane.png", false, (new AspectList()).add(Aspect.FIRE, 1).add(Aspect.ENTROPY, 1), "PIGBANE"); - //EnchantmentManager.registerExponentialCostData(cluster, "forbidden:textures/misc/lucrative.png", false, (new AspectList()).add(Aspect.FIRE, 5).add(Aspect.EARTH, 5).add(Aspect.ORDER, 5), "CLUSTER"); } } \ No newline at end of file diff --git a/src/com/spiteful/forbidden/enchantments/EnchantmentEternal.java b/src/com/spiteful/forbidden/enchantments/EnchantmentEternal.java new file mode 100644 index 0000000..d7036b5 --- /dev/null +++ b/src/com/spiteful/forbidden/enchantments/EnchantmentEternal.java @@ -0,0 +1,72 @@ +package com.spiteful.forbidden.enchantments; + +import com.spiteful.forbidden.*; +import com.spiteful.forbidden.items.*; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.EnumEnchantmentType; +import net.minecraft.item.ItemStack; + +public class EnchantmentEternal extends Enchantment +{ + public EnchantmentEternal(int id) + { + super(id, 0, EnumEnchantmentType.digger); + setName("eternal"); + } + + @Override + /** + * Returns the maximum level that the enchantment can have. + */ + public int getMaxLevel() + { + return 1; + } + + /** + * Returns the minimal value of enchantability needed on the enchantment level passed. + */ + public int getMinEnchantability(int par1) + { + return 70; + } + + /** + * Returns the maximum value of enchantability nedded on the enchantment level passed. + */ + public int getMaxEnchantability(int par1) + { + return super.getMinEnchantability(par1) + 50; + } + + @Override + /** + * Determines if the enchantment passed can be applyied together with this enchantment. + */ + public boolean canApplyTogether(Enchantment ench) + { + return super.canApplyTogether(ench) && ench.effectId != Enchantment.unbreaking.effectId && ench.effectId != DarkEnchantments.educational.effectId; + } + + @Override + public boolean canApply(ItemStack item) + { + return (item.getItem() instanceof ItemMorphPickaxe || item.getItem() instanceof ItemMorphAxe || item.getItem() instanceof ItemMorphSword || item.getItem() instanceof ItemMorphShovel); + } + + @Override + /** + * This applies specifically to applying at the enchanting table. The other method {@link #canApply(ItemStack)} + * applies for all possible enchantments. + * @param stack + * @return + */ + public boolean canApplyAtEnchantingTable(ItemStack stack) + { + return false; + } + + +} \ No newline at end of file diff --git a/src/com/spiteful/forbidden/items/ForbiddenItems.java b/src/com/spiteful/forbidden/items/ForbiddenItems.java index 4a10130..adc76ff 100644 --- a/src/com/spiteful/forbidden/items/ForbiddenItems.java +++ b/src/com/spiteful/forbidden/items/ForbiddenItems.java @@ -78,40 +78,38 @@ public class ForbiddenItems GameRegistry.registerItem(taintPickaxe, "TaintPickaxe"); MinecraftForge.setToolClass(taintPickaxe, "pickaxe", 5); - if(!Config.noHell) - { + arcaneCakeItem = new ItemArcaneCake(Config.arcaneCakeItemID).setUnlocalizedName("ArcaneCake"); + GameRegistry.registerItem(arcaneCakeItem, "ArcaneCakeItem"); - arcaneCakeItem = new ItemArcaneCake(Config.arcaneCakeItemID).setUnlocalizedName("ArcaneCake"); - GameRegistry.registerItem(arcaneCakeItem, "ArcaneCakeItem"); - - skullAxe = new ItemSkullAxe(Config.skullAxeID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("SkullAxe"); - GameRegistry.registerItem(skullAxe, "SkullAxe"); - - morphPickaxe = new ItemMorphPickaxe(Config.morphPickaxeID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("MorphPickaxe"); - GameRegistry.registerItem(morphPickaxe, "MorphPickaxe"); - MinecraftForge.setToolClass(morphPickaxe, "pickaxe", 4); - - morphSword = new ItemMorphSword(Config.morphSwordID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("MorphSword"); - GameRegistry.registerItem(morphSword, "MorphSword"); - - morphShovel = new ItemMorphShovel(Config.morphShovelID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("MorphShovel"); - GameRegistry.registerItem(morphShovel, "MorphShovel"); - MinecraftForge.setToolClass(morphShovel, "shovel", 4); - - morphAxe = new ItemMorphAxe(Config.morphAxeID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("MorphAxe"); - GameRegistry.registerItem(morphAxe, "MorphAxe"); - MinecraftForge.setToolClass(morphAxe, "axe", 4); - + skullAxe = new ItemSkullAxe(Config.skullAxeID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("SkullAxe"); + GameRegistry.registerItem(skullAxe, "SkullAxe"); + + morphPickaxe = new ItemMorphPickaxe(Config.morphPickaxeID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("MorphPickaxe"); + GameRegistry.registerItem(morphPickaxe, "MorphPickaxe"); + MinecraftForge.setToolClass(morphPickaxe, "pickaxe", 4); + + morphSword = new ItemMorphSword(Config.morphSwordID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("MorphSword"); + GameRegistry.registerItem(morphSword, "MorphSword"); + + morphShovel = new ItemMorphShovel(Config.morphShovelID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("MorphShovel"); + GameRegistry.registerItem(morphShovel, "MorphShovel"); + MinecraftForge.setToolClass(morphShovel, "shovel", 4); + + morphAxe = new ItemMorphAxe(Config.morphAxeID, ThaumcraftApi.toolMatElemental).setUnlocalizedName("MorphAxe"); + GameRegistry.registerItem(morphAxe, "MorphAxe"); + MinecraftForge.setToolClass(morphAxe, "axe", 4); + + if(Config.wrathCage) + { mobCrystal = new ItemMobCrystal(Config.mobCrystalID).setUnlocalizedName("MobCrystal"); GameRegistry.registerItem(mobCrystal, "MobCrystal"); - - fork = new ItemDiabolistFork(Config.forkID, ThaumcraftApi.toolMatThaumium).setUnlocalizedName("DiabolistFork"); - if(Config.spork) - fork.setUnlocalizedName("DiabolistSpork"); - GameRegistry.registerItem(fork, "DiabolistFork"); - } + fork = new ItemDiabolistFork(Config.forkID, ThaumcraftApi.toolMatThaumium).setUnlocalizedName("DiabolistFork"); + if(Config.spork) + fork.setUnlocalizedName("DiabolistSpork"); + GameRegistry.registerItem(fork, "DiabolistFork"); + wandCore = new ItemWandCores(Config.wandCoreID).setUnlocalizedName("WandCores"); GameRegistry.registerItem(wandCore, "WandCores"); wandCap = new ItemWandCaps(Config.wandCapID).setUnlocalizedName("WandCaps"); diff --git a/src/com/spiteful/forbidden/items/ItemMorphAxe.java b/src/com/spiteful/forbidden/items/ItemMorphAxe.java index 8375eae..f811de5 100644 --- a/src/com/spiteful/forbidden/items/ItemMorphAxe.java +++ b/src/com/spiteful/forbidden/items/ItemMorphAxe.java @@ -2,10 +2,14 @@ package com.spiteful.forbidden.items; import com.spiteful.forbidden.Forbidden; import com.spiteful.forbidden.Config; +import com.spiteful.forbidden.enchantments.DarkEnchantments; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumToolMaterial; @@ -108,4 +112,14 @@ public class ItemMorphAxe extends ItemAxe implements IRepairable return true; } + /** + * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and + * update it's contents. + */ + public void onUpdate(ItemStack stack, World world, Entity player, int wat, boolean waat) + { + if(stack.getItemDamage() > 0 && EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.eternal.effectId, stack) > 0) + stack.setItemDamage(0); + } + } diff --git a/src/com/spiteful/forbidden/items/ItemMorphPickaxe.java b/src/com/spiteful/forbidden/items/ItemMorphPickaxe.java index 12b1c64..8cf883b 100644 --- a/src/com/spiteful/forbidden/items/ItemMorphPickaxe.java +++ b/src/com/spiteful/forbidden/items/ItemMorphPickaxe.java @@ -2,10 +2,14 @@ package com.spiteful.forbidden.items; import com.spiteful.forbidden.Forbidden; import com.spiteful.forbidden.Config; +import com.spiteful.forbidden.enchantments.DarkEnchantments; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumToolMaterial; @@ -108,14 +112,13 @@ public class ItemMorphPickaxe extends ItemPickaxe implements IRepairable return true; } - //@Override - //public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - // if(!itemstack.hasTagCompound()) - // return false; - // else { - // player.swingItem(); - // return true; - //} - //return false; - //} + /** + * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and + * update it's contents. + */ + public void onUpdate(ItemStack stack, World world, Entity player, int wat, boolean waat) + { + if(stack.getItemDamage() > 0 && EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.eternal.effectId, stack) > 0) + stack.setItemDamage(0); + } } diff --git a/src/com/spiteful/forbidden/items/ItemMorphShovel.java b/src/com/spiteful/forbidden/items/ItemMorphShovel.java index c4d4de6..0e486c5 100644 --- a/src/com/spiteful/forbidden/items/ItemMorphShovel.java +++ b/src/com/spiteful/forbidden/items/ItemMorphShovel.java @@ -2,10 +2,14 @@ package com.spiteful.forbidden.items; import com.spiteful.forbidden.Forbidden; import com.spiteful.forbidden.Config; +import com.spiteful.forbidden.enchantments.DarkEnchantments; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumToolMaterial; @@ -108,4 +112,14 @@ public class ItemMorphShovel extends ItemSpade implements IRepairable return true; } + /** + * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and + * update it's contents. + */ + public void onUpdate(ItemStack stack, World world, Entity player, int wat, boolean waat) + { + if(stack.getItemDamage() > 0 && EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.eternal.effectId, stack) > 0) + stack.setItemDamage(0); + } + } diff --git a/src/com/spiteful/forbidden/items/ItemMorphSword.java b/src/com/spiteful/forbidden/items/ItemMorphSword.java index a83f27c..60e18a7 100644 --- a/src/com/spiteful/forbidden/items/ItemMorphSword.java +++ b/src/com/spiteful/forbidden/items/ItemMorphSword.java @@ -2,10 +2,14 @@ package com.spiteful.forbidden.items; import com.spiteful.forbidden.Forbidden; import com.spiteful.forbidden.Config; +import com.spiteful.forbidden.enchantments.DarkEnchantments; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumToolMaterial; @@ -110,4 +114,14 @@ public class ItemMorphSword extends ItemSword implements IRepairable return true; } + /** + * Called each tick as long the item is on a player inventory. Uses by maps to check if is on a player hand and + * update it's contents. + */ + public void onUpdate(ItemStack stack, World world, Entity player, int wat, boolean waat) + { + if(stack.getItemDamage() > 0 && EnchantmentHelper.getEnchantmentLevel(DarkEnchantments.eternal.effectId, stack) > 0) + stack.setItemDamage(0); + } + } diff --git a/src/com/spiteful/forbidden/items/ItemRidingCrop.java b/src/com/spiteful/forbidden/items/ItemRidingCrop.java index fcc5905..51b3ab8 100644 --- a/src/com/spiteful/forbidden/items/ItemRidingCrop.java +++ b/src/com/spiteful/forbidden/items/ItemRidingCrop.java @@ -59,7 +59,7 @@ public class ItemRidingCrop extends ItemSword { victim.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 75, 1)); victim.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 75, 1)); } - if(!player.worldObj.isRemote && !Config.noLust && !Config.noHell && 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(30) == 1) { EntityItem ent = victim.entityDropItem(new ItemStack(ForbiddenItems.deadlyShards, 1, 4), 1.0F); ent.motionY += player.worldObj.rand.nextFloat() * 0.05F;