From 0e51769e05072da7c4cb5057a8075a4e32bb765a Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 6 Jan 2019 00:14:12 +0100 Subject: [PATCH] folly ammo, new buckshot, 9mm and wand textures --- assets/hbm/textures/items/assembly_nopip.png | Bin 282 -> 296 bytes assets/hbm/textures/items/assembly_pip.png | Bin 301 -> 307 bytes assets/hbm/textures/items/assembly_smg.png | Bin 269 -> 269 bytes assets/hbm/textures/items/cordite.png | Bin 0 -> 349 bytes .../textures/items/gun_bolt_action_ammo.png | Bin 245 -> 245 bytes .../items/gun_bolt_action_ammo_alt.png | Bin 0 -> 245 bytes assets/hbm/textures/items/gun_folly_ammo.png | Bin 296 -> 0 bytes .../hbm/textures/items/gun_folly_ammo_du.png | Bin 0 -> 436 bytes .../textures/items/gun_folly_ammo_nuclear.png | Bin 0 -> 576 bytes .../textures/items/gun_folly_ammo_taint.png | Bin 0 -> 562 bytes assets/hbm/textures/items/gun_jack_ammo.png | Bin 310 -> 304 bytes .../hbm/textures/items/gun_jack_ammo_alt.png | Bin 0 -> 310 bytes .../textures/items/gun_lever_action_ammo.png | Bin 240 -> 237 bytes .../items/gun_lever_action_ammo_alt.png | Bin 0 -> 240 bytes assets/hbm/textures/items/gun_mp40_ammo.png | Bin 209 -> 185 bytes .../hbm/textures/items/gun_mp40_ammo_alt.png | Bin 0 -> 209 bytes .../items/gun_revolver_nightmare2_ammo.png | Bin 247 -> 263 bytes .../gun_revolver_nightmare2_ammo_alt.png | Bin 0 -> 247 bytes .../hbm/textures/items/gun_uboinik_ammo.png | Bin 261 -> 245 bytes .../textures/items/gun_uboinik_ammo_alt.png | Bin 0 -> 261 bytes assets/hbm/textures/items/wand.png | Bin 257 -> 211 bytes assets/hbm/textures/items/wand_alt.png | Bin 0 -> 257 bytes assets/hbm/textures/items/wand_d.png | Bin 250 -> 211 bytes assets/hbm/textures/items/wand_d_alt.png | Bin 0 -> 250 bytes assets/hbm/textures/items/wand_s.png | Bin 251 -> 220 bytes assets/hbm/textures/items/wand_s_alt.png | Bin 0 -> 251 bytes com/hbm/handler/BulletConfiguration.java | 18 ++++++++ com/hbm/items/ModItems.java | 12 ++++++ com/hbm/packet/AuxButtonPacket.java | 40 +++++++++--------- 29 files changed, 50 insertions(+), 20 deletions(-) create mode 100644 assets/hbm/textures/items/cordite.png create mode 100644 assets/hbm/textures/items/gun_bolt_action_ammo_alt.png delete mode 100644 assets/hbm/textures/items/gun_folly_ammo.png create mode 100644 assets/hbm/textures/items/gun_folly_ammo_du.png create mode 100644 assets/hbm/textures/items/gun_folly_ammo_nuclear.png create mode 100644 assets/hbm/textures/items/gun_folly_ammo_taint.png create mode 100644 assets/hbm/textures/items/gun_jack_ammo_alt.png create mode 100644 assets/hbm/textures/items/gun_lever_action_ammo_alt.png create mode 100644 assets/hbm/textures/items/gun_mp40_ammo_alt.png create mode 100644 assets/hbm/textures/items/gun_revolver_nightmare2_ammo_alt.png create mode 100644 assets/hbm/textures/items/gun_uboinik_ammo_alt.png create mode 100644 assets/hbm/textures/items/wand_alt.png create mode 100644 assets/hbm/textures/items/wand_d_alt.png create mode 100644 assets/hbm/textures/items/wand_s_alt.png diff --git a/assets/hbm/textures/items/assembly_nopip.png b/assets/hbm/textures/items/assembly_nopip.png index 63eeb33209cfbe68aea66fa6cac9a185cd392341..8345a3758d37a193034fedfa79429f7bc1867657 100644 GIT binary patch delta 252 zcmVkU0*DW=we$)5be~}94@_*J5z&UL zBzLEnv%9G_urtgK3;Y|rQp!IeB;Nu$&MWm)>Vu5WYr9w&XPnY9+y+9=T&17pnf2z7U8n#RxbjH;@TB%hR@ z1OOmSQ*h3~Ie#v&?|by_Byg2Qj-?lBraSTZh!@z*gC3DU} zYaMvu8~eUz#+dN(K?VRRC6rPSLSR`IXsx4;9^(bL%T(ok@1hm}0000 CRdXW% delta 238 zcmV^#Aq48W z1|Y_G+d=vMNhwhjr>*`LxAyG1F1KxqF@_KV(=;8t+kVTkL}yBgl=7o~OJLvk%ic*~ z7=}}js;astV6Dws>yyZD4vu43YjfZCEX#uT9)NkC1$>4q#)xz7;2k*_$5D9ikI64G ofYusg3`!}sZNoWt>F6=O0M5ok-LfVxivR!s07*qoM6N<$g3tJD(*OVf diff --git a/assets/hbm/textures/items/assembly_pip.png b/assets/hbm/textures/items/assembly_pip.png index ddebb268a0d833e568c65c3110e305144960ffd0..18f2e48ce178832c383e116aeadbddfae88bb706 100644 GIT binary patch delta 264 zcmV+j0r&o`0sOr)jwTT5Cr17E*!^!$_ex3%y|7bYYz=nOyT;2c%c9Q O002ovPDHLkU;%=A%5&NP delta 257 zcmV+c0sj880<8j&G=JntL_t(Ijm?rVYr;?zg})bzrjJ4r8ww#!Cy_uwGPwKxZU2Ic zYv+uiE@G7~sm&w-tIt6UXi%Q$;F&Iud%kzL_rkqNM|M|V1&~r+1hDpn&zqJ~5;i;Z zS_5N91<0B5ym((IW5>&%bO6fR`$+C>1C;&*)RKV`Y zmNF-7b|}k|@A6C30LSt7W`H0FwC8y^j)TZ0pW~6y_KdUzp?E(jP`Z$%00000NkvXX Hu0mjf^4@%- diff --git a/assets/hbm/textures/items/assembly_smg.png b/assets/hbm/textures/items/assembly_smg.png index 40a59dd8c4209a88ead4728f68884b916c1bad35..aea5e8e3228fd5b86a72efe1dae168ffabcef3ad 100644 GIT binary patch delta 218 zcmV<0044v80*wNYJAbW_I}XAy5Jbl@L<%2adRioxY3cR?G+c)}a1nZHA0ZV-pk+fr zXcAM|it@vjn98zto@RD|f9iJ9_Iljg7*EnRuTqKSTp|XN{2l>_XcQO(Fvf^UfQ!FQ zC8lcRdEWaAO5ju!h3M89jn)+rS!VX2V8H#nvnrF=E+n4s8dF@=D60mC%R>N>6^8VG zz|f|H0Yqe#Qc(~OAR?=^j!rUj4`YmAW^Zz*Dyzm1y9>NNO&`!UwYA9-xHAsv3*ZV$ U>mlpDLI3~&07*qoM6N<$g42v%*8l(j delta 218 zcmV<0044v80*wNYJAchmEe^sk7=0sXGKa00sO$j{-!0}j$0T-+OHA|*=&8>(fn<6? zEDgS>v36au4h&B<-^=?+UV*=Y5W)!|+}C2QwbNQ}GTF@!P19@&&c^h*t^;w~w&=Pp zOKz|=IcPAp@CiS?DiCm&`=nc~SQT(e0oNyC7zUh=jQ%m1>{C-}G6N^v008|fXzYPZN!`B>ejP=m31_ z5vv482&B6s*Lv1FGl;^VbA-UQEn=16OOLi~F{WCiyjw!HZ41jfdmB?>Ohr+a)O9n^ zEgFogpPp+?QIrVZ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_bolt_action_ammo.png b/assets/hbm/textures/items/gun_bolt_action_ammo.png index 28a7dd9627e26b36df946a8e0cfedd33782ab4ca..02934aa4428a47550db490c4fdf1e06199d8f2d5 100644 GIT binary patch delta 194 zcmV;z06qWp0rdfpJAdtyF$w}P5JkUY71m6nRR~_rV+a=B#ha)%uvWGbEu2gUcClEH zg-n!XTR)_jpP$DMA;3sYY8&4B976ca%&cZrlZbMEX69;sssXIE#bF{+o6b}hfO8H_ z(;&tO5kdbtKN}3uA5Z}tw{77acB~}7JmYC|hBZJ)-QqN$!8`R{dhJ68s0~(2;Bo`z w29N~E3-AjaQ2k8LJu;cDx+K7_>)BCy1FohtM>Csgng9R*07*qoM6N<$f^kJuCjbBd delta 194 zcmV;z06qWp0rdfpJAcKJu?@m75Jew|(&7r2-oOj60UeWM2MQJmbHF4SfD$Cj?oAPr z0PjoT?wW?fkXf z|Ccsz-MVs5s-UF4V#}lZNr5h#iuo9lc^G1^iz?1){=>R@*9}dEJ>QeRA9VDL=4F@= zq_oteB%ZCq@Lz+;O2L1M-6htO6Qh(S*>A1nlk?A*{qK#AgXMlM1`F9=ci;W~TNTey rakgiDU(s!!nR8noFSYun{fhU}8?$TWKHEis?q=|G^>bP0l+XkKp6y)M literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_folly_ammo.png b/assets/hbm/textures/items/gun_folly_ammo.png deleted file mode 100644 index 47c65ad3d4b8fb5e342cdb63245e852132178ab0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK^6z`PIEF;D zzMX!Mw?#q3CEZ+FVAV!W?*-!C8`w`TWc~Gk?NqC6ra|Q59UG45Ocv1p@xR#4M=2np zf3<$!;}_2>+lu+lS$?UlUwQ3wRaoji9L;5#jZv9T;8%Shas`}TxG~&TTyvOR-nQK z77if-nQN~80=+^~ChS`D)H+md73Ritw>FcE_e`}vj rui@*+hz6$#>t6G{7T?c$^eda!tLhk&`@HLbUS;rf^>bP0l+XkKxukVy diff --git a/assets/hbm/textures/items/gun_folly_ammo_du.png b/assets/hbm/textures/items/gun_folly_ammo_du.png new file mode 100644 index 0000000000000000000000000000000000000000..34e22d6afb6f0a1f0ae7ab7040ad0f0a03620029 GIT binary patch literal 436 zcmV;l0ZaagP)Z2JK=vL;zoTswS@g=nKKx+xswEO(XzFe3i{qb!SfHRWH%&}%k~pr8Uq+RV48H>(mKJ4q7c6C z!}omzK>$iA>bgc<*IAx3_e&F@elm5GTPgs~T32@?ZC;t1^xN>5SIty70c zJwST_gw(M}^a$xhe#DS~Q^_5Q-53%lMHS(dtRQ25@8j=_;{>Q#${~~J=ZKCcZ4g3` zrYX`i#lu|$rRDxPUgZh&b41zi@uUr1*Rk1b_8@rRiZJJujaP1__cniUW(=EG2686* z({UV%l`8}uKixvtb!eK#ud1p-RaM;FUyCp+_b0|70FL8O&-2h3+Oqjlb%r)P&yzyr z0x+!m4ng&7$2qAmBVK$o;#+c9Ng0J)@ zJcc;Hf7iW8yQMgt4Acs6tn@Qw%TRj;O3#9<`u#pk(}Zc7uq+F493x2*BuRqxdd-_` z8|DJMJT`#UYw6&RuU~V^vI@t&KhH~J`4P~(I)M_L27uCX6Qz7 z4B7Mx0Chx2;loZmdho4-$xJx2*VIj6!De^k!KDR zJc^Z;t1RC@FB@XNVHm=rxT=cG0m(hkyn^CK;!3jStg$}BFnD9?3~i}7Q0>cz0>E@S z6*2%oIEVlU2hw0LsN_-U^J%eI&}`b-HI8F`A~K*XNVnT9jbHmVtX6anZcJ{j}? O00003u literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_folly_ammo_taint.png b/assets/hbm/textures/items/gun_folly_ammo_taint.png new file mode 100644 index 0000000000000000000000000000000000000000..aa7e1cee2dc2362a530a6b30242b2f76ad5ca06b GIT binary patch literal 562 zcmV-20?qx2P)iuE6vzKG4RU;fcCRx`e1IknGMe}qT--aEH0e@5LQ{7) zwys^=oJwN5)Rkxx0Vfa^I@F_g3I`YizT`!7ynFxOy?1Z`G;Go-ljgl7vAYvQQG_^- z5yvs^=MOL}sdB#SDx&ni-JPJ-YH`=!jWOo$p^Y>hj^hX+G6AUgxon>+ z6XFOUOZ=279L~`+Efa#-jdVlG&hHB+nla&6V_oVz`6ULXNRr0 zoC-7wP*?e>v2AF)0;LZl0MK3)A)l$Z zs;aqhPxeP)t`(LTpxt~6E(5@@BZK?Kbr+h%9j+=TU4}lJtV_ox=Q$--eCbFNF2^1YF;Yn*aa+07*qoM6N<$g2Gz% ArT_o{ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_jack_ammo.png b/assets/hbm/textures/items/gun_jack_ammo.png index 58f0210debe078293c4e6eb1aa12e24367bb1f57..44fdb897ecdf99c53fcc7208b2abb2a8ec96e6ec 100644 GIT binary patch delta 260 zcmV+f0sH>80$9yaB7U*=Dao$PZRBATuX2Y2xa#>}6OYh9^h*6KT`l- zPXvI=+YxL&59u$cm=yu5IpL;PuD1T$=zgHiE?!Zs;cE+oXc`@6$$W132dZcvue5dWXmW@4J9Rt!QA3!CG6{ zVy%rD9DSxFNrH0@tu-Qoh+vE%&vO+sb)1@}Y1j{W@5!=EHQ6ur;DFHK!MYFt0000< KMNUMnLSTaS;(V9@ delta 267 zcmV+m0rdW`0=5E>G=J?$L_t(Ijm45NZUQk7MW0bB%R<@)1apBDTR;J23Z!&&aEcr# zCrJ^Bjt*!jD7XP)nw8MXty3&(*pL`HT#f!4{~6C1o_$OmtY(C9_bh&1^n1(ztmlN$ zAg`2m5B7_gm|_isS_lEItECt~tA=%z@i2#e4zKTokLq%Yy?^{3%4WN(3_H7zdMm(wahJ6Krpr!r2jFywVTwfq?>&=m*KFl>Cp#tYUiqN&lBTFEOvyM|MqGOW}8&y0|aZXBgHzZ@H+jeo7htx9%A;l6ae=I2hNh zUMk_Rx~+8TM}zh{zV+{0`d<}w?foNnDsA^_9_!t+8~+~7<8f==Q>A^Nu5kKRhGnPy zO4uKibR>4UGQYQ-oPRy%X-Pt@kFiDmK}&I$mPHyrsxG^gzPJ5v7;0KL|J=?UdfB-? zA)%9#3VTx{r5FSiPaCl%7?@tex$?E4oKWjn^(m;pV`;OXk;vd$@? F2>@%kdL94( literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_lever_action_ammo.png b/assets/hbm/textures/items/gun_lever_action_ammo.png index 56afc548b19813fbacb815ccc2143482978aea3f..114d8367f058e8b8c95abb930aa5e9c1d7027933 100644 GIT binary patch delta 193 zcmV;y06zcl0qp^hG=HQ?L_t(IjqQ^$3c^4TMPI}eSr7|jBLwa2J%lH*^)l9}bBNqT zs}(CzL>zysqOBk)$1!;L00000NkvXXu0mjf7w1%C delta 196 zcmV;#06YKf0q_BkG=HZ_L_t(IjbmUKXuya|Vlo56e|03j8y>Y7U>5_!|2I(lABuM| zF#N}+mIa&OO(+krht$E3=9kmkqitB!btqxIMgxWGyN?T!(2s@0q@WZ!Ub@8 z0o@Q>0ILhs>lhezG9d5+s2I^Mc>0!sfhQZnmKMgQf`9=G3_T1CzUB~Gm=8iPz!42N y4S4q%zs)d!GkMO>Mx;DxVFm`bCK8e|T>$`4(<6@h=?UZj00009zEowOwA@yS1aaoW|IGvb$aj?+8vHrFY#QtA2fi9<2?+@S$Cous zVB`UUi9meFuYtUd^dG5U15}V9KHn#0* eLX(VQ85sgDEBF0+$@v86WCl-HKbLh*2~7ageNqbm literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_mp40_ammo.png b/assets/hbm/textures/items/gun_mp40_ammo.png index 6c4ae2d1883def7f65f0e9195786555b727c4bb2..593603884f70f538cce08d00e7974f03a12a8a8f 100644 GIT binary patch delta 141 zcmV;80CNA)0l5K?G=FeOL_t(IjbmV-CD<0E@qe|i>VJG{nDA-lVPj_CW@To;X9!LM zhy}DU0OovNHf9Dw-k{h8EZ77UG`}zia56IpaxpW!|Mr*R!}q@oAHV;@YQP{3#Gz#X v)>uFeaaas|`hh(buo}S6$pnu^ngamK$0LjcG&Umu0000RWbJb3T`Lp@Fx5V9EtSg;AkusmQ`atc$dg;)b%8pw750|Ns? zcsL)Nee>ogh6@)+GytZN5WpFT#AwEA0I>jTI$&U6V5m`HKpshbEq8FM9asPWf?X_= Tz(jj600000NkvXXu0mjf76?IC diff --git a/assets/hbm/textures/items/gun_mp40_ammo_alt.png b/assets/hbm/textures/items/gun_mp40_ammo_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..6c4ae2d1883def7f65f0e9195786555b727c4bb2 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfsjz}KSP^} z4-C$>e&Pa~B-tW1a30%WlMqqF6}+Z3f;mCzL>VJ9GqZDrh5Ve_&(GA`xWzq87?w>G zI3U?^B;!~%!$yW|s{|le5t!)US*u%Kuv#{PfuSi@XYv7;Y6GB~7(8A5T-G@yGywn+ CB1X*s literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png b/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png index 11909366bcf5e95c5e7ce80e181abc76e1666118..aeeb95c931c8986b57f461681fa96fdd86181260 100644 GIT binary patch delta 219 zcmV<103`qS0fz#RG=IKHL_t(IjbmV-5HRABSU*$Y|LeC1>9nf*Sk+<`oYkiIADRE+ z^*06v1_p+@{+Af)nXnlkDvZz%(<~v%h1I1jSVb8a7<5&CGYIlCFuecB%JAYH3&ZQT z*wtZm0V!bA02~H%%(KT3o3X|Ws{uHpv22nr11l>#!|&fe8B~7#`o_S(@Pl|4eEISQ zi`Z-8UBJU5!tnX?D+X3pPKMvVzcc*){eyvrM-;08I5U&2ZRUSuFPuEN5T{y-006ZW VJRd$syO96@002ovPDHLkV1mLJXTAUc delta 203 zcmV;+05t!H0`~!sG=Hv1L_t(Ijm?rF62dSLMIQ`4gNi{^p<|+JxCXAWE+^@IdWh(# zie8{62%=L`=q}X3SG&p2%WgLCYaO%=Z^_1#yic-MT)bV$O*6;NT>xm?QG|#9Z^=vi zt%{Qb00^PnzEmLTr~v?C9Eov0I8Cxg1*G%}(xkTV4$-8Hu|&$=4$sUO=u-s@`=$Wr zT;kOj1c2H?T?YW1a{zSRUG%AdwC4f%@Rhf1Y|H--Jpg8MDxIXSf}j8Z002ovPDHLk FV1fYrT}J=_ diff --git a/assets/hbm/textures/items/gun_revolver_nightmare2_ammo_alt.png b/assets/hbm/textures/items/gun_revolver_nightmare2_ammo_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..11909366bcf5e95c5e7ce80e181abc76e1666118 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfK91P!m^8D#M zvk%#_TX^$N9-Feqe^YqOp4gMV#>daaGGyEiZ0TUgKk5BvZP#QL29AYy_Jt_CT*1hY zB-2@FXW_faops3la2SGzqOD(qd(ftw)Z6#5p zGKSuXFbP^bz(m*2@E$V{Yvq{g`oeA|o_$5Tg8_00000NkvXXu0mjf DTK-wU delta 217 zcmV;~04D$S0fhpPG=IEFL_t(Ijm46&3c@fHMUT>AyQ@ng%J300<$RVb&4CFa*H&eE^E0mtSq zcfLQ^ymRY@eJ(qXaUc6!n*F8f*!jYhlkc)Md|kEMOLHq{65Advz2~nUbM%OrGkAP! zSCmz-z1y>IX?Ix@}!ntco$igOaL z2_7r~LG#56^g$Z0pP*M;q6JP~5Dk#UJsG|(Rmp00i_ I>zopr0LyS`9smFU literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/wand.png b/assets/hbm/textures/items/wand.png index 101d7a866c2988d12612b93aad67b1a820bfa040..d6d69b2a3ba757aa0ede02c9519e897447a701de 100644 GIT binary patch delta 183 zcmV;o07(CV0@DGIB!2{RLP=Bz2nYy#2xN!=004?fL_t(Ijh&Or4a6V}1;=T^Jy`C) zl2ifo;61EZk5jgR3=A9lx&I`x0{NT;9+AZi419+{nDKc2 ziWH!rM2TxeNpOBzNqJ&XDnmhHW?qS2UTTSgiJpO;WsY&3A5cw^r;B5Vh5yns-hu}d zco+gh6qx=888minna#{QU(%_nLL_LKiqig^_Bi%SQI8it|M|T0*ov)1U+e?CBpR5!{`J6fTUT^sSJMFnhvPHx^iPH@CBu+n2J65ox_oDekiCr$qFNAtO<}w*> cbGG;7_iJChXS0D>9?*IQPgg&ebxsLQ09qecJOBUy diff --git a/assets/hbm/textures/items/wand_alt.png b/assets/hbm/textures/items/wand_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..101d7a866c2988d12612b93aad67b1a820bfa040 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJD-%+A^D&cfO=kRfR~=&IqmG1 zq8=}P{_}a~u@zg3zSswNNj_T5-cfw+)UgP?^Eq?wz25NuciMB2WQ&M-5~msNNt}M5 wcC27W??v;861!ZIUkLSn%w;m%=4|iD@7KP1&t?O&JfQ6ip00i_>zopr0P@FK(EtDd literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/wand_d.png b/assets/hbm/textures/items/wand_d.png index 3524021bea820a8aca06a9e660693d3183f18a47..cafaaa186e3c4bf896612a15d321c1c2a6aa0104 100644 GIT binary patch delta 182 zcmV;n07?J)0n-7HC4X~5NmK|32nc)#WQYI&0E$UOK~y-6os%IGfFKNo2bnD0K-mBP zH6CY|BUr4?04N-&gICzbz8AO$z=#Y{D#Z|d9-+2M^cm!EJSCS!M4EP8z_4n;GC)M~ z-iOAj8wOy!K@L0T(pXf*2>fZlfnN={aC6uLR~Nl7K%N6b-7oO7P{xxDhowe5Q%E?H ku*Cl`0GFCK`d_Mb0ZtlRS;-(6761SM07*qoM6N<$g3&ZdQ2+n{ delta 221 zcmcc2_=|CZYJIw+uOkD)#(wTUiL49^44efXk;M!Qe1|}oQB=dL0VpV0;u=vBoS#-w zo>-L1P>`6JSE84fTB2a0XP{?ju$GJK08ml6r;B5Vh5ynXN4^FF4wm0tb_XQ*|NdXT zr`mnmji{W(4eg4jw>c{Z_2^5kSbAKkc_BlXBu}e5Th_-@3tBsPQe09Ml(m|zSyBvi-v(GQ=G~sL V;)CX+IG`ICJYD@<);T3K0RUvAPr(2H diff --git a/assets/hbm/textures/items/wand_d_alt.png b/assets/hbm/textures/items/wand_d_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..3524021bea820a8aca06a9e660693d3183f18a47 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVTQMsp! zV~B4aSU%sc>ecFwvoW%|8il?_ZD=mumIc5ecpv5aI07De3s!uX* z@Pk|I0;=jF;v(XJKUw1cKvlig3V@mI+-1N&d>IhIrvXuXxHy@?yAN3mO%G-~jlTze t>KVoW<*1(Fh5^H!_j~BUn`!HrnHNO6T~-SED>VQB002ovPDHLkV1h(vRTcmM delta 222 zcmcb^_?vNpYJIw+uOkD)#(wTUiL49^44efXk;M!Qe1|}oQB=dL0VpU@;u=vBoS#-w zo>-L1P>`6JSE84fTB2a0XP{@9V_fG4R8#5c;uvD#zqIF|V1oe%%St8JC4sXyaAj}g zT!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb|%>FMGa zV&T8E=b&JN0SC)UCD$c^vo~;MZ{%FXJ1ZMVK&Z4OS!<35XR>FU}B@>9-|e$ rE^JF(QUkm~*!+bjIGWFCf5{@ab#CDi>)juLj$rU~^>bP0l+XkKTVYY; literal 0 HcmV?d00001 diff --git a/com/hbm/handler/BulletConfiguration.java b/com/hbm/handler/BulletConfiguration.java index 7637aaea2..4018dfa08 100644 --- a/com/hbm/handler/BulletConfiguration.java +++ b/com/hbm/handler/BulletConfiguration.java @@ -10,6 +10,9 @@ public class BulletConfiguration { //damage bounds public float dmgMin; public float dmgMax; + + //acceleration torwards neg Y + public double gravity; //whether the projectile should be able to bounce off of blocks public boolean doesRicochet; @@ -20,5 +23,20 @@ public class BulletConfiguration { public boolean doesPenetrate; //whether or not the bullet should break glass public boolean doesBreakGlass; + + //bullet effects + public int incendiary; + public int poison; + public int wither; + public int emp; + public int stun; + public int explosive; + public int rainbow; + public int nuke; + public boolean boxcar; + public boolean destroysBlocks; + + //appearance for rendering + public int style; } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 4a31db0c3..6b07b7140 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -728,6 +728,7 @@ public class ModItems { public static Item powder_ice; public static Item powder_poison; public static Item powder_thermite; + public static Item cordite; public static Item pellet_gas; public static Item magnetron; public static Item pellet_buckshot; @@ -820,6 +821,9 @@ public class ModItems { public static Item gun_avenger; public static Item gun_lacunae; public static Item gun_lacunae_ammo; + public static Item gun_folly_ammo_taint; + public static Item gun_folly_ammo_nuclear; + public static Item gun_folly_ammo_du; public static Item gun_fatman; public static Item gun_proto; public static Item gun_fatman_ammo; @@ -2115,6 +2119,7 @@ public class ModItems { powder_ice = new ItemCustomLore().setUnlocalizedName("powder_ice").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_ice"); powder_poison = new ItemCustomLore().setUnlocalizedName("powder_poison").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_poison"); powder_thermite = new ItemCustomLore().setUnlocalizedName("powder_thermite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_thermite"); + cordite = new Item().setUnlocalizedName("cordite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cordite"); pellet_gas = new ItemCustomLore().setUnlocalizedName("pellet_gas").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_gas"); magnetron = new ItemCustomLore().setUnlocalizedName("magnetron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnetron_alt"); pellet_buckshot = new Item().setUnlocalizedName("pellet_buckshot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_lead"); @@ -2200,6 +2205,9 @@ public class ModItems { gun_minigun = new GunLacunae().setUnlocalizedName("gun_minigun").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_minigun"); gun_avenger = new GunLacunae().setUnlocalizedName("gun_avenger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_avenger"); gun_lacunae = new GunLacunae().setUnlocalizedName("gun_lacunae").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lacunae"); + gun_folly_ammo_taint = new ItemCustomLore().setUnlocalizedName("gun_folly_ammo_taint").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_folly_ammo_taint"); + gun_folly_ammo_nuclear = new ItemCustomLore().setUnlocalizedName("gun_folly_ammo_nuclear").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_folly_ammo_nuclear"); + gun_folly_ammo_du = new ItemCustomLore().setUnlocalizedName("gun_folly_ammo_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_folly_ammo_du"); gun_fatman_ammo = new Item().setUnlocalizedName("gun_fatman_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman_ammo"); gun_fatman = new GunFatman().setMaxDamage(2500).setUnlocalizedName("gun_fatman").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman"); gun_proto = new GunProtoMirv().setMaxDamage(2500).setUnlocalizedName("gun_proto").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman"); @@ -3009,6 +3017,7 @@ public class ModItems { GameRegistry.registerItem(powder_poison, powder_poison.getUnlocalizedName()); GameRegistry.registerItem(powder_thermite, powder_thermite.getUnlocalizedName()); GameRegistry.registerItem(powder_power, powder_power.getUnlocalizedName()); + GameRegistry.registerItem(cordite, cordite.getUnlocalizedName()); //Fragments GameRegistry.registerItem(fragment_neodymium, fragment_neodymium.getUnlocalizedName()); @@ -3807,6 +3816,9 @@ public class ModItems { GameRegistry.registerItem(gun_revolver_nopip_ammo, gun_revolver_nopip_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_calamity_ammo, gun_calamity_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_lacunae_ammo, gun_lacunae_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_folly_ammo_taint, gun_folly_ammo_taint.getUnlocalizedName()); + GameRegistry.registerItem(gun_folly_ammo_nuclear, gun_folly_ammo_nuclear.getUnlocalizedName()); + GameRegistry.registerItem(gun_folly_ammo_du, gun_folly_ammo_du.getUnlocalizedName()); GameRegistry.registerItem(gun_b92_ammo, gun_b92_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_stinger_ammo, gun_stinger_ammo.getUnlocalizedName()); diff --git a/com/hbm/packet/AuxButtonPacket.java b/com/hbm/packet/AuxButtonPacket.java index d722ee67d..41358b54d 100644 --- a/com/hbm/packet/AuxButtonPacket.java +++ b/com/hbm/packet/AuxButtonPacket.java @@ -182,29 +182,29 @@ public class AuxButtonPacket implements IMessage { } } } + } + + if (te instanceof TileEntityMachineReactorLarge) { + TileEntityMachineReactorLarge reactor = (TileEntityMachineReactorLarge)te; - if (te instanceof TileEntityMachineReactorLarge) { - TileEntityMachineReactorLarge reactor = (TileEntityMachineReactorLarge)te; + if(m.id == 0) + reactor.rods = m.value; + + if(m.id == 1) { + FluidType type = FluidType.STEAM; + int fill = reactor.tanks[2].getFill(); - if(m.id == 0) - reactor.rods = m.value; - - if(m.id == 1) { - FluidType type = FluidType.STEAM; - int fill = reactor.tanks[2].getFill(); - - switch(m.value) { - case 0: type = FluidType.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break; - case 1: type = FluidType.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break; - case 2: type = FluidType.STEAM; fill = (int)Math.floor(fill * 100); break; - } - - if(fill > reactor.tanks[2].getMaxFill()) - fill = reactor.tanks[2].getMaxFill(); - - reactor.tanks[2].setTankType(type); - reactor.tanks[2].setFill(fill); + switch(m.value) { + case 0: type = FluidType.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break; + case 1: type = FluidType.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break; + case 2: type = FluidType.STEAM; fill = (int)Math.floor(fill * 100); break; } + + if(fill > reactor.tanks[2].getMaxFill()) + fill = reactor.tanks[2].getMaxFill(); + + reactor.tanks[2].setTankType(type); + reactor.tanks[2].setFill(fill); } }