From 62905da39273bf00161f57ca114379e64982ba54 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Thu, 16 Oct 2014 19:34:52 +0200 Subject: [PATCH] Crossbow Modifier Graphics \o/ --- .../textures/items/crossbow/_crossbow_1.xcf | Bin 3330 -> 3212 bytes .../textures/items/crossbow/_crossbow_2.xcf | Bin 2835 -> 3035 bytes .../textures/items/crossbow/_crossbow_3.xcf | Bin 2851 -> 3117 bytes .../crossbow/beheading_crossbow_effect.png | Bin 0 -> 229 bytes .../textures/items/crossbow/complete.xcf | Bin 0 -> 7899 bytes .../textures/items/crossbow/complete_1.xcf | Bin 0 -> 2816 bytes .../textures/items/crossbow/complete_2.xcf | Bin 0 -> 2728 bytes .../textures/items/crossbow/complete_3.xcf | Bin 0 -> 2580 bytes .../crossbow/diamond_crossbow_effect.png | Bin 0 -> 207 bytes .../crossbow/emerald_crossbow_effect.png | Bin 0 -> 206 bytes .../crossbow/emerald_crossbow_effect_1.png | Bin 0 -> 223 bytes .../crossbow/emerald_crossbow_effect_2.png | Bin 0 -> 201 bytes .../crossbow/emerald_crossbow_effect_3.png | Bin 0 -> 193 bytes .../items/crossbow/flux_crossbow_effect.png | Bin 0 -> 254 bytes .../items/crossbow/lapis_crossbow_effect.png | Bin 0 -> 209 bytes .../items/crossbow/lava_crossbow_effect.png | Bin 0 -> 193 bytes .../crossbow/necrotic_crossbow_effect.png | Bin 0 -> 239 bytes .../items/crossbow/piston_crossbow_effect.png | Bin 0 -> 274 bytes .../items/crossbow/quartz_crossbow_effect.png | Bin 0 -> 209 bytes .../crossbow/quartz_crossbow_effect_1.png | Bin 0 -> 209 bytes .../crossbow/quartz_crossbow_effect_2.png | Bin 0 -> 260 bytes .../crossbow/quartz_crossbow_effect_3.png | Bin 0 -> 253 bytes .../crossbow/redstone_crossbow_effect.png | Bin 0 -> 154 bytes .../crossbow/redstone_crossbow_effect_1.png | Bin 0 -> 154 bytes .../crossbow/redstone_crossbow_effect_2.png | Bin 0 -> 166 bytes .../crossbow/redstone_crossbow_effect_3.png | Bin 0 -> 160 bytes .../crossbow/reinforced_crossbow_effect.png | Bin 0 -> 200 bytes .../items/crossbow/silk_crossbow_effect.png | Bin 0 -> 178 bytes .../items/crossbow/smite_crossbow_effect.png | Bin 0 -> 229 bytes .../items/crossbow/spider_crossbow_effect.png | Bin 0 -> 223 bytes .../tconstruct/modifiers/tools/ModFlux.java | 9 ++++++++ .../tconstruct/weaponry/weapons/Crossbow.java | 20 ++++++++++++++---- weaponry.txt | 2 ++ 33 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 resources/assets/tinker/textures/items/crossbow/beheading_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/complete.xcf create mode 100644 resources/assets/tinker/textures/items/crossbow/complete_1.xcf create mode 100644 resources/assets/tinker/textures/items/crossbow/complete_2.xcf create mode 100644 resources/assets/tinker/textures/items/crossbow/complete_3.xcf create mode 100644 resources/assets/tinker/textures/items/crossbow/diamond_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_1.png create mode 100644 resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_2.png create mode 100644 resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_3.png create mode 100644 resources/assets/tinker/textures/items/crossbow/flux_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/lapis_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/lava_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/necrotic_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/piston_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_1.png create mode 100644 resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_2.png create mode 100644 resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_3.png create mode 100644 resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_1.png create mode 100644 resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_2.png create mode 100644 resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_3.png create mode 100644 resources/assets/tinker/textures/items/crossbow/reinforced_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/silk_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/smite_crossbow_effect.png create mode 100644 resources/assets/tinker/textures/items/crossbow/spider_crossbow_effect.png diff --git a/resources/assets/tinker/textures/items/crossbow/_crossbow_1.xcf b/resources/assets/tinker/textures/items/crossbow/_crossbow_1.xcf index b2ca3b262119a04eb737a78a847ae30b7ecdfce0..9de2a1db22cbe7bb6fa91c46a6ab5eb5cd8d7817 100644 GIT binary patch literal 3212 zcmeHJJ5L)y5S}|5KhJ>(LJIP5q!dsXfdnL!;V(pKgNz@?DSjXy&kBhm59uTtOOaAt zoqrG{D=i(Vj)FEnAQE|ju{YoB?P4RGnj%?yZoiqGx!s%nZuV@ax|ZE8l(S{0QX;ew zC5&%F3nXP(7agJK)f5cP(FVYIb&3 z&jsVoAfvM7Hfqj#)~OX%OD@OP%VoE;ez`!7zHSOFS3@}uF*{$a=2b>$Y-W0H9>2xK z#iuiKbBha47Up?OHRBT!eIG#qQSxPIOn*~@daF3|t%#?aUaQ&c zXe#d*dfqbuNhr*bNrll-st>38u+@h%eRvp{@1z^B#SN%sEI|L9}pciG1FO-h)qeLBmYPuquDvxhtq|B!oC-Nd!N#*g&nl(#@?7k zUH1D2<`bMxf$c{=!2uySpA7Izk|ElcXqdW!cIh2&gx)D;%H1Bv-1P=1wmhpzc2nef zz-tU!^os&|$skws>s4FyJL@?-ttG`2QR?_@iV&l=-v%)ZjC7ETNXVgn6BWDDe#4V7#WB%|Fh!EOJ_5lz0p9&z%HXUZIWj}?lHptpQqyu1 zWg=BZrPl;+vStAjcdSQTE|53QS`>8M;;$9b>ji7$AFkTsA6ZY(P%A;*RuBn{y%=4z zg20dXaWVqaPf)u>fsgmN(`tiOA(NA^2Ejh8-1F!;_iO<0CBTU9qa<+8m9p3GK~Ga> zkFWpk+)=!+F%gF(P$Q5Z`Cj8C7Bm4v8s#7bNdsGbA}M>1w@vRW^Ki7EhsB+nE}n9I zyha@Se5!NP%LNTnk3y5SrDj=w&L`|KA0p@uJ#dLjoOkGX6eC&s$U8jtQ2KtzBIzBU zo_hEwkms^N=iVttnV}w`ws*K0s;H<@GQ19Ajj;5_=ojuw#Pu{zXPy9N@^-z=|EuWb z;zd{&~w6WZL0xgv);14YmoQ@z43jz literal 3330 zcmeHJJ8u&~5S~3d_W31(5@>?ZNl+w(g9A>$ZBSYo#1C+s^I^$$LhMLM70D7v&?7pu z1r-G~NEixq5*6;;^8;Kbu^k`Z-0eAc!6_(0kiuGX^Uci8zGim3R;9LO?3T(#xl%O= zZCVlIs~{opnE~mmUyp7x0ndV>pgGWWg}L7~^j`&^wlHkAQY%_!*4nOYKt-?%nr}4s zs;1G{tX4J_lJjM&v{~KUHs)QH-L}??Ms6|Zwh3TKnHJ!>KEc(u8)pM{-EC|YOO?81 zEctUmxi?9vblIJHrD;^^rKe_t{Wr_yhS?l1kiCCbd77{*pF_+l)@ns{A~c&@%rE0t zC=?##^7+Eb{gq|5sU|+*pmB0jKZ)Wmh!O+e0`7+jcA8zohRpJ}&sNhk*4E9sd25Ng zYWzWqfjD9gNLLt)5&@hH;8Xyo12_}FSAcmezr_J~4sO8=@ie48Q@~$0`fAU^I_)*f zI!(28676Vr)S@XGwY#Dlkue&|ZdVGa)1XaViM4|h^O2-91Xx|A$3^=Xa#HDCE?FM7 zp-zQZnlMrN(#^ZinG?>V%p-HhPoO*-CnXNMop<7J0;(2$uRtJiqF=(g=ns}}(#Sy^ zPkn@wCZC25t^jhtW15p1TYRUve`=I$cr%%^L~kG1!x*^7zy&%~CxY?4$Ht3_FBcot zVy_ek#5eXftc!hMd4@(E#CO=C4uaV45Oq4ZwMPu_OOWUc#^?%n-lvy;+lw<$qPf?()7bDo9+>RnzY%;4c)_TYnhV>5p0VsyB*u zq$^q|+FX|Zyn1`p{G@6_o>;wGT>1mm`!dZNbrKYF;vk(g2WN#8;~Ya)%|Vf(2$T_U z4HfW&+#+&=L*>Wvbkey`hl@%&o>#TxI|clOBI%MJ!@A^mma$KXLy!@E3*gBh@$%6m zKN;{saGwkea5e+!^qBW0^?Ejv^?(g_&$i(v`%KlAc|YS M<%8*u1uyICljbwghc z=7MqWHlwm--`CBKZq|$2rZt!T0 zA82t1ZC!ssX+!kG}B2;s>Pegw?#3R(hy=inA5h;JdSsX(xFjMYAl+q5q0 zSrT%>6HP{GXuA|4My~Ci9)d&>;DPNyA&2-+5vVSEd^Jix*-H}tR$@uN*m+%n9`oKJ zHJQXDr|45OvL(+wl9YK^#;6mjdLq$ z9yKBZVELzJ*l$LG82pmW7({6+W{1Cl+d*UlXm9voi}dQ5DP!>x`o`UyqP$^>=&~1vE;+ z8X{JBbrSFUjrS69HBHdDC4rf-BWvej6<4{~@M|QKE&}o~A)`usebOT&`vqUe!4@+k zXG4rM>m^*}cTGxs(FHBNtWdCGkTU&t+?L*8eVRsHToZ#M>M}Erh>p7`S?9Rj*^~l0 zwvRm|xfgc5S_JC*GU?+sD(=rvIK|rkSc|=kZTcFZisW5I>u5ys-~4%E=ak-A3)-O z{2P!sT1ZGfaPln@Kf*`UHc4&X*t=~~3OA?(Of)-hXLfeiJJ0JlZhO}{Y&5N=+p-C= zAeHeAs1Rrtq2|`7(|fGIOVFIOw=G%g`!Px35T5aqH)RQxAK)^@iJVtaY^( zoJUtVrLTO@arZ5^(|BR`IKSI$_U!%h4RZF6uFNx?%I9D>^>({1PlT2#Yt;?>YPH&< zO0`h6n83ve%!_d@O9`s*JTT9tWEMch6fJljDOytkwPB3aUQYY8H{8ENaYAz>l1#Ov zNaF-sFVF}k!KPu+zpxlDILYKjq9KoAmrBx;0%@2NLyCXR8fAW*5;y6C{TdZ)9ynLiIWcwM|qiwh;$e9q9*l+H|Ok&Hm>3}J^!xT z$#_2PGaT-lG~=5je0?DL2F3nB40O++u{Ria!o%C@)4=0b+b3chdpNL>k7(-5tnkm! z$9<6cQ|obm?8A-QLYY1%$9**a*0OohlRO#8EYwV~x&%R~W!!>AIExc@F1;DGB)vaw zbDdNnFEehPgV)74URR2V?_nxxqhOr*W!h(c<$i&5@JjP^=F$u|8hT7QFf64U17??( zL~Ms1MNt6C9CILuf&gj4JH{XiIHF@ljp85@Q5;}4;hiCN;SrdMr_^Z_L~jFpk+2r8 xErJuI19~(|Czv^fCJi%Kz?}X6+x?xV`z-rZGShYZ7vQ%bCpGJr@Frv`lJA}F(&zvH diff --git a/resources/assets/tinker/textures/items/crossbow/_crossbow_3.xcf b/resources/assets/tinker/textures/items/crossbow/_crossbow_3.xcf index 2c9b2cc846b695a088337a6dd91fc2f4e0bbda61..2f7782ff7f82dcb931cec21cab9871dabd5b033f 100644 GIT binary patch literal 3117 zcmeHJJ8#oa6h5|-*l}74w3LCx14BC`N<~}9gw(%)n5#4oV<|7ip^pivAR#16T_Ul1 z;|Cy?N)cD?CU(*GB9;$Z*=ed&f`9E?sw0%X;mA>exYoXtxAbd z?uyFz9;zgvSwz*gzV;t;1ztjpp|bO`!0h(`{#&d!F>Tta=FL*tY+6OA2zH59?AAf0 zWZ3nJRb16q%4VTnsW*+4pi4K+oxG9FWP@@ASQDmI4Bfe6Xk<734S49j-N+ZLnrW;> zYe9K%l~U-^uWMGzuxf=@C7Z|B%VoRN8gGzCUsi>h*`XYVgqg2a^CBX&l+CPf;Frtg zo@Lk9bDK{$H`peM^aX+bOr$<1N`8y9=%Zues6X5;H0!p#Q{UURTTT42?I)Q=&17$x z8R%V-`C5n)F9;Cr7nG0h&FbRsS=K1t!C&ksz0o1XY1HY-J=s-BLaUM2 zp`MGoI_!8LV0Zp@In?Po4qlO8oIc6vo;qOZ&mgxtr)Osl62Hj2=gt|A z5}8;b&*|=lA`)?oBxi`RQkb_B^c(XM@uVvC9UqtpJaTq#cQJ{@%P?y)=@gKWi5L?# zl;;CNvR&c_K00D%B(6Tb7g&`9I&n_|B(;ZNn$8Sk-+-2>kZ;_9YL}H5AZ&Pf7~g>P_#qx3;c+~{ X8YDi%lL3BsLws+H7MOo;=mY%))4PAD literal 2851 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 e{0@EW>nhGC(vOd}ILBu+w#adixhSZljX` literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/complete_1.xcf b/resources/assets/tinker/textures/items/crossbow/complete_1.xcf new file mode 100644 index 0000000000000000000000000000000000000000..58524bc74a6dcdda328c5766ee4ffcbcbbf0046b GIT binary patch literal 2816 zcmeHIO=}xh6ut9dS&?O$Hf|{-0hMOqAZ+B~r1fe@z>5xarCq}iY*|u8ZOM3?G?o^j zArK6+aS@c_MGb+{g}ZDQqN0>8?45}z_CLs?flx@B*cy3W&l$}anYeUSLZMH*xp&Sx z_n!CeyNt?}g~iOBLMc^F!i7Fx^x$(&>_)SeseUO`+oVxn{)hk?!hW5RPu_iL`I|73k zg^jO?RUetgVTz?+ek?B+Gt;xhYVq9(QguEs5}3R#g_(?e#+`|L7)kZ{Lw$a_&mZpd zUxUwF@fd_d4UV`wMtiS(>I;z{?;BkG^OKm4bBd%zOQpq6El;PgDL-}LJgostOWly* znheWP>l)6cr-r0MS_%j0kVhg>P_syp{j!>6ifsNPS_7Dt{ZRBg*76UZ<$-nb4-_0t z^z4BAk$>Rhzd`HBA)f|6UoLxtA67t-6y1BZ#x%<>Xtvk-{=BhZl zlaydp-j=|TA+Up87@tI(%nvzf5>RJn)!`)oBejd9p+PnVrYUNR*c7$>EwQ(3&4#G` zWWCW?-+E$G)ZSWeh^^ZYZBW!^tQ~B@_#{#^jdM2(OEuS>t$lWLwl=pizE~|&?NycL0>yh{ z@Vm%~w~NvY{(KS}e8l&pnC$@xn)vnv?LA{JxQFl2K}(v_-rL*IH&8Q8UbIAZns_HG z1ezkPb~6SHIc)B#;Puw@}KoGgn%Xo_&4&lZ!_m1DN2#$z1a5zJKa#I`T-nV>H?%n?X zeE<3TQ|M1NT|%K>_%Emu3XOt>PzIcEt^duC0WiZpG<)l&B$32W8m5V<<1f^}Cy-41 Z`(lRibad72^;VBP2tY$Oo`D^P{R_&V$ff`Q literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/complete_2.xcf b/resources/assets/tinker/textures/items/crossbow/complete_2.xcf new file mode 100644 index 0000000000000000000000000000000000000000..abb570949b6fb8b0e500a3ea22b818d91ff82739 GIT binary patch literal 2728 zcmeHIKWH0g6o2=fEIGDJ)7A~8#h|nu9Ex1II7vMnHqCOSlg4rcS(a2${c(M68l%B9 zxER4L0(B@_1X;CqIVw7IkT-(}(%8+5!Hd!qODBE#z55d^;${nh(ocH#e((SHz3*|C z%NKWI57XILHebjP)^(p4zYS6pJl+M(ZvJuc2@~)lCE&_a6K=!LR3#Hl8o0 za+!E;H@^)P!LHDHA+`mfc>*7C@@_Vs-DgAB6=a0R(YD~ zQ0_xGmns%hen)6Av9fj>zxDO?FA{5O>v!(nxy?3zDZde^t3)%uAg~c=!Gmk!t}ouh zVKUi2f6wh@V)wQ(rOd~lv#a0-Rv5&$B|)=3=D2G<2BW!4c>WTOUcw8P@LRx~D_9W# zuE8sqj!!+2pQ7mFVBhc+KTYdIjpZ+CvO!TAZ`hP%xIkljgEnZ5L~@=+$-(0!Ha<)a zY%)@vSxyOeIVCV4364*GgM4NaXqMoz#gxPp0 zL928?zmg&sXe3EWII5B02hYSGP;Ihgz1@a-fdM|-E#xiIy8W*hA?JnQlSvusrO`RlxvUOc z(S?q(6)vlDs6Od{jr6ldh0E&WPKE2}4algYS9DkGG}zlgUY8*u$GT;;F=<>@b84Ec zDH_UZr*_S(*{2$p)qqV+XeeuPS&c)ri48W=PHQHY)yB5Tb+j5})X_}M73~^(JIL!Y zB;?pALM9Rp-XzUY2-5@wl1n%UNNf@AoPEQW65JZkSU8z4e7DcqH#JuuaB**i@A@Fv zA?7Ol)wC|`9wE+$Ti}O#)&u(4JFOx=qywCb=~X_+8Pwn|+_<0KEt}?6`N#WP`O-FC zc`G}m92b65UBTBbSdp)N6zmvXiKM1=k?&c)MrwP8CUtxamA2ZOJi=>wXj7fqJ*6j_ z=$1myY@(BTuh(osc#79{oycz2drkPlLC{70qO5N!nTb@y+r|n*^ZXH_| zzww1DHi@j`zQw*y8)+08TK&O*%_Deo-k~*+$f0-+$SIxU2QOr7R)Va*`^d@}@Lmkj zKd3_V2slEHB`v;a>%spg{7>AW#FX+u!cuiVge1dKkb`NIA%F`8_^U9xGdUwe-ZX|h pjY<)WjB8Q>LNE)&v6W*uhk(xG!ksVn6Vma9OSl4F)A$f8@;O#$v`PQ~ literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/complete_3.xcf b/resources/assets/tinker/textures/items/crossbow/complete_3.xcf new file mode 100644 index 0000000000000000000000000000000000000000..3517fb2efa2b509ecff1f7c6b53812b2fd0428c1 GIT binary patch literal 2580 zcmeHI&ube;6n;A^$*wHZG)+SYnp%g?#4?RdXgBzs(pgjZ%ty&UWyF2~fXg9T}lUoUtj{P*>``(Y4 zd2ckb?6q~{VYzBl?OKH}u0+E44Tz@U<4wrq$`5Dnu>fC#Bp{5hN0|NIg8vHUD;Cnu z*=t3sGG}ertDp#Wjb@$Aty;x!8Z~?MW_q@2l^eCjhB2$AxecpSG_vzqH7)@Qk?AHv zOP7SkcH_l>LmxWp#j;(ujD>hDkXx6L5jXc~-QG0pdij%z!|{!3)v0Vg-ylc-lNvGO zpq>+GOQ0+KR5TJ0z-2T5mPYUK<;2S3+(Scp1~AkXJ`eVyI9YkdCXHVlcfdP zp|42DOe6scmmy8*H+YNj8Mua%rd_+g_3i@mm(`j1f4k23&c#FjDMIlcQD^;^aZZ2A z`Xq$~)IcwwsD)ookGZIY)8qYpkl{YPJu+*B@Dv0*j`!iA6@pWC@C#7ya*jOb$ipN5 zq;tqQ@}0x&ZO*aHIoPb_!wx2R9By-te9&PBKMz&q$U)O{@W}n#I^Z0+)`8=I3?0tF zW-S-CFu~)%;T*Z3#SVTB>RmiQxgC6L?6@x6yOio3v#+Xi zS9$T#NPZrHc!%g*^6POf`3>vyd^mN?X+}HrrMjHz#5*__%gcO_B3^^5aQ$9+qv1HE z#%K3Rc6}8O$^3fV;)PySRrsBWM(QX6@s3fI)OX`ts>6Dk^mc+m4?i)Yt@px50Ou|8 zsNEAi(fkvSUyJC(>-CyiQ=>nid!X80uSq)BQKK{OqyC_qp0;~E z&+WP{9F_O)AeuyOx9{@Ps*&G@uF*5MKNz@wGlI_DLBGo$LlvUa(Ct2W9+5=%o^g&* zxGp&b)`coHnW8gSy7Wlm)`#wc|4;d!>ZMdyO`{1ZXee=K#<)_ zCP#NOF=B*@RM(O34U19)@+BnyaN*k^bzlKw0wSQNlq36afRG`{1V|x$l6=oJ`4<`} BhdBTM literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/diamond_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/diamond_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..6da1a0de398893ce10fd6faa793c826b65fbe5f9 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2$)&ls&IY)6!Q0UaSX9I zotz*srQ!IU2lht3MgjLtUfcKYJXrtLck{o=OK<-8`trZQtO-?aDe2zf>4qO7q>MIj xd@%g;^F!yuH7higPu8hlOM8_i$EqyHz_8$^Mu+)d8yld}44$rjF6*2UngDLcN1Olv literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1af109c59567f8821e6d90043c10eba8423407 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2v`WtcUZmyDCFnq;uvCa zIypgtb#Vh%!$ghHgFOEqzS+8>YDUL4tpg1Q3mv&vC8|h%c%tj9>d(-o*yAECaOT7O wgD%q=9o=R$CLU(p5ia4$WoVOVSirz=_>I7vx<3Z(K$96fUHx3vIVCg!0CdzqS^xk5 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_1.png b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_1.png new file mode 100644 index 0000000000000000000000000000000000000000..84376d9d5e69fa945fa0f830c351164904714a23 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2r9_`R;;)P6pHtBaSX9I zotz-Sy10R>VWLLpK^_qJFDU^8*A~4>RJye2KMx}tPak)bghbOqwuu=G%!em$=b385 zDA8shl!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2v{mvc7J~l6!P?RaSX9I zotz-Sy0{@vVa7vyXM@A_r+5+)5(@s@acXpYyXk-V-~FHD?+S=5;i~s-t literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_3.png b/resources/assets/tinker/textures/items/crossbow/emerald_crossbow_effect_3.png new file mode 100644 index 0000000000000000000000000000000000000000..7a086ec5acaeb43c3a46d1247d0c6473e071d877 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2w3qc)SWmF6ms-*aSX9I zotz-Sy10R>VWLLpL7x8)-)vn`HKSvj)`5nDg^t{91|QjMDo+QT6mEE_H0fYc^ZyfU i29uUZ`bY4{Ffg1nwVAu=l=5LU;Lc(-}5KP ziKU!%vI^vRzfLFl#<^3cHhlY(+7^GC^Od{Ahes!Kfo7!gfIu7TAD;c&{-=9HpFQ9a pBynI)P0{bfMJD}Cfexk&40nR{G?*8kG6uSY!PC{xWt~$(69C{gUAh1O literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/lapis_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/lapis_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..478f04a040780c8af335d6d6dbe7ce17e858d27b GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2pAd09nAj)6bkfoaSX9I zot&V+T#y<5_xYuDzs?^30;j%bYvwSubzh%vER&k>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2pB52h58l(g&aLy978Nl zzwO&7$e_T(RR3SsXo7TMd+XFNwOcREL--HmO8tn4Gv2%A0PmU`Ix|udIlCvWWbayJ iGganf;1v7wml;n~n@fM(dUhqyFa}RoKbLh*2~7a%bUX_H literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/necrotic_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/necrotic_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..9edc57e5319767c007fd9000da44241a9a8c9a88 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2aSX9I z{dVF;-U9|4EC){s?LYqBzVZ7HLyu%{%?-YjLv{-3{5YJJ?`Y(4>}BlfE(Rut%)n^V zs`qRM{4{H>vk0j8UXpornq}r@mHD1wG5*hYYF?iB#G94DFlfdSldP9)qR-#zhs^2k fsc!jObDVd=1Pj^U+NDQ!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2xzm_)+E0L3Qh8KaSX9I z{r18}PG?1dV;|pl&TXv~+rX>7q=<)of&jNTN6O?6X(ze7qS7~P7Sr?fn0!n;XkUEo z_vaQ5bSqC=rXSOvwEfSH`7=9abeOrOe46HeoO#`A;d7Q-t}!%tYn~2yP!uhg?83pg zx7;gnf@9NBM~7@RnI3>R#5(`4N&Uengm(QCM3tDk=T&0h!ZzRQnmUu(QOP%lUl P=sE^ZS3j3^P6FOC literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..6ab7c23848a2e37310bfee633a22310e02815111 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2&hWteRrM)6bkfoaSX9I zot&V+bfoI$|8xa*5Y_*6)BpOHKlJ9X83-DsJUaB0XZyOC^cQRN{`qfuJH7Ayul;G? xj{H~2c4HICRMWnYA$E%;IdMtrHw_0yhU}k~i(^ioS_d?o!PC{xWt~$(69DcQNn`*3 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_1.png b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_1.png new file mode 100644 index 0000000000000000000000000000000000000000..9dd3776f74f9125a524ebdaa587ffcb2d4ed8f2d GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2&nVj7g}-|C=}@F;uvCa zIypgs=}6Vh|LF?sAgcfCrvLRXf9TC&GY~XNd35M0&-QgO=`Ysk{qx`Sc6#6YU;ER( x9r>@4?ZzgOsiu7)L+lnya^jNKZyFAa4B0;|7ss4FwGL=FgQu&X%Q~loCII`2NreCa literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_2.png b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_2.png new file mode 100644 index 0000000000000000000000000000000000000000..898f4021f52e392a550eb660d43e3c24bc1a19a9 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2xzD@8y21d3blB;IEGl9 zPEJq|I#PA>|8cc*PHWWuA5dsJdYf-j8Ur&k^Wh_{rzPjz*?Fko^{G;}NihPiQ~&SZ zvTau4{kE$-U8`Bx`)Bj)z4*}Q$iB}mp5N2 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_3.png b/resources/assets/tinker/textures/items/crossbow/quartz_crossbow_effect_3.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9f5b7b5452c5ad1e263827de775d37ae449a09 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2&fqr{k3b; zZfs99J$#qF|HSv?^wN*@Y`Yl0I4FB2ubKY$zxVO-i8&0yMH%;Z70petKg?TE^qdQ% rR^n82wd6^o2iK;)=2@K3z`(F2*I=`GcEfg{Ll`_={an^LB{Ts5-1J^m literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..ebff98e756eb857be06d23ab53efe4658abef80a GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2*_AQ%f5R86q53EaSX9I uotz-C>481-;s1&&Dn)vhZ8$jl5W|KU++Wj|v>ySgV(@hJb6Mw<&;$T2KP-a) literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_1.png b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e36d69794ccf6c52e8c227535c053333f05f8124 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2*_DxYWJi8g`_-P978Nl uCnrd3dSK6d_`l+cN|Byr8xGDs#IRuo_t*3#?MHyB7(8A5T-G@yGywnxhbzGV literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_2.png b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_2.png new file mode 100644 index 0000000000000000000000000000000000000000..5d6b61d0a93e895f2a1a4e5002fd94a17373c372 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2q^GP2sRP{3aNRzIEGl9 zPEL^6^uV6^a6KCkEMweSE7HUCN`2CQ9-jZ~Dy@tRtxTLh({Co80_tG!boFyt=akR{ E0EvJr!~g&Q literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_3.png b/resources/assets/tinker/textures/items/crossbow/redstone_crossbow_effect_3.png new file mode 100644 index 0000000000000000000000000000000000000000..a34f368a52a1da2890705e2cdbdffd0f96d85efb GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2q+4_^2_f53MqKHIEGl9 zPEL@x^uV6^aDA7lv0+bBpn=9^vzsqx$MiCMX6F1^P!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2x#$T?YT7%DCFVk;uvCa zIyph&Q-k2_1rwK@ub23J=c{hd51xcW%Pf!QDmL#!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2(qY!o)N4E3K@C2IEGl9 zPEK%OUY))4zwrd_u51|+ S%{&6s&EV!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2r|iOPvJ`k3Z;6wIEGl9 zPEI($Wb(A~-|5ccf9VQL8y0Y{IQ{XDdBDTu2M<#cZxp_|TCc|^);7C;pMlW?W~I4H z{~2Fk1uB`4D?E9b&G~xeP`gdK>A!wG)@SBd=T42AAo}=+e_%tP5ZmH}2nGgS1FbP0l+XkK^&U*Y literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/crossbow/spider_crossbow_effect.png b/resources/assets/tinker/textures/items/crossbow/spider_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..66bb964cd47777aabc09c60ddd5e41eda1d38ba1 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2r_G@*!*S%3dMW6IEGl9 zPEL?uU7QfX;8tXkX~^*>Js~0Chx+%~jWcD=1}E*2+;Ou)a$S7=(E~24o&^Xiw-xi- z8Q+lZFf;&y4HI55mdK II;Vst05r8k*Z=?k literal 0 HcmV?d00001 diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java index 3be1d427..e8a69cad 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -2,6 +2,9 @@ package tconstruct.modifiers.tools; import cofh.api.energy.IEnergyContainerItem; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.tools.ToolCore; @@ -23,6 +26,12 @@ public class ModFlux extends ModBoolean { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + // not on ammo weapons, since they don't have durability technically + String[] traits = ((ToolCore)tool.getItem()).getTraits(); + for(String trait : traits) + if("ammo".equals(trait)) + return false; + ItemStack foundBattery = null; // try to find the battery in the input for (ItemStack stack : input) diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java index 3a137f76..b726d3fa 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java +++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java @@ -301,13 +301,15 @@ public class Crossbow extends ProjectileWeapon { @Override public IIcon getIcon(ItemStack stack, int renderPass) { - if(!animateLayer(renderPass)) + if(!animateLayer(renderPass) && renderPass < getPartAmount()) return super.getIcon(stack, renderPass); if(!stack.hasTagCompound()) return super.getIcon(stack, renderPass); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + if(tags == null || renderPass > 10) + return super.getIcon(stack, renderPass); float progress; @@ -318,10 +320,20 @@ public class Crossbow extends ProjectileWeapon { else progress = getWindupProgress(stack, getWindupTime(stack) - tags.getInteger("Reloading")); - // effects aren't animated - // todo: make effects animated - if(renderPass >= getPartAmount()) + // are we drawing an effect? + if(renderPass >= getPartAmount()) { + // is the effect animated? + String effect = "Effect" + (1 + renderPass - getPartAmount()); + if(tags.hasKey(effect)) { + int index = tags.getInteger(effect); + if(animationEffectIcons.get(index) != null) + return getCorrectAnimationIcon(animationEffectIcons, index, progress); + else + // non-animated + return effectIcons.get(index); + } return super.getIcon(stack, renderPass); + } // get the correct icon switch (renderPass) diff --git a/weaponry.txt b/weaponry.txt index 9e656d4e..2ea661e6 100644 --- a/weaponry.txt +++ b/weaponry.txt @@ -7,6 +7,8 @@ TODO: * Partbuilder stuff for weaponry stuff? * Bring bowmaterial stats etc in line? * Can't have flux or redstone or moss on ammo tools +* Knockback on projectiles knocks towards their moving direction +* Glassmakers Arrows :D maybe give javelins slight armor piercing? or do they have that already?