From db7791ec54eeacbd927965c7d8da5ca6a8274285 Mon Sep 17 00:00:00 2001 From: Alex Spinks Date: Sat, 18 Jul 2015 23:23:54 +0100 Subject: [PATCH] Burning skulls! Burning swords! --- .../spiteful/avaritia/LudicrousEvents.java | 25 +++++++++++++++++- .../avaritia/items/tools/ItemSwordSkulls.java | 11 ++++++++ .../resources/assets/avaritia/lang/en_US.lang | 1 + .../avaritia/textures/items/skull_sword.png | Bin 815 -> 3837 bytes .../textures/items/skull_sword.png.mcmeta | 16 ++++++++++- 5 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index 23afda0..a93c5f8 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -115,7 +115,30 @@ public class LudicrousEvents { if(event.recentlyHit && event.entityLiving instanceof EntitySkeleton && event.source.getEntity() instanceof EntityPlayer){ EntityPlayer player = (EntityPlayer)event.source.getEntity(); if(player.getHeldItem() != null && player.getHeldItem().getItem() == LudicrousItems.skull_sword){ - addDrop(event, new ItemStack(Items.skull, 1, 1)); + // ok, we need to drop a skull then. + if (event.drops.isEmpty()) { + addDrop(event, new ItemStack(Items.skull, 1, 1)); + } else { + int skulls = 0; + + for (int i=0; iKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000CiNklPUt-x-F{SBp{vi#G(h71?nh5eAxp1#s?md@J4{%bOm$>kx zIe$-nJ3IS+_Wga&@4O6AmLyOZ)CJv5;Qj^OK8Q3!V4oQND#SmJL(~Kp+$wM{gPjCe z5WWi4IU@ZmIFq2gps#=+be)CH3W%Q!CLYRj#A92*Nrlj9Xv)Qk8W5?5u0J8v0Oyvl zdr79c(%%Ma0(2A+sGJ4&9yie&xU_)!h0vT0bH*CgwQn#go`h7h2z4Gsp>w@6*t%_<8XKFbuWvFRZPvkBsybPXGAZ>iG+vdH2wv z6SoYwd4$=IkI~c9M|1RS3lk@fGkN*>6mHwkn{Q+i=m;rV2Uc50ht5=1YGTR|J}s%? ze09J8j31wDrc9Y^KHgkJFz80VFlQ<&6;YAa?cOa0u$+r^b$s`eOZll&1F6Rh$b-lg zk&p#(4-CMAmK-s$7OZ3l9*oh0>KrloYp_OwTLDdr`{98V-{ZlWOm!uH0M;nD{tbbP zGa;p}k70-;p1IHNo zEt{0-9#(8B#dXEry)k$&CM}JJyk7R6EaOPKD12!U9$XC%!h^Ou9^955#HES&Sv?)Z z>_O*Fk$mjNA6p-z2Q4`w^#?F_L8JkEtD>Jxp$gQTi+r2Wi3E17LBWC=PYG6=7R*V2q?Kewg8VTFBPsQfD=x3Pa7Om!^1lIW;D&m;dqN5xsOdSGml zr+HYhz7!|yvSm+<9%OjE?D@WoZ?B1h`2+Nz&2_0Aj0e~5cyL>KFm%4KM-R{g)!Z!p zkAPcv5ZEq~_TP9PhU=g8!-K$=Js#wvpsz#<{~?8bm%r{qN!@*W;O0YQBP_k&sJ0|Y z>O85i|Cq`Tr%T=8{&_InvGjVfqt^8v`Af&CczKK-bQqh&sUB9mU&^qMOTo?L9S{EJ9{fE3tR(goE`8}f00000NkvXXu0mjfz>zi2 delta 792 zcmV+z1Lyqx9j^wEB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mH;LN@>a0;@?xK~z{r?Uzkx6Hyd} zZ$hFmv4tka7L~YAsZ@)LN^v0;x+r8}DdM6L3l>F-U^e2yAAg!EREg9d3T;tH>Y_?P zr7AT35Hc1Li7kX;#EnH!+}V{|7sq#pc`}T4GH({T>48g_8NTx#$-QS@NLBS6?cfrk z<#GVVZD(Sz?fU{|4iYM(q?H3JhqpFi2pE_I_@gmnx7;Caw+1fA?{x)5Q z*IB}cv9SHh3|sTyf|$nV-9bz=y2yil>(^l_wi!vcdBA~kF&uFYOPNi$l;G7o_{Vv` zqwM;8P=81S@%jEncX?1c6Twnu6NddR&Ig(}A1s%HD4%yR(prBA&khr2y8`O)+-1T{ zuLzUY(8{p2VI(|%Q-tToMij5qm`aANd2mfkQE+u$15B@_QD2+3VLGFwEk$(W*jr;UBwehI7B>d`x7e(=Z;oi12 z&U-|{pC+2H_=NEIn8NE$!nwp+OztNvCEL{Dx7U3rCIfi5w|-^V+AtC>T_yaeG~oSh zn=oN9Y|VoauOEfp4ajV-0ZTC~C$X=k1*3is&bmDxgaz260!x`qxRl`4JaA(`^b2_` Wr4f8l&1}2?0000