From 333f41baed118fc029986b4fe57730d90204657e Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Tue, 28 Jan 2014 19:09:57 -0800 Subject: [PATCH] Witchwood Wand and Vinteum Cap --- assets/forbidden/lang/en_US.lang | 30 ++++++----- .../textures/items/wand_cap_vinteum.png | Bin 0 -> 684 bytes .../items/wand_cap_vinteum.png.mcmeta | 11 ++++ .../textures/items/wand_rod_witchwood.png | Bin 0 -> 362 bytes .../textures/models/wand_cap_vinteum.png | Bin 0 -> 353 bytes .../textures/models/wand_rod_witchwood.png | Bin 0 -> 874 bytes .../textures/models/wand_rod_witchwoodhd.png | Bin 0 -> 3267 bytes src/com/spiteful/forbidden/Compat.java | 3 ++ .../spiteful/forbidden/ForbiddenRecipes.java | 12 ++++- .../forbidden/items/ForbiddenItems.java | 4 ++ .../forbidden/items/ItemWandCaps.java | 2 +- .../forbidden/items/ItemWandCores.java | 12 ++++- .../forbidden/items/ManaWandUpdate.java | 49 ++++++++++++++++++ 13 files changed, 107 insertions(+), 16 deletions(-) create mode 100644 assets/forbidden/textures/items/wand_cap_vinteum.png create mode 100644 assets/forbidden/textures/items/wand_cap_vinteum.png.mcmeta create mode 100644 assets/forbidden/textures/items/wand_rod_witchwood.png create mode 100644 assets/forbidden/textures/models/wand_cap_vinteum.png create mode 100644 assets/forbidden/textures/models/wand_rod_witchwood.png create mode 100644 assets/forbidden/textures/models/wand_rod_witchwoodhd.png create mode 100644 src/com/spiteful/forbidden/items/ManaWandUpdate.java diff --git a/assets/forbidden/lang/en_US.lang b/assets/forbidden/lang/en_US.lang index 00eae48..5c39578 100644 --- a/assets/forbidden/lang/en_US.lang +++ b/assets/forbidden/lang/en_US.lang @@ -26,18 +26,6 @@ item.MorphPickaxe.name=Chameleon Pickaxe item.MorphSword.name=Chameleon Sword item.MorphShovel.name=Chameleon Shovel item.MorphAxe.name=Chameleon Axe -item.WandCores.tainted.name=Tainted Rod -item.WandCores.infernal.name=Infernal Rod -item.WandCores.soul.name=Eldritch Rod -item.WandCores.blood.name=Bloody Rod -item.WandCaps.alchemical.name=Alchemical Cap -item.Wand.tainted.rod=Tainted -item.Wand.infernal.rod=Infernal -item.Wand.neutronium.rod=Cosmic Neutronium -item.Wand.soul.rod=Eldritch -item.Wand.blood.rod=Blood -item.Wand.orichalcum.cap=Orichalcum Studded -item.Wand.alchemical.cap=Alchemically Crowned item.FMResource.0.name=Emerald Fragment item.FMResource.1.name=Shadow Ink item.MobCrystalEmpty.name=Blank Imprinting Crystal @@ -45,6 +33,24 @@ item.MobCrystal.name=Imprinted Crystal item.DiabolistFork.name=Diabolist Fork item.DiabolistSpork.name=Spork of Doom # +# Wand components +item.Wand.tainted.rod=Tainted +item.Wand.infernal.rod=Infernal +item.Wand.neutronium.rod=Cosmic Neutronium +item.Wand.soul.rod=Eldritch +item.Wand.blood.rod=Blood +item.Wand.witchwood.rod=Witchwood +item.Wand.orichalcum.cap=Orichalcum Studded +item.Wand.alchemical.cap=Alchemically Crowned +item.Wand.vinteum.cap=Vinteum Infused +item.WandCores.tainted.name=Tainted Rod +item.WandCores.infernal.name=Infernal Rod +item.WandCores.soul.name=Eldritch Rod +item.WandCores.blood.name=Bloody Rod +item.WandCores.witchwood.name=Witchwood Rod +item.WandCaps.alchemical.name=Alchemical Cap +item.WandCaps.vinteum.name=Vinteum Cap +# # Blocks tile.ArcaneCake.name=Thaumic Cake tile.InkFlower.name=Umbral Rose diff --git a/assets/forbidden/textures/items/wand_cap_vinteum.png b/assets/forbidden/textures/items/wand_cap_vinteum.png new file mode 100644 index 0000000000000000000000000000000000000000..a1cb0bcea2c318f471aff323b9b03092dd259cce GIT binary patch literal 684 zcmV;d0#p5oP)z>%2XskIMF-sq9|spDYj(VC0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0u@O_K~zXf?UuVs13?hR?`}6n zi5d`mfZ`hwA1ER!5{uviL<_ahB87rT3X5PV2x4tx;~!vSV_|D!VQpb=Woct$AtuK; z&dgro8Sa@_SR@ecNbdV~W_N$zt)~6Uj}fcOi{=(E;`N|u`e&pfMPm|V>H_4>Gsvwc z5Pc~ygfv5$;K&vU*Z{?H_Z4L31;qFsnSA-0px6|>b3CFL-c%;*4{RW3&jA0&b~O6B zf2dy)iirbt9Z0KtG}LvYDE2m?5k%)0h|vs>$l|ts=g3YI*D8P}P;?Bb3aIa&vV$wI zEx~9=D3fGsxrmmOehXX?UjIr)clKr3Gj3PGBYUra$HF*U@ZSTWc3JJAXfsgC1GN*Q zVRoP0gKjZ} zcs3w$LR#|3`X;{!qO2HoT=7};i!Bvuj2zAJ;Z`*3-{LJSYOayBepv!M$UZnLiQ zVM5NIgIv91Bcjp+DxW;)p5`#2zAGV;Q5I-YT^{iJp!7-)eLC?uAJp=|kJWGgy;d74 S->cIA0000!lvI6;>1s;*b z3=G^rh1>#+YnAtw0tMMiJbhi+?{dkr%W22*Xek4Qq)J>PN`mv#O3D+9QW*jgGxJLH z{9Hp6%8d0)^$ZQ&KRcNNRbBRUaSXBWPfl3CCLs18NkPndw)Q{s%M<_c2l2BX$q*BK zkj9YN_wmxt_h}2i-1i9nWPg#Z!DKgssrd03ji%ABPEUBoG~ukm*~Y$C|7Cri{BPz_ zxy60r99yQ_H@!Ihh8)Jsj<45#zRz3w=l-z(zC7bI0(*e^ryq0tlat<(W$ei8aE|RJ z&n2EslHoduI~c@5|M6udq#t>-+iy>v3&K;3BSgDaS&_6E_!RG+9cEg}O*Ga2Z5! zIrnQV;$gVS_sM+Q3Z+vF!MT}DjBRHXvQkpm7}WRXIvEMc=>WaQ;OXk;vd$@?2>|~# Bd?Nq= literal 0 HcmV?d00001 diff --git a/assets/forbidden/textures/models/wand_cap_vinteum.png b/assets/forbidden/textures/models/wand_cap_vinteum.png new file mode 100644 index 0000000000000000000000000000000000000000..e1dda42a01496c0592e896e029d9351a8f999bbe GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r(ZAk3I`t&<>&kwYgH_Oyr=CZw1Slj`;u=vBoS#-wo>-L15RjOeSEA?V z8lq5UtY@lcXz2dg$sDNal&6bhNQ8TGLPOJv*8Tr)`~LcCpK$K||8v3h|Jyq+_fA{$ z>udaiC)ew5-irS}RqEvnh8g{9)&Bg;zwq_<{t(k6j0SdRof)1bPgtsOy7hG3UvbTL z3#KE>cQQ}Vz3}qK-}uc_`wsTMvkrJvJj14ekAZb(jqP0712ca=ws$|*|34=({(tk0 z1wXH;LN@>a0@F!EK~z{r?Uz|k6hRQj>l65Z z1_gEzWOspG0)pa&ZXlopH5!e^fTFIqQ9Lj{`R+Fmco8+mi19!ayn_-G;|K6F z_}K2R)=tKGpm#C}G0{#s-P6-u^{;C^e7 z&072+hZf``*_{f&J{JZ*zYFkB&-TirQ{D11n^A+Fo!dIO2x~D)QU2n>b{W2yQ4l=4 znwM(k&Tt&|V*(sa8Wj49u-5QFo+b#ZD&tmIr16#Vw6d(~%py zTB=N2bA?&jSgwE;)Rj2_g#MCtcP15pKL}T+<7VZum=l1@Mb7sq!dib2!U)|dAnXP# z$M5Ufsue`kO#kSPg5QVpf}9wx{HzJ#oiqD~9KZovOo&IbwQWX0Ongo0rVE8lsZ zoX6kLj&chK`f-g@fM)|&uQ#r1xL+X3z4^}^x4=kU0e?fUJPI0Wfk2I4vHkloLOp?L z=Rt&VjemV*caS3@TtwzXi!}Wjs%NRy@$&oyh0BRc+R*9E@_3*}ixKABh{tj@1x3#L zn+IIS!@o!AlQUbiBBBzaCg4g=eL(-;{(1&}0rWrUl@A0fsQ>@~07*qoM6N<$f(hr0 AE&u=k literal 0 HcmV?d00001 diff --git a/assets/forbidden/textures/models/wand_rod_witchwoodhd.png b/assets/forbidden/textures/models/wand_rod_witchwoodhd.png new file mode 100644 index 0000000000000000000000000000000000000000..eb346a84d74726098bb9fd46b7d40e67dc0e1242 GIT binary patch literal 3267 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 cost) + { + prop.setCurrentMana(prop.getCurrentMana() - cost); + ((ItemWandCasting)itemstack.getItem()).addVis(itemstack, primals[x], 1, true); + } + } + } + } + + } + + } +}