From b0bc10ad441549de56e093681fa46d88a069954f Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sat, 24 Feb 2018 22:09:54 +0100 Subject: [PATCH] More clips, sky stinger, crafting recipes --- assets/hbm/lang/de_DE.lang | 11 +++ assets/hbm/lang/en_US.lang | 11 +++ assets/hbm/sounds.json | 2 + assets/hbm/sounds/weapon/sawShoot.ogg | Bin 0 -> 6091 bytes assets/hbm/sounds/weapon/stingerLockOn.ogg | Bin 0 -> 5152 bytes .../hbm/textures/items/chem_icon_DYN_DNT.png | Bin 0 -> 262 bytes .../hbm/textures/items/chem_icon_DYN_EUPH.png | Bin 0 -> 240 bytes .../textures/items/chem_icon_DYN_SCHRAB.png | Bin 0 -> 237 bytes .../hbm/textures/items/clip_defabricator.png | Bin 0 -> 255 bytes assets/hbm/textures/items/clip_euthanasia.png | Bin 0 -> 257 bytes assets/hbm/textures/items/clip_hp.png | Bin 0 -> 216 bytes assets/hbm/textures/items/clip_jack.png | Bin 0 -> 372 bytes .../hbm/textures/items/clip_revolver_pip.png | Bin 0 -> 348 bytes assets/hbm/textures/items/clip_spark.png | Bin 0 -> 321 bytes assets/hbm/textures/items/clip_stinger.png | Bin 0 -> 196 bytes assets/hbm/textures/items/gun_skystinger.png | Bin 0 -> 372 bytes .../hbm/textures/models/ModelSkyStinger.png | Bin 0 -> 2184 bytes com/hbm/blocks/bomb/TurretCWIS.java | 2 +- com/hbm/blocks/generic/BlockCrate.java | 7 ++ .../entity/projectile/EntityRocketHoming.java | 38 ++++++---- com/hbm/inventory/MachineRecipes.java | 43 ++++++++++- com/hbm/items/ModItems.java | 24 ++++++ com/hbm/items/tool/ItemAssemblyTemplate.java | 11 ++- com/hbm/items/weapon/GunB92.java | 2 + com/hbm/items/weapon/GunBaleFlare.java | 2 + com/hbm/items/weapon/GunDampfmaschine.java | 2 + com/hbm/items/weapon/GunDash.java | 2 + com/hbm/items/weapon/GunDefabricator.java | 2 + com/hbm/items/weapon/GunEuthanasia.java | 2 + com/hbm/items/weapon/GunHP.java | 2 + com/hbm/items/weapon/GunJack.java | 2 + com/hbm/items/weapon/GunLeverActionS.java | 2 + com/hbm/items/weapon/GunMP.java | 2 + com/hbm/items/weapon/GunRevolver.java | 4 + com/hbm/items/weapon/GunSpark.java | 2 + com/hbm/items/weapon/GunStinger.java | 71 +++++++++++++----- com/hbm/items/weapon/GunZOMG.java | 2 + com/hbm/items/weapon/ItemClip.java | 58 ++++++++++++++ com/hbm/main/ClientProxy.java | 1 + com/hbm/main/CraftingManager.java | 10 ++- com/hbm/render/item/ItemRenderStinger.java | 11 ++- 41 files changed, 287 insertions(+), 41 deletions(-) create mode 100644 assets/hbm/sounds/weapon/sawShoot.ogg create mode 100644 assets/hbm/sounds/weapon/stingerLockOn.ogg create mode 100644 assets/hbm/textures/items/chem_icon_DYN_DNT.png create mode 100644 assets/hbm/textures/items/chem_icon_DYN_EUPH.png create mode 100644 assets/hbm/textures/items/chem_icon_DYN_SCHRAB.png create mode 100644 assets/hbm/textures/items/clip_defabricator.png create mode 100644 assets/hbm/textures/items/clip_euthanasia.png create mode 100644 assets/hbm/textures/items/clip_hp.png create mode 100644 assets/hbm/textures/items/clip_jack.png create mode 100644 assets/hbm/textures/items/clip_revolver_pip.png create mode 100644 assets/hbm/textures/items/clip_spark.png create mode 100644 assets/hbm/textures/items/clip_stinger.png create mode 100644 assets/hbm/textures/items/gun_skystinger.png create mode 100644 assets/hbm/textures/models/ModelSkyStinger.png diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index d8534a518..5c1a4e79c 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -94,6 +94,9 @@ chem.BP_BIOGAS=Biogasherstellung chem.BP_BIOFUEL=Biodieselumesterung chem.SAS3=Schrabidiumtrisulfatherstellung chem.NITAN=NITAN-Supertreibstoff mischen +chem.DYN_SCHRAB=Schrabidium-Dynosynthese +chem.DYN_EUPH=Euphemium-Dynosynthese +chem.DYN_DNT=Dineutronium-Dynosynthese item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -839,6 +842,7 @@ item.rod_quad_waste.name=Vierfacher Atommüllstab item.gun_rpg.name=Raketenwerfer item.gun_rpg_ammo.name=Rakete item.gun_stinger.name=FIM-92 Stinger +item.gun_skystinger.name=The One Sky Stinger item.gun_stinger_ammo.name=Stinger-Rakete item.flame_pony.name=Bild eines Cartoon Ponys @@ -1073,6 +1077,13 @@ item.clip_bolt_action.name=12x74 Brenneke-Patronenbox item.clip_emp.name=Magnetsteifen mit Energiezellen item.clip_revolver_nightmare.name=Sack voll Kugeln item.clip_revolver_nightmare2.name=Munitionsgürtel mit Laserschrot +item.clip_revolver_pip.name=Speedloader mit verdorbenen Patronen +item.clip_stinger.name=Dreierpack Stinger-Raketen +item.clip_jack.name=12x70 Vierfache Schrotpatronenbox +item.clip_spark.name=Große Elektromagnetische Katusche +item.clip_hp.name=Tintentanks +item.clip_euthanasia.name=Letzte-Hilfe Koffer +item.clip_defabricator.name=Gürtel mit Defabrikator-Energiezellen item.ammo_container.name=Munitionsbehälter diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 85ae65283..4579ac7b6 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -94,6 +94,9 @@ chem.BP_BIOGAS=Biogas Production chem.BP_BIOFUEL=Biofuel Transesterification chem.SAS3=Schrabidium Trisulfide Production chem.NITAN=NITAN Super Fuel Mixing +chem.DYN_SCHRAB=Schrabidium Dynosynthesis +chem.DYN_EUPH=Euphemium Dynosynthesis +chem.DYN_DNT=Dineutronium Dynosynthesis item.record.lc.desc=Valve - Diabolic Adrenaline Guitar/Lambda Core item.record.ss.desc=Valve - Sector Sweep @@ -842,6 +845,7 @@ item.rod_quad_waste.name=Nuclear Waste Quad Rod item.gun_rpg.name=Rocket Launcher item.gun_rpg_ammo.name=Rocket item.gun_stinger.name=FIM-92 Stinger +item.gun_skystinger.name=The One Sky Stinger item.gun_stinger_ammo.name=Stinger Rocket item.flame_pony.name=Painting of a Cartoon Pony @@ -1076,6 +1080,13 @@ item.clip_bolt_action.name=Box of 12x74 Slugs item.clip_emp.name=Small Pack of Energy Cells item.clip_revolver_nightmare.name=Bag of Bullets item.clip_revolver_nightmare2.name=Belt with Laser Buckshot +item.clip_revolver_pip.name=Speedloader with Tainted Bullets +item.clip_stinger.name=Pack of Stinger Rockets +item.clip_jack.name=Box of Quadruple 12x70 Buckshot Rounds +item.clip_spark.name=Large Electromagnetic Cartridge +item.clip_hp.name=Ink Tanks +item.clip_euthanasia.name=Last Aid Kit +item.clip_defabricator.name=Belt with Defabricator Energy Cells item.ammo_container.name=Ammo Container diff --git a/assets/hbm/sounds.json b/assets/hbm/sounds.json index 1f6996088..8386202df 100644 --- a/assets/hbm/sounds.json +++ b/assets/hbm/sounds.json @@ -54,6 +54,8 @@ "weapon.bang": {"category": "player", "sounds": [{"name": "weapon/bang", "stream": false}]}, "weapon.leverActionReload": {"category": "player", "sounds": [{"name": "weapon/leverActionReload", "stream": false}]}, "weapon.b92Reload": {"category": "player", "sounds": [{"name": "weapon/b92Reload", "stream": false}]}, + "weapon.stingerLockOn": {"category": "player", "sounds": [{"name": "weapon/stingerLockOn", "stream": false}]}, + "weapon.sawShoot": {"category": "player", "sounds": [{"name": "weapon/sawShoot", "stream": false}]}, "weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]}, "weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]}, diff --git a/assets/hbm/sounds/weapon/sawShoot.ogg b/assets/hbm/sounds/weapon/sawShoot.ogg new file mode 100644 index 0000000000000000000000000000000000000000..703113358316ac4667b9c845afff5bb614a34e0c GIT binary patch literal 6091 zcmcgPdpMNayWhADN<%~LjdGb0Wkify47rR=`p9KSGHmyXp_G&wiWzBQXxPIhGZ-~W zOm17Lm~l()Dmzh%u4;GR?Q+)WxA!@}^PJ~A=dZJ#HEZ7Qd)ND}_x`SLdvvrPBnACz zxIR?0mwcR~^Zu1=tD zvZvWRhgzi(IFPh}0nign^gxn=A%OA;^99NI_#as1WSnH*akM)!s&#HOs$G+vw%S)bw{W7!{Kd(-$mv8}( zIzQfFEF;w*CInSfV(E{t$|$WXick*(p`4P??q|_n4Lbe91}l*(gJpp+ASBr5agysn z=LO~e99wR5_&m1syvc(uc+qg{b0YSby(B1pd^2>CQ5QGfJ(yMIp=Yk4& z!R7K(0uUE-h%pGTX)WgAjP{4P2p^^Yt%e40*Q{NVx=1noiFvkxU?97J8X! zGT^84LoI-mGQG!Kz14P(?@XNhn7I36;=}Q%haaP+ z#-nx>M?DZG?wZ)OYcloU=d$XVGEipz9I!f=9{F4k#bxI(5fBQ>tg@j$_5l9KHw-Q? ziY<;lR9thYv^H07c?)n1uo@Vd=a=1P5L{dxTV5k^c3mC4nqOBJS6UtWzfY-3{RaVJ2L3;aGYtJK`tXSA3!zPQLXN zNuO6SI&HyY!Yk5i*u)-<=an=jKKt_Ied?W#PkO+4Dv&EEEh3BvMd`sC8PZhoVuMI{ z-8_foLo(uV1IPp1EH;U8mg++?HY|k6O8lq-QoLa`aH*6I_?cz_S!AFc5R`-Wz;V$q z317o@A>qU$45QDIvJT&gN;g6j@~>1JGiO03!B z2z=U1#0kmkILV4I_B4W)%6A`y@ zBF<)1lZK(Bgb-KCR_mW6Lj4;{kzK$*@x1fE6~35TrAViB>poq3);Y+3={n8$+2NJAm; zS_uWV5OcFs$tH$Ps-##xYlMvD35&^jIH9@=j-L&aH}IN@$#r;P0Huq~8X({R1qml8 zg2@+j3JdU9K8;Dj;ksd%0sL&SP@94xnee;(;aCB81jg||03_hL{X-bSlM+*R1;BB5 zA$Y`3=HPLffMOn0G+1&5!I($OCq1p;7Qpd5E_(A*E{MK9Oce}5hNtQWqynsX+zE1? zuzHMaW+()#8d$0lR_b2fAY@1;cyLBM{%I+hfd>d2PEahrc@S{%1UI(6fJfq<$h;XaPX^J;N4T8*PK;DNFHL;eF zh7bz$E{$6n6qFW^15%X6q7HiYazNoHfzTj&;HW-Cl3CQCvj<=3OCkxn)k&Uwp}GgNHumTAyB}rgyOG9;eAkelS0#P`d2lW-pc!RJ3ziMJfJeH^Bl~*PTNPp2fs+FGD zYRw{@=1=6u_qUEu$9g+7>i~i5fIxPaQHm>r6`(m#$bkfG>Y!$}hNPFTfb%4+oetVP z&`p8>tp*@KFcyGzpM@eVNaVxuQUIco1>4SJfPAe%D;2!(v4+KvuwvR<{9X51gpN4vQ0NB)lohVv!jH`9hds zH9t)QrYxlmI*bQMN+>7dB6vpy33KoU0(#l$cJ{V{+lhaaKuU}^sL9iy4iM(^;5$Njz7{tfjJaJ)hZ!gbISCka3tPvYRe_x%n1bGi9n3?c=! zXzM^2)dbES!)F)wTed961Gv~#psD#JB#y;|YuV@Xi8ve=CMl{=20fqafK~*mQy&4z z z@!Lv_SK>q%A=mU4%C8{zEt--?z`D68jST7nq#1F#X7R7BxlTS|LG4z>si@Me z;>oIBo3zlk2ArA;Q#|77OczUd>SW{oH#Xh!v*B@p_Fpdb)C{VwAKUZl^E+V%OH>=v z?fd9mohItfB_EP>Q%FbnSH$V$ju(dQ*X3rn6-He)-ei3En({BkXLh$U4Dj=`hJAI- zt*eM<+rsbfOHj!zPcPIQ(=M}9*}3L|s_a(5x}zbl{2t1Dbx-9CB4}p#4?fXutinu0 zQ}B@6eWePM7q=$9*CgsY#Cn|BYps{{$c{LzzL#}~%pRIdvA?9-+BcWjs(ftimGdNx zs|WMXwx1*%=pAMCw*MYgxW3`f0J#hm>w6>p?oImIFoG;d)U@#pKR+pbpOn8@HvQbq z8n49S4#AEy@~6MQefb%cmR`Jb`qUk}eEey-8SsmQlO7;g6et$UNYFzJ2#>r@CuG5%)kq&Y7}g$oe+1_i1`zLVZ^bv&r7>-);W3Bs?GLl=&iKIYqJTf z8ZGWk^d`7v3?=JC+{jpSx81i(1*YwKY4)-<$E~n0I3c*dY;BiqYFqnxKVQ?MjJXw% ziFu1uxX`w+UvO;p)}t3Qe;ny3ZpFv3)|l<--S~_TYr=)L@nM|ZS`5pwhjEWO<&2iP zzeMf2xG5n%Uy0^;xGB}RKQc!SDtZE)b`aS#YY+!Mo(w(_d30`WDuf)ZHSo&`{gh84`OnALeQv_pkWzK|{I5!L zmpF5meCcaUO~c1Vj*q1qd~MUbjc^^MyTp+ymXrjvsMU_?b25K8wYsz)9xnY}_R)4o>GWiG4f^J$6XtCBbI!pIl;BJv zq-T7?q9T5ghRzXh-fucTyYEUVujLMw*Qhm3zbI`k3r%haM|zGt?-vZWYyaYybJPZ# z`q6e{_2t|>+x%?O`Y9Ptw%tgnEy^zR-p>3u9h^iDd1f=Q(Yt8FDfQ?(N>i&djy>O$ zBgn-%Z`pokHMX>BH92lj`r6?EWlL!0FqFHpfGZ4H62xk=ZJg_~^Epuy<%fFt)ixH~ zdpl10IfaQ|=2^=ok?&3~`RXhkA`L;m%^&UFle1cx_1e^PXtQn*{mmV&&h`cR=Dp9~ zyl&$`j_G6I!?8sseDjoN+*MsOPhcRj0$wy!fpqzBHtFQ^)HAf2n% zFB)|``3k9GkmvmK%POB~x4$wjd|Lf;Jpa`3_0M|sn$6B67VnR&*LB7|Df@Fe`l3s% zN7&)_au5`HK>MBmvt*r+14djKil=fo>xDaU~?Edw7KJZcC@GZ zaJ8${JkXG_r?t+lC9SHT=wtCYnCZ^@5FS%McgiK2aE`nGlG_)p{4I}ex8cL+c?e5p zrkA|N!Q`JRzdYw1N?#n?vgKY3QNUh8oj`_67~O1d47(mysPeUKVNQ*#@apy2j97(X z?hL(k`N2MxS=FY`L}Pmjv3%O|Y+_|jzffuYQ2hRnB(r@igIk8IJSzg!g#;!*@D z5R7B*WQ#X{wWzy1AfE~+GTipTP=rwwxN>u=&Ly<0szZUst@+_RdwtKR5O|cuj04_xzF8UdOW!ob&=% z_1HV>_s35V9M5Sz1V@amH1LEb_sLdN@BfMX+r4kETf@*Hw=oIxv*#S$1JTMGH^|jL zI{rJ!Zs#>q3s#l`vi6nE!N&E?CeK;S&#@Y(4 z)?WIQ?%dx~_c%B0Q`k0yV_g>x+X+psnlbp<>)ZFK?Z2|UFZbXd938wECQ>?jUB5ym zlt89Rc`RF*i~f4b9w_Yf2haFAV*xHTnMbZx(H7S4Q*&s!#WIb*fKN7t>2Z z9c0hAlQCwDHG;aZ>i;TqiRo=iI)0bqXQs&0VVoJC?zz zM{}ADjQ^9wQYx7fGVUtK)9!Y)#GFx7YDcdKY8 z`|$F&{%hQSrMS9Gg*R(u20mC?a%dWNK6|fP&Hvqbf1e|3I?BiHM2zgMH=TFP`%qZU zrw)3A>KVTZ-4^;i!M^(@`KVL(!*SV#4_9Nq@DVcJxt+ynv(kT+TiB45Y;|T6UyugE ok`4NvV~x4H(o^()J_m% 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 TeYomLa4#&}d&3jP4Q&4erWP?( literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/chem_icon_DYN_DNT.png b/assets/hbm/textures/items/chem_icon_DYN_DNT.png new file mode 100644 index 0000000000000000000000000000000000000000..7a9e726fd115122f6f9a64364a965d8ee91394cd GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfHYlw?yfeQqM~8jyLS>hEH3K3c-NQMl6mZzs71xI z-4E>7-B7URNl>tgnm%!XQqW~4ZavPrnF)K?YHK!4o7l+MEk427PFJ_r(bct8an|*= zhfQ0Ao4dNWn5&`=O0)g`_V%#)*#id{eA#a>Y>bnrU|{I`?5=Fj63Pkm2!p4qpUXO@ GgeCx@CSr&H literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/chem_icon_DYN_EUPH.png b/assets/hbm/textures/items/chem_icon_DYN_EUPH.png new file mode 100644 index 0000000000000000000000000000000000000000..4b560ba5b1a6d647e70f61536512b34c6c6e30a8 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfb-c^m)Med?3pObjoshv z*WFOC=1EYnikd!ggO<=`CT_h>=UJu|yqk94JJfNPVabH;zTVB;_V>5*pW9dboG(#) kLG~fm4^j;|mmjb)NL+Vr@s!+m3+QA9Pgg&ebxsLQ07Yb7Z2$lO literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/chem_icon_DYN_SCHRAB.png b/assets/hbm/textures/items/chem_icon_DYN_SCHRAB.png new file mode 100644 index 0000000000000000000000000000000000000000..23b8328b5836a3e116646a43cd204769378272e7 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfNO*?laKcLD=IgELN^F0k+UcI`!`*tmhtjjwJ7vDqVVh8|*C(KR89ZJ6T-G@yGywpFLQ@$4 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/clip_defabricator.png b/assets/hbm/textures/items/clip_defabricator.png new file mode 100644 index 0000000000000000000000000000000000000000..18ed33b08aaa6eb0108a7d1a897499dda1319937 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfb`v{<|psdKVYNkCKJcA3T_|T71uU1_n*lZMmxx*P1@7JhtzB#57li1C!e=pG)-^ z@}(~oDLUu7&2B=_sx*#7i{(=ce1j*;u4*r1+n9KuF2!MD>$P1~&TKKq?}hXTdaX3y z4-^HmIUZJ*zY1eJzQ155m_>|e7A#?F~#XK3{c=mQ2%S3j3^P6s^1OZ+}1#lYYILndBs11sZz)aDHiN;@Bk$3L6wAP^Gs^u#{v<5m^YZrzCz z*Q{Fvm>AAkGAB&EQ+hYi;@FO>rLoW7UbRerBbqrco#EF$^u^&jzlk3yyftS-NS;l|@nePU=1n|G?Vdmvm03>%wZ@&-33<087!h JAns;#ND^GYJ@3mC9X+}e=#`>y1kBZA>K7_Xj zM3uj<{XLcWz$MjVH$0kDyfk0Dn{#-3&HeAJ3}@1Be~Y*p|8m_vJM*toE*X3cC}{hs z9W(F2HSVHw3Y>zDYekiqCbd_(bFbNYE3YTe{*?9Se1n2#Q=flkt8sX-;$dlwKhS9m Mp00i_>zopr03*m#$^ZZW literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/clip_jack.png b/assets/hbm/textures/items/clip_jack.png new file mode 100644 index 0000000000000000000000000000000000000000..18a0c616b31218b71691339724a2743d2c291194 GIT binary patch literal 372 zcmV-)0gL{LP)LS&Keh*Ow%;s7Kq3QA;1_z z+qMU(wtg)AORY5kAj`77UieMi8mDOrij-vur4*{Fa``SS{KOUkfN>mA6u+xgN+Hj4 zD5atT&I}?loO5(t2hO?skR(Y&>ia(S;Lq7;O};8y%#Il-@RdX@cfeoeQTPD}bb@h# SkSIt10000C1PUVb z03!HkW7ux8KD3F6e@b8b!LZ-5Gv9tQ11Ar4=&>jYKfae``72*~k|c@O&Y(N9Q$8sD z4LvRv7h~*S^=Yva-ab6Joi}H2^a_40K%5b zn|Mf!qKNf+4M1JjL{Y?Iu}~UdKA%IYp%M5vgU=9}aMHrhcKTBQ(uYUh-e2j&qTPOo z4cuSfP3%@xr2x`2^*z@B)$wTqJ9?GtIF-zn9CMaKM(Jo+E;QUDFPQxT_2X@u!hMkU6l-9U3ul7*h z*}|lHNF}ap>;8>tHvi8?YTp<=rm6 zP*w*Qfr&R$I2jI{S(XjNzrExhlJVr zbD0@zOs{iJ=(kDuD3;W7a+f!!LumNp=18O2H{WQ!|2nfRaY63woVS6$*yb}P{JH(3 RR~i@w44$rjF6*2UngB3|efa&mYm3kyB3Dl>DOx3qTPPe@~kn8~PdxoKwTcB9~BsYlI3boFyt=akR{0MAoQQ~&?~ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/gun_skystinger.png b/assets/hbm/textures/items/gun_skystinger.png new file mode 100644 index 0000000000000000000000000000000000000000..9c07773ef323cd4ee27d331598b0097ea8535edd GIT binary patch literal 372 zcmV-)0gL{LP)f=NzVE>@DHe+|eYf0(#J!!v zwr#O(TeL)n|B@I0g+f69QmGVA`=><10b#vjSZ+hYdc{~IFadnuHvk@YkBEi?#z6-i zPSil-IF2;gAsU648H?4eZ4x!mVWkwuykll8qEW~==q$?43Y1b*TP>7QeBN9by1{z& zI{79_rIJja*>X)Rw;>PGO)mM(;oX&72KN%zWZ{4`*>X)L{T}IDo{#gBnT#11nr71P z5sgB=-d^WslBfZ|nsX+4z3E(@gXbpgcH2lS(2|vnP4-@H@jUNe*&p<`UmD-W27b1` Sp_ShN0000Ply~<9>>2m*6R+_s}mH0>|yaBp1dTNWe$~Wc;nrg7c~8OzLi-H0Cdm&#Q@S> zm+DxmbIKwo>vaU7>ne(nuwT6N_w0t?bRl>b2HP3uRBdsz-ubOJ?$%!ZB(od<=yiTb ze<9m!w(ml?4h*w|`=%a@Y>VU6>4TmTojSRiSq=c$@4uvD0F6dd5PAsc!#E59X0RdG z+?{u^*}m($AXQr`ncL@+RZj4RRpy(C4g9{T2fbq&Y|H4b{$t)V&gvh|Cz5mONmi_-9D2rqkL{z@L5mVOrVS^i>7Le zLzQ{UA_oAR|9zeQLbe&@sjWs+7}^6wFfJaz7X##5yxEG<VQFSJsu_oB zW|BnCsgtWPSQ%gZ^INcAK9YGh0{~3AhM&&7poarZetcFm`Qn+(L%^udnbTaG>UgU2 z$|5K0wFD_DAK()*GczMN=df)XoO4{iem(Xe^?F@!&H(_Nb6mT2E%Axb@#rtjXVWnG z;u&GEvgdmHZGrL1x983SEH5u-zFC(qUmnVhri4q9?YQAH0P2Z*4dFVT>y6uv8)m&; zSB{O0F<6!*CMPGs7#mt|9RxJqY7Y>`%;UoILh-};`Z_r0xN+mgK+c8o?Mb%dM(!J4 ztyTr+9Gy<5uM)}AEH5t`ve$_kb{Jz|j45M`q(NPhg_6pAQzQuv_iA96xGY>XRLE_W zN+qOx%d$kZS{1VLgWHvr6$1b|oetL5*U{;8001j1D@K%eBIWkm8l`gV%3o!^DU4D% zk-WXi(4GqjDl_<6o_-bqWy+$AfZE4Bqvi_&*Vfj+ImiC}`@J`C&cRsnCs=}zLhJRq zkd+>M%@_j(oSNaG3<4=Z18gbAwr$w94a>3wV+`cBgP)z5nGpccZnr~;oqD}4Nae1 z^=dh)*Y14uDXb?}t5wech$t7Hmm+fev^bPhPSi9o$y3!?p1d9wk#lyr7q{DOIL=m@ zv{Wi77l~vKK*;m>HU*=alDaS(Zq;a5X6Ie`Qfn(Td<*^z5G? zxZ@Rm2$#eCK;cnFrX#5!RIz6zn+Qt~myoB3mGzwX=op4>a z-7d^>8C@Y_T{=+Qvh%o5s0WyxofWgQv!3#&r>8^d<+#7;>1hC43U<3)%zg9`+-^7V z=QZh=0Du!GPIwKqTCFhQOG`_s4dCk4tKR3u!~_uNX$!0JH}fJR@rWvcjoA zM6Uaj_vJzm)&4ks|6fu@)&KzbzDr-VAN;O;xoDLBPi-2FM#0Zy1n 250) this.setDead(); } - int homingRadius = 35; - int homingMod = 15; - float acceptance = 120; + public int homingRadius = 35; + public int homingMod = 15; + public float acceptance = 120; + int lockonTicks = 0; + boolean hasBeeped = false; - private void steer() { + private boolean steer() { List all = worldObj.getEntitiesWithinAABBExcludingEntity(this, AxisAlignedBB.getBoundingBox(posX - homingRadius, posY - homingRadius, posZ - homingRadius, posX + homingRadius, posY + homingRadius, posZ + homingRadius)); HashMap targetable = new HashMap(); Vec3 path = Vec3.createVectorHelper(motionX, motionY, motionZ); @@ -527,10 +525,14 @@ public class EntityRocketHoming extends Entity implements IProjectile path.normalize(); if(all.isEmpty()) - return; + return false; //Iterate through all entities and only allocate ones that can be targeted for(Entity e : all) { + + if(e == this.shootingEntity) + continue; + Vec3 rel = Vec3.createVectorHelper(e.posX - posX, e.posY + e.getEyeHeight() - posY, e.posZ - posZ); double vecProd = rel.xCoord * path.xCoord + rel.yCoord * path.yCoord + rel.zCoord * path.zCoord; double bot = rel.lengthVector() * path.lengthVector(); @@ -543,7 +545,7 @@ public class EntityRocketHoming extends Entity implements IProjectile } if(targetable.isEmpty()) - return; + return false; double smallest = Double.POSITIVE_INFINITY; Entity nearestE = null; @@ -557,7 +559,7 @@ public class EntityRocketHoming extends Entity implements IProjectile } if(nearestE == null) - return; + return false; Vec3 winVec = Vec3.createVectorHelper(nearestE.posX - posX, nearestE.posY - posY, nearestE.posZ - posZ); @@ -577,6 +579,14 @@ public class EntityRocketHoming extends Entity implements IProjectile motionY = newPath.yCoord; motionZ = newPath.zCoord; this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, (float)startSpeed, 0.0F); + + lockonTicks++; + if(lockonTicks == 5 && !hasBeeped) { + worldObj.playSoundAtEntity(this, "hbm:weapon.stingerLockOn", 10F, 1F); + hasBeeped = true; + } + + return true; } /** @@ -637,7 +647,7 @@ public class EntityRocketHoming extends Entity implements IProjectile { boolean flag = this.canBePickedUp == 1 || this.canBePickedUp == 2 && p_70100_1_.capabilities.isCreativeMode; - if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 1))) + if (this.canBePickedUp == 1 && !p_70100_1_.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 1))) { flag = false; } diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 201910c38..cb6322b7a 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -2996,6 +2996,38 @@ public class MachineRecipes { list.add(new ItemStack(ModBlocks.fwatz_computer, 2)); list.add(new ItemStack(ModItems.crystal_xen, 1)); break; + case AMS_LIMITER: + list.add(new ItemStack(ModItems.component_limiter, 5)); + list.add(new ItemStack(ModItems.plate_steel, 64)); + list.add(new ItemStack(ModItems.plate_titanium, 128)); + list.add(new ItemStack(ModItems.plate_dineutronium, 16)); + list.add(new ItemStack(ModItems.circuit_schrabidium, 6)); + list.add(new ItemStack(ModItems.pipes_steel, 16)); + list.add(new ItemStack(ModItems.motor, 12)); + list.add(new ItemStack(ModItems.coil_advanced_torus, 12)); + list.add(new ItemStack(ModItems.entanglement_kit, 1)); + break; + case AMS_EMITTER: + list.add(new ItemStack(ModItems.component_emitter, 16)); + list.add(new ItemStack(ModItems.plate_steel, 128)); + list.add(new ItemStack(ModItems.plate_titanium, 192)); + list.add(new ItemStack(ModItems.plate_dineutronium, 32)); + list.add(new ItemStack(ModItems.circuit_schrabidium, 12)); + list.add(new ItemStack(ModItems.coil_advanced_torus, 24)); + list.add(new ItemStack(ModItems.entanglement_kit, 3)); + list.add(new ItemStack(ModItems.crystal_horn, 1)); + list.add(new ItemStack(ModBlocks.fwatz_core, 1)); + break; + case RADAR: + list.add(new ItemStack(ModItems.ingot_steel, 8)); + list.add(new ItemStack(ModItems.plate_steel, 16)); + list.add(new ItemStack(ModItems.ingot_polymer, 4)); + list.add(new ItemStack(ModItems.plate_polymer, 24)); + list.add(new ItemStack(ModItems.magnetron, 10)); + list.add(new ItemStack(ModItems.motor, 3)); + list.add(new ItemStack(ModItems.circuit_gold, 4)); + list.add(new ItemStack(ModItems.coil_copper, 12)); + break; default: list.add(new ItemStack(Items.stick)); break; @@ -3672,6 +3704,15 @@ public class MachineRecipes { case COMPONENT_EMITTER: output = new ItemStack(ModItems.component_emitter, 1); break; + case AMS_LIMITER: + output = new ItemStack(ModBlocks.ams_limiter, 1); + break; + case AMS_EMITTER: + output = new ItemStack(ModBlocks.ams_emitter, 1); + break; + case RADAR: + output = new ItemStack(ModBlocks.machine_radar, 1); + break; default: output = new ItemStack(Items.stick, 1); break; @@ -4212,7 +4253,7 @@ public class MachineRecipes { input[0] = new FluidStack(800, FluidType.SMEAR); break; case CC_HEATING: - input[0] = new FluidStack(800, FluidType.HEATINGOIL); + input[0] = new FluidStack(1800, FluidType.HEATINGOIL); break; case CC_HEAVY: input[0] = new FluidStack(1800, FluidType.HEAVYOIL); diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 2fc2af3e0..912539c76 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -660,6 +660,7 @@ public class ModItems { public static Item gun_rpg; public static Item gun_rpg_ammo; public static Item gun_stinger; + public static Item gun_skystinger; public static Item gun_stinger_ammo; public static Item gun_revolver; public static Item gun_revolver_ammo; @@ -1041,7 +1042,9 @@ public class ModItems { public static Item clip_revolver_cursed; public static Item clip_revolver_nightmare; public static Item clip_revolver_nightmare2; + public static Item clip_revolver_pip; public static Item clip_rpg; + public static Item clip_stinger; public static Item clip_fatman; public static Item clip_mirv; public static Item clip_bf; @@ -1055,6 +1058,11 @@ public class ModItems { public static Item clip_mp; public static Item clip_xvl1456; public static Item clip_emp; + public static Item clip_jack; + public static Item clip_spark; + public static Item clip_hp; + public static Item clip_euthanasia; + public static Item clip_defabricator; public static Item ammo_container; @@ -1756,6 +1764,7 @@ public class ModItems { gun_rpg = new GunRpg().setUnlocalizedName("gun_rpg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_rpg_new"); gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_rpg_ammo_new"); gun_stinger = new GunStinger().setUnlocalizedName("gun_stinger").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_stinger"); + gun_skystinger = new GunStinger().setUnlocalizedName("gun_skystinger").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_skystinger"); gun_stinger_ammo = new Item().setUnlocalizedName("gun_stinger_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_stinger_ammo"); gun_revolver_ammo = new Item().setUnlocalizedName("gun_revolver_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_ammo"); gun_revolver = new GunRevolver(gun_revolver_ammo, 10, 25, false, false).setMaxDamage(500).setUnlocalizedName("gun_revolver").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver"); @@ -1997,7 +2006,9 @@ public class ModItems { clip_revolver_cursed = new ItemClip().setUnlocalizedName("clip_revolver_cursed").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_cursed"); clip_revolver_nightmare = new ItemClip().setUnlocalizedName("clip_revolver_nightmare").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_nightmare"); clip_revolver_nightmare2 = new ItemClip().setUnlocalizedName("clip_revolver_nightmare2").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_nightmare2"); + clip_revolver_pip = new ItemClip().setUnlocalizedName("clip_revolver_pip").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_pip"); clip_rpg = new ItemClip().setUnlocalizedName("clip_rpg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_rpg"); + clip_stinger = new ItemClip().setUnlocalizedName("clip_stinger").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_stinger"); clip_fatman = new ItemClip().setUnlocalizedName("clip_fatman").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_fatman"); clip_mirv = new ItemClip().setUnlocalizedName("clip_mirv").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_mirv"); clip_bf = new ItemClip().setUnlocalizedName("clip_bf").setCreativeTab(null).setTextureName(RefStrings.MODID + ":clip_bf"); @@ -2011,6 +2022,11 @@ public class ModItems { clip_mp = new ItemClip().setUnlocalizedName("clip_mp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_mp"); clip_xvl1456 = new ItemClip().setUnlocalizedName("clip_xvl1456").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_xvl1456"); clip_emp = new ItemClip().setUnlocalizedName("clip_emp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_emp"); + clip_jack = new ItemClip().setUnlocalizedName("clip_jack").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_jack"); + clip_spark = new ItemClip().setUnlocalizedName("clip_spark").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_spark"); + clip_hp = new ItemClip().setUnlocalizedName("clip_hp").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_hp"); + clip_euthanasia = new ItemClip().setUnlocalizedName("clip_euthanasia").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_euthanasia"); + clip_defabricator = new ItemClip().setUnlocalizedName("clip_defabricator").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_defabricator"); ammo_container = new ItemClip().setUnlocalizedName("ammo_container").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":ammo_container"); @@ -3046,6 +3062,7 @@ public class ModItems { GameRegistry.registerItem(gun_spark, gun_spark.getUnlocalizedName()); GameRegistry.registerItem(gun_hp, gun_hp.getUnlocalizedName()); GameRegistry.registerItem(gun_euthanasia, gun_euthanasia.getUnlocalizedName()); + GameRegistry.registerItem(gun_skystinger, gun_skystinger.getUnlocalizedName()); //GameRegistry.registerItem(gun_dash, gun_dash.getUnlocalizedName()); //GameRegistry.registerItem(gun_twigun, gun_twigun.getUnlocalizedName()); GameRegistry.registerItem(gun_defabricator, gun_defabricator.getUnlocalizedName()); @@ -3103,7 +3120,9 @@ public class ModItems { GameRegistry.registerItem(clip_revolver_cursed, clip_revolver_cursed.getUnlocalizedName()); GameRegistry.registerItem(clip_revolver_nightmare, clip_revolver_nightmare.getUnlocalizedName()); GameRegistry.registerItem(clip_revolver_nightmare2, clip_revolver_nightmare2.getUnlocalizedName()); + GameRegistry.registerItem(clip_revolver_pip, clip_revolver_pip.getUnlocalizedName()); GameRegistry.registerItem(clip_rpg, clip_rpg.getUnlocalizedName()); + GameRegistry.registerItem(clip_stinger, clip_stinger.getUnlocalizedName()); GameRegistry.registerItem(clip_fatman, clip_fatman.getUnlocalizedName()); GameRegistry.registerItem(clip_mirv, clip_mirv.getUnlocalizedName()); GameRegistry.registerItem(clip_bf, clip_bf.getUnlocalizedName()); @@ -3117,6 +3136,11 @@ public class ModItems { GameRegistry.registerItem(clip_cryolator, clip_cryolator.getUnlocalizedName()); GameRegistry.registerItem(clip_mp, clip_mp.getUnlocalizedName()); GameRegistry.registerItem(clip_emp, clip_emp.getUnlocalizedName()); + GameRegistry.registerItem(clip_jack, clip_jack.getUnlocalizedName()); + GameRegistry.registerItem(clip_spark, clip_spark.getUnlocalizedName()); + GameRegistry.registerItem(clip_hp, clip_hp.getUnlocalizedName()); + GameRegistry.registerItem(clip_euthanasia, clip_euthanasia.getUnlocalizedName()); + GameRegistry.registerItem(clip_defabricator, clip_defabricator.getUnlocalizedName()); GameRegistry.registerItem(ammo_container, ammo_container.getUnlocalizedName()); diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index bc81df6c2..f391984bb 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -231,7 +231,10 @@ public class ItemAssemblyTemplate extends Item { FLEIJA_PROPELLANT, SCHRABIDIUM_HAMMER, COMPONENT_LIMITER, - COMPONENT_EMITTER; + COMPONENT_EMITTER, + AMS_LIMITER, + AMS_EMITTER, + RADAR; //private final int value; //private EnumAssemblyTemplate(int value) { @@ -724,6 +727,12 @@ public class ItemAssemblyTemplate extends Item { return 2500; case COMPONENT_EMITTER: return 2500; + case AMS_LIMITER: + return 6000; + case AMS_EMITTER: + return 6000; + case RADAR: + return 300; default: return 100; } diff --git a/com/hbm/items/weapon/GunB92.java b/com/hbm/items/weapon/GunB92.java index 42309c2a4..27562cd3e 100644 --- a/com/hbm/items/weapon/GunB92.java +++ b/com/hbm/items/weapon/GunB92.java @@ -210,6 +210,8 @@ public class GunB92 extends Item { list.add("Only up to ten charges may be stored."); list.add(""); list.add("\"It's nerf or nothing!\""); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunBaleFlare.java b/com/hbm/items/weapon/GunBaleFlare.java index ebaca01d4..d9b26c1df 100644 --- a/com/hbm/items/weapon/GunBaleFlare.java +++ b/com/hbm/items/weapon/GunBaleFlare.java @@ -153,5 +153,7 @@ public class GunBaleFlare extends Item { list.add("Ammo: Mk.V AMAT Shell"); list.add("Damage: 1000"); list.add("Creates small nuclear explosion."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } } diff --git a/com/hbm/items/weapon/GunDampfmaschine.java b/com/hbm/items/weapon/GunDampfmaschine.java index d57e41c6c..d675bbdea 100644 --- a/com/hbm/items/weapon/GunDampfmaschine.java +++ b/com/hbm/items/weapon/GunDampfmaschine.java @@ -106,6 +106,8 @@ public class GunDampfmaschine extends Item { list.add(""); list.add("Ammo: orang"); list.add("Damage: aaaaaaaaa"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunDash.java b/com/hbm/items/weapon/GunDash.java index 42dd8c83e..2c3f534c8 100644 --- a/com/hbm/items/weapon/GunDash.java +++ b/com/hbm/items/weapon/GunDash.java @@ -90,6 +90,8 @@ public class GunDash extends Item { list.add(""); list.add("Ammo: SMG Round"); list.add("Damage: 2 - 8"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunDefabricator.java b/com/hbm/items/weapon/GunDefabricator.java index 37299fd2e..50a4bfbfa 100644 --- a/com/hbm/items/weapon/GunDefabricator.java +++ b/com/hbm/items/weapon/GunDefabricator.java @@ -85,6 +85,8 @@ public class GunDefabricator extends Item { list.add(""); list.add("Ammo: Defabricator Energy Cell"); list.add("Damage: 40 - 120"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunEuthanasia.java b/com/hbm/items/weapon/GunEuthanasia.java index d6532efe6..13a7b9bdc 100644 --- a/com/hbm/items/weapon/GunEuthanasia.java +++ b/com/hbm/items/weapon/GunEuthanasia.java @@ -91,6 +91,8 @@ public class GunEuthanasia extends Item { list.add("Ammo: Syringe"); list.add("Damage: 1 - 4"); list.add("Syringes have a 20% chance to instakill the enemy."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunHP.java b/com/hbm/items/weapon/GunHP.java index f6e13f808..170ad0d99 100644 --- a/com/hbm/items/weapon/GunHP.java +++ b/com/hbm/items/weapon/GunHP.java @@ -105,6 +105,8 @@ public class GunHP extends Item { list.add(""); list.add("Ammo: Ink Cartridge"); list.add("Damage: 25 - 45"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunJack.java b/com/hbm/items/weapon/GunJack.java index b92bf677d..efb6e453e 100644 --- a/com/hbm/items/weapon/GunJack.java +++ b/com/hbm/items/weapon/GunJack.java @@ -136,6 +136,8 @@ public class GunJack extends Item { list.add("Ammo: Quadruple Shotgun Shells"); list.add("Damage: 12 - 24"); list.add("Projectiles: 24 - 48"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunLeverActionS.java b/com/hbm/items/weapon/GunLeverActionS.java index ca0be3801..3fb6b2601 100644 --- a/com/hbm/items/weapon/GunLeverActionS.java +++ b/com/hbm/items/weapon/GunLeverActionS.java @@ -173,6 +173,8 @@ public class GunLeverActionS extends Item { list.add(""); list.add("Ammo: 12x74 Buckshot"); list.add("Damage: Infinite"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunMP.java b/com/hbm/items/weapon/GunMP.java index a0f84d47f..67c4bba62 100644 --- a/com/hbm/items/weapon/GunMP.java +++ b/com/hbm/items/weapon/GunMP.java @@ -88,6 +88,8 @@ public class GunMP extends Item { list.add(""); list.add("Ammo: Small Propellantless Machine Gun Round"); list.add("Damage: 100 - 150"); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunRevolver.java b/com/hbm/items/weapon/GunRevolver.java index e8e016016..da43082c4 100644 --- a/com/hbm/items/weapon/GunRevolver.java +++ b/com/hbm/items/weapon/GunRevolver.java @@ -232,6 +232,8 @@ public class GunRevolver extends Item { list.add("Ammo: Schrabidium Bullets"); list.add("Damage: 10000 - 100000"); list.add("Sets enemy's health to zero."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } if (this == ModItems.gun_revolver_cursed) { list.add("You're dead."); @@ -249,6 +251,8 @@ public class GunRevolver extends Item { list.add("Damage: 25 - 35"); list.add("Secondary Damage: 1"); list.add("Enemy is hit by boxcar."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } } diff --git a/com/hbm/items/weapon/GunSpark.java b/com/hbm/items/weapon/GunSpark.java index 9dd434065..b2bcc2bfc 100644 --- a/com/hbm/items/weapon/GunSpark.java +++ b/com/hbm/items/weapon/GunSpark.java @@ -129,6 +129,8 @@ public class GunSpark extends Item { list.add(""); list.add("Ammo: Electromagnetic Cartridge"); list.add("Projectiles explode on impact."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); } @Override diff --git a/com/hbm/items/weapon/GunStinger.java b/com/hbm/items/weapon/GunStinger.java index 1d5d40e2f..24a140a81 100644 --- a/com/hbm/items/weapon/GunStinger.java +++ b/com/hbm/items/weapon/GunStinger.java @@ -28,7 +28,10 @@ public class GunStinger extends Item { public GunStinger() { this.maxStackSize = 1; - this.setMaxDamage(500); + if(this == ModItems.gun_stinger) + this.setMaxDamage(500); + if(this == ModItems.gun_skystinger) + this.setMaxDamage(1000); } @Override @@ -57,24 +60,41 @@ public class GunStinger extends Item { f = 25.0F; } - EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 1.0F); - - if (f == 1.0F) { - entityarrow.setIsCritical(true); - } - p_77615_1_.damageItem(1, p_77615_3_); p_77615_2_.playSoundAtEntity(p_77615_3_, "hbm:weapon.rpgShoot", 1.0F, 0.25F); - if (flag) { - entityarrow.canBePickedUp = 2; - } else { - p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_stinger_ammo); - } + p_77615_3_.inventory.consumeInventoryItem(ModItems.gun_stinger_ammo); if (!p_77615_2_.isRemote) { - entityarrow.canBePickedUp = 2; - p_77615_2_.spawnEntityInWorld(entityarrow); + if(this == ModItems.gun_stinger) { + EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 1.0F); + if(p_77615_3_.isSneaking()) + entityarrow.homingRadius = 0; + p_77615_2_.spawnEntityInWorld(entityarrow); + } + + if(this == ModItems.gun_skystinger) { + + if(p_77615_3_.isSneaking()) { + EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 1.5F); + EntityRocketHoming entityarrow1 = new EntityRocketHoming(p_77615_2_, p_77615_3_, 1.5F); + entityarrow.homingMod = 12; + entityarrow1.homingMod = 12; + entityarrow.motionX += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow.motionY += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow.motionZ += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow1.motionX += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow1.motionY += p_77615_2_.rand.nextGaussian() * 0.2; + entityarrow1.motionZ += p_77615_2_.rand.nextGaussian() * 0.2; + p_77615_2_.spawnEntityInWorld(entityarrow); + p_77615_2_.spawnEntityInWorld(entityarrow1); + } else { + EntityRocketHoming entityarrow = new EntityRocketHoming(p_77615_2_, p_77615_3_, 2.0F); + entityarrow.homingMod = 8; + entityarrow.homingRadius *= 50; + p_77615_2_.spawnEntityInWorld(entityarrow); + } + } } } } @@ -117,10 +137,25 @@ public class GunStinger extends Item { @Override public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - list.add("Kaboom!"); - list.add(""); - list.add("Ammo: Rockets"); - list.add("Projectiles explode on impact."); + if(this == ModItems.gun_stinger) { + list.add("Woosh, beep-beep-beep!"); + list.add(""); + list.add("Ammo: Stinger Rockets"); + list.add("Projectiles target entities."); + list.add("Projectiles explode on impact."); + list.add("Alt-fire disables homing effect."); + } + if(this == ModItems.gun_skystinger) { + list.add("Oh, I get it, because of the...nyeees!"); + list.add("It all makes sense now!"); + list.add(""); + list.add("Ammo: Stinger Rockets"); + list.add("Projectiles target entities."); + list.add("Projectiles explode on impact."); + list.add("Alt-fire fires a second rocket for free."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); + } } @Override diff --git a/com/hbm/items/weapon/GunZOMG.java b/com/hbm/items/weapon/GunZOMG.java index d542ae056..2854a69fb 100644 --- a/com/hbm/items/weapon/GunZOMG.java +++ b/com/hbm/items/weapon/GunZOMG.java @@ -213,6 +213,8 @@ public class GunZOMG extends Item { list.add("Damage: 35 - 45"); list.add("Energy Damage: 10000 - 100000"); list.add("Energy projectiles destroy blocks."); + list.add(""); + list.add("[LEGENDARY WEAPON]"); //for(int i = 0; i < 25; i++) // list.add("How do I use the ZOMG? How do I use the ZOMG? How do I use the ZOMG?"); } diff --git a/com/hbm/items/weapon/ItemClip.java b/com/hbm/items/weapon/ItemClip.java index d88659e2c..299555745 100644 --- a/com/hbm/items/weapon/ItemClip.java +++ b/com/hbm/items/weapon/ItemClip.java @@ -202,6 +202,62 @@ public class ItemClip extends Item { } } + if(this == ModItems.clip_revolver_pip) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip_ammo, 6))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_stinger) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 3))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_jack) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_jack_ammo, 6))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_spark) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_spark_ammo, 4))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_hp) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_hp_ammo, 8))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_euthanasia) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_euthanasia_ammo, 16))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + + if(this == ModItems.clip_defabricator) + { + if (!player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_defabricator_ammo, 12))) + { + //player.dropPlayerItemWithRandomChoice(new ItemStack(ModItems.gun_mp40_ammo, 32), false); + } + } + if(this == ModItems.ammo_container) { if(player.inventory.hasItem(ModItems.gun_revolver_iron)) @@ -224,6 +280,8 @@ public class ItemClip extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip_ammo, 12)); if(player.inventory.hasItem(ModItems.gun_rpg)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 3)); + if(player.inventory.hasItem(ModItems.gun_stinger)) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_stinger_ammo, 2)); if(player.inventory.hasItem(ModItems.gun_fatman)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_fatman_ammo, 2)); if(player.inventory.hasItem(ModItems.gun_mirv)) diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index afd16eaef..1756c228a 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -85,6 +85,7 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg, new ItemRenderRpg()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_stinger, new ItemRenderStinger()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_skystinger, new ItemRenderStinger()); //MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg_ammo, new ItemRenderRocket()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBombMulti.class, new RenderBombMulti()); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 5ca790db0..5f2efe8fe 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -525,7 +525,7 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_diesel), 1), new Object[] { "HTH", "PRP", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston), 'R', "ingotRedstoneAlloy", 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) })); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_shredder), 1), new Object[] { "SHS", "MBM", "CFC", 'H', ModItems.hull_big_steel, 'S', ModBlocks.steel_beam, 'M', ModItems.motor, 'B', Blocks.iron_bars, 'C', ModBlocks.red_wire_coated, 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) }); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_combine_factory), 1), new Object[] { "HCH", "STS", "RFR", 'H', ModItems.tank_steel, 'C', ModItems.coil_advanced_torus, 'S', "plateSteel", 'T', ModBlocks.block_magnetized_tungsten, 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_teleporter), 1), new Object[] { "PTP", "FKF", "BBB", 'P', "plateTitanium", 'T', ModItems.telepad, 'F', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'K', ModItems.entanglement_kit, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_teleporter), 1), new Object[] { "PTP", "FKF", "BBB", 'P', "plateTitanium", 'T', ModItems.telepad, 'F', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'K', ModItems.entanglement_kit, 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_rtg_grey), 1), new Object[] { "UPU", "UWU", "UPU", 'P', "plateSteel", 'U', ModItems.rtg_unit, 'W', ModBlocks.red_wire_coated })); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_cyclotron), 1), new Object[] { "PTP", "PCP", "WBW", 'P', ModItems.board_copper, 'T', ModItems.cyclotron_tower, 'C', ModBlocks.fusion_core, 'W', ModBlocks.red_wire_coated, 'B', ModBlocks.machine_battery }); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_well), 1), new Object[] { "TPM", "GPG", "GDG", 'T', ModItems.tank_steel, 'P', ModItems.pipes_steel, 'M', ModItems.motor, 'G', ModBlocks.steel_scaffold, 'D', ModItems.drill_titanium }); @@ -702,6 +702,7 @@ public class CraftingManager { GameRegistry.addShapedRecipe(new ItemStack(ModItems.gun_euthanasia_ammo, 12), new Object[] { "P", "S", "N", 'P', ModItems.powder_poison, 'N', ModItems.niter, 'S', ModItems.syringe_metal_empty }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_spark, 1), new Object[] { "TTD", "AAS", " T", 'A', "ingotDaffergon", 'T', ModItems.toothpicks, 'S', ModItems.gun_rpg, 'D', ModItems.ducttape })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_spark_ammo, 4), new Object[] { "PCP", "DDD", "PCP", 'P', "plateLead", 'C', ModItems.coil_gold, 'D', ModItems.powder_power })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_skystinger, 1), new Object[] { "TTT", "AAS", " D ", 'A', "ingotUnobtainium", 'T', ModItems.toothpicks, 'S', ModItems.gun_stinger, 'D', ModItems.ducttape })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hp, 1), new Object[] { "TDT", "ASA", " T ", 'A', "ingotReiium", 'T', ModItems.toothpicks, 'S', ModItems.gun_xvl1456, 'D', ModItems.ducttape })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_hp_ammo, 8), new Object[] { " R ", "BSK", " Y ", 'S', "plateSteel", 'K', new ItemStack(Items.dye, 1, 0), 'R', new ItemStack(Items.dye, 1, 1), 'B', new ItemStack(Items.dye, 1, 4), 'Y', new ItemStack(Items.dye, 1, 11) })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_defabricator, 1), new Object[] { " SS", "DDD", "TCB", 'S', "plateSteel", 'D', ModItems.plate_dalekanium, 'T', "plateTitanium", 'C', ModItems.circuit_gold, 'B', ModItems.battery_lithium })); @@ -1003,6 +1004,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.mask_of_infamy, 1), new Object[] { "III", "III", " I ", 'I', "plateIron" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.designator, 1), new Object[] { " A", "#B#", "#B#", '#', "plateIron", 'A', "plateSteel", 'B', ModItems.circuit_red_copper })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.designator_range, 1), new Object[] { "RRD", "PIC", " P", 'P', "plateSteel", 'R', Items.redstone, 'C', ModItems.circuit_gold, 'D', ModItems.designator, 'I', "ingotSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.designator_manual, 1), new Object[] { " A", "#C#", "#B#", '#', "ingotPolymer", 'A', "plateLead", 'B', ModItems.circuit_gold, 'C', ModItems.designator })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.linker, 1), new Object[] { "I I", "ICI", "GGG", 'I', "plateIron", 'G', "plateGold", 'C', ModItems.circuit_gold })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.oil_detector, 1), new Object[] { "W I", "WCI", "PPP", 'W', ModItems.wire_gold, 'I', "ingotCopper", 'C', ModItems.circuit_red_copper, 'P', "plateSteel" })); GameRegistry.addRecipe(new ItemStack(ModItems.turret_chip, 1), new Object[] { "WWW", "CPC", "WWW", 'W', ModItems.wire_gold, 'P', ModItems.ingot_polymer, 'C', ModItems.circuit_gold, }); @@ -1028,9 +1030,9 @@ public class CraftingManager { //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.canister_NITAN, 1), new Object[] { ModItems.canister_empty, ModItems.canister_napalm, ModItems.powder_strontium, ModItems.powder_cobalt, ModItems.powder_bromine, ModItems.powder_tennessine, ModItems.powder_niobium, ModItems.powder_cerium }); //} - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 1), new Object[] { "dustNeptunium", "dustIodine", "dustThorium", "dustAstatine", "dustNeodymium", "dustCaesium" })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 1), new Object[] { "dustStrontium", "dustCobalt", "dustBromine", "dustTennessine", "dustNiobium", "dustCerium" })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_spark_mix, 1), new Object[] { "dustDesh", "dustEuphemium", ModItems.powder_meteorite, ModItems.powder_power, ModItems.powder_nitan_mix })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 6), new Object[] { "dustNeptunium", "dustIodine", "dustThorium", "dustAstatine", "dustNeodymium", "dustCaesium" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_nitan_mix, 6), new Object[] { "dustStrontium", "dustCobalt", "dustBromine", "dustTennessine", "dustNiobium", "dustCerium" })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.powder_spark_mix, 5), new Object[] { "dustDesh", "dustEuphemium", ModItems.powder_meteorite, ModItems.powder_power, ModItems.powder_nitan_mix })); GameRegistry.addRecipe(new ItemStack(ModItems.canister_petroil, 9), new Object[] { "RRR", "RLR", "RRR", 'R', ModItems.canister_reoil, 'L', ModItems.canister_canola }); diff --git a/com/hbm/render/item/ItemRenderStinger.java b/com/hbm/render/item/ItemRenderStinger.java index a2b2ee71f..3eb1b9623 100644 --- a/com/hbm/render/item/ItemRenderStinger.java +++ b/com/hbm/render/item/ItemRenderStinger.java @@ -2,6 +2,7 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; +import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelAt4; import com.hbm.render.model.ModelStinger; @@ -43,7 +44,10 @@ public class ItemRenderStinger implements IItemRenderer { switch(type) { case EQUIPPED_FIRST_PERSON: GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelStinger.png")); + if(item.getItem() == ModItems.gun_stinger) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelStinger.png")); + if(item.getItem() == ModItems.gun_skystinger) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSkyStinger.png")); GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(-0.3F, 0.0F, -0.1F); GL11.glScalef(2.0F, 2.0F, 2.0F); @@ -55,7 +59,10 @@ public class ItemRenderStinger implements IItemRenderer { case EQUIPPED: case ENTITY: GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelStinger.png")); + if(item.getItem() == ModItems.gun_stinger) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelStinger.png")); + if(item.getItem() == ModItems.gun_skystinger) + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelSkyStinger.png")); GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F);