From 9b57ff0e9048663b1cae8bdaa6a71aead2db11df Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Mon, 3 Feb 2014 18:36:09 -0800 Subject: [PATCH] Ender Cap added --- assets/forbidden/textures/items/wand_cap_soul.png | Bin 0 -> 631 bytes .../textures/items/wand_cap_soul.png.mcmeta | 11 +++++++++++ .../forbidden/textures/models/wand_cap_soul.png | Bin 0 -> 330 bytes src/com/spiteful/forbidden/Compat.java | 9 +++++++-- 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 assets/forbidden/textures/items/wand_cap_soul.png create mode 100644 assets/forbidden/textures/items/wand_cap_soul.png.mcmeta create mode 100644 assets/forbidden/textures/models/wand_cap_soul.png diff --git a/assets/forbidden/textures/items/wand_cap_soul.png b/assets/forbidden/textures/items/wand_cap_soul.png new file mode 100644 index 0000000000000000000000000000000000000000..a9ea1f573b212e7aee5b28ce7c3c12686fd17e96 GIT binary patch literal 631 zcmV--0*L*IP)H;LN@>a0pLkQK~zXf?N&QT13?s=kSJ)x zPNVoORKyVD2bE|He!vg0Pz*v4f}*5RM1mrMScqUL*od_t)|NIFR(3XGVPS7!t%UgW z(ACy%mWR3e*zjHPIoc; Rn)d(z002ovPDHLkV1hcs2crN0 literal 0 HcmV?d00001 diff --git a/assets/forbidden/textures/items/wand_cap_soul.png.mcmeta b/assets/forbidden/textures/items/wand_cap_soul.png.mcmeta new file mode 100644 index 0000000..ce40017 --- /dev/null +++ b/assets/forbidden/textures/items/wand_cap_soul.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 3, + "frames": [ + 0, + 1, + 2, + 1 + ] + } +} diff --git a/assets/forbidden/textures/models/wand_cap_soul.png b/assets/forbidden/textures/models/wand_cap_soul.png new file mode 100644 index 0000000000000000000000000000000000000000..b2be6f31a30997ed6d0c6724b187fdfdd7837cd3 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r)^Ak4U9V)k30AbW|YuPggq4pu=+gMj3$&p;um64!{5;QX|b^2DN4hJeJ(yb?V> z*ARs=V?9$nLqqq^PUb*Wn>}3|Ln7SYPTtGqWGK@7*`TROV^Px&YYwZf$qIUWN;@oK zSOkxpyjb4X611~9`}`E0w=XX}QD#3;rQi9wW5ux}*$3}e-*|dMxh(h574>(Q9hkkU zXAAU87D}pdov&0{xO2ypA2uE*`D2|_Oip(^3(ze5vHWX`(T7OZbP0l+XkK9MO44 literal 0 HcmV?d00001 diff --git a/src/com/spiteful/forbidden/Compat.java b/src/com/spiteful/forbidden/Compat.java index 1496245..c68fb29 100644 --- a/src/com/spiteful/forbidden/Compat.java +++ b/src/com/spiteful/forbidden/Compat.java @@ -23,6 +23,7 @@ import thaumcraft.api.aspects.IEssentiaContainerItem; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; import thaumcraft.api.wands.WandTriggerRegistry; +import thaumcraft.api.crafting.IArcaneRecipe; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchCategoryList; @@ -151,9 +152,13 @@ public class Compat { try { InfusionRecipe soul_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_soul", new ItemStack(ForbiddenItems.wandCore, 1, 2), 5, (new AspectList()).add(Aspect.ELDRITCH, 32).add(Aspect.MAGIC, 12).add(Aspect.SOUL, 16), new ItemStack(PlayerBeacons.defiledSoulPylonBlock), new ItemStack[]{ItemApi.getItem("itemResource", 14), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(PlayerBeacons.defiledSoulConductorBlock), new ItemStack(Item.eyeOfEnder), new ItemStack(Item.eyeOfEnder)}); - (new DarkResearchItem("ROD_soul", "THAUMATURGY", (new AspectList()).add(Aspect.ELDRITCH, 2).add(Aspect.SOUL, 1).add(Aspect.TOOL, 1), -5, 7, 4, new ItemStack(ForbiddenItems.wandCore, 1, 2))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_soul.1"), new ResearchPage(soul_recipe)}).setParents(new String[]{"ROD_silverwood", "PB_CRYSTAL"}).setConcealed().registerResearchItem(); + (new DarkResearchItem("ROD_soul", "THAUMATURGY", (new AspectList()).add(Aspect.ELDRITCH, 2).add(Aspect.SOUL, 1).add(Aspect.TOOL, 1), -5, 7, 5, new ItemStack(ForbiddenItems.wandCore, 1, 2))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.ROD_soul.1"), new ResearchPage(soul_recipe)}).setParents(new String[]{"ROD_silverwood", "PB_CRYSTAL"}).setConcealed().registerResearchItem(); + + IArcaneRecipe soul_cap = ThaumcraftApi.addArcaneCraftingRecipe("CAP_soul", new ItemStack(ForbiddenItems.wandCap, 1, 2), (new AspectList()).add(Aspect.ENTROPY, 20).add(Aspect.FIRE, 5).add(Aspect.WATER, 5).add(Aspect.AIR, 5).add(Aspect.EARTH, 5), new Object[]{"NXN", "N N", Character.valueOf('N'), Item.enderPearl, Character.valueOf('X'), PlayerBeacons.crystalItem}); + (new DarkResearchItem("CAP_soul", "THAUMATURGY", (new AspectList()).add(Aspect.ELDRITCH, 1).add(Aspect.MAGIC, 1).add(Aspect.ENTROPY, 2), -7, 7, 3, new ItemStack(ForbiddenItems.wandCap, 1, 2))).setPages(new ResearchPage[]{new ResearchPage("forbidden.research_page.CAP_soul.1"), new ResearchPage(soul_cap)}).setParents(new String[]{"ROD_soul"}).setConcealed().registerResearchItem(); + } - catch(NoClassDefFoundError e) + catch(LinkageError e) { FMLLog.log(Level.INFO, e, "Player Beacons showed Forbidden Magic who the Alpha Fox is."); //e.printStackTrace();