From 25916f920d8e018b3e879359f836aafeb9e74417 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 14 May 2022 22:31:43 +0700 Subject: [PATCH] Plasma rifle fire sound --- .../mc/otm/item/weapon/PlasmaRifleItem.kt | 11 ++++++++++ .../dbotthepony/mc/otm/registry/MRegistry.kt | 1 + .../mc/otm/registry/MSoundEvents.kt | 19 ++++++++++++++++++ .../overdrive_that_matters/lang/en_us.json | 1 + .../assets/overdrive_that_matters/sounds.json | 12 +++++++++++ .../sounds/item/rifle_shot.ogg | Bin 0 -> 7885 bytes 6 files changed, 44 insertions(+) create mode 100644 src/main/kotlin/ru/dbotthepony/mc/otm/registry/MSoundEvents.kt create mode 100644 src/main/resources/assets/overdrive_that_matters/sounds.json create mode 100644 src/main/resources/assets/overdrive_that_matters/sounds/item/rifle_shot.ogg diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt index 82b3da95b..b9ba3fcfe 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt @@ -1,5 +1,6 @@ package ru.dbotthepony.mc.otm.item.weapon +import net.minecraft.sounds.SoundSource import net.minecraft.util.Mth import net.minecraft.world.entity.Entity import net.minecraft.world.entity.player.Player @@ -9,6 +10,7 @@ import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.core.Vector import ru.dbotthepony.mc.otm.entity.PlasmaProjectile import ru.dbotthepony.mc.otm.position +import ru.dbotthepony.mc.otm.registry.MSoundEvents import java.util.* import kotlin.math.PI import kotlin.math.cos @@ -145,6 +147,15 @@ class PlasmaRifleItem : PlasmaWeaponItem(WeaponDataTable::class dt.doFireAnim(deviation = rotFireAnimDeviation) } + player.level.playSound( + player, + player, + MSoundEvents.RIFLE_SHOT, + SoundSource.NEUTRAL, + 1f, + 1f + ) + return true } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index bfc8326c6..0961cf185 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -104,6 +104,7 @@ object MRegistry { MItems.register() AndroidFeatures.register() AndroidResearch.register() + MSoundEvents.register() } private fun register(event: NewRegistryEvent) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MSoundEvents.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MSoundEvents.kt new file mode 100644 index 000000000..58f759899 --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MSoundEvents.kt @@ -0,0 +1,19 @@ +package ru.dbotthepony.mc.otm.registry + +import net.minecraft.resources.ResourceLocation +import net.minecraft.sounds.SoundEvent +import net.minecraft.world.entity.EntityType +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext +import net.minecraftforge.registries.DeferredRegister +import net.minecraftforge.registries.ForgeRegistries +import ru.dbotthepony.mc.otm.OverdriveThatMatters + +object MSoundEvents { + private val registry: DeferredRegister = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, OverdriveThatMatters.MOD_ID) + + val RIFLE_SHOT by registry.register("item.rifle_shot") { SoundEvent(ResourceLocation(OverdriveThatMatters.MOD_ID, "item.rifle_shot")) } + + internal fun register() { + registry.register(FMLJavaModLoadingContext.get().modEventBus) + } +} diff --git a/src/main/resources/assets/overdrive_that_matters/lang/en_us.json b/src/main/resources/assets/overdrive_that_matters/lang/en_us.json index 6a577c848..8dbf13b49 100644 --- a/src/main/resources/assets/overdrive_that_matters/lang/en_us.json +++ b/src/main/resources/assets/overdrive_that_matters/lang/en_us.json @@ -1,4 +1,5 @@ { + "otm.sound.rifle_shoot": "Plasma rifle fire", "itemGroup.otm": "Overdrive That Matters", "otm.pill.warning": "WARNING: This will INSTANTLY decommission you upon ingestion!", diff --git a/src/main/resources/assets/overdrive_that_matters/sounds.json b/src/main/resources/assets/overdrive_that_matters/sounds.json new file mode 100644 index 000000000..74cf34289 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/sounds.json @@ -0,0 +1,12 @@ +{ + "item.rifle_shot": { + "subtitle": "otm.sound.rifle_shoot", + "sounds": [ + { + "name": "overdrive_that_matters:item/rifle_shot", + "volume": 1.0, + "weight": 1 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/sounds/item/rifle_shot.ogg b/src/main/resources/assets/overdrive_that_matters/sounds/item/rifle_shot.ogg new file mode 100644 index 0000000000000000000000000000000000000000..82f78ecdf958302914d42ad36dc2bb1252adbc2a GIT binary patch literal 7885 zcmai32UJttvOWPq2WcW;z|e%yLs5b#MNkr&1cE?7YUn+HilU)P7a<^0lomP&LAoH) zr1v645m8Z!4X}&v1pfct|J}FNeP?ZU_Sv)d%$}KV=FDE0y1AJHbiiManq?>pZTRI4 zh65r33GoYb@*vVCAbORwAMm*d+52gNn9_Fs>!IzWQHVWve{$*n`Cm^z{XQc#kZ$GS z@2+4P=mz)paI)NE4@bk5m5}O6D#&ASX%oMTaHNuwB;1v7kq`(cx)Z#;i3pk$2y~wb zLie;K1YibdkVfzx(pU-(0Js3aK?1><=88s8$obNjGsy7}I5w ze=vbDLQY#cSGO_RT_uj7R&)O9SoZXQgJ;oY6m;RzWu~!@MHFWSf~@w{f&(N_P2lV; zK6EYLU@dHTT*CCToEfj$xQf2Hg)t6%g6+16S#Z=M(E;N(CSyIIisfFlbSI=sX><0IW z2A@Hy+#r>GZwUYam(ZR(kF4VV(_F1H2>*Z6cJGq`v_V@w34lEbkkH3UJPDLz+Ou#U z0QyuLE7udKdX}jAgs2I&vq5_OWTWA2qXU0Cf#!Aq&_=>~0$}~1HL&uNfokW8CufPq zv!E$x7WwZ__#R$BMMQI5GdxMmDk+Y8W+8!W1@f6sv+qj+7sTejf@h6oZ4IM1vtH+w z@nugwj zn!^Dgifa$We|LLO-bZm!YP`&Vbls5hpd78M>>ANnuj%4C&5i_7ET;ydIH~^4U1BxL zz>88pV;|aOp&#IK2kpiW22b)6%#Ybksu3n}gy|5% zTmu2$7-rq@SHSFt&C+b}KO%<~B4ViI6@yfUe@9N9bn;8}WN~z=gmvoC%NcHQS!H+b zzAGzW{g23Tk1xrLFNuv`jZK!0%kYTHDsL|E9;jY#`G4ELBIj(N1lYjH(GQgPN91%M zVW+`pqRJU>?dy1Q95iT<{-J+50025t*bVpch#6LX8ml&qmB(3}{O=J1Qm0joCsjei zrUQT=0EmN5j^c_BOwsi{X~m3uBLU4vG3Iv*M3r!Ly(PBx{Yy4bf~V5JZ0 z8AT>Z9#4jIbQas9U#l~NX^#Og0{{}T57{jcID+oa(;GpuAcQ~9Mh2o0C)!k{L__Ibu%mRW&mU+#oM*+5)%0Z;We@H0Cun-nPK;>f;XLCNqq2^**Dj zggFb`Gk)B317U&x+WCy&B^6_9@O1{H2G3@M+0XdcW&Xv=m~W5OG2Co}npqIe3`elG zz*&b7tiR&U&x9F*RCD9GgE(9RZf?g1ml3ucgtI$OnEQ&e=D&uYjb8o|wk$y7JUbl> zQXOXqj*Y=f(jHkJo&}}lS<>a@W#tV%<<(XAg16-bivpp?{$z`U0P0+ zD=(L;pjQ4Yms@WrEpMqBpw?tpSFAUDVC#}wZ}Bg$uCAbN(5Nj{>%9T%ElO955rf4Q zYb|9hExzk50YeQwu)^}ScA3G>ngQyE^%lhk!J=lk;AdpJmGht;KK2*y;=e{yeNH^8 z`Z)kHnD~Yo^@BBo+v1`=|qRcv9-eP3Bdy%u@{erl|I2`;?P z&hq3Yhz$r08@vPB`J%FPBy|YDD7wmL&Lz_W58}eE!HX=AjG{ynOb?8F4&y0Go|5T> zTO_0Va?*G(?g;V(mMNcd4&#+ip22$67Ed{C!i)GZ9`fV~8_%-dDVs!YXD;Q{B9{>~ z3*`Zg0J2)mE8^6}P>T2rG4hr}Adm|ubPURhc+Amd^&l%s5x*e@*}#YQMb5y$9Ys8N zG@_T!+(*7QOS~5jvg)S^-;?n=lMJ%D6Pb#^RHdh4hjP+rtRj;!XhcIQ#t1wW22&f2 zwed#I zfHsMRkVi`)w6N8Q#g3poxB`bzGAz17D5ATXSwDh8AbMs{%#sv-LmBxV zOD_Zh)IuJtJNCks(KxOL!pdRI0_cHJ+zSWu4x=DNAaYEgh|ifzj3NN~g~I0y+E#$b zsVgJsJfb6wh&qRnK}2(5(2^9e)MbT%^_=$@*$M_8Xg`lQusg9MW8gs+$}-$hMi{BG zaL}Sv!5|bUJwrC0RS%wOGgn2=C>u(GP;jm4&a{yQfDQ0K8+&;~5=dbJv;_)5xhOX- zry4F5X-ph{!I|_M%M!;g;!NEBMC5T2K zV_5+}#viPRYRp`S5x4TdoJj{ENKL?%?2EV zhPPS>7YM6fo70%89xJbEQOb-{rP?eA;`%pPUKo(zHQWpUi%=$@hW@brF)0BS8C91( zB}j14jETq?KBsu(YR+k9L{BDI;}i?fN)PZOORGN;K?3;N3ldPPFj|*GO#XLa^6wFN zllVVMl!0{?wixfs@Lp9Qg7@q>pm0$qbc!5Xvl1J3fI3?DD_6IY>j8lTzj13#`!q*=l8Po*Cq!-n7j=$LR zwJ2C@>+V^bb}_($zR07YMN|(1qKbwQ(J0Uj`*Tq#|C-~{Slx#f2&mQlb>wrpd(dLe z2j>vNAjqWmMv~x&Wxs&i17j2qSjv$>&iiv@9#F_|Y>AP+6)_Q5SsyY4-YwzGfD)IeO1L(J zPoNJJ6vco5@@hK9khTmAuXvPM*;$`N5hpz80j{V%_FJ)5>^!{X;RQ|_fR(L79}|f^ zDd|B1+gs%hsNG^PJPOVr8ruWmOCd$_`d)g;VcPVVMMIy$xqlUg03ra8$^jP>%R(h{ z-aL@Pb&ETdCykd3!WRHuKu8Awk_0q1Hr6${uxo{0LeC|tsQVRzZ*Q$Rj$Y-*~juC6I=xtE<+UP!H=R@Bz&vC_ci z8QTuh`Z1w)^VkpbP}a8GZ!MW)me};h;ugB@Q``q?B*dRCouH@OXx;tda!^HG%VuD@ z(fs(29?^G26_aPLn-ri9DQ%vdI!H$r8I0wYTECmguucyMM?e}|ar!FFGs#mPrtf9b zWFvKllOFipc;%3zA~ppO`*I2tE7_0Kb%El`PXgd{6e_hgANsZ)G&G zaj^DlA1R&t6gY8|^1L`gs`=gfot4|at<|_LP z7mrRAJW7ky{nC-oROzWxtd{Wc($)#rvT|-b8SjLliViV$+-U*cRPnr+79xG@A^;NI zU+@+Hu)BUR9qNEi8I zvfo=O=8-$8DFX(+BSfd$UYt-_||vnX$7SU|z1O1oaAiH2G=UyHZ78BRn6U zBr3#DpS1aq6|KPwqo+2T)uPj7WG6L-+AV)vtve(b;ea`j*Fl>3M(@_{D~o^s%0#7$ zYGBDVG|l19X53_@efCtu`1@&+u*khjrpMVZ8tpz%;Mzu2G&J^1K+;T*sYi?ga5zZG z}o8!FL*X|?X!7d4RIieXCL)7>L9+7~z zRruhs>lJH7(!i<8q-Y94+#oc%Y`IOu;f5E4!@X;nRZ^sXg21h9PWZ_?9Bl2WO8!V~ zbt}1eTfxUBv`xicBG;vIaX!`DYGSThR03cAQlp*FI&AZJ$6oX16j8tQvPa2F?1dV{ zBHO`?*-tH|K2IOB&u*|Cs#r9RpOrO~)<%kQw;i8)ajFxaw;>`DGo_ZIaY$aCZ=hab z$u1IMWfraK_G#x6r?wyTIZ$B9y*)g^xWzVvK58pM67^dZ0)T5L(oINXH>85j6+XEw z_b#L30Mk4xS?Y=ex{lc)(h@&;cr^P;q?w1$@2&7guZ%6G;+Vkk5KQhz6ICOfZ$av7 z=yR^izVRlN1z-Hd7_YBuL|hYjnb3-B5dM|3(2p%hYe=t6kZYql5(#>d2aX+;7lW04MVJ+(i&xFWQLJ>R1E0F%8wov~E z1eE3l75HJ-b3%ajnrWZm_xP*fER5f4+#wbR1UN5*Li_YyJEso#SuX$PtnoX`Vk5|} zWD@6i(+JH7xbK?#T0U+HXous2eonTIUJncYSzpn3;H;-sr6@59P1O>bn?XNaYyWNf z#i##l?Fp5;S5M9`D1FYH4Z%BdF$Pc@HY>i}Jxyn@(N}&k^X&}wg1qMa780W*Pcj<;9ORB4y?YA^1=30i8XAOtuN#R|&o|2c391iIf#*(%H+tUL z^vy!GopR4?rc{kYJTqvYYao#+FXN#6rFx+sc9;+m0g~U-*oqB)ULMZzh?eO&ZFSkh zO453V^`36WpGzxSrfO54{BAjO%=k4$6x!M@WF74~B2PUJH~N_QaJ{5WCgO;Zzi`wG zHaOb{O%panPD_L2?odS)L6R_VcYv&LbV@tnK;JHYzFE7|!uaJ06{ibaBX0FoQbu2JN%N?6^@S<%2q4_ zXSH_1?oCZVNGw|?uN0R~^i1~O&c}|P(zf566ZWdQEs&z*3&e?{_p z2j51a5{v*FT7F(jcTHoOa`qeKu_C@{IB9-TlbI~RKc(_nN(k-^p-wA14 zwfHUQ)9=#R&^8ZgRl2a}l?1M&_pQ9)3KIT-WcxHhEA-^Cw+{Ilg_j@dt59=+*)GaR z*GD>DEACilHkY@h;(tD6Kt#NJh>GLmq;H4)D^`qvdCypr9RWVz!eDlo2zB!MY{q%c z#hX_iomvva-3Ynu6>4CsxAlcxTukse^XG*WmY9>mbw1Z@ei8?p{1iv(TecoF>z{r( zX(~6VXE(rqKW;bDTZg&mD5a;kR_M6tx$_%5(JObNqt#&I@6ig3*}G=p)e6^Ilnn{$ zdL`>&gR0NmcaPgYzRE&TIlyqrGpU|QaL zwrm?BsoC`DhSrg1b>!1ZyT6>=&Uvg(#(sV#?m749NFmW&GgMY2!KPo|UY#uk(h&Z| zeCD%5d!6)~vSVDNq~|xTA-{9HHDIqn!$drjt|bl(N<@oX(qgh=QSGp*I&!kW;T_((vZxk7uG!=hzhvq8 zDX|OPSxpmkp?2oQdR{uHe(w&Y0rzR+p@hYI#mnTekFNL+p+k=~<6M^@ z-S~)*N@%IvA#t{6wjK##I-%whvzFHKNdG{}y=x&iylxfYnPwSZuBKOACrsqu4eI4?A1H;_ z$UhehyKHMX@B0RJ;2wVx+>-rGcY4k97frSv+B!_{#WedJ)332ykIQWr z+##@EB|&W;-iK_{rA5|0EK0RNbV54(UA!xI%HZ}d44ydn{V_)W$wmo3x^aq_pUW0> zG`k+ty)LZsdvXD_Lnl6#ce544KZ46{k<-% z-c#yj%9_bZt8in^xA_`%NY+kt8`<6ZZ4Bh1mbBIte<(K}?8a9n{v}gawd0DVjotH0 z{FNHZ-@JLhiY{lFZ6r>z^u)xC_@fXoP*B75EX=8^MpPUi<%(ib=Ezj<26TH97ud8e2C z_W9=BvB|w%a#Z89gI9YKiO{h8%})L&L+0DV{Uc!oc)yhuGTp=7#2Bq`{$HJl+hRI} zYs@i_9b~s!O%uV}CGCWOZ6y9$9#N)5siK2(7yDCZT&kni9k}4(O@W^2fZEy*WU+9G zR2Upq^ME)k^cG*=y8cA)`zeJhbsVkT`1YaDgtR+~_chmjhJq}50uYYEYnOgk)(6lj zciLIv;%E8&G;XyN%T@TKY_@YB()+L>FP1|+)NJMN<&M@x^m4w7@AB}=lXGYPcnJE; z&0zcVb=iU-6V29~NaC+|?(~~__xu?gJVhBCd)Hs_bMvJJBKQ^6yKZ(htvt~t{xS^U z@Sgk4zsZ#>%(?3}IgiOVr!<(;y|cf(MmbFCpc7{+DxdYlqFH^ zvxXtxkg;}@$9d{0qeYlUeWs`e6}hd?7efxQP13QkerogP$`&-Lad{M)lD6jw6YfjjvjP9D-)Cx}$8~H{U;^I4xOG+jb>?#zzf55H> z47R-8e9Y9iL1|Ojary8q&1>#Y`+SC`t(x~*@RH`&oh+G<`=95YsnieL`1Kge^V+s0 z7nkT_+H@uBL*rO(l6AGB;>4+ma7|3^)#fh;ep*=y*cIP~0QJYLj|iMg(c@^tjIxpP0TEZ* zkuAQ?rwbn9+mMcne(< XY|j>p6n(im{wjJFzGCIy0tNmDMv|!0 literal 0 HcmV?d00001