From 0dc90c8dd8d9ea29d61b766b6c83f1c8221eb01f Mon Sep 17 00:00:00 2001 From: Phylogeny Date: Tue, 27 Nov 2018 06:49:36 -0800 Subject: [PATCH 1/2] Randomized pitch of grenade hit sounds, and added distinct sounds for hitting blocks with glass, wood, and stone/metal step sounds. --- .../guns/entity/EntityThrowableItem.java | 17 ++++++++++++++++- .../com/mrcrayfish/guns/init/ModSounds.java | 3 +++ src/main/resources/assets/cgm/lang/en_us.lang | 3 ++- src/main/resources/assets/cgm/sounds.json | 5 ++++- .../assets/cgm/sounds/grenade_hit_glass.ogg | Bin 0 -> 14503 bytes .../assets/cgm/sounds/grenade_hit_stone.ogg | Bin 0 -> 20528 bytes .../assets/cgm/sounds/grenade_hit_wood.ogg | Bin 0 -> 9611 bytes 7 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/cgm/sounds/grenade_hit_glass.ogg create mode 100644 src/main/resources/assets/cgm/sounds/grenade_hit_stone.ogg create mode 100644 src/main/resources/assets/cgm/sounds/grenade_hit_wood.ogg diff --git a/src/main/java/com/mrcrayfish/guns/entity/EntityThrowableItem.java b/src/main/java/com/mrcrayfish/guns/entity/EntityThrowableItem.java index c9ae41e69..01f9afb29 100644 --- a/src/main/java/com/mrcrayfish/guns/entity/EntityThrowableItem.java +++ b/src/main/java/com/mrcrayfish/guns/entity/EntityThrowableItem.java @@ -1,12 +1,14 @@ package com.mrcrayfish.guns.entity; import com.mrcrayfish.guns.init.ModGuns; +import com.mrcrayfish.guns.init.ModSounds; import com.mrcrayfish.guns.item.ItemAmmo; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; @@ -100,7 +102,20 @@ protected void onImpact(RayTraceResult result) double speed = Math.sqrt(Math.pow(this.motionX, 2) + Math.pow(this.motionY, 2) + Math.pow(this.motionZ, 2)); if(speed > 0.1) { - world.playSound(null, result.hitVec.x, result.hitVec.y, result.hitVec.z, event, SoundCategory.AMBIENT, 1.0F, 1.0F); + float pitch = 1.4F + 0.2F * rand.nextFloat(); + boolean hitStone = event == SoundEvents.BLOCK_STONE_STEP; + if (hitStone || event == SoundEvents.BLOCK_METAL_STEP || event == SoundEvents.BLOCK_ANVIL_STEP) + { + event = ModSounds.getSound("grenade_hit_stone"); + if (!hitStone) + pitch += 0.5F; + } + else if (event == SoundEvents.BLOCK_GLASS_STEP) + event = ModSounds.getSound("grenade_hit_glass"); + else if (event == SoundEvents.BLOCK_WOOD_STEP || event == SoundEvents.BLOCK_LADDER_STEP) + event = ModSounds.getSound("grenade_hit_wood"); + + world.playSound(null, result.hitVec.x, result.hitVec.y, result.hitVec.z, event, SoundCategory.AMBIENT, 1.0F, pitch); } EnumFacing facing = result.sideHit; switch(facing.getAxis()) diff --git a/src/main/java/com/mrcrayfish/guns/init/ModSounds.java b/src/main/java/com/mrcrayfish/guns/init/ModSounds.java index 109c41c7d..97a9c3214 100644 --- a/src/main/java/com/mrcrayfish/guns/init/ModSounds.java +++ b/src/main/java/com/mrcrayfish/guns/init/ModSounds.java @@ -27,6 +27,9 @@ public class ModSounds } register("grenade_stun_explosion"); register("grenade_stun_ring"); + register("grenade_hit_glass"); + register("grenade_hit_stone"); + register("grenade_hit_wood"); } private static void register(String name) diff --git a/src/main/resources/assets/cgm/lang/en_us.lang b/src/main/resources/assets/cgm/lang/en_us.lang index a75c58241..f20833bcf 100644 --- a/src/main/resources/assets/cgm/lang/en_us.lang +++ b/src/main/resources/assets/cgm/lang/en_us.lang @@ -165,4 +165,5 @@ subtitle.cgm.stun.explosion=Stun grenade explosion subtitle.cgm.stun.ring=Ringing subtitle.cgm.fire=Gunfire subtitle.cgm.fire.silenced=Silenced gunfire -subtitle.cgm.reload=Reloading \ No newline at end of file +subtitle.cgm.reload=Reloading +subtitle.cgm.grenade.hit=Grenade hit hard surface \ No newline at end of file diff --git a/src/main/resources/assets/cgm/sounds.json b/src/main/resources/assets/cgm/sounds.json index 5fcd1ea32..4a3dcdd8e 100644 --- a/src/main/resources/assets/cgm/sounds.json +++ b/src/main/resources/assets/cgm/sounds.json @@ -10,5 +10,8 @@ "rifle_fire_silenced": { "subtitle": "subtitle.cgm.fire.silenced", "sounds": [{ "name": "cgm:rifle_fire_silenced" }]}, "pistol_reload": { "subtitle": "subtitle.cgm.reload", "sounds": [{ "name": "cgm:pistol_reload" }]}, "grenade_stun_explosion": { "subtitle": "subtitle.cgm.stun.explosion", "sounds": [{ "name": "cgm:grenade_stun_explosion" }]}, - "grenade_stun_ring": { "subtitle": "subtitle.cgm.stun.ring", "sounds": [{ "name": "cgm:grenade_stun_ring", "stream": true }]} + "grenade_stun_ring": { "subtitle": "subtitle.cgm.stun.ring", "sounds": [{ "name": "cgm:grenade_stun_ring", "stream": true }]}, + "grenade_hit_glass": { "subtitle": "subtitle.cgm.grenade.hit", "sounds": [{ "name": "cgm:grenade_hit_glass" }]}, + "grenade_hit_stone": { "subtitle": "subtitle.cgm.grenade.hit", "sounds": [{ "name": "cgm:grenade_hit_stone" }]}, + "grenade_hit_wood": { "subtitle": "subtitle.cgm.grenade.hit", "sounds": [{ "name": "cgm:grenade_hit_wood" }]} } \ No newline at end of file diff --git a/src/main/resources/assets/cgm/sounds/grenade_hit_glass.ogg b/src/main/resources/assets/cgm/sounds/grenade_hit_glass.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a4dafbcd6c90adc6d749808b62397a0768389c20 GIT binary patch literal 14503 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%0Ad3%&C-R0*(t`8sV5_hX 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

(BeK#?J28joMF6K_ULS#^f5C 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/cgm/sounds/grenade_hit_stone.ogg b/src/main/resources/assets/cgm/sounds/grenade_hit_stone.ogg new file mode 100644 index 0000000000000000000000000000000000000000..7633baf7e8133fe60287fb04cf95717869a6976b GIT binary patch literal 20528 zcmce-cUV))*Dt<94G=Iuz<_`uv=EAfCLk&;KrkQ)2_1#d!9o{%sD@Ca8>$dm2t~RA z7J3z=iv=rE1bg>bejCp@@BO~-?|JTh?mu^)nPJwRx;|^InU&d_gMoog01xm_5Rdu0 zupBr45uyNzIUYd^j@)|0L+}2(=4hGVpTafB!L6SE6}EapKuV(3!bE)J_kRygynm0R z0XA?A4hzyg7!im%5=?XcGd_xd($&G~>gej|p)d!J9t#eO@Q?IA7NyPyHkSqyg+L+V z_uBhM`5Zw}j-zaj_(VqP=nH{0R^}A^Ua+$f0wm1I6oM0FuXXg1BY)c3`TGUifzK@u z+S}tDC{BBwjz>rM`kSDFqN2hgO?K@Hi17E1JRW__Py2X8;I1(L<6%eqcm22SyZ%&1 z?$X!Yz1v8C7li*GJ}fMqApjH{8%IP9(x)=1000L7Z)J6{oB)D)Rc<-vBrDf;t2C&S z!pcn^?z2}IrX${Yui zbxuWw$xBSzl!b^^+l(C%H}CA*ctgPJOys2TYVkjr&>ucf;94vMWc=V3(5>Ma>eZ|W zaHzl8LIHG;O~57#L1;#dH_J^-D<6EXNs=^}*26nd?5SXg_Hv2wzZ(;MH|DGxE6L;9 zS+{FR9*ap{Uy^)~$^XQ!XCHsriho!~L4YzPHbsQaU(Hw7q{b>Sf*p^NJKv{5M_5UvhxaIr*pQBmO2o^8{u^bMU z8xB{-la+@fGzI@4JOY3+H6v>dM(Eo_>JLYng3%_*YBZNP@sYUgUm3{87McOMdVOPJnC$Q01cs7t(c<_bx|y*3^$@) zsgRywZC9J%NS0Bnii-ckISK$0;eWLF-|UYn|E)a_FAgR4nii_wqoo_%~b{qXkW|EXC2 zWjO$7G>Ly~GMAQy8!k?8un_uN!2eoKIASX4e2o9S4u6lUXWcsfF_^#2=JDO=|FE1b6G0niJh#o}`(Kt* zhRJwll%Yh(R(8u)J((YvQdnD1x?al`{vVbT#H?X4YZ%N`Mg}G&KRBh3+sQsM*0|C2 ze~kZSIW`f>U<54(AEEpomeYfivjnZFMbrMn-#qS}1_6!2Z~spL06FOF|^%Cl0eL z#z+oqUtz@;IyE!K$!S^lX~G4%7H;qM#-u4;*o!Q&SW^}Nw>>_91ONgAG(mavy(!z~ zqvoCGDW>A|<&*m9tAtXU53vdW;bW|VeU53?>a;$1vO&baByCZysKG-wf&i(?Clv_q zO|!uc_6S90eszk%9Z7ttD${CKzq~NN`Xm}83)PrJl7UZQ=~{v6Y!tP+mh0)3uh?Cx zR;W5l@d8Odmwd%>(Cjr2>e&|tF!d+&Q`o_M`dSkpsap6ixtB!Q>PvK@b~bMGMem)a zP}%>B1lML;8nD$kxKLdJKbsirUKsc{8T5xdRlUX~&Qc55T(Z~Qq>WST+AeUYlxl7S z6(qs4e~LIAox-k@z*GGT8-?fRt!6>;xhld_-B`-kjm z6mby%SN|u_IfX5^^}Q|ycWKW@dtGY`;{Hpz?~V9grL|10jUaF#wPXDzN`a zg<;S%KA3`xgj30o>?3U;5RQ1kuVz;W3@goda0`qHjJBX$6a7og(=6#ZZpBgn)pw;~ZP0RTErKrhMLLI$JnrvhXO z17^qygzqGQP^)XLzKY77are(8Pnu(@+5^<9iW9QQp%Y{~V>Okkg+g_i1V=l&27^3Z zf%4p3_t41{xP@KA;9{|)Vq&g)YO}GLuey3W(l^p!h)fQ_4XqSAHMUFpPJj-WXQkb{{h`QK7QyS4h?&;C@@{#TPff-Lgy5Tj2^T1$`v zWt?Thp9>+;nST@}7y?>1s4&PVxE*L=!iu2e9W1a7gVMfs{nioJz=*yF)F+sQ^wXC7Ok>Gf)p^cr= zK55gPdF~;aTF@5;>B&2+&P4`*R-v zz|8<29?)RGuyvI3@ceym&;uR_TVdZCjCa5apxJ$6NUTZ-O)H@dVTp9kWW3?$(*%>i-`!pRL`#PuY!4y&IEM+ewmu#^G}IA&SB)eRMze07vmCZ@<16gYF*Z*6)fnI3Uc^@dIIv6oWfNo2)= zrglj4Msjeo_&|uu9?BqX246rrn#^n{j1l&Cou{#rl{R4gy(^2{5esWSBTP&?qcOfP zK0TNhje0|8hnVw;41{4)Jd+a!Gh=xeci8a!K<{PvTZF(ii`!4Wny!~6y_HK`Q+?}g zhs>E{N4bqhd=Yu`Fhl~U=*$uqfAqE9nB7bg;2aqfxjYwM3JK@ zIqzxWozr;*uRl&o<>L9Jcqv3)qJdUChHZFUqZ;o>BK12WJa){|?w7Mvt2qyO0fdwb zgOO`4P}F@v^i(EET2~jF%Do{E^oUEQdg+L^%Wmwbq)65UBjbZjjH07-EW=6GJiQvy zg9zNwIem%_aSySM#bI*U+j-UTBm`E->t&M}%%Hh|#$+m14>D!3Or9nY&LFKOeO^b3 zUq7oES(e4a)EfKCvOQSA%6fUpa#Y*+%=z?d+WoNW@`0jz;rYB&pgN&{b4= zg`}Z;>G4R3K4l9&RUrXm3tJ0^5h+b#Vi=FLMpwE&o+PfkE`j>l$BsB0$n(LKgHRsx za05yh6>G7kLgKifGIW(xeD4!RERR^fS{OX>0zSn`LU8znFce4@;^PrxS5-f&;!()W z-Cxy#gE+%;%6ue9D#BAjx663LCe2fnp2O_n7gx&kW%_M|kTB^uhyX7y>@u5APA+{I zjd8}t**o!O3n0pTywSl1}ixC^>PFUL(YXL9^HlI-hN}_ef6wP@>FA?BVN4 zv_zxLGMF5exvvCES*Nzr2|41aXe|e4=s?7c^!(Cr7Q?ni`@4`=VUQ}77gzMu7Q?v!5N<1&8xj)TdD^W{gnAvLKXx{=w}dLBl7G{BuW z8eP?DA`$bQoPH>M&gRO#F1~bbMTl)?nVm2mj#B&>Z=jecMg@js$r5!IdByY;e{|RP zW;>z;fQFJUp))B~M~GIJP>FsE1Vpw0vC;>htq?#ZIf51nm`my#e-v(4cs zOg#tgP1osX&tW`bc|;ziEgt*z_Ddw~p%v^6O231H2N z@9Z{(?aJ3heCaM@&Iby%hgF7(y{p;`JeEOK6%mqn2fe*9tKZ9kkk{k?O*8%I|CPLYXaS z|72yJ(;X3`z#yD&u4iC{=7-M7jEPkk~?7!}-+ge%L$<3nnd?4>Xvf)G>d5TLkqBda%<--(DuF?#ueK;g zS@J_5&8d<^^fqfY0&sNJQZ%+85Hg;{<-!lrQBKMcaxxO-d^|z*loTyR0cvk0&Nv)z zF`7xpd&md}@X5+amI8@uM(FLz;^xMyJ#o-$;x3~MWBy4wv@d-`CQC?>U^VbI*kTk1 zLKU+%qe=?xTKj?n5n{#BOA{2x6!vCZNYvHesxiL{L`85d>9BlyE3-I{jho6POWivIN7IzhXuTp~}`N zV40UoARtgq)Ibj-9-}XnPAIK^H3|~oMGFyC)(a<5^J|Nw@?c7Z->GXlC02G$ z9rONAfZ{S8_LvMLJIVyjlGR&Mu1oT&O!LWD%e;wIzddE2Cbl8G*ImbwT}cFsu$MDr)Hxvu1ocJld-)N-tB9!=4V4}F7ZVO!t? z=ha75dJ8SQMBPs$T%cBsR92R0UT` z)Rz<}a8qEw!CFjk`b|=_;|9jt1AbaQXXo3~Dfwj!Jf6-TwkXDc6#%Ob*=~vKZ*vnR zN|`qprp~jg-Rsdz_q$vl`2j39Iarbco9(G)OV^df2TREa8sxnob zYQhz>w?oY?QjXo&CVWMT7q`K8QAR;#+hOCtK|x1*x|Q`Ky$+>w_CqWCZ#F#>`6|MX z<>fIOf@Ct&?j)WRPArx%7l-j<2bgYgt_r7Qb#sMPAZa?VFqEn>Z$=s`d=6GClXH%q zkA%ux*FjkNbKoV|H8V)PwSP9zs>TV5a;554qaofy_PSkWwj-7dHKiK3qSX!`WN#G9 zhEC7UWk4MT1c)=7DB&SxLN7(=Vgw^r_=TgF-E23mw zlIcBD?E-1xLnPzpi3|o`5C7_b90bkt+y{~*jysh?4@u+`*@Gbh%ic(?iBy~bk8QMY zNpSO2pLB{JzeZA-V=c`2s;svfnO-;0TpPeOVuo0ExoHl$0dY z*^mC^BEwKDTNgX2JI^HQGAYSTQbYjaP17ilk^W8)RmZxbNVM7t5l91x>gZ!gD3FSCCwLxickqcv zRp~R`6ZnFmcH$@jaRNUSmPB21t|2nV6LWVOID9*f@ibeC8t~F26c&B^jkviyDhAkg=B%?5E2Ek2+=t z@mD41Z8YAzuuG z=HAR);!4}p$%EdRj_V@DKHQ2@X(l|NAWj9Ws;;zpo4ATv+NaLz99^+WKDPq?P*9Ve z4beNw=0NQ>BC^byJ@|-CCgE*I~-I(sfI{x3!hvGSl*go``9YDS38I&sv|*0SM4j#qM*wCSB3?LxNv- zDJ3VyAd{gv%rK_e+_@K8{;_v*=uN1VkThSKxaFiHT>Oo<(WjiceFsg#f|4&L0Tu(k z1L32O1;y)CeTzZo6d{;5RvBMzR4}B~f`&MX*xboBp0qVaB@kSu)QQSIF#X%!Xt>Ms zG$e1bwIBAQ&(OxAVg(A1@I^asNN}7D^F9bV03Z1 zWfLsh!e0Vrzz;Dichc!mLh{I1r|3g6A&DpfDajshjbb9P%5g2xHUtn+VWj)eM5Q1YicZiKQYDxdI{I>_3GsbpBrREa7A^xwYer>YjTI43Bx=JVV5H&^ z`#{IEq9o~AOTAV(0ifyD9iDFKmxiNddV5{htP%s7;>U-~BAsdx+v2UAP6%_!klU!g z68kJ2{h1RlmxU{Zk^(-_bHOdG*3VZeeatVQ$qu6;`}6+3QxEN1oD{2-XZS`6qN?_k z)wu+HQdCwf3ieLdR$ia3!+w7WHLuh_m`^o06*eRZIMbt3qBI#mK$$fqK9cM|`Q03m zsVtf_r=PB>Et)mbxu6_Qty!_CZqd%Qp0@oow|N%2*MgHfx2D>AilX9ET^PzISir=D zV0qQEO)-sil8$B)sMnrywgGB+Zthf@BD$k&h}fvz8K{ZSMxhF;;fR@$V&c_l&r2u2 zm{XCc<3A!qru~)-HHP?*d~u|QwQ-Sc`QNX}zSbNW%fn~``!3Zr4}B20HTs!f=tZaJ zJA+cG?8jDr#V3Af7RInt(ZZNAEUi6NQY7RJmIFx7j-7JuUvxh19*#UvFvH;vhA=st zi2?n3PW+M%Zarp)5!(rp>^y-h~A*5}%aSQS2BzOTznLBH(IH5qE-bRAqDV z0EZ*$Xhkyj*dP4j{y>0>IADpB+hy%m1>2rW=3d`d5`M6vY^+U3gk^=|v}tMa+o09~VC z#Qd$RBG1NKU;OLj}h8WRtvS3y6FOvJi48=L}3HRWUpq%B&##N_@iqUajh> zq^+njCS&I=RiQFPtg}zH175!ejogIjn8 zPcBY9&%A=x!|FxB)6KC)!WnYn%7G)Kw{CMHPY#;dCo3t#Gcw`RDmt0UL&~GoQ!>Pk zwC!a&&St7ln;4?Lopg2^JPxYL_7*UwwiK}X${dYqc-S)>M6|?Z5#MI;l@qd09LM)8 zTRBrHj!!O^j$22TspB$wDly_xio)q*JupWcgO_L3D$zmMzJ3VBQFd~I3J@TE;*>SUNl6OH zEO64BU$--0KGf?R+tvLZE4n(S)>?V^sr{}%GE^nsHNv}vWn6ymko%=n*{;2%+4rYw zOY`QWUYbwzR%?7;TNoD@^$eEEGs2=|u=DFp2&+?;6Ow@jr1X9D!YW)l$vT&d4ikAd zqKX#SpC*{f+Q<3tOI05yl=M`DQwwTXiwW&lrOq6CjEkLltP9!s&y5uLvScf4-AM6* zfBC3otqAb`$qP(bV9EniGnmFplT*8DMAMfob;k{Q^gZYH9t~2yob7hZbRSPVN0bLs zeSaQ-gE?(7eWLo&@k}2*qGbKTX4l$@0Aja~yQp|wZ8eI+buDHk2Nxo-Y5WG1qsj9D z?HmYAN}N>Z<8DR$gq7b1Cs<3nz0#TEL9@%SedZJZkZeD8e{pdUe`J&51Z46HW9W>f zHt$7s3=of5dghH{vr+Nhx+zQM@Lop^*ZMxxpy8sItGvCWfzEsgGFh|UVeS|&6-N;V zDD}z0m|W+X3%pr7W~%MsBq=8fpJ}MA29(Wmpy=?wO0IPlg!hKH7nl94#*ZT5-$x3d zw=(@IE-eH;DdYhhg@GPs8dF)0F9;fk(uL@1cP{rBg`0b)F^mG`3ZAFYE38~B`9xWj zR*E`BWjYz$k<6k9eC-89g@O*QJO7M|(3!8y)1l2s$5vbb|f zg;FE~qb~KXlZND;O}Pl31)S%VQO&lWmr0$1lH{NTiqhA&QN3quAj4*`Z}`8Ccp=v)Gg} zSu1apC#6u9P~OVb+pDSS^)$u4(l@>wE6(TC$hp3U|F&aAOI>gXqAL7ao>_0_wlJPr zo{M)5OiRT%2V4?OPjbjBqK<0Jgu1lN5SV%s9-QlbY%}4S1;eD3^r&U!aa(ym^5;su zRrLU7bs#Y-nxz=(JL7fKP;>mFw+m4&@5fX3lV)!(z3D~R*yhY0iGFmwnsfY%aOb=Z z?ADZU9I;$(`=QpnqaWun?l&Zu+O5tN(AtYPg~~5tU2S+d?h+H6cd`c6WKkRW%t)nPBd_v^#Ages=Ze@h_~#FI087AT;zA~mhfBQS@KxR zP-b#b^ucc7x4K$YnxVo@H1Ma*qSY%NXG>Aa0Mm!&T72J+GEdobwwyy(m#ZeTH&Rm6 z8Drjh{8Dp(6H$=VjTh}6%)oEP$IR-?A4BpabA9eQd~DcUf&fkZ0&`Y4etL(ZV7x3k zUKkl8w_Dp!8c(t2+03%2Yo{^s;^3Wh(}NdlwoM6ux9fakGT<$o{c6y9|Jkcdq;skd z$DU{oZLqWo&?D@;Z9&B0shZV;ZLZxW+`*5|{RpZh9$!gtmNI}1WHybX+7wDWEvfa% ztPHeW_4F&+iD8{V&AbWM2XTJPxuVfyVyZA@FAhFE`Zd}YA)tioTYDj`CF*y&?^=08*BZjq+uDV{ygsxR_C_+=a$ASR#JYCK~ zpR64?=`$iOgNjJT=*J;-XmJJxsbA(TU%2u|d`yOz#_%a;@|#O+%PpneX_BzqRtZbT z>4*gsN0PBTsA9@MZk)A?4b&e=|+jWU9XS2aUXfY5jtJ`|(A&*Q&5nCKz&>kS- z2{m>S{q{!BdlUqDwJ#_+L`%GM=(N!_@1>+XtrTI(j@tUeW6VNc6OFg2KUZ;kmHqw5 z*wlBY(Ja%QTJ&+@f|3SJ-n_mZ?WI-TK+^DK)#b1PjKOv<1*tKqd5`EafqjFCB;S!C z&gPDp*Y}Spo*-{G{G`4;@O9=>LXoDF_QR6umVB7)cw1iSg_+N7>s=Fjv3ZGe?vNY8 z9q7sTU$fdDr97(q+BX=sgX=Wt{?T{lz2AA)kN1}Kc1o8nb2fioHIUcXbK^`j|Jds` z|E`i%O#88j@89lTF6RH@QTUP9y>9IF=J30*oB2$&LkAxy#(uh;TG*lVtHpJ6VDjr* zbnB(h0-C_ZTSv4Uj@^Cil(q6OM>$Rp_N70)5B#8Hw|8Mq`>%1QJt_P4xIM|bBx+z8 zJD!{Y=~bM;ky<4*ro`#)ZG}vlve2uCDOvV~qRe~uE_`^Xp0_KeQs$Vhzpve{$#+ej zSGLv8zVT#~Edr%^8#jlq$a$7>43e}wFZ%u{j2lmP_hlLC48YZ@2dyYXqGc0?Yvk>n zvCa_1J5ubsS)9U{I<_>#V7SeVUz~(*_MpfUH><%Lzh-w)>!Zo#3``jVd<#ItX`w@g zW9P)`FyMEK?weT7pfFpN{RGn8409vFdP;S?7_Rl;E7;2LHd%n{%|5~dU_-Q^(CCqy}`_b8CH(u5I-bXlV^7rkp&6Nl;G?e&%lA$nRv;qw{M1g_lJ}TeX~6 z@({_%>wP_aSBTIYNU?6M4 zsbxNM?zP%ZwF_FK&pw55$IqyJT)K7q*&Dy9lTn5%{CR_BNwo()p8Xo|z4?0K@cm*f z`>W^faO|BvTDI*B(bJgF>9)U|^7)m(e*1~P@;+=(d6A#R4=WbrxMuSJZxat3lu?l> zvyo0SG7$iZ&Codl#X!15id!@?`TMnGIT++dVZEwMcr{FhUMQ$UlT(aCez1cQQNCgd zHrh}jy7=?79D!l@HU0c#Ml8A~oTOdw46SL|_vD)qEFb*@o(L7r92r&CQLUv&KhgQ| z^+UlEm8Tcf2FhId#>+Ap)z&Hn&^l6ZlruzebtM~;-rED`3CCTp(;YggL(5KKl1XA> z2Um8;d>LHv;e+^9s>)^B9=ds8d(e#J@tm`PeWb|8?QF(F4e6i4r&*gCf#H{57fQs6 zC&)!=lIQxIKFQQ~)Q~9Uu0$Shlf1H~&a`gy~Yi+6R3ZxlNlZNHdd)qo1ksr2G zz7^~3zh0W<<>aC={Ke2iOCs>)8)d%pcWy?j5B^nj5w91lbZ>n)=0i{EL}0{W^g{T1 zU~<<{)fwNY%nx#xLJuQn&q$s2eN&-ti1)AlK6XBrj6Tk6t^9H2euaM5(J#}as@^?; znlDE??|TI5rNu0+UbY!s|Fn1Z(f(DN3(Fe{pDAMnRdX)8t2p^@eNJBZer;F%bDwtQ z%fDMM$u4b#hrECN^k(~Dn7!cxkM7s(-=>e=YjsC|YPpG@XT+SpH?iq5l<{1sCN${~ ze#dl$^Qoj?_hkw4GL=&~7znIRSeHkr>=LaO8&7xxlY$tUB)M3JdZWB=Wc#GvimFh#>%I;Z67;@Zzg%nAeOLS zb?hT1nzqW#)VDr`%Y_z)Q)NT8%N=#@4`Jm`y=-}to)Ro+E^a^+5nv%h2S`m1tnB3t z>{C-X!8miR5Lsk39nVMVZqRt?Ez5PL8kk3V_%2hqsw%cKVjj3T@XZ;PyQpXba2QNB zJGrDtx;I2N#GC?2ERy!%0}y2oirvl4@!~L86EB7t?3;==U$&Li^_4DmR;AH6i$|-g ziY8Z1Ij9R7IBz&-&VI6Pm23#!!!y5`{oWZ8iQ^RK6r4Eys=H&)1$mq(arquXO^NF3dMov{OucFSKSG-{CF+(TW+n&i)+i8Sc~j!NwKzm4^s!U++;_BzHd3Z z*%Ad3c49+(5~F1af`mYbeKtq463*J&1&35U%j4(mNjU!K@BoTd>?k7P|Bb9Wq;U-W z6y7;t?qoMy8-^X?-^G@&(|49lVm8O?EzyNc9DS}MVKNE{icjvqNh0Cliu=mMFU0YC z0-;8TrgR=fV!t(Bjm~4m5(i{02c{5~lE(Vtea{{9`-gooe1cDJXv)M8kR-lr0m=C? zOO7s4zzqo(w7MGS)K>C(6AN>?WND6kE)ngQ!6R}Fb2-lxeeguqF_i24J^2f{>qrln zvB&{CgZ0_~^}bQJv6!F7va3$s>=j=@ zh@XFva3g1a;ny+i$rHI~U-D1Zx>UFM_lC1I=`0VbHuckW%}o=VLp$AGzl^6d7rQsz zc73s2o_+k9ekE_P-oN@m>7+ykwy5;l`5kL-3L6h}jyC)(-81B6Jam_S^>Wr5+fDx4 z?>yUzk7;^*K78S?njaW1gW+!T{U279&VQuD@CM+WSE0KUZql^t+_er|%;|4+SunUX zmZ~2d*ZuSaY|(jd|L>0nt{L7aG5FRt>2Y7|{C%VAEm~6t-*x4P;nnJ*!@uXf{*oSe zgJaPm72MFbv6uYO)6Bd+_v#CYZ(nBQD9zS8hPhL9K2-~8`%dKvl-lT}q4b4(=lrzZ zeQ!)vDZyS;)l!Q;N;TZLR3AzjKj5Ku(CdBr=l8}<5v9LY9=ZZYPCb2LdLs3D>3cQa zn@JCT$}Q=zw}}Q%EN+!|@=srgYYQ-y26zYI1~@)RDhxNzlYD>p7<4vl@&Wj2^r%b+#RO ziEbWozu@UU8SZXFt}?rfWh=HYovk!v=hx6x70Zk$C270uLxfLVeC=uWex5Q}dBa4K zsRL9Dy|O__X>HV5q3Jox8Kg$}luq;t`sjJi7vzb}56g@*jYG9X=iP2Ec`baETg6)~ z@$anAuy05nXwF|JeyLg*yd5Qa_M=tf%hs5fOMkt^-eIl2$GDO|5KF9^Z@gUSBz(Xu zE1paazlC`iy;D2>>>y0t)BLbyTJfHxM)x0+3U>nMB+7$3KBsbAu1{1VNEM0@cqIUs zmT_!h;xb3Ml~B@^3w97hyY0c{8|RCC6rJe=+vZx@#lhpfYNk%h1K;(&{g^0C8IjXD z#Vfyj^XWIOs#xWos2`EEQihUMLt3Oa51<;MF0uV-B$UrIjdV@mkfuz(%JVRwkA{)6 zE@>q9+f_MDY037RQ#&o7%H}e9qm_<8sFUCMo3hTMvOSXW!90*%qmDv76JwfCu0d}{ zdAG{F?2C*O-a5!_W|Sne^eMK^*szmq%Mit9tx(V;=wSbpgY1A3(}(Py${xG2-W+tL z<9E1G`J#-+zP%WK>B;$ijS`g-{rnRyz`^88xrb&}9}apMG)7d(P*+wD?deoHyL$YS z=KgyV$6lF7#;!0Ut8?Z#4}1fx$<>czid!FiuS*?&qZhO(ti*+`M%+3{`rY>pDqYX> z_+)pzNmDG_&GzB`^s2}~O9!`((Y(6QbG!F_TzEFI5p^9Ngct~sn#LbGseb2Rz(lN6 z_>;8dvu6^tJ>-)*D-Pb+zH#@$e5#4(^NQQs1p;4=#azGjeBnGt;i+@L(W6ySRlA*M zH}!_K3saT-wwrw7@hd%^loubXblD498>!!t?Rao0a{Hb3aYNpb0;8{#FD36I@3e~w z$UDS-`D}RVSN)m2d-N`n{))U?(0%LGr3eYBK<=uKWnNxZSo7s`T)mgqgnFI_e16u^ zdntCkb3w0iGHw6O@zpmaLE(A5A9_Y2y)R2&TZRe&|6C85{J9b4gvQj7 zW2}x(TF$8{-cnMdjhC194Nu1hGnSg%d#H0wcT*F*_`9o|kI(0y-T&ZCzV0AKqgpZ9 zb;8jX=Zc_O=E4q7y87;kRdcsqyvn z{)+hnu;_q2PP^{j);skg)-im-bQ&)70>|Qtd#-x1%5&EIec z^5xI#ImI;rqlFr$*xZX)(w%qTun|AHpX|nb_@tU14xfuLUB*Z&c%N;i# zP+YdH)HP-n~gHozO)bZTu64fR%uoGoZ(kr*R1^3 zDI>G=m*l1yDDz|0JqLptv$Bj4;J^nr%{cH|cL3q!`nJVOOXKz(%tQ0?2gS+AeH#3; z&@f-`iVUSeDbe^4`^0!#n1YB?EadQuH_zVd>vJo*Dh*pomMV+N@?MnmsMKixb*vv3 zc)Z1r|L*nYUn6z#Nv)wRj%sceXv22G+0A|r`;=a*D=r~5Skdv_tL06z`(s{A?z$io z=>E|&SND2LV4kk}o2$3kuXmpu^4KHxCh$Y2ap=Ko7L9nw8>c7Lz9W(ehxlf9{KUD~ zOxw$w{pvXP^0oZ(c;|sdnTgJu?>_V2YCj)A={{xp{==s$5Bq-ZvM4=rQGYEjDCuPR zl@HxdUKIwp_n7D0W7QX5eN@&eRmGnBxgDK$_YU{1?DfzOyKt&fC!f}Pv#d_sKD}Jj znExU;E~K>i?%s+kyDM25qB}KO9epUFUFWhogEyr1A4&9+eAW{hI`A;P<>cFYwIi*W zgueA=VeK0?1S`&a8s9yWeC5kR(a-&dC2zviKI^1ik}svL(LU*n>&-kr`Yb37mt%(S*6F#yLYJeM_uqaNUa>dW*tqig?8Z>6 zP#23<-nB9H_3gu@*W0-}7O<3kxkV2YPNzIkDfncNr1+5X#rlw$cii~rGH6~xjlNv|X*iJ$2&G~)k6eMdU9&b;bqeP{r zxf6>D8iRve?b~CEm_D*@97W;keId=RcnCmjUJPb2*bI7yvoK76jin34`#&d=YGJ^( zwG;gg{BV+BbWi3G6ce;==-Z6YO8gj={+GAvRCpbpLL02O*JI&!1|BLFp|u-n3gZ_CPINtp zJ^3JD;3Z|U4mmoxV+fXK%#i z3sbG-SrI)4>V??MT#I8eJ9cAS`t|Hx=AI%O{xs7|VQTDe*y>$2)vRYCRg zy6vC(7)Ll9TXildIP4FS5(J* zzv0>G&^s)yHnuzQm6y{kC6Vx7y9#tti?dfn{KSbnQt!P~|M_~{0U=hh@Zx6Jc7eX} zhabEzs-14qys)#zvEsO){&KS6rLrs~p8VO$YjeE`vr@QAcG?ffyn#1pq8N#|J?e{7 z`3rn`VeXpnDUqHqv#eC%rhD%0C-0SU3)Qj<#}!Y0x%zN(^H}JJ!F2n!8(&(l8b5CFSsOrN1G;^_oL`?2FMdl2$}T-HyR07Z+3EF#y#-4=m8xs1 zA3yzQ`DIem?tA!m`ZdRy-dFxaxE|q0&95=1oegrYn|pQL!|$!_v3ypv5$e(GyKQ@; z(QmaAzjY+C&Yk>m<;>}80?HK~*1INKrQ$m34m>-ga@E5*`o5>{M?sM+_Y*aiRHY3dTu=+=e%@(sDcXZ^!2-AJ!^$!z*$Q{oZ( zTfj#^SxvliL$A<)b@##%idAIJLA5nuQrP2HiBUTikJwEXFB>8~Ty$LomuCnVDc20z ztscEmk6mw1t+YA&1$_GLcb9wH3e&YR?=i;Q3=ZAUoF$s(yy^&J`F*%z`09?~ke094 zMCBE&JJDx-+n6twACtHl_mL4DL#YOqo>AJ#DpMhVk~7PP(^(za-7)x5Z^@>j$|&6b z*VP-W;mNGjSD(C2Z`);4wYV=;w?S|)`*7g7(EX{GAqt5_W3u*{`%WUI+lO=#i(bn5 zOdl#d(8@80e*gj4O{_b$_P)B*syT1g222Mgt|cVVAMeri<9)Wk%CnW+t0w1bUq)56 zm2ns(yEIC(cJh4C>Aj&aUsA~+Iz(?yr(uX~Q9d#U0*kzv?1IX@2qZhyPy6myw@j>vCIEVWq8X{$({S|wlB!F87Rie zyAY#k_mxA`y2{$59s76g)d>07)5&_QP<#2X^TmkMb9c0q=leedZumn$2_ z9YMxL13SMd#&&hbx)U-u)m_U5hVs8gs4Pw!Q`p#^Ko z=_+OV?xN+r{i6Y$Wi=U(!cIBYj7?9*U5v|7@WL8=VjZHoynIb+U7THi|21y1(jKES zL|A=X*DibOc)W}BZ+QuW(MM0ca%WHZjR$#L{OcZ-`TcqtDlmBC^s8UDuCB}-c=(Rn zw_iJ0ZV&z4=2u4|^kvEXiF0L#?iH3#hsqqcx~0d+yNtQqN?WaI!+ew}h(h zMUivHRi=&~|9as0^Gp4S$4gB%qjV_bQBUZ=W(zssK;Vnp_X4+%@P2xzBy{?R>!CIw zZH@Tzfj92#T)S#YeO>zAZm@BCgLTN8K^2vT<$RU1h4=PfzuKO=?~6ie|0wQrhenO5 z?r)XF`O}F9!cUjkd|uqO5-tx51oGakhu-|F+TU+~@6T8i1lX6jXUx-kdVuSi8e+x_ zJAK(Q-g~}&%wTBzWv-&6nYPGMU`%sf<&LW8%ldw4DKnD|flibo!5ZN&?C0Rov!4DY-Ws+Z&ua}->uOyXwB6ZtH!BR?+-N)JA8D_T&iDx4s(?CJ^ntHj)Jmc zWSPPoZ2IDZ{Q0Y54^r7&2!rzWbnY1DJdEEg#AD}M>C~s=u8&-Y(D#+_BJ|qAQ`-Y%taePK#C@56EuI*o6y@`sw^sU)Gs8eMN;E&j zS0UzCwW3+>mvu0t z3IDg}o7hLczEE(!aLxA6g)~tc4Hvxp>}{#t85+MRqYKi@ZEx3g@3x1qyicvnd^xBf z=YLy;;&Mn@kGQ_=>g#RM9U4mV-Q6~yn7^N4A6@-Uetm9F7{SGT>16BpSN{)M-=~K6 zEY;z}k5_Npd?r%xvG`{9UlYF`xwEz{Y;W!Q;<@Ly@V-Qk@rOxfHm!CY?&&z_)tXMY z#C_)0ncp`aK8A`@mTrxij8U0G&i3ASqDA34vXjt*`t@G4nT1-pSsj&@jFVdPUC-FA zR)-Mvi>00KorMRg9EXhjO=vB0pcqtd2BOLGO+CIl)!U_Ff=Af;jy}EpBgb zdUckSHx<@@(!+o|fA2vo63;+)w@MhSrkxCsyR*lC;o$*0+YD2k7eVWJBp3aTPo7e< zciv_FC6{)|&5BxwswGbpu~*+>#MAs)vht!gUw>yKmd0DpxkWgurSAUgBlF3T(tGLt zXDhPxOVamx&gEGiEJ5?wx_tD$EjzpTf$Oz@*SO~DUDNljQ_!=2VN$f)w%d3NM&lly zq3G9CB23()M)FGa@xjQ5_l{Q{eeyb!KN9(A)%gDl2nzT0a`aWl@5`S?{UGz~Nf9ma zlnY3r4y#IuI$Iab?)tH;bukZ}#gF?PFOx`!bQK&__ADm)Xf2dE&0KL~i+-%U(JFfT zI;O_SmlKY}uHCAwkSk~&@}m#I=61|{Jrw_q_Ayt}I8gFu{@_cg2VaHd%u7p~N4r+R zK_;SV2HIT5?9j9GHFV~XZa)-W>q3WuKH1Z4PW0G|UiEVf>F0h)6o|gJ#vh0FQPRf!C~ANo>ofg*ZJz(;7^!JTtoz_5l~jm(@T(uo67?e3>o$ zj5bqC&PT%SQ(@`~^2PN}-MKBr#0AED?V$PAt5&At{10kkWwv#k&Se*xJ3xCf7l2J# z?`vbT{bWSHZ zPXr>PQ_tL%X3vd?3rA11c%zvpuP3yqrCp)pxH?)7QB#R4$4>^A#un2z=#13N_3A6w z-3w-~5Tn-XI3dT`F4w}EavXg8*5@8Hd|d~9kZUr%doABFM%R-qY&qCR=UQ4l5Ce zda4Mo@x^LGUp+KfNjX1z$wNvHdfESPk?%3vwf}bwXRkI^^^M6CXIi%}$&30==}*o| z%Spxs=1a+2oi=pm6$7%*6yNXUJF}c5P~lxqXWq=pl;q7E{6dq^##HTOm7<8htnrk8 z_eXQjIb$8par5%k{Z?f4+MwN}d0d;1D3@X*O8`%2XHx(Ki9i4V000005q1Co1poj5 zq@2{|2><{8{~!PV`W}Qk(^yCW-HJ;=T4NZ(UHsTpLbu?dD3WUmmsLt2WhP7{Oyh;% z)xLIE8H^>9Xrrq&rPU?0R)bYXXX7$z6`2!zc{PjT_vAHVDJ-U;3*>igrETR;Tyu(v zIUcO1tIoYix)zs0&0O(1qAX^>5yWB(08ofHzMOPsFYc+EtL^siIMmiJ)QZVwPPbc!Gt0M2?7XCkkU5;j z)vAZXw3!wQ8qb_p>(8d%r8e65_g_Db_3FQEUUYfJsyzBlAEq9X%M~s9q;$dRoMX({ zdKq{5dwG9iX2tg>zdFx8DPCTSk77ms(#FgP5hxNDRoIaMilD}8*;2uyz%SjoP2maf7N(AwM$|e*C;;dG0lT%oX{?S7-lD1 z#mS|Pk+GHht{xAR%t*b7t})aU9=YQ7)Lk-%%RT1yPalsN^Rb;hxH5UT*reSkO7v*_ zoJ9{ZanciyBi2|G>kn+msG9+ z2}nu;0F>JSKA>5aK(kYeF-;q)>ssG}LH?ziWvNWVUSB0~`zo&=J8UTxj`(r5$Diw8 zoB>?~lBhKM`>)*6mAmJWGw*-xXI1oh9>rqhg#5_3vV4P9l*5(%$hh5r*@_lnEf z?`h<#0~IXfK$yFF;(FIX`9@j2w+l-K>y3vj+^sz8efJVYKeBjUiFql1r9IxIfiAWz z{wQldmMnG_;ls1PF^Xe%RnZsgdbk7;b*vSmeW-KNst+UBK4;adh`q*OKF+ zF4-@m!Nqu@ROIv4+Usj>zhl_ml8+lbuImft0%Zxj>hVz~g-*|V%G0qRF_SNqOr1Dw z(90VNqQh&)YuNm3yU8osskCQ)C%nBm@-|Y`D!7~Vi3je)RrwYT-}DVxgL7a-dAHxQ zuTimVeR=iuz5UN8!JyP`-L1rB`a7REe;~8@7qa+W+$ttLeP`^iR{oPJTZ*vH>B7?I zSO?JnEw}lyp&R~GG~0qElff&;wg+R_^>?==oK{qhn$Ab(>jB8T-ivkHxrVIVdc)A+ z$a*@{<4N@S@14##XL0XL`N6j8xi-fq#VO=Ak@!qtxBVTYbp zd`>Th=@zrHy0U7FDJqy2tHo-V9VMkoTr{p{z4WB4mS58?T9heUN{Nh==>hu4-s(Vj z0~F8)lMo)jMTE!m#i7e*-+4TsFvTsHM8^O9j?*ldB2pz|-!f9jsJ1)(yRTK~0F@K~ z001&d)`%JmR(VC7rnVwH)H^n5U%cb!5odctEcFblz+O9btp2R>y1{jI=XWCU#$)^8 zUPbrkvirhZE6kQgiBZ6eqEny$6$sW{-|=bLavn5A^YJ^&y=n}%0|Rn8 z&630MyRQ>Jw~a$h&E2n`^DLE!rO9jsJv~*pJXkY2tMC7F@=&H)umAU`p5~Rar%{3A z{P4OoT-%nd0fcW`q@&c|KEsY1mF0IeJKyQ7bA461C2hOhu2MXXN4A#Ip8v~8vHrdm zA%+P4_Ps+Zy)LUxM!JmIsrj$f)Qh7_E-LDFS68|Mg&6Xpub+3u-ZMXrAL>`e+_CLC z{o88!4$oP=c^`;Wef*ux9uIvG0N9)Ig%r`q`S+jy-K#NX+%`1TRHH?-`K3X`UYy;3 zVgH4ROpC`POb~CEHJiM>`eZ@rhp+daXFE0W(d6y?=U?$YHPd#fM065t5YdPfGBp=2 znvSG^dn;H@7xtg;fBt>Ct4Jt~dp&#p|NZYj z*SXg4{42NRv9)7KB|SNO+qd<*nD+Vo`}g>4H_qc~w|(26s|f(A*IX}`IMS)juI!aD Hk4FUns)jFk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/cgm/sounds/grenade_hit_wood.ogg b/src/main/resources/assets/cgm/sounds/grenade_hit_wood.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fc03770b7e296936868718f886ec52baabe11c90 GIT binary patch literal 9611 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 literal 0 HcmV?d00001 From 5ce8f8dc17e9300f26d5e0e48781962c2e68347e Mon Sep 17 00:00:00 2001 From: Phylogeny Date: Tue, 27 Nov 2018 06:50:41 -0800 Subject: [PATCH 2/2] Made the volume of grenade hit sounds decrease with speed. --- .../java/com/mrcrayfish/guns/entity/EntityThrowableItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/mrcrayfish/guns/entity/EntityThrowableItem.java b/src/main/java/com/mrcrayfish/guns/entity/EntityThrowableItem.java index 01f9afb29..284746a28 100644 --- a/src/main/java/com/mrcrayfish/guns/entity/EntityThrowableItem.java +++ b/src/main/java/com/mrcrayfish/guns/entity/EntityThrowableItem.java @@ -115,7 +115,7 @@ else if (event == SoundEvents.BLOCK_GLASS_STEP) else if (event == SoundEvents.BLOCK_WOOD_STEP || event == SoundEvents.BLOCK_LADDER_STEP) event = ModSounds.getSound("grenade_hit_wood"); - world.playSound(null, result.hitVec.x, result.hitVec.y, result.hitVec.z, event, SoundCategory.AMBIENT, 1.0F, pitch); + world.playSound(null, result.hitVec.x, result.hitVec.y, result.hitVec.z, event, SoundCategory.AMBIENT, (float) Math.min(1, speed), pitch); } EnumFacing facing = result.sideHit; switch(facing.getAxis())