From 2c135dc7642a531b8c16350ed4ebf5ef9e8aca68 Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Wed, 23 Jan 2019 12:45:21 +0100
Subject: [PATCH] 40mm grenade items & model, recipes

---
 assets/hbm/lang/de_DE.lang                    |   6 ++
 assets/hbm/lang/en_US.lang                    |   6 ++
 assets/hbm/textures/blocks/chlorine_gas.png   | Bin 0 -> 102 bytes
 .../blocks/vent_chlorine_seal_side.png        | Bin 0 -> 424 bytes
 .../blocks/vent_chlorine_seal_top.png         | Bin 0 -> 360 bytes
 assets/hbm/textures/entity/ModelGrenade.png   | Bin 0 -> 702 bytes
 assets/hbm/textures/entity/ModelGrenadeHE.png | Bin 0 -> 873 bytes
 .../entity/ModelGrenadeIncendiary.png         | Bin 0 -> 867 bytes
 .../hbm/textures/entity/ModelGrenadeSleek.png | Bin 0 -> 823 bytes
 .../hbm/textures/entity/ModelGrenadeToxic.png | Bin 0 -> 868 bytes
 .../{models => entity}/ModelRocket.png        | Bin
 .../{models => entity}/ModelRocketEMP.png     | Bin
 .../{models => entity}/ModelRocketGlare.png   | Bin
 .../{models => entity}/ModelRocketHE.png      | Bin
 .../ModelRocketIncendiary.png                 | Bin
 .../ModelRocketShrapnel.png                   | Bin
 .../{models => entity}/ModelRocketSleek.png   | Bin
 assets/hbm/textures/entity/buckshot.png       | Bin 0 -> 114 bytes
 assets/hbm/textures/entity/bullet.png         | Bin 0 -> 185 bytes
 assets/hbm/textures/gui/centrifuge.png        | Bin 3007 -> 2970 bytes
 assets/hbm/textures/items/ammo_grenade.png    | Bin 0 -> 288 bytes
 assets/hbm/textures/items/ammo_grenade_FG.png | Bin 0 -> 232 bytes
 assets/hbm/textures/items/ammo_grenade_he.png | Bin 0 -> 307 bytes
 .../items/ammo_grenade_incendiary.png         | Bin 0 -> 308 bytes
 .../hbm/textures/items/ammo_grenade_sleek.png | Bin 0 -> 285 bytes
 .../hbm/textures/items/ammo_grenade_toxic.png | Bin 0 -> 308 bytes
 .../hbm/textures/items/ammo_rocket_sleek.png  | Bin 0 -> 244 bytes
 .../hbm/textures/items/assembly_lacunae.png   | Bin 271 -> 272 bytes
 assets/hbm/textures/items/assembly_smg.png    | Bin 269 -> 272 bytes
 .../grenade/EntityGrenadeIFMystery.java       |   3 +
 .../entity/projectile/EntityBulletBase.java   |  18 +++--
 com/hbm/explosion/ExplosionChaos.java         |  15 ++++
 com/hbm/handler/BulletConfigFactory.java      |  19 +++--
 com/hbm/handler/BulletConfiguration.java      |   7 ++
 com/hbm/handler/GunConfiguration.java         |   2 +
 com/hbm/items/ModItems.java                   |  18 +++++
 com/hbm/main/CraftingManager.java             |   9 ++-
 com/hbm/render/entity/RenderBullet.java       |  63 +++++++++++++---
 com/hbm/render/model/ModelBuckshot.java       |  45 ++++++++++++
 com/hbm/render/model/ModelGrenade.java        |  67 ++++++++++++++++++
 com/hbm/render/model/ModelGustav.java         |   4 ++
 41 files changed, 260 insertions(+), 22 deletions(-)
 create mode 100644 assets/hbm/textures/blocks/chlorine_gas.png
 create mode 100644 assets/hbm/textures/blocks/vent_chlorine_seal_side.png
 create mode 100644 assets/hbm/textures/blocks/vent_chlorine_seal_top.png
 create mode 100644 assets/hbm/textures/entity/ModelGrenade.png
 create mode 100644 assets/hbm/textures/entity/ModelGrenadeHE.png
 create mode 100644 assets/hbm/textures/entity/ModelGrenadeIncendiary.png
 create mode 100644 assets/hbm/textures/entity/ModelGrenadeSleek.png
 create mode 100644 assets/hbm/textures/entity/ModelGrenadeToxic.png
 rename assets/hbm/textures/{models => entity}/ModelRocket.png (100%)
 rename assets/hbm/textures/{models => entity}/ModelRocketEMP.png (100%)
 rename assets/hbm/textures/{models => entity}/ModelRocketGlare.png (100%)
 rename assets/hbm/textures/{models => entity}/ModelRocketHE.png (100%)
 rename assets/hbm/textures/{models => entity}/ModelRocketIncendiary.png (100%)
 rename assets/hbm/textures/{models => entity}/ModelRocketShrapnel.png (100%)
 rename assets/hbm/textures/{models => entity}/ModelRocketSleek.png (100%)
 create mode 100644 assets/hbm/textures/entity/buckshot.png
 create mode 100644 assets/hbm/textures/entity/bullet.png
 create mode 100644 assets/hbm/textures/items/ammo_grenade.png
 create mode 100644 assets/hbm/textures/items/ammo_grenade_FG.png
 create mode 100644 assets/hbm/textures/items/ammo_grenade_he.png
 create mode 100644 assets/hbm/textures/items/ammo_grenade_incendiary.png
 create mode 100644 assets/hbm/textures/items/ammo_grenade_sleek.png
 create mode 100644 assets/hbm/textures/items/ammo_grenade_toxic.png
 create mode 100644 assets/hbm/textures/items/ammo_rocket_sleek.png
 create mode 100644 com/hbm/render/model/ModelBuckshot.java
 create mode 100644 com/hbm/render/model/ModelGrenade.java

diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
index ccdb06584..50031cc17 100644
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@@ -1383,6 +1383,12 @@ item.ammo_rocket_incendiary.name=84mm Rakete (Brand)
 item.ammo_rocket_shrapnel.name=84mm Rakete (Schrapnell)
 item.ammo_rocket_emp.name=84mm Rakete (Impuls)
 item.ammo_rocket_glare.name=84mm Rakete (Roter Schein)
+item.ammo_rocket_sleek.name=84mm Rakete (IF-R&D)
+item.ammo_grenade.name=40mm Granate
+item.ammo_grenade_he.name=40mm Granate (HE)
+item.ammo_grenade_incendiary.name=40mm Granate (Brand)
+item.ammo_grenade_toxic.name=40mm Granate (Chemisch)
+item.ammo_grenade_sleek.name=40mm Granate (IF-F&E)
 
 item.folly_shell.name=Silberne Kanonenhülse
 item.folly_bullet.name=12,8cm Sternenmetall-Hochenergiegeschoss
diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
index 65434cbc8..208c2cd4f 100644
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@@ -1383,6 +1383,12 @@ item.ammo_rocket_incendiary.name=84mm Rocket (Incendiary)
 item.ammo_rocket_shrapnel.name=84mm Rocket (Shrapnel)
 item.ammo_rocket_emp.name=84mm Rocket (Pulse)
 item.ammo_rocket_glare.name=84mm Rocket (Red Glare)
+item.ammo_rocket_sleek.name=84mm Rocket (IF-R&D)
+item.ammo_grenade.name=40mm Grenade
+item.ammo_grenade_he.name=40mm Grenade (HE)
+item.ammo_grenade_incendiary.name=40mm Grenade (Incendiary)
+item.ammo_grenade_toxic.name=40mm Grenade (Chemical)
+item.ammo_grenade_sleek.name=40mm Grenade (IF-R&D)
 
 item.folly_shell.name=Silver Bullet Casing
 item.folly_bullet.name=12.8cm Starmetal High-Energy Shell
diff --git a/assets/hbm/textures/blocks/chlorine_gas.png b/assets/hbm/textures/blocks/chlorine_gas.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee75f37c8d578268d727274c5f50f77447134706
GIT binary patch
literal 102
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<jZ=xIEGmC
uChKUX8>BB_FbG^!d8Hwc*^O7i2dL|=9-~wLiMt*^g$$mqelF{r5}E+_$rpP7

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/blocks/vent_chlorine_seal_side.png b/assets/hbm/textures/blocks/vent_chlorine_seal_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..58aca274a885f5cd91cd2413165b99d66dabe8a9
GIT binary patch
literal 424
zcmV;Z0ayNsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0004BNkl<ZIE|f?L2DZ^6ofy$ClQz8))<;~iwn7hmJlfU3pw`Jha7q;g`V2A
zT}UCDSk`P0_HG?E4k5aXB+$&qh!-v|zqXPvGhU*xltR<oy~rS?NOX7HoyB5F+qQ%d
zo~2cFjJt0MN-0Q%$z<{@gVkz9DFw6epTNv9TT|D+$vKl!0wCuM(4VX71heg%0fDsU
z?ED8gi*BW4<g8wo^?Rgph+xC@)yW{WBg#25pSMpDY&iY&{XufK-x`T!{o!$f7{M%Z
zef4pWyx+xqo(>TRDROrH^FiXUgX6~uAYpbtAn3a2XsYT6vvR0|5nnF8^@$zDekaTN
z-BZ61segS&T46Rq`it2HX@uEZB**<=2ZfuPTVM^aGYq&pZJP<<9@x+{0Vxa#X0sVm
zgISBTz-)>%#tfue%-$f0@p#$~Q%?}1@1`ta_GhQBkzVcHPj^O+6fiSNDf|QI8cR}M
Sllhnc0000<MNUMnLSTX<U%I>i

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/blocks/vent_chlorine_seal_top.png b/assets/hbm/textures/blocks/vent_chlorine_seal_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..f853a0a42ec4fbfe5f89f00d7c3b52a42b821f25
GIT binary patch
literal 360
zcmV-u0hj)XP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0003WNkl<ZIE|f?&q~BF5XQfmX%DSJ7hK$4){_V#=s~@ThdqkEpikr7gA3v_
zNNF#wiBKl-&_8Zj+S<+KOGqZ)ZzdC3tscB{4$O>wG*DGo`?J>tVHh9~5r_z$HyNHR
z;f^d`d;}tb_r6ybi(`mLMWCv9G#;~Af;A;b1_Fr)MNvRi!AySy%mQXcQM|%fk2od(
zfHfWf5Y_AX(Jh#(m=1w+3g;ZoFTPQh4$TNdMp?R6^Q=1COYrf20BgIh#(2aL!B~%z
zr3@3Co_%$kn>m305v<=1+x(5$t;KST;PPtIahzO(ZG!d%>ipw~FrSYQT;G`1v7y+m
z$tXegc|X{~BHT}q=lN(0H@ZWRrs?F*)Di@N)EhKORTaNdcug82j=tdl0000<MNUMn
GLSTZ8m6n<S

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/entity/ModelGrenade.png b/assets/hbm/textures/entity/ModelGrenade.png
new file mode 100644
index 0000000000000000000000000000000000000000..519dd733df5eee017eca58c38aea779a0c0d5907
GIT binary patch
literal 702
zcmV;v0zv(WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP00009a7bBm000ic000ic0Tn1pfB*mh7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%hhNHDpIvQUCw~JV``BR9Hvtlrc-hKoEuVj|5Rv6hROy<v<WQ5fn~~ARgkOoM2;R
zCD>V7+F4p!_`jkr&I|8e_RJD29r(COZZb3bW_OD&JH9-soR_8b#=p2PTfA><H-4n)
zZ>KjWmGio?+4xrv;}##AJB=S{`dfK-Ryl8LTaADFc-`W2XSeYqO@C8qiAt<1Cx5Dd
zCMH@y8zX<Z2UJ?366<J)jwsUfH(fbF1N3!s65XVcroXAQ1P##F<4N?GMw<DCAan}3
zkPxeawD@HaM`sMC(`hxCOlH74HUYFLr8qo4sJ^X8!8tlQV-_Ee$5mODHSpO4@`LBa
z)y7wf{j<IATImKjM@MJO;-k^18V-jw@Yw|NgQtb%##eq-ASD@4IZ*_wM&ZF=Py-+D
z@E=z?R{<pP!X)(p&}3Z=q?%T0nY}PcNd{C-6!~ogsj(^bM)Sf%SFNZ5U7Ikqah3X<
z`_aQ6=q@E0a5>q8f_HjU{pgao4cg|C>HQBPtkbY^TwL*(Z!VeM{~*FT4J$|U@tAKe
zSziV49dgBEzIj1!D8f1o%0bO|%r}?ZM-pKz!v>}7EbgZZ$2h|0n=9a(GQwJhBZ^oQ
zMl--0Kum=Hbc|r_8osaClMufjm=8_h8TdDdiSk7)hX*i$uGnLU-;h`UHy#S5@*{VY
z|B=iC@FCF4#$$*p5NY!bg*+*x)8rmQw8<H1a}9EMQpg5WUXLL<rWt8-4YSg@arfpb
kpc@t6M%sV-w@fRFFViTIg`&s7i~s-t07*qoM6N<$f~W~D`Tzg`

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/entity/ModelGrenadeHE.png b/assets/hbm/textures/entity/ModelGrenadeHE.png
new file mode 100644
index 0000000000000000000000000000000000000000..870b02d13b31b0641ae1db55c9129c7113a42169
GIT binary patch
literal 873
zcmV-v1D5=WP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS0009ZNkl<ZScUCZJ!lj`6#i~^W_EAS<j@c#66^#;Bv=F?ASt!A5E77JDg_Bj
z2&7W66oME;NN2DTEK&*D2x)|1l}ao`2+>rE=jHZhcXn?rE;~27J9B@e^n>MY-<y5!
zyYJ1sw^u?BEG{o3dE4xnFWCNh0RS+1a-{Ig^|QNpzc&Q{SbzAk)Ga>gMS!y664$Y$
zoibYV6I*K^l0Y$#Lpuo^<`n!EbG7!N2oS1KplnHd5C#Q*E96@HPy~8OEJ9K6^C;HZ
zha%8R;%1{+B+zUj64CJxFiDx(b-y$a$EbiQP-+)p@t5+TrM2r&T3lX8C?lYZg3$J-
z!yE)*U`(!_a{#C`s}Lf)mQsoXzAx|9-l2jBA@J(iYi+Z*_vlWc2?5y}SEDfqA>@@N
z2Y?B85_|RU0DvHj3nbeFy41?#Q)?{ZcH%~(0pIrl0G{WeQmJHO@Ib#WNVkq<s$-_c
zHXww6@B5Mf05HZtDV4|7b@bhlq;hEqXe0x2a@xkn0d&gYFdMpDMAz#j0YeEga=Ps#
zp65xw=Xo+&8eg3sIRa({Og>f4G*P8e0b@+s<VB7YpoS6<O0e?uL82bLNJJ2!Fzx|W
z&I7)W33oC>CjH(h*FcV1jXFP67-#jH7gv&xKQ7Aq`AgsMZvV2pUt4|Nb<U^Q+L%dB
zjg4UT<_GP1;|9n}Hpqxo;g&75LT>aM3FIXkWW;9T5F0#-haix9s~Kd(s<4;~Uat>M
zATN2pBX)CbIypV=z$G>;=HmCSI&R$kl&Syv<EiBSligBR0(r>;(w_oB7^C)AfYTOg
zhrV`=>vXyo*<71WswXJivL#vjegl8%BJ;8_x4KgTb_&66EzQe;b#>w^9A?9zHUbeN
z2=%phm_ndd4{>|tb4H@AjhUq1mkM<a4`Q4@H;z`w!6OSiXrWdQH40cA0;(J-YKP{R
zjXczi>N>XZysMa7+L3FBDo2V`I@2)95Ky|GE><rPRgM%qI3mzT3Dg0ji`A1rb(CWJ
z?X{#`w-~(HLhVo>2;;u~-Kc9EI=BM=@gM&Htx9<j8X_OA00000NkvXXu0mjfrig-U

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/entity/ModelGrenadeIncendiary.png b/assets/hbm/textures/entity/ModelGrenadeIncendiary.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d175b3793887fbc8938dcb23c2b4474b6a97e74
GIT binary patch
literal 867
zcmV-p1DyPcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS0009TNkl<ZScUCZJ!lj`6#i~!W_PkjawIAt5PQWUSOg&;DYdmrK!VpOK|~3H
zAZRHFBBl_*Cc!FQDnT0|jS#F-iG>IfNF!d3czd%u`(tspo7vr&yUmd@9~^i4-t2qd
zesAWzy&8s~xweuNZHuk%*qOWx0GOB@FWqzV&mKOVp927_KYLpn6rT<w!0hr8&aBMN
zY*zLYqP34mpd83i5;(R~@>`s1?IRJOOrwBpWp+RCOa530t$ic{!z7l0EcrzgY3(Bs
z7$$MI(=8JSVuUh09RemPQ@id-{nJ#y6ezXJp!}pl##*}$wdUGN!fXm=Gf>w1c5DZJ
z;2V>x=Ntg)-3Fx0uVswkK<sDNYVS}%rIgrs{XyF-?mxd*YC=H1#*OeCq?FkwO%4Dv
zd=|ftegOddFe;Jk5g1S_lTWR&jCzSXoen(D0|2<Li+a7Diy@?bU(i7v%T&i)jR_#7
zgy(q~0RXUV8;r5+xN@fNjx?1^OF$zTP>_=tZwGK(4u=xxa#3Bc&j=Vwkdu@5lDMv$
z`CZq|lBMz0`B5NXR>0&_<xCUR>vh<+o!PPv?JHmyP?R!?$1fix>d^~j2pLG@9#G{x
z5c`<nvpF*9@6K2owBKsf`Juu%tGDi6OTJ89$*z}!pZGX^HM@TG<juf2pJID;A(@&S
z$Ks36+V#c_P?XHFs*hL|+_n%4Ve}gb6eWxQRUfgrID|k%(Fg<z3Y=ubs<1eRXdRuL
zK=G}n>WJNJ&L`6o4mcsOILF`C5pKQvnydf%(p>UzYp*ttK=G}n>WKBj2<@(fATio4
zPrHV*<L*T_oAXJ7GjQ9=SbLog4!bh<va$4jw+8H%g57?woDHn&hd<y@0*4UzQ3OBK
z*WRHDfp#~*osDlfiMCf4lB!Rvt`RcArHdC33jq;X5Hd!)8)y`;jtQu8q-YEC%SI9E
zM&*nc&%27AntcMQ94S)iOv5NgK<R$ESi?Y7IZ_DOCs3gT>VVP38cLus#<27BM$)TW
t1QEn&3kg4rD*d}r*Er<l3Y_5#{{afjdFk;VArb%p002ovPDHLkV1hxHifaG>

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/entity/ModelGrenadeSleek.png b/assets/hbm/textures/entity/ModelGrenadeSleek.png
new file mode 100644
index 0000000000000000000000000000000000000000..581649526c56cce356cb43c4d82f881596dba5d7
GIT binary patch
literal 823
zcmV-71IYY|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS0008+Nkl<ZScUDDzl#(x6vw}lA2XTaI8fAo;W|0kL)c~u3u_y(un@FR5CjVg
zD{WLP6j2a_gDWiLnyW1=mIXn)#y>=HZtr$76OyqQGMm{+c4y`6?!m(5Ws-dIeR(g5
zu)+p|LAB_6a6iKP54Af@)6SSDk1ITX6#)PylS#B}ezppLQrhu}1h8&GNVlH@9{1@1
zB=H=;*H1VHrRx6yh_nKwwX$04PQOta9{0ZitdiIm)9IJ0f-y@&-ydL=#7cFgmN`yO
z0iVPGZ~VUgqC7<apTw@;2Ox_GT6eP74=@-EDoQErj}QV%DYVwX#b>h<0CkLQ9dJQD
z?gD8_k>`0+N8H-c0?=CH@bJ)kVur(^cN=buEvyS{4{n;KI6giG02I=%3JdLWaaXP_
z##n2OvMiee$vH<H#{lM`k_F&fiuuxP6@VLKN-2ynP)fBjf-%;F6aYjLfe?=ZzBF3}
z5R%hpcK$>}pma@uP<R&QB!qx--n2RA&Cc!o?)}jlAQT=~PCGu1V=%^=aW<>0x%Wp0
zU^E(4ZtB@n9SVUfXP)OxD!L2W|BV99{oz`$V1NE}rF!#j-hTN^;OUEbdpsWZD)tBa
z!|L4m4UDdS@qQnygh@<Wk`XR?U$L%<l)xw%><<Enl(Zx>O7^brt$8?wRN;YP08U%4
z8mV;eE7mo_1?16meSk&DWv+TDu(!KYUAmam8{h)Je@$`y#<v#v+t-(?hmU?nO92)o
zFUo$eoI+}3nSzWBvgyqGjY#H)i|y_1RGS+dA|(y=Y<7Y_M+)v+<L0gJUj4VXx0~{I
z?{0)dP$V%$QEC)2l*SG~mX)}D=SOSugZ*LEcgJqElm)Q0bpb|6NJStEgDfjMV?;7P
zT+EfjS~jh>-lyKX)lwu;FyCEs)nu+5)~s}W09xf%te+*!mBX4WYJeqA1uuX|)?OcM
zbCYBI^;%WOO+)4e*;JvB+IxR514!ca0nY5q{sIFrVUKCk0&M^Q002ovPDHLkV1jq1
Bb5H;P

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/entity/ModelGrenadeToxic.png b/assets/hbm/textures/entity/ModelGrenadeToxic.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd1064afc6432fdb9345cb0bbe4bbf3cd61a7a0b
GIT binary patch
literal 868
zcmV-q1DpJbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS0009UNkl<ZScUCZzl+pB6#h1u$&3l>q9Sr|e}JNR2#Rox<<(m0A*WXy79z?a
zSZOcF;T2XEo)%)|)s{BGsfA}F79z;Obz)eOon-REVmGssWU{}w@*adu-kZGl&G+WL
zmu+E;tgf%*Rb6!c2iW&B0Dz;%+O>DY#a-~P3jl!4$1hr={F8A2s8e5(aZBl`Lu>Y&
z+eZD201N@xFaUE{9iYXH`k4R_T3?cIOX;IHs@pSR)XxN99K|x0HG3pdv<&*00F0x!
z7xe0Oks*=E!2oEYve26th@%5!z!bpN^fIpRREi9iL2r`Q>iSAf9Rli55ZeD`4nq`2
z#^6A?&H=#dbs%MVEu|FuVoyEmy+aowrNpa^H^ydh_sN}F69URP?j$E5rBqiD902C{
zJpOcl0|1gJg(d47B2Bvl%=8209LuyHI0yoSVF&<lT^F9`m3$-(l|e>zEK`1gN{($n
zN{KKG6#xKm90!zARjy6lkrZ?p0~sg-Ds<Y7uLBsSBV#s9v52YHD*z2CDACFLL0s2W
zcGq=Pu)@DSKPmv48ECTUbQXa;&x7MQN~bO|NC9g|0igsBpFYU-(o19l8Oz2qpwqc8
z_AtliOJIuo;D`@0Xf^u$(4}!!-+FgBXW!1MXTJ0c&gTp2`PrlABj<b}Yuk%?`*<50
zS3VfmHy!||LK&H2#Oh*k3rQv#?TrAe3T4xbSX~&m5s7qq0IX8C-6=+FDS*Y%6W!?n
zR4Ml-9I?w=m-6;02F7g=i=+Fui<ehFmGXaWb0L3!f44OfK$Y@IM{E+M5WYkvG6a5T
zTtoP<dy(a>OS#vfu(+jA2VsETKZ#WP*m!+?rv>cPoZY;4Lk+C>+)of@!(le!C`A&P
zb5EECK=?7<-u_aeXl;8jpLEB1w@gHe`O_znWCE73AVmh@$F+ATw}t?8ItmH=zSBuQ
zD)fVzbGxzLb?LKN0AO_h1$CzRT?3$Xzs%rkoDiK31z=FOlcYc&Fqy&ESOC03vHo!>
uPcnf>q=VBdkwoc4|87btn1O*qIh6m{<9p;PwO>2{0000<MNUMnLSTaW(T0Wq

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/models/ModelRocket.png b/assets/hbm/textures/entity/ModelRocket.png
similarity index 100%
rename from assets/hbm/textures/models/ModelRocket.png
rename to assets/hbm/textures/entity/ModelRocket.png
diff --git a/assets/hbm/textures/models/ModelRocketEMP.png b/assets/hbm/textures/entity/ModelRocketEMP.png
similarity index 100%
rename from assets/hbm/textures/models/ModelRocketEMP.png
rename to assets/hbm/textures/entity/ModelRocketEMP.png
diff --git a/assets/hbm/textures/models/ModelRocketGlare.png b/assets/hbm/textures/entity/ModelRocketGlare.png
similarity index 100%
rename from assets/hbm/textures/models/ModelRocketGlare.png
rename to assets/hbm/textures/entity/ModelRocketGlare.png
diff --git a/assets/hbm/textures/models/ModelRocketHE.png b/assets/hbm/textures/entity/ModelRocketHE.png
similarity index 100%
rename from assets/hbm/textures/models/ModelRocketHE.png
rename to assets/hbm/textures/entity/ModelRocketHE.png
diff --git a/assets/hbm/textures/models/ModelRocketIncendiary.png b/assets/hbm/textures/entity/ModelRocketIncendiary.png
similarity index 100%
rename from assets/hbm/textures/models/ModelRocketIncendiary.png
rename to assets/hbm/textures/entity/ModelRocketIncendiary.png
diff --git a/assets/hbm/textures/models/ModelRocketShrapnel.png b/assets/hbm/textures/entity/ModelRocketShrapnel.png
similarity index 100%
rename from assets/hbm/textures/models/ModelRocketShrapnel.png
rename to assets/hbm/textures/entity/ModelRocketShrapnel.png
diff --git a/assets/hbm/textures/models/ModelRocketSleek.png b/assets/hbm/textures/entity/ModelRocketSleek.png
similarity index 100%
rename from assets/hbm/textures/models/ModelRocketSleek.png
rename to assets/hbm/textures/entity/ModelRocketSleek.png
diff --git a/assets/hbm/textures/entity/buckshot.png b/assets/hbm/textures/entity/buckshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fd134e2c614805088657e4178f95e3b82207c3b
GIT binary patch
literal 114
zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2|p6gzo_Z~#FKM@k2fuj%RH7{W2L
z^`Ijog8>iI#@oWoqMeOi&plOj7!%5~cQc$XOK(&0c=VourGZO{A$Z3Wpe6=SS3j3^
HP6<r_ThAPP

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/entity/bullet.png b/assets/hbm/textures/entity/bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c6c09f0da15353fbdf8299d2cb8fff3c5eb1a8b
GIT binary patch
literal 185
zcmeAS@N?(olHy`uVBq!ia0vp^96-#%!3HEZpRM}<q!^2X+?^QKos)S9l1X>;b!1@J
z*w6hZkrl}2EbxddW?<ku48n}Z^H-z*1tm*dBT9nv(@M${i&7a15;OBk^zu?m6ioCC
z^b8Hwa&a91D$?|HaSV|NPyX@$zrC}w^Wpjw9--z$Hg<OQ9V|xD>llt5Xx+%A^r4=O
Y!QU;?ltK5^d7vf+Pgg&ebxsLQ0G*LDH~;_u

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/gui/centrifuge.png b/assets/hbm/textures/gui/centrifuge.png
index 36d3712547f6cd9096ff6b92769617b746106787..f369d74b92d0a923e5d06412fb72dbd4a4f93115 100644
GIT binary patch
delta 2694
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

delta 2732
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
WD+oses-p;yJZIb)$4Yzu#Qy^Lwl2N^

diff --git a/assets/hbm/textures/items/ammo_grenade.png b/assets/hbm/textures/items/ammo_grenade.png
new file mode 100644
index 0000000000000000000000000000000000000000..6329ca5d88cac81cf8c51fdb1c4a6ee2a24666a3
GIT binary patch
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<X`u6aSXBO
zJsP}_?~s9r&57tuq4`Dgw<-vzOn4x`A&_A3f>WlhiT_6V1HlQMD}58fE>9OZJV~|M
z*Nx+0NcG-()q9^Y#wR_onz3GOTdc6)xy)x*x~5Nmy)u^}oALHLRozY%!4t}FzHv(&
zRydrHw(&+qK{Q_n+i{cEh3%J9cVvJ6%bT#eoNrRtnFV`nH{Lw=ppqq7B1htTwx*ac
zFT;YW42`7=wzgfnb@Oe$)1Up05^c76T}l@ncs8!fK2peY|GOXy<CGwcE+>-$K95N%
k+kSIb&f}L~=Kq1I?Sg;E1g7A{Krb?Qy85}Sb4q9e0K)KaTmS$7

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/ammo_grenade_FG.png b/assets/hbm/textures/items/ammo_grenade_FG.png
new file mode 100644
index 0000000000000000000000000000000000000000..78f0f9ed97d652cf72dc9dd0a724f93a0a8609fe
GIT binary patch
literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<j?nXaSXBO
zJv!N%?~s82YkPmd9$mkeyO;RCUHr`9rEl|-Qc12DmkoUa98XRE^}2tG;<kUbp-?RB
zGm{FpRc?&l0ofgl;SZQzXjkNLc(sa7*i|NWL#SrXU)Ho^g)tTT=34zqlo0E--L7JI
zOh;*j)+(=aH=lf4f3TkA-tX;u_r3RRj65<$NRegNy2F<39R}w&Yi5`Q_Y_9{KV;$?
c-TS>(PBuqVID@BrAJC}`p00i_>zopr02;+tj{pDw

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/ammo_grenade_he.png b/assets/hbm/textures/items/ammo_grenade_he.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bad60f644499786500f9903ec848f6ffdc152d7
GIT binary patch
literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0002$Nkl<ZIE}@VF^j@L5QU#Ifn@8X%%2jXMG8T|=CH81#_F1@E$jqKk$`P}
zgQbOySa_tcGQ~A+vjcP0LBLs1M10jU`}W(%TNZdyE#Jmq+>`$`5n(Y~sou8lFcD!s
zD6sq}z|0s;a?!k`4v9bkVY(T@IR+7fnbo9ff=8qRzPqcN*;l8ypE{c4a@|4X0J-iU
zmo21OYEx<l=i@Iv*L?&5!8ryy#%X_6FH->kaQU$?#=u$&Yppl!Yf5}SAdcgkS&}3w
zKrOMZYouw4Fbokz5sWdYs!9cTKU0=v(tL%oEWO^R^aoD?PmfZ-!Q21<002ovPDHLk
FV1no7eiQ%z

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/ammo_grenade_incendiary.png b/assets/hbm/textures/items/ammo_grenade_incendiary.png
new file mode 100644
index 0000000000000000000000000000000000000000..273d30508a49162eed0f19753a8c20e947a169e6
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<iGZGaSXBO
zJvw=#*AWL1*ZxmTCqtrDZa?MzGjGFDu|r&CVq!{bdV9Z$m2r!SML%KwB>OE|Lvx!^
z!YaoZ+f%e1Pe=!deGEH1*Sg(0U&10tePi#@t2sZSx;b87J$7c^F}`k&{`sc<zokN-
zeyXyIh&1#SR1utZncFEqMPpT#nW^+2H?;=~@AvHaz0ZvCndm#U;xPI1J6LKM))!dM
zWK8bhypda-ckZ00kRpp~^QT{%epfO#d^hhe=6i2@?{~zT{<a_g8*I+I#|4V09gs=7
zUOFY!bJnty$hP9XZMnV<UyMUTO>62~mt`)xxwwSk?{lyBw!7SmfZk^CboFyt=akR{
E0B8n$x&QzG

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/ammo_grenade_sleek.png b/assets/hbm/textures/items/ammo_grenade_sleek.png
new file mode 100644
index 0000000000000000000000000000000000000000..405e4b0074a01e266fc05105a2dc973e16ec1108
GIT binary patch
literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0002gNkl<ZIE}?qu?oU46g-WTHgij9psU!mQ@_Hk|LEe_Z*XuBom{&Ff?boL
z5aJ*er7sW>@uuW*IW89-@Ff<$gFMgOv}TM!O6k>-mxT~cpWxgTZrTSY5JEV{7@{b`
zIF7K^!deTZ)J(q&j^zPqaNf%qcigFP*P<w%@7E`|+u_jzrCm{EUDw!bFK-=G)f!68
zQ;-G#&@>G==P<^=7z3>}sryZd|2Ig}bjD>_MjDVM4#R-5ED^^sk|Y7=9DU!D2HpW_
j+t$7QLf3WS!}JO6eg;!5RXrcG00000NkvXXu0mjfEbnxX

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/ammo_grenade_toxic.png b/assets/hbm/textures/items/ammo_grenade_toxic.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf1e8c5519e9ee251af0e4ca7867caecc0619729
GIT binary patch
literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0002%Nkl<ZIE}@VA*%vG6ot=|yRbWXH|}o{yV1p95Z(jZ3kHkLA~wNj7ujN4
zlf~cg+6(Wo!Q=*uQ|7`o2@Bo<MZ}YaJ7>N*oMC_`_2Jw2{O-ziO+;AESE{$+J4{4q
z&vJAYIhYxPVNWzKsY4=AK-f>e;2eX9!OUt>HNhiN0j=@sX4V|#_frSMo@~yLtw1(s
z$odGWms*$F!QuCW-K38oAUMZh$N2j>sF$e#066|z7-L|qg|*h3_BAEG9}vg!%`8b0
z6`+<_RTa`SMHq&Nq6o$qlx3*`yq_t{GO52pQ50V9Q@Q{&X->>(R<tMp0000<MNUMn
GLSTYmD1qPr

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/ammo_rocket_sleek.png b/assets/hbm/textures/items/ammo_rocket_sleek.png
new file mode 100644
index 0000000000000000000000000000000000000000..748fb0a4fb32018df87414c4a906e5c0700e01cb
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<gfO0aSXBO
zJv-5m?~nnHYrR$4GroCeTT=869XW7t2hYS!7dP&7zE))#9FWnhFm=L*M=F=<fBk3w
zG5exmny`<{8h7(6)BkoZT=k-HN0EXOGsAn^Q+$d$%y(^Vo-&D<A=LGz*+T7empKJz
z_8Fx8yWx2`sn5Xja(H3ewa4!oLS+OuhAmNJsCfINY_D@@;U15A{iTz4zDkj^R<JxY
rO(5-EaiDY2oex`0Qzrjd{+S{4Zo1A(o(g85vl%>H{an^LB{Ts5-AQ5=

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/items/assembly_lacunae.png b/assets/hbm/textures/items/assembly_lacunae.png
index fdd2299c6df656be51f512638fe49617c9c6dd33..df7b519ba8752b8c6c4e22d4178cf51aa0612434 100644
GIT binary patch
delta 228
zcmV<A02}|00+0fbG=IlQL_t(IjbmUKRNzdT{{I`Dn*T}B!$gcC2L}h7hB6}C&cpnR
z;mcn(hL68F8Jz1+FyhigvI}6qz`y{*B_tVe;lc$*bnmbbtJ%T9;s1vZ9~eG-_<$l#
zls|7A4*Ac=%f|5O^Dl<aUw$)~dTxa4BgqTc0QC*P7Sco;;9cP0@Lxbc0K<^aUw*^=
z|K;m%>;^bEIQ-Yp(7@^vULIBkK3+BkULIBk9&T0?15jcCS<{6J7Z@2BFk|4$R|xiv
e-%V5u5(EIT4NuWBNMMuz0000<MNUMnLSTaZduI3m

delta 227
zcmV<9038320*?ZaG=IiPL_t(Ijm?oE4#GeXMSmMGtzau?&<Il58!)HA)Nl!ofZ#TJ
zgwfR~1PmlCf`mno61LmIf*^de$xr6(%>Te&sVq{nT~18fCnCpd6#9U**1=mqS)?W!
zhNv%B@M7HgW1i=Z@3lcAW)9lt419-)$cP9;#PYoW`wdJIYg`;EKq_F$9e~+-*BjI;
zeU!m(09{pi1Bl2dr5uP<cm#N?djLdavMlS|M8!Z7-``PW1FYnqhnP74nhNa=PG?}g
d!dI<1x&fc4M?3k(d-DJQ002ovPDHLkV1kYhW$FL`

diff --git a/assets/hbm/textures/items/assembly_smg.png b/assets/hbm/textures/items/assembly_smg.png
index aea5e8e3228fd5b86a72efe1dae168ffabcef3ad..9580c6732dd5d9bd9385f643b9b981c457733acb 100644
GIT binary patch
delta 228
zcmV<A02}{}0+0fbG=IlQL_t(IjjfSA3IZ_@g<qEFvQ}YB3+pWxPcVfCu<&A5UMHZf
zutyL}g^)%e7>HHE{%QjIAP~a5Z{B2pIdwf9+~v4;DW0rtE^>}y$&mud{+9qmGzp9X
zNGaJ*K#1?p#29s558k2@cr{JK`r}MS>x+n-);fTq0gv<6EnQX{@VtaI3ZM5K)+nrZ
zHwGk*FsAtdV?P}YAR;G(NP+|a5xJ_Wl9O<Mky0|Pbujr=S))R+-+(c%A)syQbjVBi
eHFos`0DJ*-O-}qdh3EJH0000<MNUMnLSTZ8y<!9a

delta 225
zcmV<703QF40*wNYG=IcNL_t(IjjfS84#F@HM8`2i3Ljy5S|pcg>GlFNT!%Yw5qfGL
zAr(iUWkW$|5>wfV^23&x%CdHzW_E#p>UPrhdfeL>PtrE8Qi<hUA_kKD9s!7G6c_|B
z#)wIPi@#1KrfTGQ-unwm;8YZa=++sH))f(1X7-?9!2P_lDq54+E+n4s8eG*Vs|JV5
zLjaK#hV*~H(58a{L}ZmxQ4kLxBCEBIPBL>3V~k*CZ*r$9tHuwz3%ou}AJ8_nwaF5=
bGY;ts;0j9XA?v<E00000NkvXXu0mjfAn9R+

diff --git a/com/hbm/entity/grenade/EntityGrenadeIFMystery.java b/com/hbm/entity/grenade/EntityGrenadeIFMystery.java
index 18370d4af..a672752a2 100644
--- a/com/hbm/entity/grenade/EntityGrenadeIFMystery.java
+++ b/com/hbm/entity/grenade/EntityGrenadeIFMystery.java
@@ -1,5 +1,6 @@
 package com.hbm.entity.grenade;
 
+import com.hbm.explosion.ExplosionChaos;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.ItemGrenade;
 
@@ -31,6 +32,8 @@ public class EntityGrenadeIFMystery extends EntityGrenadeBouncyBase {
             this.setDead();
     		
     		worldObj.newExplosion(this, posX, posY, posZ, 10, false, false);
+    		
+    		ExplosionChaos.spawnVolley(worldObj, posX, posY, posZ, 100, 1.0D);
         }
     }
 
diff --git a/com/hbm/entity/projectile/EntityBulletBase.java b/com/hbm/entity/projectile/EntityBulletBase.java
index 1ca20c09c..4a3728e2d 100644
--- a/com/hbm/entity/projectile/EntityBulletBase.java
+++ b/com/hbm/entity/projectile/EntityBulletBase.java
@@ -226,10 +226,13 @@ public class EntityBulletBase extends Entity implements IProjectile {
         	//handle block collision
         	} else {
         		
-        		if(!config.isSpectral && !config.doesRicochet)
+        		boolean hRic = rand.nextInt(100) < config.HBRC;
+        		boolean doesRic = config.doesRicochet || hRic;
+        		
+        		if(!config.isSpectral && !doesRic)
         			this.setDead();
         		
-        		if(config.doesRicochet) {
+        		if(doesRic) {
         			
         			Vec3 face = null;
                 	
@@ -252,10 +255,11 @@ public class EntityBulletBase extends Entity implements IProjectile {
                 		
                 		Vec3 vel = Vec3.createVectorHelper(motionX, motionY, motionZ);
                 		vel.normalize();
-                		
+
+                		boolean lRic = rand.nextInt(100) < config.LBRC;
                 		double angle = Math.abs(VectorUtil.getCrossAngle(vel, face) - 90);
                 		
-                		if(angle <= 10000) {
+                		if(hRic || (angle <= config.ricochetAngle && lRic)) {
                         	switch(movement.sideHit) {
                         	case 0:
                         	case 1:
@@ -281,9 +285,9 @@ public class EntityBulletBase extends Entity implements IProjectile {
                         this.posY += (movement.hitVec.yCoord - this.posY) * 0.6;
                         this.posZ += (movement.hitVec.zCoord - this.posZ) * 0.6;
 
-                        this.motionX *= 0.8;
-                        this.motionY *= 0.8;
-                        this.motionZ *= 0.8;
+                        this.motionX *= config.bounceMod;
+                        this.motionY *= config.bounceMod;
+                        this.motionZ *= config.bounceMod;
                         
                 		didBounce = true;
                 	}
diff --git a/com/hbm/explosion/ExplosionChaos.java b/com/hbm/explosion/ExplosionChaos.java
index f94c79db0..f7e7a840f 100644
--- a/com/hbm/explosion/ExplosionChaos.java
+++ b/com/hbm/explosion/ExplosionChaos.java
@@ -379,6 +379,21 @@ public class ExplosionChaos {
 		}
 	}
 
+	public static void spawnVolley(World world, double x, double y, double z, int count, double speed) {
+		
+		for(int i = 0; i < count; i++) {
+			
+			EntityModFX fx = new EntityOrangeFX(world, x, y, z, 0.0, 0.0, 0.0);
+			
+			fx.motionX = rand.nextGaussian() * speed;
+			fx.motionZ = rand.nextGaussian() * speed;
+			
+			fx.motionY = rand.nextDouble() * speed * 7.5D;
+			
+			world.spawnEntityInWorld(fx);
+		}
+	}
+
 	public static void destruction(World world, int x, int y, int z) {
 
 		if (world.getBlock(x, y, z) == Blocks.bedrock || world.getBlock(x, y, z) == ModBlocks.reinforced_brick
diff --git a/com/hbm/handler/BulletConfigFactory.java b/com/hbm/handler/BulletConfigFactory.java
index 0bd0d4cbb..84d11830a 100644
--- a/com/hbm/handler/BulletConfigFactory.java
+++ b/com/hbm/handler/BulletConfigFactory.java
@@ -24,6 +24,9 @@ public class BulletConfigFactory {
 		bullet.maxAge = 100;
 		bullet.doesRicochet = true;
 		bullet.ricochetAngle = 10;
+		bullet.HBRC = 2;
+		bullet.LBRC = 90;
+		bullet.bounceMod = 0.8;
 		bullet.doesPenetrate = true;
 		bullet.doesBreakGlass = true;
 		bullet.incendiary = 0;
@@ -52,6 +55,9 @@ public class BulletConfigFactory {
 		bullet.maxAge = 100;
 		bullet.doesRicochet = true;
 		bullet.ricochetAngle = 5;
+		bullet.HBRC = 2;
+		bullet.LBRC = 95;
+		bullet.bounceMod = 0.8;
 		bullet.doesPenetrate = true;
 		bullet.doesBreakGlass = true;
 		bullet.incendiary = 0;
@@ -61,8 +67,8 @@ public class BulletConfigFactory {
 		bullet.boxcar = false;
 		bullet.boat = false;
 		bullet.destroysBlocks = false;
-		bullet.style = 0;
-		bullet.plink = 1;
+		bullet.style = BulletConfiguration.STYLE_NORMAL;
+		bullet.plink = BulletConfiguration.PLINK_BULLET;
 		bullet.instakill = false;
 		
 		return bullet;
@@ -77,7 +83,10 @@ public class BulletConfigFactory {
 		bullet.gravity = 0D;
 		bullet.maxAge = 100;
 		bullet.doesRicochet = true;
-		bullet.ricochetAngle = 3;
+		bullet.ricochetAngle = 5;
+		bullet.HBRC = 10;
+		bullet.LBRC = 95;
+		bullet.bounceMod = 0.8;
 		bullet.doesPenetrate = false;
 		bullet.doesBreakGlass = true;
 		bullet.incendiary = 0;
@@ -87,8 +96,8 @@ public class BulletConfigFactory {
 		bullet.boxcar = false;
 		bullet.boat = false;
 		bullet.destroysBlocks = false;
-		bullet.style = 0;
-		bullet.plink = 1;
+		bullet.style = BulletConfiguration.STYLE_PELLET;
+		bullet.plink = BulletConfiguration.PLINK_BULLET;
 		bullet.instakill = false;
 		
 		return bullet;
diff --git a/com/hbm/handler/BulletConfiguration.java b/com/hbm/handler/BulletConfiguration.java
index b5ac40d19..8ba73b2f0 100644
--- a/com/hbm/handler/BulletConfiguration.java
+++ b/com/hbm/handler/BulletConfiguration.java
@@ -29,6 +29,12 @@ public class BulletConfiguration {
 	public boolean doesRicochet;
 	//the maximum angle at which the projectile should bounce
 	public double ricochetAngle;
+	//lower bound ricochet chance (below R angle)
+	public int LBRC;
+	//higher bound ricochet chance (above R angle)
+	public int HBRC;
+	//how much of the initial velocity is kept after bouncing
+	public double bounceMod;
 
 	//whether or not the bullet should penetrate mobs
 	public boolean doesPenetrate;
@@ -65,6 +71,7 @@ public class BulletConfiguration {
 	public static final int STYLE_STINGER = 6;
 	public static final int STYLE_NUKE = 7;
 	public static final int STYLE_MIRV = 8;
+	public static final int STYLE_GRENADE = 9;
 
 	public static final int PLINK_NONE = 0;
 	public static final int PLINK_BULLET = 1;
diff --git a/com/hbm/handler/GunConfiguration.java b/com/hbm/handler/GunConfiguration.java
index 0e7d27e5a..fec75b1d2 100644
--- a/com/hbm/handler/GunConfiguration.java
+++ b/com/hbm/handler/GunConfiguration.java
@@ -12,6 +12,8 @@ public class GunConfiguration {
 	 * restrictions must be applied in gun's logic, mechanism may be dysfunctional if these rules are ignored
 	 */
 	
+	//TODO: bind RoF and spread to ammo
+	
 	//amount of ticks between each bullet
 	public int rateOfFire;
 	//greatest amount of pellets created each shot
diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java
index 9b1418c66..89fca295f 100644
--- a/com/hbm/items/ModItems.java
+++ b/com/hbm/items/ModItems.java
@@ -842,6 +842,12 @@ public class ModItems {
 	public static Item ammo_rocket_shrapnel;
 	public static Item ammo_rocket_emp;
 	public static Item ammo_rocket_glare;
+	public static Item ammo_rocket_sleek;
+	public static Item ammo_grenade;
+	public static Item ammo_grenade_he;
+	public static Item ammo_grenade_incendiary;
+	public static Item ammo_grenade_toxic;
+	public static Item ammo_grenade_sleek;
 	
 	public static Item gun_rpg;
 	public static Item gun_rpg_ammo;
@@ -2280,6 +2286,12 @@ public class ModItems {
 		ammo_rocket_shrapnel = new Item().setUnlocalizedName("ammo_rocket_shrapnel").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_shrapnel");
 		ammo_rocket_emp = new Item().setUnlocalizedName("ammo_rocket_emp").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_emp");
 		ammo_rocket_glare = new Item().setUnlocalizedName("ammo_rocket_glare").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_glare");
+		ammo_rocket_sleek = new Item().setUnlocalizedName("ammo_rocket_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_sleek");
+		ammo_grenade = new Item().setUnlocalizedName("ammo_grenade").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade");
+		ammo_grenade_he = new Item().setUnlocalizedName("ammo_grenade_he").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_he");
+		ammo_grenade_incendiary = new Item().setUnlocalizedName("ammo_grenade_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_incendiary");
+		ammo_grenade_toxic = new Item().setUnlocalizedName("ammo_grenade_toxic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_toxic");
+		ammo_grenade_sleek = new Item().setUnlocalizedName("ammo_grenade_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_grenade_sleek");
 		
 		gun_rpg = new GunRpg().setUnlocalizedName("gun_rpg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_rpg_new");
 		gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_alt");
@@ -4005,6 +4017,12 @@ public class ModItems {
 		GameRegistry.registerItem(ammo_rocket_shrapnel, ammo_rocket_shrapnel.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_rocket_emp, ammo_rocket_emp.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_rocket_glare, ammo_rocket_glare.getUnlocalizedName());
+		GameRegistry.registerItem(ammo_rocket_sleek, ammo_rocket_sleek.getUnlocalizedName());
+		GameRegistry.registerItem(ammo_grenade, ammo_grenade.getUnlocalizedName());
+		GameRegistry.registerItem(ammo_grenade_he, ammo_grenade_he.getUnlocalizedName());
+		GameRegistry.registerItem(ammo_grenade_incendiary, ammo_grenade_incendiary.getUnlocalizedName());
+		GameRegistry.registerItem(ammo_grenade_toxic, ammo_grenade_toxic.getUnlocalizedName());
+		GameRegistry.registerItem(ammo_grenade_sleek, ammo_grenade_sleek.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_folly, ammo_folly.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_folly_nuclear, ammo_folly_nuclear.getUnlocalizedName());
 		GameRegistry.registerItem(ammo_folly_du, ammo_folly_du.getUnlocalizedName());
diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java
index cb6dc1bde..c404928a6 100644
--- a/com/hbm/main/CraftingManager.java
+++ b/com/hbm/main/CraftingManager.java
@@ -750,8 +750,8 @@ public class CraftingManager {
 	
 	public static void reg2() {
 		
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " MW", 'S', "plateSteel", 'W', "plateIron", 'M', ModItems.mechanism_launcher_1 }));
-		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg_ammo, 8), new Object[] { "SI ", "ITI", " I ", 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateIron", 'M', ModItems.mechanism_launcher_2 }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg, 1), new Object[] { "SSW", " MW", 'S', ModItems.hull_small_steel, 'W', "plateIron", 'M', ModItems.mechanism_launcher_1 }));
+		//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_rpg_ammo, 8), new Object[] { "SI ", "ITI", " I ", 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateIron", 'M', ModItems.mechanism_launcher_2 }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_stinger, 1), new Object[] { "SSW", "CMW", 'S', "plateSteel", 'W', "plateTitanium", 'C', ModItems.circuit_red_copper, 'M', ModItems.mechanism_launcher_2 }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_stinger_ammo, 4), new Object[] { "SS ", "STI", " IR", 'S', "plateSteel", 'T', Item.getItemFromBlock(Blocks.tnt), 'I', "plateAluminum", 'R', "dustRedstone" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver, 1), new Object[] { "SSM", " RW", 'S', "plateSteel", 'W', "plankWood", 'R', ModItems.wire_aluminium, 'M', ModItems.mechanism_revolver_1 }));
@@ -892,6 +892,11 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_shrapnel, 1), new Object[] { "G", "R", 'G', ModItems.pellet_buckshot, 'R', ModItems.ammo_rocket });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_glare, 1), new Object[] { "GGG", "GRG", "GGG", 'G', Items.redstone, 'R', ModItems.ammo_rocket });
 
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_grenade, 2), new Object[] { " T ", "GCI", " P ", 'T', Items.gunpowder, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'I', "plateIron" }));
+		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_he, 2), new Object[] { "GIG", 'G', ModItems.ammo_grenade, 'I', Blocks.tnt });
+		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_incendiary, 2), new Object[] { "GIG", 'G', ModItems.ammo_grenade, 'I', ModItems.powder_fire });
+		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_toxic, 2), new Object[] { "GIG", 'G', ModItems.ammo_grenade, 'I', ModItems.powder_poison });
+
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.stamp_357, 1), new Object[] { "RSR", "III", " C ", 'R', "dustRedstone", 'S', ModItems.stamp_iron_flat, 'I', ModItems.plate_polymer, 'C', ModItems.casing_357 }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.stamp_44, 1), new Object[] { "RSR", "III", " C ", 'R', "dustRedstone", 'S', ModItems.stamp_iron_flat, 'I', ModItems.plate_polymer, 'C', ModItems.casing_44 }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.stamp_9, 1), new Object[] { "RSR", "III", " C ", 'R', "dustRedstone", 'S', ModItems.stamp_iron_flat, 'I', ModItems.plate_polymer, 'C', ModItems.casing_9 }));
diff --git a/com/hbm/render/entity/RenderBullet.java b/com/hbm/render/entity/RenderBullet.java
index 8fd3703dd..620566b62 100644
--- a/com/hbm/render/entity/RenderBullet.java
+++ b/com/hbm/render/entity/RenderBullet.java
@@ -5,8 +5,11 @@ import java.util.Random;
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.entity.projectile.EntityBullet;
+import com.hbm.handler.BulletConfiguration;
 import com.hbm.lib.RefStrings;
+import com.hbm.render.model.ModelBuckshot;
 import com.hbm.render.model.ModelBullet;
+import com.hbm.render.model.ModelGrenade;
 import com.hbm.render.model.ModelRocket;
 
 import net.minecraft.client.renderer.Tessellator;
@@ -17,11 +20,15 @@ import net.minecraft.util.ResourceLocation;
 public class RenderBullet extends Render {
 
 	private ModelBullet bullet;
+	private ModelBuckshot buckshot;
 	private ModelRocket rocket;
+	private ModelGrenade grenade;
 
 	public RenderBullet() {
 		bullet = new ModelBullet();
+		buckshot = new ModelBuckshot();
 		rocket = new ModelRocket();
+		grenade = new ModelGrenade();
 	}
 
 	@Override
@@ -36,8 +43,21 @@ public class RenderBullet extends Render {
 		GL11.glScalef(1.5F, 1.5F, 1.5F);
 		
 		GL11.glRotatef(new Random(bullet.getEntityId()).nextInt(360), 1.0F, 0.0F, 0.0F);
+
+		int style = bullet.getDataWatcher().getWatchableObjectByte(16);
+		int trail = bullet.getDataWatcher().getWatchableObjectByte(17);
+		
+		switch(style) {
+			case BulletConfiguration.STYLE_NORMAL: renderBullet(trail); break;
+			case BulletConfiguration.STYLE_BOLT: renderDart(0.25F, 0.0F, 0.75F); break;
+			case BulletConfiguration.STYLE_FLECHETTE: renderFlechette(); break;
+			case BulletConfiguration.STYLE_FOLLY: renderBullet(trail); break;
+			case BulletConfiguration.STYLE_PELLET: renderBuckshot(); break;
+			case BulletConfiguration.STYLE_ROCKET: renderRocket(trail); break;
+			case BulletConfiguration.STYLE_GRENADE: renderGrenade(trail); break;
+			default: renderBullet(trail); break;
+		}
 		
-		renderDart(0.75F, 0.0F, 1.0F);
 		
 		GL11.glPopMatrix();
 	}
@@ -55,28 +75,55 @@ public class RenderBullet extends Render {
 		bullet.renderAll(0.0625F);
 	}
 	
+	private void renderBuckshot() {
+
+		bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/buckshot.png"));
+		
+		buckshot.renderAll(0.0625F);
+	}
+	
 	private void renderRocket(int type) {
 		
 		switch(type) {
 		case 0:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocket.png")); break;
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocket.png")); break;
 		case 1:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketHE.png")); break;
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocketHE.png")); break;
 		case 2:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketIncendiary.png")); break;
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocketIncendiary.png")); break;
 		case 3:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketShrapnel.png")); break;
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocketShrapnel.png")); break;
 		case 4:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketEMP.png")); break;
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocketEMP.png")); break;
 		case 5:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketGlare.png")); break;
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocketGlare.png")); break;
 		case 6:
-			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/models/ModelRocketSleek.png")); break;
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelRocketSleek.png")); break;
 		}
 		
 		rocket.renderAll(0.0625F);
 	}
 	
+	private void renderGrenade(int type) {
+
+		GL11.glScalef(0.25F, 0.25F, 0.25F);
+		
+		switch(type) {
+		case 0:
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenade.png")); break;
+		case 1:
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenadeHE.png")); break;
+		case 2:
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenadeIncendiary.png")); break;
+		case 3:
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenadeToxic.png")); break;
+		case 4:
+			bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/entity/ModelGrenadeSleek.png")); break;
+		}
+		
+		grenade.renderAll(0.0625F);
+	}
+	
 	private void renderFlechette() {
 		GL11.glPushMatrix();
         GL11.glDisable(GL11.GL_TEXTURE_2D);
diff --git a/com/hbm/render/model/ModelBuckshot.java b/com/hbm/render/model/ModelBuckshot.java
new file mode 100644
index 000000000..2ddadaf54
--- /dev/null
+++ b/com/hbm/render/model/ModelBuckshot.java
@@ -0,0 +1,45 @@
+package com.hbm.render.model;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelBuckshot extends ModelBase {
+
+	ModelRenderer bullet;
+
+	public ModelBuckshot() {
+		textureWidth = 4;
+		textureHeight = 4;
+
+		bullet = new ModelRenderer(this, 0, 0);
+		bullet.addBox(0F, 0F, 0F, 1, 1, 1);
+		bullet.setRotationPoint(1F, -0.5F, -0.5F);
+		bullet.setTextureSize(4, 4);
+		bullet.mirror = true;
+		setRotation(bullet, 0F, 0F, 0F);
+	}
+
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		super.render(entity, f, f1, f2, f3, f4, f5);
+		setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+		bullet.render(f5);
+	}
+
+	private void setRotation(ModelRenderer model, float x, float y, float z) {
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+
+	@Override
+	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
+		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+	}
+
+	public void renderAll(float f5) {
+		bullet.render(f5);
+	}
+
+}
\ No newline at end of file
diff --git a/com/hbm/render/model/ModelGrenade.java b/com/hbm/render/model/ModelGrenade.java
new file mode 100644
index 000000000..88ee4dddb
--- /dev/null
+++ b/com/hbm/render/model/ModelGrenade.java
@@ -0,0 +1,67 @@
+// Date: 23.01.2019 10:30:04
+// Template version 1.1
+// Java generated by Techne
+// Keep in mind that you still need to fill in some blanks
+// - ZeuX
+
+package com.hbm.render.model;
+
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelRenderer;
+import net.minecraft.entity.Entity;
+
+public class ModelGrenade extends ModelBase {
+	// fields
+	ModelRenderer Shape1;
+	ModelRenderer Shape2;
+	ModelRenderer Shape3;
+
+	public ModelGrenade() {
+		textureWidth = 32;
+		textureHeight = 32;
+
+		Shape1 = new ModelRenderer(this, 0, 0);
+		Shape1.addBox(0F, 0F, 0F, 8, 8, 8);
+		Shape1.setRotationPoint(-4F, -4F, -4F);
+		Shape1.setTextureSize(32, 32);
+		Shape1.mirror = true;
+		setRotation(Shape1, 0F, 0F, 0F);
+		Shape2 = new ModelRenderer(this, 0, 16);
+		Shape2.addBox(0F, 0F, 0F, 4, 6, 6);
+		Shape2.setRotationPoint(-8F, -3F, -3F);
+		Shape2.setTextureSize(32, 32);
+		Shape2.mirror = true;
+		setRotation(Shape2, 0F, 0F, 0F);
+		Shape3 = new ModelRenderer(this, 20, 16);
+		Shape3.addBox(0F, 0F, 0F, 1, 4, 4);
+		Shape3.setRotationPoint(-9F, -2F, -2F);
+		Shape3.setTextureSize(32, 32);
+		Shape3.mirror = true;
+		setRotation(Shape3, 0F, 0F, 0F);
+	}
+
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+		super.render(entity, f, f1, f2, f3, f4, f5);
+		setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+		Shape1.render(f5);
+		Shape2.render(f5);
+		Shape3.render(f5);
+	}
+	
+	public void renderAll(float f5) {
+		Shape1.render(f5);
+		Shape2.render(f5);
+		Shape3.render(f5);
+	}
+
+	private void setRotation(ModelRenderer model, float x, float y, float z) {
+		model.rotateAngleX = x;
+		model.rotateAngleY = y;
+		model.rotateAngleZ = z;
+	}
+
+	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) {
+		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+	}
+
+}
diff --git a/com/hbm/render/model/ModelGustav.java b/com/hbm/render/model/ModelGustav.java
index 956b794dc..43fcd28bc 100644
--- a/com/hbm/render/model/ModelGustav.java
+++ b/com/hbm/render/model/ModelGustav.java
@@ -6,6 +6,8 @@
 
 package com.hbm.render.model;
 
+import org.lwjgl.opengl.GL11;
+
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
@@ -260,6 +262,7 @@ public class ModelGustav extends ModelBase {
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
 		super.render(entity, f, f1, f2, f3, f4, f5);
 		setRotationAngles(f, f1, f2, f3, f4, f5, entity);
+		GL11.glDisable(GL11.GL_CULL_FACE);
 		Shape1.render(f5);
 		Shape2.render(f5);
 		Shape3.render(f5);
@@ -294,6 +297,7 @@ public class ModelGustav extends ModelBase {
 		Shape32.render(f5);
 		Shape33.render(f5);
 		Shape34.render(f5);
+		GL11.glEnable(GL11.GL_CULL_FACE);
 	}
 
 	private void setRotation(ModelRenderer model, float x, float y, float z) {