From da4cb041523683c706d01c5c02610abfcd3b609f Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 5 Sep 2020 15:36:25 +0200 Subject: [PATCH] more warcrime ammo --- src/main/java/assets/hbm/lang/de_DE.lang | 5 + src/main/java/assets/hbm/lang/en_US.lang | 5 + .../textures/gui/machine/gui_cyclotron.png | Bin 5381 -> 5266 bytes .../textures/items/ammo_4gauge_balefire.png | Bin 0 -> 377 bytes .../textures/items/ammo_4gauge_flechette.png | Bin 0 -> 321 bytes .../ammo_4gauge_flechette_phosphorus.png | Bin 0 -> 422 bytes ...gauge_rocket.png => ammo_4gauge_kampf.png} | Bin .../hbm/textures/items/ammo_4gauge_semtex.png | Bin 0 -> 347 bytes .../hbm/handler/BulletConfigSyncingUtil.java | 10 ++ .../hbm/handler/guncfg/Gun4GaugeFactory.java | 156 ++++++++++++++++++ src/main/java/com/hbm/items/ModItems.java | 15 ++ .../java/com/hbm/main/CraftingManager.java | 7 + .../java/com/hbm/main/ModEventHandler.java | 15 ++ 13 files changed, 213 insertions(+) create mode 100644 src/main/java/assets/hbm/textures/items/ammo_4gauge_balefire.png create mode 100644 src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette.png create mode 100644 src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette_phosphorus.png rename src/main/java/assets/hbm/textures/items/{ammo_4gauge_rocket.png => ammo_4gauge_kampf.png} (100%) create mode 100644 src/main/java/assets/hbm/textures/items/ammo_4gauge_semtex.png diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index cda5726e4..344316d88 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -348,7 +348,12 @@ item.ammo_44_rocket.name=.44 Magnum Rakete item.ammo_44_silver.name=.44 Magnum Patrone (Gebäude) item.ammo_44_star.name=.44 Magnum Patrone (Sternenmetall) item.ammo_4gauge.name=Kaliber 20 Schrot +item.ammo_4gauge_balefire.name=23mm Balefire-Granate item.ammo_4gauge_explosive.name=23mm Granate +item.ammo_4gauge_flechette.name=Kaliber 4 Flechet +item.ammo_4gauge_flechette_phosphorus.name=Kaliber 4 Flechet (WP) +item.ammo_4gauge_kampf.name=23mm Rakete +item.ammo_4gauge_semtex.name=23mm Bergbauladung item.ammo_4gauge_sleek.name=Kaliber 4 Schrot (IF-F&E) item.ammo_4gauge_slug.name=Kaliber 4 Brenneke item.ammo_50ae.name=.50 AE Patrone diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index adc3cf2af..b7a728f91 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -348,7 +348,12 @@ item.ammo_44_rocket.name=.44 Magnum Rocket item.ammo_44_silver.name=.44 Magnum Bullet (Building) item.ammo_44_star.name=.44 Magnum Bullet (Starmetal) item.ammo_4gauge.name=4 Gauge Buckshot +item.ammo_4gauge_balefire.name=23mm Balefire Grenade item.ammo_4gauge_explosive.name=23mm Grenade +item.ammo_4gauge_flechette.name=4 Gauge Flechette Shell +item.ammo_4gauge_flechette_phosphorus.name=4 Gauge Flechette Shell (WP) +item.ammo_4gauge_kampf.name=23mm Rocket +item.ammo_4gauge_semtex.name=23mm Mining Charge item.ammo_4gauge_sleek.name=4 Gauge Buckshot (IF-R&D) item.ammo_4gauge_slug.name=4 Gauge Solid Steel Slug item.ammo_50ae.name=.50 AE Round diff --git a/src/main/java/assets/hbm/textures/gui/machine/gui_cyclotron.png b/src/main/java/assets/hbm/textures/gui/machine/gui_cyclotron.png index 5d1e9e4b1270df43a4f2b9dca4991fe9334303c1..76f167219d4078a506863dae49d35179c05a746e 100644 GIT binary patch literal 5266 zcmb7IXH-*Nm%d3Tp(glBkxuXhk&bkTL<9jviblEt1*IuHNKK&#!b?#R6$JvQAVpBR z5CWnUQHu1A0t!TkNJ40V$vd-V&3tRVZ)VN;bM9Ja?`NO$+`XTD?!9AYV%51YpI9RK{adfixiy{zQo9z!C0q!?!*TB^IMh<*^Qlq?Mj6wVOmk&8kT1`|psuSU zWuw!VDfKg@QTg@q#pxVAN$ER1&(A%K+n(Cojoqewb*Z@7%vhuh&17V>M7i&8&<^S^ z?pfd6P{d11NpWr%f*TEUd+++l{bDHxX3cawSH~MOSrah#yxo?AkNIZzS1)fAc7gL}iQ zpw*b)#O1IRPZPlN$&)7`^Bn@?Gc$QcA=^7Y^A0v>*U6culR&=?4z?zynD||p*`b;5 zFnXZRp3~93HTne^8jkUkPOE%wQe0X@!;~_HYh(_aaQYON!4$nsQGt8DZ%w)nn24lV z3YuEx%K?bExImK|sGO3q2Nxst&PMdv^Q1bZt(_u6q-A828w zzUms4zspB0hT&oZMZov1_I1-+q79g{r%%HGKIQSbOSUL4oC+$Ji;f#W;^y8hZJleZ zI?0z%I0JYBC?GFadvn?Kexq#vX_VK#wg+qV{h2RuB-CUFpwEd?y4IU?UKm?e*03|; zB?5M=g)iaypX3U%4}lc{rUM-Fu2me6H4IOx>JLyETFmiI`({Bf&=Ez>YiI~~Hn^fn$e;29S+&56x6`jav*1G6h+>{aZ20h&`E^mIJ`d>6 zZNt)0*}%&vVYO&LcVu62cm*^TP!->X($&+e2nZEQ*fN})Qp5&lq{5drqYzXoqOV4Y zGTBdtcjdJI9JIZeZ%fbuw^w(3#jM+n{mi?$6khrHzj|Ywl&JT0^eNE%rK0 zJ&}2TE>G~UHA%b@H8B5n+k)OU5xX_rQ`?f$p#q3ZSRNt+i!17kOq1dsV^;IQXimqsOtIdaP@dOYWU*)rBRTvWJa1e_Hiaq+MtM_UhU_z z92j;ubbRMsp~_8HZVxO!$$I`rmrUJ{zWm*pM3;N=jH0JMRxF}xwKN(->=qinQkD4! zYgSzVecfQ4N@s)YGQKQuzGpiwX|qha|g;s`i$LYHe!1)yJy z(~`@)p;3Azi-(Alo##8^JZ?O+hsTc z@usOs+3}T|Z`A1AIQ>cY&wZeK91zkJB>Hp$6B?D2+FGmvN6MLT+6-BlNt?Yz_Wwm% zk_Nh6KnimGb<(IXQOHZU<(GJmTes@FFPqBJHx9~8a$jk-9NcDJNChP)(`iEzfaJ`L7DOg55z*At^rpI6zNe?Bx^r`L z^Do+A&x`D`fbLe;)r~m2x|Y=nJlS8#-|soUh_)yc=djj|7?y`Wc0WOS0UCbU%Ak%e z?l7p;cy|mYk25aSaQoPg;=txm`k>y7!P!B2OHBpBP8$@&T)Qk}AP7Q2>2Ubtd;upH zmz>@D8d(B9Klb;ln9c5{mRqOI(mR2b7@g1EDy>@u+l^PI1D?IyWzzag=k{5<)$p;| z+5B9=r4!)k0H(G6vC&HRhq<}Ao<(OaD;&LH_2i4P zI5#`gz4-X}6B%W2Ck!T=Oh&pkCG(;k@eJDjB{MT=*4KyClt5N+zmNXkB~(@nTocDX zkf(e;cYU~ovU4Fv`Y(Ql)|?$vIc?^b4BOg!f99EwGWezZ+wQyM8}p-;&~jJO)myh5 zv$M0mzh%}3&f1VKep;QZU+liGm`Em+#<+30opDVe-e3nAUrDg%M!dxWh7yxNL&u?E>~MLkSYKZy>~#Pq)!d@PEVgyy3ob8 z%|YYs+@G8!a63>zUUX29N6d22#K~P_PN!!nDE!8Fa?>KH&d7h%}|e=!w*kDXjzk&({f;o%qhrtcSn4R!oUl@k4;A|S*nTjW%M z7#+WhrDvM&34;-Lj6OW2gV~YvU3HFyNOF{Zy{HGAos0qo-1taKWt)G4cyncW)tf{L z5P2cuCRuE9%!C2I7F=MU`U&VgM{vrgz7Ibx+e2$qfpRp5_zZuUmbEm?Ml%YU)%eIF zS5RB2X4IgD#nXY)7gcziT#Cq4D{E8i`*D9b4t+#Z7_4A!egn!bpPP8QwA>UF%cvHI z({DbqkcJ#w6C#Zsx>35WTtMzEScQE|_2Va54*0Z)^K~6p6|4~eWu7wmT`ct+3Q_^< z2@^YDY5A`8622D)!Z2FUH)m5JH?L3-{aXe0MQVQ>YB|i7=7f$6hw7%o4QBH+CQV;} zn3k3{Q8c9Ke_9F{@~%YmTY2jG4xPvDPU2DnW}(Cn-t~yg_*eLG`X7{g(l3v}xGH@P<(*;yF$zJ5U2>8LuU z`4^ebyMJrmBUZehBMpy91`+hf%AgC4_KuC`Xq%hi@_ov0haLe0bsKL`4*MqezCD+e zhBeHcg3AJP=cwvjyyW%Nrxg~D=-)o@nF5%xmr(6yUr+aPXs|%*_wO&J8iM6FbiXO2 znf&`JI;B$!k$sk^r{E7_E7=2o4(mEkm-UXLfN4~&`Oj6`ks;L_djr4}6A`*PX!}DZ zf^O->*vhtVpFO~I%)fSP!j_HD#9ozmMHpwh24Z?*dOrsF3|amL%Vv#6YCZncq2*JP zTI2we9fQ3qvbdh%dlI*UHhUJXfwmulKo_wNo=5Zorm9+2+2cZ@^Oa81Phc_E%fePK zzZHp7)RU5uFnIhCb4U)hF7>+s51|m2T(4*JT$H4@?_VF#-D#VzJHzKQ$q%GqgKKc& z{bMUDHzZNretYMc?538WzRuBFWbt?&h$>TG5Q%>A1)Pf72A0PV-apF9n2$ERLAAULT!fRL~~rvx(g-+IAX zhk4uVq5!p-i+{9jipksg@}q>mRi?kMV9j(ESko9IfNBl%n-G&Y$EC>Tv;{N$Ke7>Rynz6V<#fkLnde zbqNz=A{cFuqRy}t^7p!*t5>!+=e%dP%3<+u({7CjweH-N^OhpeQc!YSsO-Se5wi;c zlz=k5gzLi?USl!-@9F#98`Nf+p02K!hM3rFSxfd`{-7@@aoVfDepTtD62C-&c6R;! zV}Q?9Umzuei#;nm`br6pOL!jDb#*#ASLxb$0#Pv8@vY%}-45tn9^+K&!V?TVwkTu; zbd=)002kxudH~i99aNMxUgp z#}{a4(?KO%c_U*y#9z)$Co=cXJekt8@Vy~^%$rNL?6saSnEicJ-Rl2aLH3fVY?)~0 zFx#?9^*R!`#8PzT>>?pDm*?veLpCyuXJ1w1rbC`}i34698g8}G05;vJcLd@kwW^Hf z_!vD^r_gk83Fkgw2na=iZ+brG?x!)8DX;zb+Zy9?2xskWTbVf^*V5bPF))TDR3V{fKKn%l}NF%=i0wkJuaeLD3nHNam1(z3z`pzp)P1~ zI31UiR;&iD&CH!q=TdTpwVIpDj*gO>nxBr)mnzTQ2GUGaMnu5RE4ceJ)|@lEU*mK< zx^oCtScwA=+Jydgy(TILS&FR_#iBy@LQn5&VG8Gj8{1OXcxp~u&trwU*H);W0Gh*(5^)@SNfOf9+^h+_*q%@v zOF@lPave6f2$TIhIEyo8#!ly%UXBm_@x5i1?u0y6Ax(H!m>-@}jL5XSqCU4AXp-mu ztA3_ATmhb=rGIP9dcH5ZnWsA#NK8Skey9Z$@1?n~3xO2`rW~P1xw!|$P2~Ee*U=nW zVh}qy5;w6@nsD#u?_IyGv-U_p=rJFt1M;q;77)kQj8bx>A^j2&6WcBOPJ>r6!&M0@ ztUo1;ki_t0cJyR>_12oUK-NarE^uWq#Sg3?fkYC2eF!zEx`G52PP~Mg*^-duec&vi zcd;Nln}J#&0oBA2?GB7Gx%h{_r;1jG?zT0CHpUaqSMqeZa+8z|rR@5Mc$;i6ch6Or z$71f?=KURNZzm`wV~6_Dji)Qi!-(xqP@oBjiIYV$nUXRehai@Dfj*m;ls_0xY>C%>&Gtzx4+E?f?mI7z!)KcNH;dCE1m-XK{z)n| zroLnM$>porYRuv^wz0#w_mJcE;nrd97b{7vOm6+7H)8~R_i#hv5a{Z8zMJ@o) zg2Kcxn_rU!h)g3i$5o@Yz@!w^ng-Xuq~aei{wGtK$HA|2=jtK1LX^QExk5xH@+tVg z=nUZoz2yBAZaQZ3=D5bsg5w&KJUAnMo2GUp0RDdg{|in_*m!ZXf>UfTm!#6x%^=?Y z+&bwJnkf_hRP?S*@t{GDwL)_P$_ou64N@7+Yfw8b2qFBad#k*9G$_kro}2xj@c%i| Z_c$LavtVOIsHwj_t;}uAUYUBt{TpsRpk)96 literal 5381 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

!8O)>G+L(_?RjEK(}jf=LxM_BW7 z@n;G#C`-4k?}RsnVp3jBspAMYH#e^cADjIn*BeJx9&P}W!WsR}(kf^+b#cFG+Oz{( zQ(HJnPO)T16jk~km-e3R9Cff#d{8{ z5~eKYz|>}QhPZuXdieDBOF2(BBy&~l!?h10v&$sTiX9}7f5>j{MO+O(F!&z!OqIXT zIGG!Sd(3}uKs|OP^c%D0AxUE_G|!r0<&d?nCo$%%NULM6pn)jI*Ky^_m7azbJRWa; z-$wg!oH8@o+x5OkUOe0Ke%T2@LDhpj*JCX1MH1XAa({q$MU`GM_aE7`*u9pO0{fY%d?7n>KEZUH$WIf>t{ z;8@D2hnTVZ=O0C`CK-x?m);`b8%zxtYrM=*i6#bVQkbUwVb zGHvey0`J8u+mz?am>(q;GZ2a~Nvs<5K)uUnv*6flPJKoyLoaK(}7$hxE61=1+ zC@Lvgs4|9){}MpEAxZP`T4&WlW*-cAsqNU9%y^HSdHQ|qZuY@cr6N3-Z>>Zfx1+8@ zRs+MdornZBk+ycH4QdW*%dm(Q^DL&XKGhsyQ5(A|Yd^n#7p@xfUJM%)Z-2*yE)|LO zZf$L?N=K$XqhHT1FWZ1r=orEY$v<3Oq54dYObU>G;h*osn5`MGNL)8)CU-Y1@d$xU zA{#VbFtj(I*nbHU+kNI7f;dJofGGMR(Ubsv)Oxl*a0pxP>gwui9J_e#nTw0pbjQRy zId3E`dwxv^RWK^!eJJUN#09Mr$%*JG%{f3?MKwkB$cA(}mf+!^&(S3fj(F2YUoYoo zP|Hw)6#fBw^9EP)+qSyBgn?9a6l;Y$B?fJ8D9eyiI%?aTU0PaH)`~BIXd#im4A0S- zjyUsXuq9Phmz%PStObo@UmaN;Uhh={7#CtFmbvL|<%mbx}+ z&eGBTSOO%r8I3Facqrq~Md)O}ZaXCKY~Y>ctKof*5|K*3mvdnW9qt1`8A8b zj-#Gr)knS`R}8ovz+`RLYKba%L66IRWJGT~*7TfTT>1~RaT)zhGxj!XlAMiQOd}U* zbc9dZAPh{IY_88!E3a2Conl@u#q^Z#P@g{E7%#o1yVh9l=-tx%p<&+V>xGqrpsJH% z(3&}KJv1f7>7ESk({Qjvd*tYxs@H& z6)b(>Jr~Y3%E|4#uqhkOACvqU>Y}>8lU++@KzNH6F^U9-xOyDK`P_?TKTuk2Z1H-w8b+VVCGpP>hx5Df}1{J==l1=}uzV*KBHfU~wtQ;J0 z80!)4)N88Ji>&tAWip*op-gF9q8ApkX9Jwk``>B(;G@Ei<#qiEh$!j~ikWXugt%zW zQ%!zXkw~UPm_7B>(p}iq*nEpI9V~{p79HrC>2@5yfnK^w4ypF(jbRfMlRD3x-p#}r zEqr$ekYphv!@PE)QN5E-A|97Do}N3PRvp_caONADe&(K15(s#ZaKAYlK@GLZq5Q<2 z2h&CJ97$GL3XX1W`GGQqDa#h;gRo6v%g7}$L1@~jLy-@xOvxd8;5AF{&vDb^bn6tI zP49>$gg4K#n`LkqP7VbCl%{5&q+tMuJ4ut9kPv`&K+seu9RLtKP@qNfcY|7&?sW89 zajK>o8y%{B-erxWP-;7>AP z!5mM}7sBMo-RCxCM|5mBo^#Se2QzQt@%%X(ib&4CFsNs<2mYq)Z6_W<{%O_!9O8c@ z_P2>8?4y63J!{(Cc&#gm)DCSubiluYMxHA`xUkaHmH$+tzmfjAiega5a}!bwo$aLv z*p!eZtdD{A#qw_jW`LM+^871DD~BEitLWD!)}G(};1O^W@xM0aKScfAJJa8|k>?y( zi=a9bf>?#dzjcXVedQNhXy%z5{oGz27C4>!SuKYv@E)4}V|*D#KqA4?NyVwQ_NyQ@ ihRjA&BLBbR!M>nvOo&V(#&_&D)I~jG-LgL&?)(>K$8_TW diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_balefire.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_balefire.png new file mode 100644 index 0000000000000000000000000000000000000000..039f681cc8f140a9a12ccce9b2068e37e6cfcea7 GIT binary patch literal 377 zcmV-<0fzpGP)YU7zOZ?Kt~~eCKtC3uAMSCi9zrI3Vng^B^*M0gZm1C z6tfmwgy14LIhCs*ag9q&!6_Ab97_J0h6sKTF5KMnJwrh1FbA-qcV2-eA;Kks<@y>eteg=TO$P58& zgqR@!02pn+cC8X9z-+a~{o&TA@8H7NWlaEhI)(A|vIPKSt956S<)T_#5pL|D54nB+ z#MQaeK=zIogMMn#PfboY4nH2jOP-Oh;B@0qDK#8fF3>=fQcRL$81iu4L_~xnndf;Y z!rJ!>5fN&wskJ7_vWbYW7XSbeVH8D-qKH~+iU{*OZ-je+I#M)ghX+j^`E$6AwC{cZ XcJku3sv}}d00000NkvXXu0mjf6V0GV literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette.png new file mode 100644 index 0000000000000000000000000000000000000000..f24e7e0b71edd302c770b906c9eb63674957425b GIT binary patch literal 321 zcmV-H0lxl;P)={3?eCjc4DgbgZ}>R8sA-lY7WGw0Q546wad+~^dmft{ z4Qk?NnhnhxrLdWOV!J!EZxg_n979O}AZuZa4S)zm0RU`wK-2u8O_Ij1swz9hyF=1X z@PuS^Ciwlz5E=mSa|BzFF*&TYye{}hvR-|oEX$tca?Lk~U5I-jA|%NW0=@U_N|>CU zL`0~nR8^9swU*v{iU@}V07Qh&IXdU4suU515YFI1K`LpJbm5ySmD~-dlJ4Cei`B4x TP1q)Q00000NkvXXu0mjfMl6BU literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette_phosphorus.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_flechette_phosphorus.png new file mode 100644 index 0000000000000000000000000000000000000000..457d799d90453293d3e3e316b6d0375339fc0f9e GIT binary patch literal 422 zcmV;X0a^ZuP)YU6vn?>x->YXv;) zBz@m!7={!PRssM(L>L4CgCL;Rnj%7DOhH@;$U{;mW$~{f5Bak=4=LBa0G`X#NM1H0 QZ2$lO07*qoM6N<$g5j5_=Kufz literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_rocket.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_kampf.png similarity index 100% rename from src/main/java/assets/hbm/textures/items/ammo_4gauge_rocket.png rename to src/main/java/assets/hbm/textures/items/ammo_4gauge_kampf.png diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_semtex.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_semtex.png new file mode 100644 index 0000000000000000000000000000000000000000..16c9c87a46737ecaffe65f4227fac4baf5524cc1 GIT binary patch literal 347 zcmV-h0i^zkP)CY3Olwusm@M{aHvkb+)MV)289Vn%kBnbdu7zO}1ixh2(`Zhz+w(BdL!Xcz-n#iAb z08mv`)c1W5IUX<}(bYq=dc+X&diRE>_i~1;fOE*>^)qhvG9kv8;1>h(); config.config.add(BulletConfigSyncingUtil.G4_NORMAL); config.config.add(BulletConfigSyncingUtil.G4_SLUG); + config.config.add(BulletConfigSyncingUtil.G4_FLECHETTE); + config.config.add(BulletConfigSyncingUtil.G4_FLECHETTE_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.G4_EXPLOSIVE); + config.config.add(BulletConfigSyncingUtil.G4_SEMTEX); + config.config.add(BulletConfigSyncingUtil.G4_BALEFIRE); + config.config.add(BulletConfigSyncingUtil.G4_KAMPF); config.config.add(BulletConfigSyncingUtil.G4_SLEEK); return config; @@ -98,7 +115,12 @@ public class Gun4GaugeFactory { config.config = new ArrayList(); config.config.add(BulletConfigSyncingUtil.G4_NORMAL); config.config.add(BulletConfigSyncingUtil.G4_SLUG); + config.config.add(BulletConfigSyncingUtil.G4_FLECHETTE); + config.config.add(BulletConfigSyncingUtil.G4_FLECHETTE_PHOSPHORUS); config.config.add(BulletConfigSyncingUtil.G4_EXPLOSIVE); + config.config.add(BulletConfigSyncingUtil.G4_SEMTEX); + config.config.add(BulletConfigSyncingUtil.G4_BALEFIRE); + config.config.add(BulletConfigSyncingUtil.G4_KAMPF); config.config.add(BulletConfigSyncingUtil.G4_SLEEK); return config; @@ -130,6 +152,63 @@ public class Gun4GaugeFactory { return bullet; } + public static BulletConfiguration get4GaugeFlechetteConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); + + bullet.ammo = ModItems.ammo_4gauge_flechette; + bullet.dmgMin = 5; + bullet.dmgMax = 8; + bullet.bulletsMin *= 2; + bullet.bulletsMax *= 2; + bullet.wear = 15; + bullet.style = BulletConfiguration.STYLE_FLECHETTE; + bullet.HBRC = 2; + bullet.LBRC = 95; + + return bullet; + } + + public static BulletConfiguration get4GaugeFlechettePhosphorusConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardBuckshotConfig(); + + bullet.ammo = ModItems.ammo_4gauge_flechette; + bullet.dmgMin = 5; + bullet.dmgMax = 8; + bullet.bulletsMin *= 2; + bullet.bulletsMax *= 2; + bullet.wear = 15; + bullet.style = BulletConfiguration.STYLE_FLECHETTE; + bullet.HBRC = 2; + bullet.LBRC = 95; + + bullet.ammo = ModItems.ammo_4gauge_flechette_phosphorus; + bullet.incendiary = 5; + + PotionEffect eff = new PotionEffect(HbmPotion.phosphorus.id, 20 * 20, 0, true); + eff.getCurativeItems().clear(); + bullet.effects = new ArrayList(); + bullet.effects.add(new PotionEffect(eff)); + + bullet.bImpact = new IBulletImpactBehavior() { + + @Override + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + NBTTagCompound data = new NBTTagCompound(); + data.setString("type", "vanillaburst"); + data.setString("mode", "flame"); + data.setInteger("count", 15); + data.setDouble("motion", 0.05D); + + PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, bullet.posX, bullet.posY, bullet.posZ), new TargetPoint(bullet.dimension, bullet.posX, bullet.posY, bullet.posZ, 50)); + } + }; + + return bullet; + } + public static BulletConfiguration get4GaugeExplosiveConfig() { BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); @@ -145,6 +224,83 @@ public class Gun4GaugeFactory { return bullet; } + public static BulletConfiguration get4GaugeMiningConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); + + bullet.ammo = ModItems.ammo_4gauge_semtex; + bullet.velocity *= 2; + bullet.gravity *= 2; + bullet.dmgMin = 10; + bullet.dmgMax = 15; + bullet.wear = 25; + bullet.trail = 1; + bullet.explosive = 0.0F; + + bullet.bImpact = new IBulletImpactBehavior() { + + @Override + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + ExplosionNT explosion = new ExplosionNT(bullet.worldObj, null, bullet.posX, bullet.posY, bullet.posZ, 4); + explosion.atttributes.add(ExAttrib.ALLDROP); + explosion.atttributes.add(ExAttrib.NOHURT); + explosion.doExplosionA(); + explosion.doExplosionB(false); + + ExplosionLarge.spawnParticles(bullet.worldObj, bullet.posX, bullet.posY, bullet.posZ, 5); + } + }; + + return bullet; + } + + public static BulletConfiguration get4GaugeBalefireConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardGrenadeConfig(); + + bullet.ammo = ModItems.ammo_4gauge_balefire; + bullet.velocity *= 2; + bullet.gravity *= 2; + bullet.dmgMin = 10; + bullet.dmgMax = 15; + bullet.wear = 25; + bullet.trail = 1; + bullet.explosive = 0.0F; + + bullet.bImpact = new IBulletImpactBehavior() { + + @Override + public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + + ExplosionNT explosion = new ExplosionNT(bullet.worldObj, null, bullet.posX, bullet.posY, bullet.posZ, 6); + explosion.atttributes.add(ExAttrib.BALEFIRE); + explosion.doExplosionA(); + explosion.doExplosionB(false); + + ExplosionLarge.spawnParticles(bullet.worldObj, bullet.posX, bullet.posY, bullet.posZ, 30); + } + }; + + return bullet; + } + + public static BulletConfiguration getGrenadeKampfConfig() { + + BulletConfiguration bullet = BulletConfigFactory.standardRocketConfig(); + + bullet.ammo = ModItems.ammo_4gauge_kampf; + bullet.spread = 0.0F; + bullet.gravity = 0.0D; + bullet.wear = 15; + bullet.explosive = 3.5F; + bullet.style = BulletConfiguration.STYLE_GRENADE; + bullet.trail = 4; + bullet.vPFX = "smoke"; + + return bullet; + } + public static BulletConfiguration get4GaugeSleekConfig() { BulletConfiguration bullet = BulletConfigFactory.standardAirstrikeConfig(); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index ccff8b18c..9b1852bc4 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1106,7 +1106,12 @@ public class ModItems { public static Item ammo_20gauge_sleek; public static Item ammo_4gauge; public static Item ammo_4gauge_slug; + public static Item ammo_4gauge_flechette; + public static Item ammo_4gauge_flechette_phosphorus; public static Item ammo_4gauge_explosive; + public static Item ammo_4gauge_semtex; + public static Item ammo_4gauge_balefire; + public static Item ammo_4gauge_kampf; public static Item ammo_4gauge_sleek; public static Item ammo_357_desh; public static Item ammo_44; @@ -2942,7 +2947,12 @@ public class ModItems { ammo_20gauge_sleek = new ItemAmmo().setUnlocalizedName("ammo_20gauge_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_20gauge_sleek"); ammo_4gauge = new ItemAmmo().setUnlocalizedName("ammo_4gauge").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge"); ammo_4gauge_slug = new ItemAmmo().setUnlocalizedName("ammo_4gauge_slug").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_slug"); + ammo_4gauge_flechette = new ItemAmmo().setUnlocalizedName("ammo_4gauge_flechette").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_flechette"); + ammo_4gauge_flechette_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_4gauge_flechette_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_flechette_phosphorus"); ammo_4gauge_explosive = new ItemAmmo().setUnlocalizedName("ammo_4gauge_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_explosive"); + ammo_4gauge_semtex = new ItemAmmo().setUnlocalizedName("ammo_4gauge_semtex").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_semtex"); + ammo_4gauge_balefire = new ItemAmmo().setUnlocalizedName("ammo_4gauge_balefire").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_balefire"); + ammo_4gauge_kampf = new ItemAmmo().setUnlocalizedName("ammo_4gauge_kampf").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_kampf"); ammo_4gauge_sleek = new ItemAmmo().setUnlocalizedName("ammo_4gauge_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_sleek"); ammo_5mm = new ItemAmmo().setUnlocalizedName("ammo_5mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm"); ammo_5mm_explosive = new ItemAmmo().setUnlocalizedName("ammo_5mm_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_explosive"); @@ -5204,7 +5214,12 @@ public class ModItems { GameRegistry.registerItem(ammo_20gauge_sleek, ammo_20gauge_sleek.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge, ammo_4gauge.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge_slug, ammo_4gauge_slug.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_flechette, ammo_4gauge_flechette.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_flechette_phosphorus, ammo_4gauge_flechette_phosphorus.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge_explosive, ammo_4gauge_explosive.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_semtex, ammo_4gauge_semtex.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_balefire, ammo_4gauge_balefire.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_kampf, ammo_4gauge_kampf.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge_sleek, ammo_4gauge_sleek.getUnlocalizedName()); GameRegistry.registerItem(ammo_44, ammo_44.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_ap, ammo_44_ap.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 2cf7ab2e9..c7b366013 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -834,10 +834,14 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_4gauge_slug, 12), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_4gauge_slug, 12), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer })); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_flechette, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_flechette, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_flechette, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_flechette, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 4), new Object[] { " I ", "GCL", " P ", 'I', Blocks.tnt, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 4), new Object[] { " I ", "GCL", " P ", 'I', Blocks.tnt, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 6), new Object[] { " I ", "GCL", " P ", 'I', ModItems.ingot_semtex, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_explosive, 6), new Object[] { " I ", "GCL", " P ", 'I', ModItems.ingot_semtex, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_semtex, 4), new Object[] { " I ", "GCL", " P ", 'I', ModBlocks.det_miner, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_semtex, 4), new Object[] { " I ", "GCL", " P ", 'I', ModBlocks.det_miner, 'G', ModItems.ballistite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'L', ModItems.plate_polymer }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge, 12), new Object[] { " I ", "GCL", " P ", 'I', ModItems.pellet_buckshot, 'G', ModItems.ballistite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_slug, 12), new Object[] { " I ", "GCL", " P ", 'I', "ingotLead", 'G', ModItems.cordite, 'C', ModItems.casing_buckshot, 'P', ModItems.primer_buckshot, 'L', "plateCopper" })); @@ -860,6 +864,9 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_shock, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_20gauge, 'A', "dustDiamond" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_20gauge_wither, 4), new Object[] { "BCB", "CAC", "BCB", 'B', ModItems.ammo_20gauge, 'A', Blocks.soul_sand, 'C', "dustCoal" })); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_20gauge_sleek, 64), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_20gauge, 'A', ModItems.coin_maskman }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_flechette_phosphorus, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_4gauge_flechette, 'A', ModItems.ingot_phosphorus }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_balefire, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_4gauge_explosive, 'A', ModItems.egg_balefire_shard }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_kampf, 2), new Object[] { "G", "R", 'G', ModItems.ammo_rocket, 'R', ModItems.ammo_4gauge_explosive }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_sleek, 64), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_4gauge, 'A', ModItems.coin_maskman }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_u238 }); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 25ead1bc4..4fc43f1f9 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -477,6 +477,7 @@ public class ModEventHandler if(!player.worldObj.isRemote && event.phase == TickEvent.Phase.START) { + /// FSB ARMOR START /// ItemStack helmet = player.inventory.armorInventory[3]; ItemStack plate = player.inventory.armorInventory[2]; ItemStack legs = player.inventory.armorInventory[1]; @@ -503,6 +504,20 @@ public class ModEventHandler } } } + /// FSB ARMOR END /// + + /// BETA HEALTH START /// + if(player.getUniqueID().toString().equals(Library.Dr_Nostalgia)) { + if(player.getFoodStats().getFoodLevel() < 10) { + player.getFoodStats().setFoodLevel(10); + } + + if(player.getFoodStats().getFoodLevel() > 10) { + player.heal(player.getFoodStats().getFoodLevel() - 10); + player.getFoodStats().setFoodLevel(10); + } + } + /// BETA HEALTH END /// } //TODO: rewrite this so it doesn't look like shit