From c6c82d1f1ba3b920939d52d23ef76445e887c4e4 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Fri, 10 May 2024 01:06:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8C=96=E9=9F=B3=E6=95=88?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mcreator/target/init/TargetModSounds.java | 68 ++--- .../target/procedures/NormalMagGunFire.java | 254 ------------------ ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 2 +- src/main/resources/assets/target/sounds.json | 136 +++++----- .../{m60/m60_far.ogg => m_60/m_60_far.ogg} | Bin .../m60_fire_1p.ogg => m_60/m_60_fire_1p.ogg} | Bin .../m60_fire_3p.ogg => m_60/m_60_fire_3p.ogg} | Bin .../m_60_reload_empty.ogg} | Bin .../m_60_reload_normal.ogg} | Bin .../m60_veryfar.ogg => m_60/m_60_veryfar.ogg} | Bin .../{m79/m79_far.ogg => m_79/m_79_far.ogg} | Bin .../m79_fire_1p.ogg => m_79/m_79_fire_1p.ogg} | Bin .../m79_fire_3p.ogg => m_79/m_79_fire_3p.ogg} | Bin .../m79_reload.ogg => m_79/m_79_reload.ogg} | Bin .../m79_veryfar.ogg => m_79/m_79_veryfar.ogg} | Bin .../m870_far.ogg => m_870/m_870_far.ogg} | Bin .../m_870_fire_1p.ogg} | Bin .../m_870_fire_3p.ogg} | Bin .../m_870_preparealt.ogg} | Bin .../m_870_reload_loop.ogg} | Bin .../m_870_veryfar.ogg} | Bin .../m98b_far.ogg => m_98b/m_98b_far.ogg} | Bin .../m_98b_fire_1p.ogg} | Bin .../m_98b_fire_3p.ogg} | Bin .../m_98b_reload_empty.ogg} | Bin .../m_98b_reload_normal.ogg} | Bin .../m_98b_veryfar.ogg} | Bin .../mk14_far.ogg => mk_14/mk_14_far.ogg} | Bin .../mk_14_fire_1p.ogg} | Bin .../mk_14_fire_3p.ogg} | Bin .../mk_14_reload_empty.ogg} | Bin .../mk_14_reload_normal.ogg} | Bin .../mk_14_veryfar.ogg} | Bin .../rpg/{rpg7_fire_1p.ogg => rpg_fire_1p.ogg} | Bin .../rpg/{rpg7_fire_3p.ogg => rpg_fire_3p.ogg} | Bin .../rpg/{rpg7_reload.ogg => rpg_reload.ogg} | Bin 36 files changed, 103 insertions(+), 357 deletions(-) delete mode 100644 src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java rename src/main/resources/assets/target/sounds/{m60/m60_far.ogg => m_60/m_60_far.ogg} (100%) rename src/main/resources/assets/target/sounds/{m60/m60_fire_1p.ogg => m_60/m_60_fire_1p.ogg} (100%) rename src/main/resources/assets/target/sounds/{m60/m60_fire_3p.ogg => m_60/m_60_fire_3p.ogg} (100%) rename src/main/resources/assets/target/sounds/{m60/m60_reload_empty.ogg => m_60/m_60_reload_empty.ogg} (100%) rename src/main/resources/assets/target/sounds/{m60/m60_reload_normal.ogg => m_60/m_60_reload_normal.ogg} (100%) rename src/main/resources/assets/target/sounds/{m60/m60_veryfar.ogg => m_60/m_60_veryfar.ogg} (100%) rename src/main/resources/assets/target/sounds/{m79/m79_far.ogg => m_79/m_79_far.ogg} (100%) rename src/main/resources/assets/target/sounds/{m79/m79_fire_1p.ogg => m_79/m_79_fire_1p.ogg} (100%) rename src/main/resources/assets/target/sounds/{m79/m79_fire_3p.ogg => m_79/m_79_fire_3p.ogg} (100%) rename src/main/resources/assets/target/sounds/{m79/m79_reload.ogg => m_79/m_79_reload.ogg} (100%) rename src/main/resources/assets/target/sounds/{m79/m79_veryfar.ogg => m_79/m_79_veryfar.ogg} (100%) rename src/main/resources/assets/target/sounds/{m870/m870_far.ogg => m_870/m_870_far.ogg} (100%) rename src/main/resources/assets/target/sounds/{m870/m870_fire_1p.ogg => m_870/m_870_fire_1p.ogg} (100%) rename src/main/resources/assets/target/sounds/{m870/m870_fire_3p.ogg => m_870/m_870_fire_3p.ogg} (100%) rename src/main/resources/assets/target/sounds/{m870/m870_preparealt.ogg => m_870/m_870_preparealt.ogg} (100%) rename src/main/resources/assets/target/sounds/{m870/m870_reload_loop.ogg => m_870/m_870_reload_loop.ogg} (100%) rename src/main/resources/assets/target/sounds/{m870/m870_veryfar.ogg => m_870/m_870_veryfar.ogg} (100%) rename src/main/resources/assets/target/sounds/{m98b/m98b_far.ogg => m_98b/m_98b_far.ogg} (100%) rename src/main/resources/assets/target/sounds/{m98b/m98b_fire_1p.ogg => m_98b/m_98b_fire_1p.ogg} (100%) rename src/main/resources/assets/target/sounds/{m98b/m98b_fire_3p.ogg => m_98b/m_98b_fire_3p.ogg} (100%) rename src/main/resources/assets/target/sounds/{m98b/m98b_reload_empty.ogg => m_98b/m_98b_reload_empty.ogg} (100%) rename src/main/resources/assets/target/sounds/{m98b/m98b_reload_normal.ogg => m_98b/m_98b_reload_normal.ogg} (100%) rename src/main/resources/assets/target/sounds/{m98b/m98b_veryfar.ogg => m_98b/m_98b_veryfar.ogg} (100%) rename src/main/resources/assets/target/sounds/{mk14/mk14_far.ogg => mk_14/mk_14_far.ogg} (100%) rename src/main/resources/assets/target/sounds/{mk14/mk14_fire_1p.ogg => mk_14/mk_14_fire_1p.ogg} (100%) rename src/main/resources/assets/target/sounds/{mk14/mk14_fire_3p.ogg => mk_14/mk_14_fire_3p.ogg} (100%) rename src/main/resources/assets/target/sounds/{mk14/mk14_reload_empty.ogg => mk_14/mk_14_reload_empty.ogg} (100%) rename src/main/resources/assets/target/sounds/{mk14/mk14_reload_normal.ogg => mk_14/mk_14_reload_normal.ogg} (100%) rename src/main/resources/assets/target/sounds/{mk14/mk14_veryfar.ogg => mk_14/mk_14_veryfar.ogg} (100%) rename src/main/resources/assets/target/sounds/rpg/{rpg7_fire_1p.ogg => rpg_fire_1p.ogg} (100%) rename src/main/resources/assets/target/sounds/rpg/{rpg7_fire_3p.ogg => rpg_fire_3p.ogg} (100%) rename src/main/resources/assets/target/sounds/rpg/{rpg7_reload.ogg => rpg_reload.ogg} (100%) diff --git a/src/main/java/net/mcreator/target/init/TargetModSounds.java b/src/main/java/net/mcreator/target/init/TargetModSounds.java index ca7d60241..0f6f7289f 100644 --- a/src/main/java/net/mcreator/target/init/TargetModSounds.java +++ b/src/main/java/net/mcreator/target/init/TargetModSounds.java @@ -37,11 +37,11 @@ public class TargetModSounds { public static final RegistryObject STEP = REGISTRY.register("step", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "step"))); public static final RegistryObject GROWL = REGISTRY.register("growl", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "growl"))); public static final RegistryObject IDLE = REGISTRY.register("idle", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "idle"))); - public static final RegistryObject M79_FIRE_1P = REGISTRY.register("m79_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m79_fire_1p"))); - public static final RegistryObject M79_FIRE_3P = REGISTRY.register("m79_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m79_fire_3p"))); - public static final RegistryObject M79_FAR = REGISTRY.register("m79_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m79_far"))); - public static final RegistryObject M79_VERYFAR = REGISTRY.register("m79_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m79_veryfar"))); - public static final RegistryObject M79_RELOAD = REGISTRY.register("m79_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m79_reload"))); + public static final RegistryObject M_79_FIRE_1P = REGISTRY.register("m_79_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_fire_1p"))); + public static final RegistryObject M_79_FIRE_3P = REGISTRY.register("m_79_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_fire_3p"))); + public static final RegistryObject M_79_FAR = REGISTRY.register("m_79_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_far"))); + public static final RegistryObject M_79_VERYFAR = REGISTRY.register("m_79_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_veryfar"))); + public static final RegistryObject M_79_RELOAD = REGISTRY.register("m_79_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_79_reload"))); public static final RegistryObject SKS_FIRE_1P = REGISTRY.register("sks_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_fire_1p"))); public static final RegistryObject SKS_FIRE_3P = REGISTRY.register("sks_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_fire_3p"))); public static final RegistryObject SKS_RELOAD_NORMAL = REGISTRY.register("sks_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_reload_normal"))); @@ -69,11 +69,11 @@ public class TargetModSounds { public static final RegistryObject DEVOTION_VERYFAR = REGISTRY.register("devotion_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_veryfar"))); public static final RegistryObject DEVOTION_RELOAD_NORMAL = REGISTRY.register("devotion_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_reload_normal"))); public static final RegistryObject DEVOTION_RELOAD_EMPTY = REGISTRY.register("devotion_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_reload_empty"))); - public static final RegistryObject RPG7_FIRE_1P = REGISTRY.register("rpg7_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg7_fire_1p"))); - public static final RegistryObject RPG7_FIRE_3P = REGISTRY.register("rpg7_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg7_fire_3p"))); - public static final RegistryObject RPG7_FAR = REGISTRY.register("rpg7_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg7_far"))); - public static final RegistryObject RPG7_VERYFAR = REGISTRY.register("rpg7_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg7_veryfar"))); - public static final RegistryObject RPG7_RELOAD = REGISTRY.register("rpg7_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg7_reload"))); + public static final RegistryObject RPG_FIRE_1P = REGISTRY.register("rpg_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_fire_1p"))); + public static final RegistryObject RPG_FIRE_3P = REGISTRY.register("rpg_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_fire_3p"))); + public static final RegistryObject RPG_FAR = REGISTRY.register("rpg_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_far"))); + public static final RegistryObject RPG_VERYFAR = REGISTRY.register("rpg_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_veryfar"))); + public static final RegistryObject RPG_RELOAD = REGISTRY.register("rpg_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg_reload"))); public static final RegistryObject MORTAR_FIRE = REGISTRY.register("mortar_fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_fire"))); public static final RegistryObject MORTAR_LOAD = REGISTRY.register("mortar_load", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_load"))); public static final RegistryObject MORTAR_DISTANT = REGISTRY.register("mortar_distant", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_distant"))); @@ -126,12 +126,12 @@ public class TargetModSounds { public static final RegistryObject MINIGUN_VERYFAR = REGISTRY.register("minigun_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_veryfar"))); public static final RegistryObject MINIGUN_ROT = REGISTRY.register("minigun_rot", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_rot"))); public static final RegistryObject MINIGUN_OVERHEAT = REGISTRY.register("minigun_overheat", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_overheat"))); - public static final RegistryObject MK14_FIRE_1P = REGISTRY.register("mk14_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk14_fire_1p"))); - public static final RegistryObject MK14_FIRE_3P = REGISTRY.register("mk14_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk14_fire_3p"))); - public static final RegistryObject MK14_FAR = REGISTRY.register("mk14_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk14_far"))); - public static final RegistryObject MK14_VERYFAR = REGISTRY.register("mk14_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk14_veryfar"))); - public static final RegistryObject MK14_RELOAD_NORMAL = REGISTRY.register("mk14_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk14_reload_normal"))); - public static final RegistryObject MK14_RELOAD_EMPTY = REGISTRY.register("mk14_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk14_reload_empty"))); + public static final RegistryObject MK_14_FIRE_1P = REGISTRY.register("mk_14_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_fire_1p"))); + public static final RegistryObject MK_14_FIRE_3P = REGISTRY.register("mk_14_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_fire_3p"))); + public static final RegistryObject MK_14_FAR = REGISTRY.register("mk_14_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_far"))); + public static final RegistryObject MK_14_VERYFAR = REGISTRY.register("mk_14_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_veryfar"))); + public static final RegistryObject MK_14_RELOAD_NORMAL = REGISTRY.register("mk_14_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_reload_normal"))); + public static final RegistryObject MK_14_RELOAD_EMPTY = REGISTRY.register("mk_14_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk_14_reload_empty"))); public static final RegistryObject SENTINEL_FIRE_1P = REGISTRY.register("sentinel_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_fire_1p"))); public static final RegistryObject SENTINEL_FIRE_3P = REGISTRY.register("sentinel_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_fire_3p"))); public static final RegistryObject SENTINEL_CHARGE_FIRE_1P = REGISTRY.register("sentinel_charge_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge_fire_1p"))); @@ -143,12 +143,12 @@ public class TargetModSounds { public static final RegistryObject SENTINEL_RELOAD_NORMAL = REGISTRY.register("sentinel_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_reload_normal"))); public static final RegistryObject SENTINEL_RELOAD_EMPTY = REGISTRY.register("sentinel_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_reload_empty"))); public static final RegistryObject SENTINEL_CHARGE = REGISTRY.register("sentinel_charge", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge"))); - public static final RegistryObject M60_FIRE_1P = REGISTRY.register("m60_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m60_fire_1p"))); - public static final RegistryObject M60_FIRE_3P = REGISTRY.register("m60_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m60_fire_3p"))); - public static final RegistryObject M60_FAR = REGISTRY.register("m60_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m60_far"))); - public static final RegistryObject M60_VERYFAR = REGISTRY.register("m60_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m60_veryfar"))); - public static final RegistryObject M60_RELOAD_NORMAL = REGISTRY.register("m60_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m60_reload_normal"))); - public static final RegistryObject M60_RELOAD_EMPTY = REGISTRY.register("m60_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m60_reload_empty"))); + public static final RegistryObject M_60_FIRE_1P = REGISTRY.register("m_60_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_fire_1p"))); + public static final RegistryObject M_60_FIRE_3P = REGISTRY.register("m_60_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_fire_3p"))); + public static final RegistryObject M_60_FAR = REGISTRY.register("m_60_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_far"))); + public static final RegistryObject M_60_VERYFAR = REGISTRY.register("m_60_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_veryfar"))); + public static final RegistryObject M_60_RELOAD_NORMAL = REGISTRY.register("m_60_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_reload_normal"))); + public static final RegistryObject M_60_RELOAD_EMPTY = REGISTRY.register("m_60_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_60_reload_empty"))); public static final RegistryObject LIGHTSABER = REGISTRY.register("lightsaber", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "lightsaber"))); public static final RegistryObject SVD_FIRE_1P = REGISTRY.register("svd_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_fire_1p"))); public static final RegistryObject SVD_FIRE_3P = REGISTRY.register("svd_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_fire_3p"))); @@ -156,12 +156,12 @@ public class TargetModSounds { public static final RegistryObject SVD_VERYFAR = REGISTRY.register("svd_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_veryfar"))); public static final RegistryObject SVD_RELOAD_NORMAL = REGISTRY.register("svd_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_reload_normal"))); public static final RegistryObject SVD_RELOAD_EMPTY = REGISTRY.register("svd_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_reload_empty"))); - public static final RegistryObject M98B_FIRE_1P = REGISTRY.register("m98b_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m98b_fire_1p"))); - public static final RegistryObject M98B_FIRE_3P = REGISTRY.register("m98b_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m98b_fire_3p"))); - public static final RegistryObject M98B_FAR = REGISTRY.register("m98b_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m98b_far"))); - public static final RegistryObject M98B_VERYFAR = REGISTRY.register("m98b_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m98b_veryfar"))); - public static final RegistryObject M98B_RELOAD_NORMAL = REGISTRY.register("m98b_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m98b_reload_normal"))); - public static final RegistryObject M98B_RELOAD_EMPTY = REGISTRY.register("m98b_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m98b_reload_empty"))); + public static final RegistryObject M_98B_FIRE_1P = REGISTRY.register("m_98b_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_fire_1p"))); + public static final RegistryObject M_98B_FIRE_3P = REGISTRY.register("m_98b_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_fire_3p"))); + public static final RegistryObject M_98B_FAR = REGISTRY.register("m_98b_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_far"))); + public static final RegistryObject M_98B_VERYFAR = REGISTRY.register("m_98b_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_veryfar"))); + public static final RegistryObject M_98B_RELOAD_NORMAL = REGISTRY.register("m_98b_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_reload_normal"))); + public static final RegistryObject M_98B_RELOAD_EMPTY = REGISTRY.register("m_98b_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_98b_reload_empty"))); public static final RegistryObject MARLIN_FIRE_1P = REGISTRY.register("marlin_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_fire_1p"))); public static final RegistryObject MARLIN_FIRE_3P = REGISTRY.register("marlin_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_fire_3p"))); public static final RegistryObject MARLIN_FAR = REGISTRY.register("marlin_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_far"))); @@ -169,11 +169,11 @@ public class TargetModSounds { public static final RegistryObject MARLIN_LOOP = REGISTRY.register("marlin_loop", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_loop"))); public static final RegistryObject MARLIN_START = REGISTRY.register("marlin_start", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_start"))); public static final RegistryObject MARLIN_END = REGISTRY.register("marlin_end", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_end"))); - public static final RegistryObject M870_FIRE_1P = REGISTRY.register("m870_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m870_fire_1p"))); - public static final RegistryObject M870_FIRE_3P = REGISTRY.register("m870_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m870_fire_3p"))); - public static final RegistryObject M870_FAR = REGISTRY.register("m870_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m870_far"))); - public static final RegistryObject M870_VERYFAR = REGISTRY.register("m870_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m870_veryfar"))); - public static final RegistryObject M870_PREPAREALT = REGISTRY.register("m870_preparealt", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m870_preparealt"))); - public static final RegistryObject M870_RELOADLOOP = REGISTRY.register("m870_reloadloop", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m870_reloadloop"))); + public static final RegistryObject M_870_FIRE_1P = REGISTRY.register("m_870_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_fire_1p"))); + public static final RegistryObject M_870_FIRE_3P = REGISTRY.register("m_870_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_fire_3p"))); + public static final RegistryObject M_870_FAR = REGISTRY.register("m_870_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_far"))); + public static final RegistryObject M_870_VERYFAR = REGISTRY.register("m_870_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_veryfar"))); + public static final RegistryObject M_870_PREPAREALT = REGISTRY.register("m_870_preparealt", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_preparealt"))); + public static final RegistryObject M_870_RELOADLOOP = REGISTRY.register("m_870_reloadloop", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_870_reloadloop"))); public static final RegistryObject BULLETSUPPLY = REGISTRY.register("bulletsupply", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bulletsupply"))); } diff --git a/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java b/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java deleted file mode 100644 index b27ebe5c7..000000000 --- a/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java +++ /dev/null @@ -1,254 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.event.TickEvent; - -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.Entity; -import net.minecraft.tags.ItemTags; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.commands.CommandSource; - -import net.mcreator.target.init.TargetModItems; - -import javax.annotation.Nullable; - -@Mod.EventBusSubscriber -public class NormalMagGunFire { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event, event.player); - } - } - - public static void execute(Entity entity) { - execute(null, entity); - } - - private static void execute(@Nullable Event event, Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - double dam = 0; - usehand = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - if (usehand.is(ItemTags.create(new ResourceLocation("target:normal_mag_gun"))) - && entity.getPersistentData().getDouble("firing") == 1 - && usehand.getOrCreateTag().getDouble("reloading") == 0 - && usehand.getOrCreateTag().getDouble("ammo") > 0 - && !(entity instanceof Player _plrCldCheck5 - && _plrCldCheck5.getCooldowns().isOnCooldown(usehand.getItem())) - && !(usehand.getOrCreateTag().getDouble("firemode") == 1)) { - if (usehand.getOrCreateTag().getDouble("firemode") == 0) { - entity.getPersistentData().putDouble("firing", 0); - } - if (usehand.getOrCreateTag().getDouble("animindex") == 1) { - usehand.getOrCreateTag().putDouble("animindex", 0); - } else { - usehand.getOrCreateTag().putDouble("animindex", 1); - } - if (usehand.getOrCreateTag().getDouble("ammo") == 1) { - usehand.getOrCreateTag().putDouble("gj", 1); - } - usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); - usehand.getOrCreateTag().putDouble("firecooldown", 7); - usehand.getOrCreateTag().putDouble("fireanim", 2); - usehand.getOrCreateTag().putDouble("empty", 1); - - // TODO 修改后面的音效播放方法，使其成为通用方法 -// if (entity instanceof Player _player) -// _player.getCooldowns().addCooldown(usehand.getItem(), 2); -// for (int index0 = 0; index0 < (int) usehand.getOrCreateTag().getDouble("projectileamount"); index0++) { -// BulletFireNormalProcedure.execute(entity); -// } - if (usehand.getItem() == TargetModItems.AK_47.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.AA_12.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.DEVOTION.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.HK_416.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.M_4.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.M_60.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m60_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m60_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m60_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m60_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.SKS.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sks_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sks_fire_3p player @a ~ ~ ~ 5 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sks_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sks_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.MK_14.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:mk14_fire_1p player @a ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:mk14_fire_3p player @s ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:mk14_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:mk14_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.RPK.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:rpk_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:rpk_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:rpk_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:rpk_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.SVD.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:svd_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:svd_fire_3p player @a ~ ~ ~ 6 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:svd_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:svd_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.VECTOR.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:vector_fire_1p player @a ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:vector_fire_1p player @s ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:vector_far player @a ~ ~ ~ 6 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:vector_veryfar player @a ~ ~ ~ 12 1"); - } - } - } - if (usehand.getItem() == TargetModItems.TRACHELIUM.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:trachelium_fire_1p player @s ~ ~ ~ 2 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:trachelium_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:trachelium_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:trachelium_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - if (usehand.getItem() == TargetModItems.HUNTING_RIFLE.get()) { - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hunting_rifle_fire_1p player @s ~ ~ ~ 1 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hunting_rifle_fire_3p player @a ~ ~ ~ 4 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hunting_rifle_far player @a ~ ~ ~ 12 1"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hunting_rifle_veryfar player @a ~ ~ ~ 24 1"); - } - } - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 123a9a1e5..36f2d1a14 100644 --- a/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -29,7 +29,7 @@ public class TacRpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { Entity _ent = entity; if (!_ent.level().isClientSide() && _ent.getServer() != null) { _ent.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, _ent.position(), _ent.getRotationVector(), _ent.level() instanceof ServerLevel ? (ServerLevel) _ent.level() : null, 4, - _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:rpg7_reload player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:rpg_reload player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/resources/assets/target/sounds.json b/src/main/resources/assets/target/sounds.json index 3f608edb7..f9ecfac48 100644 --- a/src/main/resources/assets/target/sounds.json +++ b/src/main/resources/assets/target/sounds.json @@ -106,42 +106,42 @@ ] }, - "m79_fire_1p": { + "m_79_fire_1p": { "sounds": [ { - "name": "target:m79/m79_fire_1p", + "name": "target:m_79/m_79_fire_1p", "stream": false } ] }, - "m79_fire_3p": { + "m_79_fire_3p": { "sounds": [ { - "name": "target:m79/m79_fire_3p", + "name": "target:m_79/m_79_fire_3p", "stream": false } ] }, - "m79_far": { + "m_79_far": { "sounds": [ { - "name": "target:m79/m79_far", + "name": "target:m_79/m_79_far", "stream": false } ] }, - "m79_veryfar": { + "m_79_veryfar": { "sounds": [ { - "name": "target:m79/v_veryfar", + "name": "target:m_79/v_veryfar", "stream": false } ] }, - "m79_reload": { + "m_79_reload": { "sounds": [ { - "name": "target:m79/m79_reload", + "name": "target:m_79/m_79_reload", "stream": false } ] @@ -343,42 +343,42 @@ ] }, - "rpg7_fire_1p": { + "rpg_fire_1p": { "sounds": [ { - "name": "target:rpg/rpg7_fire_1p", + "name": "target:rpg/rpg_fire_1p", "stream": false } ] }, - "rpg7_fire_3p": { + "rpg_fire_3p": { "sounds": [ { - "name": "target:rpg/rpg7_fire_3p", + "name": "target:rpg/rpg_fire_3p", "stream": false } ] }, - "rpg7_far": { + "rpg_far": { "sounds": [ { - "name": "target:rpg/rpg7_far", + "name": "target:rpg/rpg_far", "stream": false } ] }, - "rpg7_veryfar": { + "rpg_veryfar": { "sounds": [ { - "name": "target:rpg/rpg7_veryfar", + "name": "target:rpg/rpg_veryfar", "stream": false } ] }, - "rpg7_reload": { + "rpg_reload": { "sounds": [ { - "name": "target:rpg/rpg7_reload", + "name": "target:rpg/rpg_reload", "stream": false } ] @@ -776,50 +776,50 @@ ] }, - "mk14_fire_1p": { + "mk_14_fire_1p": { "sounds": [ { - "name": "target:mk14/mk14_fire_1p", + "name": "target:mk_14/mk_14_fire_1p", "stream": false } ] }, - "mk14_fire_3p": { + "mk_14_fire_3p": { "sounds": [ { - "name": "target:mk14/mk14_fire_3p", + "name": "target:mk_14/mk_14_fire_3p", "stream": false } ] }, - "mk14_far": { + "mk_14_far": { "sounds": [ { - "name": "target:mk14/mk14_far", + "name": "target:mk_14/mk_14_far", "stream": false } ] }, - "mk14_veryfar": { + "mk_14_veryfar": { "sounds": [ { - "name": "target:mk14/mk14_veryfar", + "name": "target:mk_14/mk_14_veryfar", "stream": false } ] }, - "mk14_reload_normal": { + "mk_14_reload_normal": { "sounds": [ { - "name": "target:mk14/mk14_reload_normal", + "name": "target:mk_14/mk_14_reload_normal", "stream": false } ] }, - "mk14_reload_empty": { + "mk_14_reload_empty": { "sounds": [ { - "name": "target:mk14/mk14_reload_empty", + "name": "target:mk_14/mk_14_reload_empty", "stream": false } ] @@ -914,50 +914,50 @@ ] }, - "m60_fire_1p": { + "m_60_fire_1p": { "sounds": [ { - "name": "target:m60/m60_fire_1p", + "name": "target:m_60/m_60_fire_1p", "stream": false } ] }, - "m60_fire_3p": { + "m_60_fire_3p": { "sounds": [ { - "name": "target:m60/m60_fire_3p", + "name": "target:m_60/m_60_fire_3p", "stream": false } ] }, - "m60_far": { + "m_60_far": { "sounds": [ { - "name": "target:m60/m60_far", + "name": "target:m_60/m_60_far", "stream": false } ] }, - "m60_veryfar": { + "m_60_veryfar": { "sounds": [ { - "name": "target:m60/m60_veryfar", + "name": "target:m_60/m_60_veryfar", "stream": false } ] }, - "m60_reload_normal": { + "m_60_reload_normal": { "sounds": [ { - "name": "target:m60/m60_reload_normal", + "name": "target:m_60/m_60_reload_normal", "stream": false } ] }, - "m60_reload_empty": { + "m_60_reload_empty": { "sounds": [ { - "name": "target:m60/m60_reload_empty", + "name": "target:m_60/m_60_reload_empty", "stream": false } ] @@ -1012,50 +1012,50 @@ ] }, - "m98b_fire_1p": { + "m_98b_fire_1p": { "sounds": [ { - "name": "target:m98b/m98b_fire_1p", + "name": "target:m_98b/m_98b_fire_1p", "stream": false } ] }, - "m98b_fire_3p": { + "m_98b_fire_3p": { "sounds": [ { - "name": "target:m98b/m98b_fire_3p", + "name": "target:m_98b/m_98b_fire_3p", "stream": false } ] }, - "m98b_far": { + "m_98b_far": { "sounds": [ { - "name": "target:m98b/m98b_far", + "name": "target:m_98b/m_98b_far", "stream": false } ] }, - "m98b_veryfar": { + "m_98b_veryfar": { "sounds": [ { - "name": "target:m98b/m98b_veryfar", + "name": "target:m_98b/m_98b_veryfar", "stream": false } ] }, - "m98b_reload_normal": { + "m_98b_reload_normal": { "sounds": [ { - "name": "target:m98b/m98b_reload_normal", + "name": "target:m_98b/m_98b_reload_normal", "stream": false } ] }, - "m98b_reload_empty": { + "m_98b_reload_empty": { "sounds": [ { - "name": "target:m98b/m98b_reload_empty", + "name": "target:m_98b/m_98b_reload_empty", "stream": false } ] @@ -1118,50 +1118,50 @@ ] }, - "m870_fire_1p": { + "m_870_fire_1p": { "sounds": [ { - "name": "target:m870/m870_fire_1p", + "name": "target:m_870/m_870_fire_1p", "stream": false } ] }, - "m870_fire_3p": { + "m_870_fire_3p": { "sounds": [ { - "name": "target:m870/m870_fire_3p", + "name": "target:m_870/m_870_fire_3p", "stream": false } ] }, - "m870_far": { + "m_870_far": { "sounds": [ { - "name": "target:m870/m870_far", + "name": "target:m_870/m_870_far", "stream": false } ] }, - "m870_veryfar": { + "m_870_veryfar": { "sounds": [ { - "name": "target:m870/m870_veryfar", + "name": "target:m_870/m_870_veryfar", "stream": false } ] }, - "m870_preparealt": { + "m_870_preparealt": { "sounds": [ { - "name": "target:m870/m870_preparealt", + "name": "target:m_870/m_870_preparealt", "stream": false } ] }, - "m870_reloadloop": { + "m_870_reloadloop": { "sounds": [ { - "name": "target:m870/m870_reload_loop", + "name": "target:m_870/m_870_reload_loop", "stream": false } ] diff --git a/src/main/resources/assets/target/sounds/m60/m60_far.ogg b/src/main/resources/assets/target/sounds/m_60/m_60_far.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m60/m60_far.ogg rename to src/main/resources/assets/target/sounds/m_60/m_60_far.ogg diff --git a/src/main/resources/assets/target/sounds/m60/m60_fire_1p.ogg b/src/main/resources/assets/target/sounds/m_60/m_60_fire_1p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m60/m60_fire_1p.ogg rename to src/main/resources/assets/target/sounds/m_60/m_60_fire_1p.ogg diff --git a/src/main/resources/assets/target/sounds/m60/m60_fire_3p.ogg b/src/main/resources/assets/target/sounds/m_60/m_60_fire_3p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m60/m60_fire_3p.ogg rename to src/main/resources/assets/target/sounds/m_60/m_60_fire_3p.ogg diff --git a/src/main/resources/assets/target/sounds/m60/m60_reload_empty.ogg b/src/main/resources/assets/target/sounds/m_60/m_60_reload_empty.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m60/m60_reload_empty.ogg rename to src/main/resources/assets/target/sounds/m_60/m_60_reload_empty.ogg diff --git a/src/main/resources/assets/target/sounds/m60/m60_reload_normal.ogg b/src/main/resources/assets/target/sounds/m_60/m_60_reload_normal.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m60/m60_reload_normal.ogg rename to src/main/resources/assets/target/sounds/m_60/m_60_reload_normal.ogg diff --git a/src/main/resources/assets/target/sounds/m60/m60_veryfar.ogg b/src/main/resources/assets/target/sounds/m_60/m_60_veryfar.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m60/m60_veryfar.ogg rename to src/main/resources/assets/target/sounds/m_60/m_60_veryfar.ogg diff --git a/src/main/resources/assets/target/sounds/m79/m79_far.ogg b/src/main/resources/assets/target/sounds/m_79/m_79_far.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m79/m79_far.ogg rename to src/main/resources/assets/target/sounds/m_79/m_79_far.ogg diff --git a/src/main/resources/assets/target/sounds/m79/m79_fire_1p.ogg b/src/main/resources/assets/target/sounds/m_79/m_79_fire_1p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m79/m79_fire_1p.ogg rename to src/main/resources/assets/target/sounds/m_79/m_79_fire_1p.ogg diff --git a/src/main/resources/assets/target/sounds/m79/m79_fire_3p.ogg b/src/main/resources/assets/target/sounds/m_79/m_79_fire_3p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m79/m79_fire_3p.ogg rename to src/main/resources/assets/target/sounds/m_79/m_79_fire_3p.ogg diff --git a/src/main/resources/assets/target/sounds/m79/m79_reload.ogg b/src/main/resources/assets/target/sounds/m_79/m_79_reload.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m79/m79_reload.ogg rename to src/main/resources/assets/target/sounds/m_79/m_79_reload.ogg diff --git a/src/main/resources/assets/target/sounds/m79/m79_veryfar.ogg b/src/main/resources/assets/target/sounds/m_79/m_79_veryfar.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m79/m79_veryfar.ogg rename to src/main/resources/assets/target/sounds/m_79/m_79_veryfar.ogg diff --git a/src/main/resources/assets/target/sounds/m870/m870_far.ogg b/src/main/resources/assets/target/sounds/m_870/m_870_far.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m870/m870_far.ogg rename to src/main/resources/assets/target/sounds/m_870/m_870_far.ogg diff --git a/src/main/resources/assets/target/sounds/m870/m870_fire_1p.ogg b/src/main/resources/assets/target/sounds/m_870/m_870_fire_1p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m870/m870_fire_1p.ogg rename to src/main/resources/assets/target/sounds/m_870/m_870_fire_1p.ogg diff --git a/src/main/resources/assets/target/sounds/m870/m870_fire_3p.ogg b/src/main/resources/assets/target/sounds/m_870/m_870_fire_3p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m870/m870_fire_3p.ogg rename to src/main/resources/assets/target/sounds/m_870/m_870_fire_3p.ogg diff --git a/src/main/resources/assets/target/sounds/m870/m870_preparealt.ogg b/src/main/resources/assets/target/sounds/m_870/m_870_preparealt.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m870/m870_preparealt.ogg rename to src/main/resources/assets/target/sounds/m_870/m_870_preparealt.ogg diff --git a/src/main/resources/assets/target/sounds/m870/m870_reload_loop.ogg b/src/main/resources/assets/target/sounds/m_870/m_870_reload_loop.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m870/m870_reload_loop.ogg rename to src/main/resources/assets/target/sounds/m_870/m_870_reload_loop.ogg diff --git a/src/main/resources/assets/target/sounds/m870/m870_veryfar.ogg b/src/main/resources/assets/target/sounds/m_870/m_870_veryfar.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m870/m870_veryfar.ogg rename to src/main/resources/assets/target/sounds/m_870/m_870_veryfar.ogg diff --git a/src/main/resources/assets/target/sounds/m98b/m98b_far.ogg b/src/main/resources/assets/target/sounds/m_98b/m_98b_far.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m98b/m98b_far.ogg rename to src/main/resources/assets/target/sounds/m_98b/m_98b_far.ogg diff --git a/src/main/resources/assets/target/sounds/m98b/m98b_fire_1p.ogg b/src/main/resources/assets/target/sounds/m_98b/m_98b_fire_1p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m98b/m98b_fire_1p.ogg rename to src/main/resources/assets/target/sounds/m_98b/m_98b_fire_1p.ogg diff --git a/src/main/resources/assets/target/sounds/m98b/m98b_fire_3p.ogg b/src/main/resources/assets/target/sounds/m_98b/m_98b_fire_3p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m98b/m98b_fire_3p.ogg rename to src/main/resources/assets/target/sounds/m_98b/m_98b_fire_3p.ogg diff --git a/src/main/resources/assets/target/sounds/m98b/m98b_reload_empty.ogg b/src/main/resources/assets/target/sounds/m_98b/m_98b_reload_empty.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m98b/m98b_reload_empty.ogg rename to src/main/resources/assets/target/sounds/m_98b/m_98b_reload_empty.ogg diff --git a/src/main/resources/assets/target/sounds/m98b/m98b_reload_normal.ogg b/src/main/resources/assets/target/sounds/m_98b/m_98b_reload_normal.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m98b/m98b_reload_normal.ogg rename to src/main/resources/assets/target/sounds/m_98b/m_98b_reload_normal.ogg diff --git a/src/main/resources/assets/target/sounds/m98b/m98b_veryfar.ogg b/src/main/resources/assets/target/sounds/m_98b/m_98b_veryfar.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m98b/m98b_veryfar.ogg rename to src/main/resources/assets/target/sounds/m_98b/m_98b_veryfar.ogg diff --git a/src/main/resources/assets/target/sounds/mk14/mk14_far.ogg b/src/main/resources/assets/target/sounds/mk_14/mk_14_far.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/mk14/mk14_far.ogg rename to src/main/resources/assets/target/sounds/mk_14/mk_14_far.ogg diff --git a/src/main/resources/assets/target/sounds/mk14/mk14_fire_1p.ogg b/src/main/resources/assets/target/sounds/mk_14/mk_14_fire_1p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/mk14/mk14_fire_1p.ogg rename to src/main/resources/assets/target/sounds/mk_14/mk_14_fire_1p.ogg diff --git a/src/main/resources/assets/target/sounds/mk14/mk14_fire_3p.ogg b/src/main/resources/assets/target/sounds/mk_14/mk_14_fire_3p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/mk14/mk14_fire_3p.ogg rename to src/main/resources/assets/target/sounds/mk_14/mk_14_fire_3p.ogg diff --git a/src/main/resources/assets/target/sounds/mk14/mk14_reload_empty.ogg b/src/main/resources/assets/target/sounds/mk_14/mk_14_reload_empty.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/mk14/mk14_reload_empty.ogg rename to src/main/resources/assets/target/sounds/mk_14/mk_14_reload_empty.ogg diff --git a/src/main/resources/assets/target/sounds/mk14/mk14_reload_normal.ogg b/src/main/resources/assets/target/sounds/mk_14/mk_14_reload_normal.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/mk14/mk14_reload_normal.ogg rename to src/main/resources/assets/target/sounds/mk_14/mk_14_reload_normal.ogg diff --git a/src/main/resources/assets/target/sounds/mk14/mk14_veryfar.ogg b/src/main/resources/assets/target/sounds/mk_14/mk_14_veryfar.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/mk14/mk14_veryfar.ogg rename to src/main/resources/assets/target/sounds/mk_14/mk_14_veryfar.ogg diff --git a/src/main/resources/assets/target/sounds/rpg/rpg7_fire_1p.ogg b/src/main/resources/assets/target/sounds/rpg/rpg_fire_1p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/rpg/rpg7_fire_1p.ogg rename to src/main/resources/assets/target/sounds/rpg/rpg_fire_1p.ogg diff --git a/src/main/resources/assets/target/sounds/rpg/rpg7_fire_3p.ogg b/src/main/resources/assets/target/sounds/rpg/rpg_fire_3p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/rpg/rpg7_fire_3p.ogg rename to src/main/resources/assets/target/sounds/rpg/rpg_fire_3p.ogg diff --git a/src/main/resources/assets/target/sounds/rpg/rpg7_reload.ogg b/src/main/resources/assets/target/sounds/rpg/rpg_reload.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/rpg/rpg7_reload.ogg rename to src/main/resources/assets/target/sounds/rpg/rpg_reload.ogg