diff --git a/src/main/java/net/mcreator/target/init/TargetModSounds.java b/src/main/java/net/mcreator/target/init/TargetModSounds.java index 510560949..bcd592dca 100644 --- a/src/main/java/net/mcreator/target/init/TargetModSounds.java +++ b/src/main/java/net/mcreator/target/init/TargetModSounds.java @@ -1,7 +1,4 @@ -/* - * MCreator note: This file will be REGENERATED on each build. - */ package net.mcreator.target.init; import net.mcreator.target.TargetMod; @@ -42,6 +39,8 @@ public class TargetModSounds { 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 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"))); @@ -63,8 +62,6 @@ public class TargetModSounds { public static final RegistryObject AK47_RELOAD_EMPTY = REGISTRY.register("ak47_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47_reload_empty"))); public static final RegistryObject LAND = REGISTRY.register("land", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "land"))); public static final RegistryObject SHIFT = REGISTRY.register("shift", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "shift"))); - public static final RegistryObject ENEMY_SPOT = REGISTRY.register("enemy_spot", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "enemy_spot"))); - public static final RegistryObject ENEMY_SPOT_1P = REGISTRY.register("enemy_spot_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "enemy_spot_1p"))); public static final RegistryObject HEADSHOT = REGISTRY.register("headshot", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "headshot"))); public static final RegistryObject DEVOTION_FIRE_1P = REGISTRY.register("devotion_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_fire_1p"))); public static final RegistryObject DEVOTION_FIRE_3P = REGISTRY.register("devotion_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_fire_3p"))); @@ -72,87 +69,111 @@ 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 = REGISTRY.register("rpg7_fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpg7_fire"))); + 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 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"))); public static final RegistryObject FIRERATE = REGISTRY.register("firerate", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "firerate"))); - public static final RegistryObject M4FIRE = REGISTRY.register("m4fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4fire"))); - public static final RegistryObject M4RELOAD = REGISTRY.register("m4reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4reload"))); - public static final RegistryObject M4RELOAD2 = REGISTRY.register("m4reload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4reload2"))); - public static final RegistryObject AA12FIRE = REGISTRY.register("aa12fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12fire"))); - public static final RegistryObject AA12RELOAD = REGISTRY.register("aa12reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12reload"))); - public static final RegistryObject AA12RELOAD2 = REGISTRY.register("aa12reload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12reload2"))); - public static final RegistryObject BOWPULL = REGISTRY.register("bowpull", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bowpull"))); - public static final RegistryObject BOWFIRE1P = REGISTRY.register("bowfire1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bowfire1p"))); - public static final RegistryObject BOWFIRE3P = REGISTRY.register("bowfire3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bowfire3p"))); - public static final RegistryObject SHOTFIRE = REGISTRY.register("shotfire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "shotfire"))); - public static final RegistryObject SHOTFIRE3P = REGISTRY.register("shotfire3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "shotfire3p"))); - public static final RegistryObject BOWPULL1P = REGISTRY.register("bowpull1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bowpull1p"))); - public static final RegistryObject HK416RELOAD = REGISTRY.register("hk416reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416reload"))); - public static final RegistryObject HK416RELOAD2 = REGISTRY.register("hk416reload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416reload2"))); - public static final RegistryObject HK416FIRE = REGISTRY.register("hk416fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416fire"))); - public static final RegistryObject RPKFIRE = REGISTRY.register("rpkfire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpkfire"))); - public static final RegistryObject RPKRELOAD = REGISTRY.register("rpkreload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpkreload"))); - public static final RegistryObject RPKRELOAD2 = REGISTRY.register("rpkreload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpkreload2"))); + public static final RegistryObject M4_FIRE_1P = REGISTRY.register("m4_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_fire_1p"))); + public static final RegistryObject M4_FIRE_3P = REGISTRY.register("m4_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_fire_3p"))); + public static final RegistryObject M4_FAR = REGISTRY.register("m4_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_far"))); + public static final RegistryObject M4_VERYFAR = REGISTRY.register("m4_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_veryfar"))); + public static final RegistryObject M4_RELOAD_NORMAL = REGISTRY.register("m4_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_reload_normal"))); + public static final RegistryObject M4_RELOAD_EMPTY = REGISTRY.register("m4_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_reload_empty"))); + public static final RegistryObject AA12_FIRE_1P = REGISTRY.register("aa12_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_fire_1p"))); + public static final RegistryObject AA12_FIRE_3P = REGISTRY.register("aa12_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_fire_3p"))); + public static final RegistryObject AA12_FAR = REGISTRY.register("aa12_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_far"))); + public static final RegistryObject AA12_VERYFAR = REGISTRY.register("aa12_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_veryfar"))); + public static final RegistryObject AA12_RELOAD_NORMAL = REGISTRY.register("aa12_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_reload_normal"))); + public static final RegistryObject AA12_RELOAD_EMPTY = REGISTRY.register("aa12_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_reload_empty"))); + public static final RegistryObject BOCEK_ZOOM_FIRE_1P = REGISTRY.register("bocek_zoom_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_zoom_fire_1p"))); + public static final RegistryObject BOCEK_ZOOM_FIRE_3P = REGISTRY.register("bocek_zoom_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_zoom_fire_3p"))); + public static final RegistryObject BOCEK_SHATTER_CAP_FIRE_1P = REGISTRY.register("bocek_shatter_cap_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_shatter_cap_fire_1p"))); + public static final RegistryObject BOCEK_SHATTER_CAP_FIRE_3P = REGISTRY.register("bocek_shatter_cap_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_shatter_cap_fire_3p"))); + public static final RegistryObject BOCEK_PULL_1P = REGISTRY.register("bocek_pull_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_pull_1p"))); + public static final RegistryObject BOCEK_PULL_3P = REGISTRY.register("bocek_pull_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_pull_3p"))); + public static final RegistryObject HK416_FIRE_1P = REGISTRY.register("hk416_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416_fire_1p"))); + public static final RegistryObject HK416_FIRE_3P = REGISTRY.register("hk416_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416_fire_3p"))); + public static final RegistryObject HK416_FAR = REGISTRY.register("hk416_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416_far"))); + public static final RegistryObject HK416_VERYFAR = REGISTRY.register("hk416_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416_veryfar"))); + public static final RegistryObject HK416_RELOAD_NORMAL = REGISTRY.register("hk416_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416_reload_normal"))); + public static final RegistryObject HK416_RELOAD_EMPTY = REGISTRY.register("hk416_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416_reload_empty"))); + public static final RegistryObject RPK_FIRE_1P = REGISTRY.register("rpk_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_fire_1p"))); + public static final RegistryObject RPK_FIRE_3P = REGISTRY.register("rpk_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_fire_3p"))); + public static final RegistryObject RPK_FAR = REGISTRY.register("rpk_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_far"))); + public static final RegistryObject RPK_VERYFAR = REGISTRY.register("rpk_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_veryfar"))); + public static final RegistryObject RPK_RELOAD_NORMAL = REGISTRY.register("rpk_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_reload_normal"))); + public static final RegistryObject RPK_RELOAD_EMPTY = REGISTRY.register("rpk_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_reload_empty"))); public static final RegistryObject KRABER_FIRE_1P = REGISTRY.register("kraber_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraber_fire_1p"))); public static final RegistryObject KRABER_FIRE_3P = REGISTRY.register("kraber_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraber_fire_3p"))); - public static final RegistryObject KRABERRELOAD1 = REGISTRY.register("kraberreload1", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraberreload1"))); - public static final RegistryObject KRABERRELOAD2 = REGISTRY.register("kraberreload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraberreload2"))); - public static final RegistryObject VEC1 = REGISTRY.register("vec1", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vec1"))); - public static final RegistryObject VEC3 = REGISTRY.register("vec3", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vec3"))); - public static final RegistryObject VECRELOAD = REGISTRY.register("vecreload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vecreload"))); - public static final RegistryObject VECRELOAD2 = REGISTRY.register("vecreload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vecreload2"))); - public static final RegistryObject MINIGUNSTOP = REGISTRY.register("minigunstop", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigunstop"))); + public static final RegistryObject KRABER_FAR = REGISTRY.register("kraber_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraber_far"))); + public static final RegistryObject KRABER_VERYFAR = REGISTRY.register("kraber_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraber_veryfar"))); + public static final RegistryObject KRABER_RELOAD_NORMAL = REGISTRY.register("kraber_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraber_reload_normal"))); + public static final RegistryObject KRABER_RELOAD_EMPTY = REGISTRY.register("kraber_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraber_reload_empty"))); + public static final RegistryObject VECTOR_FIRE_1P = REGISTRY.register("vector_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_fire_1p"))); + public static final RegistryObject VECTOR_FIRE_3P = REGISTRY.register("vector_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_fire_3p"))); + public static final RegistryObject VECTOR_FAR = REGISTRY.register("vector_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_far"))); + public static final RegistryObject VECTOR_VERYFAR = REGISTRY.register("vector_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_veryfar"))); + public static final RegistryObject VECTOR_RELOAD_NORMAL = REGISTRY.register("vector_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_reload_normal"))); + public static final RegistryObject VECTOR_RELOAD_EMPTY = REGISTRY.register("vector_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "vector_reload_empty"))); public static final RegistryObject MINIGUN_FIRE_1P = REGISTRY.register("minigun_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_fire_1p"))); public static final RegistryObject MINIGUN_FIRE_3P = REGISTRY.register("minigun_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_fire_3p"))); - public static final RegistryObject OVERHEAT = REGISTRY.register("overheat", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "overheat"))); - public static final RegistryObject OVERHEAT_WARN = REGISTRY.register("overheat_warn", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "overheat_warn"))); - public static final RegistryObject MK14FIRE = REGISTRY.register("mk14fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk14fire"))); - public static final RegistryObject MK14_RELOAD_EMPTY = REGISTRY.register("mk14_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk14_reload_empty"))); + public static final RegistryObject MINIGUN_FAR = REGISTRY.register("minigun_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "minigun_far"))); + 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 SENTINELFIRE1 = REGISTRY.register("sentinelfire1", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinelfire1"))); - public static final RegistryObject SENTINELFIRE3 = REGISTRY.register("sentinelfire3", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinelfire3"))); - public static final RegistryObject SENTINELFIRECHARGE1 = REGISTRY.register("sentinelfirecharge1", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinelfirecharge1"))); - public static final RegistryObject SENTINELFIRECHARGE3 = REGISTRY.register("sentinelfirecharge3", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinelfirecharge3"))); - public static final RegistryObject CHARGE = REGISTRY.register("charge", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "charge"))); - public static final RegistryObject SENTINEL_RELOAD = REGISTRY.register("sentinel_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_reload"))); - public static final RegistryObject SENTINEL_RELOAD2 = REGISTRY.register("sentinel_reload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_reload2"))); - public static final RegistryObject M60RELOAD = REGISTRY.register("m60reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m60reload"))); - public static final RegistryObject M60RELOAD2 = REGISTRY.register("m60reload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m60reload2"))); - public static final RegistryObject M60FIRE = REGISTRY.register("m60fire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m60fire"))); + public static final RegistryObject MK14_RELOAD_EMPTY = REGISTRY.register("mk14_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mk14_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"))); + public static final RegistryObject SENTINEL_CHARGE_FIRE_3P = REGISTRY.register("sentinel_charge_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge_fire_3p"))); + public static final RegistryObject SENTINEL_FAR = REGISTRY.register("sentinel_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_far"))); + public static final RegistryObject SENTINEL_VERYFAR = REGISTRY.register("sentinel_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_veryfar"))); + public static final RegistryObject SENTINEL_CHARGE_FAR = REGISTRY.register("sentinel_charge_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge_far"))); + public static final RegistryObject SENTINEL_CHARGE_VERYFAR = REGISTRY.register("sentinel_charge_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sentinel_charge_veryfar"))); + 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 LIGHTSABER = REGISTRY.register("lightsaber", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "lightsaber"))); - public static final RegistryObject SVDRELOAD = REGISTRY.register("svdreload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svdreload"))); - public static final RegistryObject SVDRELOAD2 = REGISTRY.register("svdreload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svdreload2"))); - public static final RegistryObject SVDFIRE1P = REGISTRY.register("svdfire1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svdfire1p"))); - public static final RegistryObject SVDFIRE3P = REGISTRY.register("svdfire3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svdfire3p"))); - public static final RegistryObject MARLIN_FIRE1P = REGISTRY.register("marlin_fire1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_fire1p"))); - public static final RegistryObject MARLIN_FIRE3P = REGISTRY.register("marlin_fire3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_fire3p"))); + 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"))); + public static final RegistryObject SVD_FAR = REGISTRY.register("svd_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svd_far"))); + 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 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"))); + public static final RegistryObject MARLIN_VERYFAR = REGISTRY.register("marlin_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "marlin_veryfar"))); 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_FIRE1P = REGISTRY.register("m870_fire1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m870_fire1p"))); - public static final RegistryObject M870_FIRE3P = REGISTRY.register("m870_fire3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m870_fire3p"))); + 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 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 M98BRELOAD = REGISTRY.register("m98breload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m98breload"))); - public static final RegistryObject M98BRELOAD2 = REGISTRY.register("m98breload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m98breload2"))); public static final RegistryObject BULLETSUPPLY = REGISTRY.register("bulletsupply", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bulletsupply"))); - public static final RegistryObject M4FIRE_3P = REGISTRY.register("m4fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4fire_3p"))); - public static final RegistryObject M4FAR = REGISTRY.register("m4far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4far"))); - public static final RegistryObject M4VERYFAR = REGISTRY.register("m4veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4veryfar"))); - public static final RegistryObject RPK_FIRE1P = REGISTRY.register("rpk_fire1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_fire1p"))); - public static final RegistryObject KRABERFAR = REGISTRY.register("kraberfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraberfar"))); - public static final RegistryObject KRABERVERYFAR = REGISTRY.register("kraberveryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "kraberveryfar"))); - public static final RegistryObject SVDFAR = REGISTRY.register("svdfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svdfar"))); - public static final RegistryObject SVDVERYFAR = REGISTRY.register("svdveryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "svdveryfar"))); - public static final RegistryObject HK416_FIRE1P = REGISTRY.register("hk416_fire1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk416_fire1p"))); - public static final RegistryObject HK_FAR = REGISTRY.register("hk_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk_far"))); - public static final RegistryObject HK_VERY_FAR = REGISTRY.register("hk_very_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hk_very_far"))); - public static final RegistryObject AA12_FIRE_1P = REGISTRY.register("aa12_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_fire_1p"))); - public static final RegistryObject AA12_FAR = REGISTRY.register("aa12_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_far"))); - public static final RegistryObject AA12_VERY_FAR = REGISTRY.register("aa12_very_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_very_far"))); } diff --git a/src/main/java/net/mcreator/target/procedures/Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index cfefb6fe0..d87cedd57 100644 --- a/src/main/java/net/mcreator/target/procedures/Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -24,7 +24,7 @@ public class Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:aa12reload2 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -47,7 +47,7 @@ public class Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:aa12reload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java b/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java index d1ade3e1f..5e7ff0cdb 100644 --- a/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/BowlooseProcedure.java @@ -26,9 +26,9 @@ public class BowlooseProcedure { power = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power"); 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), "stopsound @s player target:bowpull"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @a player target:bocek_pull_1p"); 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), "stopsound @s player target:bowpull1p"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @a player target:bocek_pull_3p"); } if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.BOCEK.get() && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power") >= 6) { @@ -55,11 +55,9 @@ public class BowlooseProcedure { } 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:bowfire1p player @s ~ ~ ~ 10 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:bocek_zoom_fire_1p player @s ~ ~ ~ 10 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:bowfire3p 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), "stopsound @s player target:bowfire3p"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:bocek_zoom_fire_3p player @a ~ ~ ~ 2 1"); } } else { for (int index0 = 0; index0 < 10; index0++) { @@ -68,11 +66,9 @@ public class BowlooseProcedure { 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:shotfire player @s ~ ~ ~ 10 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:bocek_shatter_cap_fire_1p player @s ~ ~ ~ 10 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:shotfire3p 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), "stopsound @s player target:shotfire3p"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:bocek_shatter_cap_fire_3p player @a ~ ~ ~ 2 1"); } } entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { diff --git a/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java b/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java index ff05585cb..e74d0e0d3 100644 --- a/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/BulletFireNormalProcedure.java @@ -46,7 +46,7 @@ public class BulletFireNormalProcedure { ProjectileEntity projectile = new ProjectileEntity(entity.level(), living, damage, headshot); projectile.setPos((living.getX() + (-0.5) * living.getLookAngle().x), (living.getEyeY() - 0.1 + (-0.5) * living.getLookAngle().y), (living.getZ() + (-0.5) * living.getLookAngle().z)); - projectile.shoot(living.getLookAngle().x, living.getLookAngle().y, living.getLookAngle().z,3 * velocity, 2.5f); + projectile.shoot(living.getLookAngle().x, living.getLookAngle().y, living.getLookAngle().z,1 * velocity, 2.5f); entity.level().addFreshEntity(projectile); } else { @@ -56,7 +56,7 @@ public class BulletFireNormalProcedure { ProjectileEntity projectile = new ProjectileEntity(entity.level(), living, damage, headshot); projectile.setPos((living.getX() + (-0.5) * living.getLookAngle().x), (living.getEyeY() - 0.1 + (-0.5) * living.getLookAngle().y), (living.getZ() + (-0.5) * living.getLookAngle().z)); - projectile.shoot(living.getLookAngle().x, living.getLookAngle().y, living.getLookAngle().z,3 * (float) heldItem.getOrCreateTag().getDouble("velocity"), + projectile.shoot(living.getLookAngle().x, living.getLookAngle().y, living.getLookAngle().z,1 * (float) heldItem.getOrCreateTag().getDouble("velocity"), (float) living.getAttribute(TargetModAttributes.SPREAD.get()).getBaseValue()); entity.level().addFreshEntity(projectile); } diff --git a/src/main/java/net/mcreator/target/procedures/GunsDevProcedure.java b/src/main/java/net/mcreator/target/procedures/GunsDevProcedure.java index b02b4e047..88736addd 100644 --- a/src/main/java/net/mcreator/target/procedures/GunsDevProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/GunsDevProcedure.java @@ -72,11 +72,11 @@ public class GunsDevProcedure { } if (entity.getPersistentData().getDouble("miaozhunshijian") > 4) { if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("sniperguns") == 1) { - zoom = 0.001; + zoom = 0.0001; } else if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("shotgun") == 1) { zoom = 0.9; } else { - zoom = 0.1; + zoom = 0.0001; } } else { zoom = 1; diff --git a/src/main/java/net/mcreator/target/procedures/Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 97f6bbef8..28d463ab3 100644 --- a/src/main/java/net/mcreator/target/procedures/Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -24,7 +24,7 @@ public class Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:hk416reload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -47,7 +47,7 @@ public class Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:hk416reload2 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 6bf780001..ab31e5e12 100644 --- a/src/main/java/net/mcreator/target/procedures/KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -24,7 +24,7 @@ public class KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:kraberreload2 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:kraber_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -47,7 +47,7 @@ public class KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:kraberreload1 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:kraber_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java b/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java index a3a1eb880..b81bdd234 100644 --- a/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java @@ -24,11 +24,11 @@ public class KraberfireProcedure { 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:kraber_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:kraber_fire_3p player @a ~ ~ ~ 6 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:kraber_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:kraberfar player @a ~ ~ ~ 16 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:kraber_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:kraberveryfar player @a ~ ~ ~ 32 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:kraber_veryfar player @a ~ ~ ~ 24 1"); } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); } diff --git a/src/main/java/net/mcreator/target/procedures/M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 18f8a5a20..afb1b6178 100644 --- a/src/main/java/net/mcreator/target/procedures/M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -23,7 +23,7 @@ public class M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:m4reload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4_reload_empty player @s ~ ~ ~ 100 1"); } } entity.getPersistentData().putDouble("id", id); @@ -46,7 +46,7 @@ public class M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:m4reload2 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4_reload_normal player @s ~ ~ ~ 100 1"); } } entity.getPersistentData().putDouble("id", id); diff --git a/src/main/java/net/mcreator/target/procedures/M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index ca57e528e..630dd3cb5 100644 --- a/src/main/java/net/mcreator/target/procedures/M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -24,7 +24,7 @@ public class M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:m60reload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m60_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -50,7 +50,7 @@ public class M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:m60reload2 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m60_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java index 0adec5f6d..c49c9229f 100644 --- a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java @@ -62,6 +62,10 @@ public class M79fireProcedure { entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m79_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:m79_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:m79_far player @s ~ ~ ~ 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:m79_veryfar player @a ~ ~ ~ 12 1"); } usehand.getOrCreateTag().putDouble("fireanim", 2); usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); diff --git a/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java b/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java index 47e7ee391..43a023a06 100644 --- a/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M870fireProcedure.java @@ -28,11 +28,13 @@ public class M870fireProcedure { 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:m870_fire1p player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m870_fire1p 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:m870_fire3p 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), "stopsound @s player target:m870_fire3p"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m870_far player @s ~ ~ ~ 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:m870_veryfar player @a ~ ~ ~ 24 1"); } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); usehand.getOrCreateTag().putDouble("fireanim", 2); diff --git a/src/main/java/net/mcreator/target/procedures/M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 3c8e936ae..c5a29c93c 100644 --- a/src/main/java/net/mcreator/target/procedures/M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -28,7 +28,7 @@ public class M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:m98breload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m98b_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -51,7 +51,7 @@ public class M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:m98breload2 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m98b_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java b/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java index 7c701fb92..b9fba7daf 100644 --- a/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M98bfireProcedure.java @@ -21,15 +21,13 @@ public class M98bfireProcedure { 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:m98b_fire_1p player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m98b_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:m98b_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:shift @a ~ ~ ~ 1 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m98b_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), "stopsound @s player target:m98b_fire_3p"); - 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), "stopsound @s player target:shift"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m98b_veryfar player @a ~ ~ ~ 24 1"); } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); } diff --git a/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java b/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java index 97da1c32e..001b9bb81 100644 --- a/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MarlinfireProcedure.java @@ -34,11 +34,13 @@ public class MarlinfireProcedure { 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:marlin_fire1p player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:marlin_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:marlin_fire3p player @a ~ ~ ~ 4 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:marlin_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), "stopsound @s player target:marlin_fire3p"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:marlin_far player @s ~ ~ ~ 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:marlin_veryfar player @a ~ ~ ~ 24 1"); } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); if (usehand.getOrCreateTag().getDouble("animindex") == 1) { diff --git a/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java b/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java index bdadd3987..93dc7c9b3 100644 --- a/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/MinigunautofireProcedure.java @@ -42,7 +42,7 @@ public class MinigunautofireProcedure { { 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:minigunstop player @s ~ ~ ~ 4 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:minigun_rot player @s ~ ~ ~ 2 1"); } } } else { @@ -62,15 +62,7 @@ public class MinigunautofireProcedure { { 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:overheat player @s ~ ~ ~ 2 1"); - } - } - } - if (usehand.getOrCreateTag().getDouble("heat") == 40) { - { - 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:overheat_warn player @s ~ ~ ~ 2 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:minigun_overheat player @s ~ ~ ~ 2 1"); } } } @@ -79,6 +71,12 @@ public class MinigunautofireProcedure { 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:minigun_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:minigun_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:minigun_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:minigun_veryfar player @a ~ ~ ~ 24 1"); } } } else { @@ -86,21 +84,15 @@ public class MinigunautofireProcedure { 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:minigun_fire_1p player @s ~ ~ ~ 2 " + (1 - 0.025 * Math.abs(40 - usehand.getOrCreateTag().getDouble("heat"))))); + 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:minigun_fire_3p player @a ~ ~ ~ 4 " + (1 - 0.025 * Math.abs(40 - usehand.getOrCreateTag().getDouble("heat"))))); + 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:minigun_far player @a ~ ~ ~ 12 " + (1 - 0.025 * Math.abs(40 - usehand.getOrCreateTag().getDouble("heat"))))); + 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:minigun_veryfar player @a ~ ~ ~ 24 " + (1 - 0.025 * Math.abs(40 - usehand.getOrCreateTag().getDouble("heat"))))); } } } - { - 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:minigun_fire_3p player @a ~ ~ ~ 4 1"); - } - } - { - 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), "stopsound @s player target:minigun_fire_3p"); - } - } BulletFireNormalProcedure.execute(entity); { double _setval = (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleammo - 1; diff --git a/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java b/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java index 157dfa0d9..41dc18923 100644 --- a/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java +++ b/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java @@ -38,8 +38,13 @@ public class NormalMagGunFire { 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()))) { + 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); } @@ -80,11 +85,11 @@ public class NormalMagGunFire { 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:aa12fire player @a ~ ~ ~ 6 1"); + 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 ~ ~ ~ 16 1"); + 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_very_far player @a ~ ~ ~ 32 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_veryfar player @a ~ ~ ~ 24 1"); } } } @@ -106,13 +111,13 @@ public class NormalMagGunFire { { 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_fire1p player @s ~ ~ ~ 2 1"); + 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:hk416fire player @a ~ ~ ~ 4 1"); + 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:hk_far player @a ~ ~ ~ 12 1"); + 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:hk_very_far player @a ~ ~ ~ 24 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hk416_veryfar player @a ~ ~ ~ 24 1"); } } } @@ -120,13 +125,13 @@ public class NormalMagGunFire { { 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:m4fire player @s ~ ~ ~ 2 1"); + 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:m4fire_3p player @a ~ ~ ~ 4 1"); + 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:m4far player @a ~ ~ ~ 12 1"); + 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:m4veryfar player @a ~ ~ ~ 24 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m4_veryfar player @a ~ ~ ~ 24 1"); } } } @@ -134,7 +139,13 @@ public class NormalMagGunFire { { 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:m60fire player @a ~ ~ ~ 4 1"); + 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"); } } } @@ -156,7 +167,13 @@ public class NormalMagGunFire { { 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:mk14fire player @a ~ ~ ~ 4 1"); + 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"); } } } @@ -164,11 +181,13 @@ public class NormalMagGunFire { { 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_fire1p player @s ~ ~ ~ 2 1"); + 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), "stopsound @s player target:rpkfire"); + 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:rpkfire player @a ~ ~ ~ 4 1"); + 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"); } } } @@ -176,13 +195,13 @@ public class NormalMagGunFire { { 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:svdfire1p player @s ~ ~ ~ 2 1"); + 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:svdfire3p player @a ~ ~ ~ 6 1"); + 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:svdfar player @a ~ ~ ~ 16 1"); + 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:svdveryfar player @a ~ ~ ~ 32 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:svd_veryfar player @a ~ ~ ~ 24 1"); } } } @@ -190,7 +209,13 @@ public class NormalMagGunFire { { 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:vec3 player @a ~ ~ ~ 2 1"); + 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"); } } } @@ -202,9 +227,9 @@ public class NormalMagGunFire { 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_veryfar player @a ~ ~ ~ 16 1"); + 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), "stopsound @s player target:trachelium_fire_3p"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:trachelium_veryfar player @a ~ ~ ~ 24 1"); } } } @@ -216,9 +241,9 @@ public class NormalMagGunFire { 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 ~ ~ ~ 16 1"); + 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 ~ ~ ~ 32 1"); + 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/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java index 9d3e6e813..0402394fc 100644 --- a/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PullXiaoGuoChiXuShiMeiKeFaShengProcedure.java @@ -49,24 +49,11 @@ public class PullXiaoGuoChiXuShiMeiKeFaShengProcedure { } if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("power") == 1) { { - 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:bowpull1p player @s ~ ~ ~ 10 1"); - } - } - { - 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:bowpull player @a ~ ~ ~ 0.5 1"); - } - } - { - 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), "stopsound @s player target:bowpull"); + 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:bocek_pull_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:bocek_pull_3p player @a ~ ~ ~ 0.5 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java index 05ced91a1..ef6eb8800 100644 --- a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java @@ -70,15 +70,15 @@ public class ReloadsoundstopProcedure { 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), "stopsound @s player target:m98breload"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m98b_reload_normal"); 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), "stopsound @s player target:m98breload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m98b_reload_empty"); 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), "stopsound @s player target:m4reload"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m4_reload_normal"); 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), "stopsound @s player target:m4reload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m4_reload_empty"); entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, @@ -92,55 +92,61 @@ public class ReloadsoundstopProcedure { 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), "stopsound @s player target:aa12reload"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:aa12_reload_normal"); 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), "stopsound @s player target:aa12reload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:aa12_reload_empty"); 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), "stopsound @s player target:hk416reload"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:hk416_reload_normal"); 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), "stopsound @s player target:hk416reload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:hk416_reload_empty"); 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), "stopsound @s player target:rpkreload"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:rpk_reload_normal"); 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), "stopsound @s player target:rpkreload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:rpk_reload_empty"); 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), "stopsound @s player target:kraberreload"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:kraber_reload_normal"); 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), "stopsound @s player target:kraberreload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:kraber_reload_empty"); 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), "stopsound @s player target:vecreload"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:vector_reload_normal"); 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), "stopsound @s player target:vecreload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:vector_reload_empty"); 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), "stopsound @s player target:sentinel_reload"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:mk14_reload_normal"); 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), "stopsound @s player target:sentinel_reload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:mk14_reload_empty"); 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), "stopsound @s player target:charge"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:sentinel_reload_normal"); + 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), "stopsound @s player target:sentinel_reload_empty"); 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), "stopsound @s player target:m60reload"); - 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), "stopsound @s player target:m60reload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:sentinel_charge"); 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), "stopsound @s player target:svdreload"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m60_reload_normal"); 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), "stopsound @s player target:svdreload2"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m60_reload_empty"); + + + 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), "stopsound @s player target:svd_reload_normal"); + 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), "stopsound @s player target:svd_reload_empty"); } } @@ -174,7 +180,7 @@ public class ReloadsoundstopProcedure { 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), "stopsound @s player target:charge"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "stopsound @s player target:sentinel_charge"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/RpgfireProcedure.java b/src/main/java/net/mcreator/target/procedures/RpgfireProcedure.java index 9e67b0de5..51d13b622 100644 --- a/src/main/java/net/mcreator/target/procedures/RpgfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpgfireProcedure.java @@ -61,7 +61,13 @@ public class RpgfireProcedure { player.getCooldowns().addCooldown(usehand.getItem(), 10); 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:rpg7_fire player @a ~ ~ ~ 3 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:rpg7_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:rpg7_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:rpg7_far player @a ~ ~ ~ 8 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:rpg7_veryfar player @a ~ ~ ~ 16 1"); } usehand.getOrCreateTag().putDouble("fireanim", 2); usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); diff --git a/src/main/java/net/mcreator/target/procedures/RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 7a1867e92..e1c65b4d0 100644 --- a/src/main/java/net/mcreator/target/procedures/RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -25,7 +25,7 @@ public class RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:rpkreload player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:rpk_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -49,7 +49,7 @@ public class RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:rpkreload2 player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:rpk_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/SentinelFireProcedure.java b/src/main/java/net/mcreator/target/procedures/SentinelFireProcedure.java index 567e05550..9a62b8e9c 100644 --- a/src/main/java/net/mcreator/target/procedures/SentinelFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SentinelFireProcedure.java @@ -24,9 +24,13 @@ public class SentinelFireProcedure { } 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:sentinelfirecharge1 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sentinel_charge_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:sentinelfirecharge3 player @a ~ ~ ~ 4 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sentinel_charge_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:sentinel_charge_far player @s ~ ~ ~ 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:sentinel_charge_veryfar player @a ~ ~ ~ 24 1"); } if (usehand.getOrCreateTag().getDouble("power") > 20) { usehand.getOrCreateTag().putDouble("power", (usehand.getOrCreateTag().getDouble("power") - 20)); @@ -41,21 +45,18 @@ public class SentinelFireProcedure { } 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:sentinelfire1 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sentinel_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:sentinelfire3 player @a ~ ~ ~ 4 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sentinel_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:sentinel_far player @s ~ ~ ~ 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:sentinel_veryfar player @a ~ ~ ~ 24 1"); } } BulletFireNormalProcedure.execute(entity); usehand.getOrCreateTag().putDouble("crot", 20); player.getCooldowns().addCooldown(usehand.getItem(), 23); - - 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), "stopsound @s player target:sentinelfire3"); - 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), "stopsound @s player target:sentinelfirecharge3"); - } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); usehand.getOrCreateTag().putDouble("fireanim", 2); } diff --git a/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 99b6e2227..e89d74afa 100644 --- a/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -26,7 +26,7 @@ public class SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:sentinel_reload player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:sentinel_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -50,7 +50,7 @@ public class SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:sentinel_reload2 player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:sentinel_reload_normal player @s ~ ~ ~ 100 1"); } } } @@ -87,7 +87,7 @@ public class SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:charge player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:sentinel_charge player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index d52ce6b70..6189c3867 100644 --- a/src/main/java/net/mcreator/target/procedures/SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -25,7 +25,7 @@ public class SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:svdreload player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:svd_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -52,7 +52,7 @@ public class SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:svdreload2 player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:svd_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java b/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java index c47a80f86..55632b951 100644 --- a/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/VecBurstFireProcedure.java @@ -57,10 +57,15 @@ public class VecBurstFireProcedure { usehand.getOrCreateTag().putDouble("burst", (usehand.getOrCreateTag().getDouble("burst") - 1)); BulletFireNormalProcedure.execute(entity); { - 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:vec3 player @a ~ ~ ~ 2 1"); + 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"); } } usehand.getOrCreateTag().putDouble("fireanim", 2); diff --git a/src/main/java/net/mcreator/target/procedures/VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 0e64fab9e..316800e7c 100644 --- a/src/main/java/net/mcreator/target/procedures/VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -29,7 +29,7 @@ public class VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:vecreload player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:vector_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -53,7 +53,7 @@ public class VectorWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:vecreload2 player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:vector_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/resources/assets/target/sounds.json b/src/main/resources/assets/target/sounds.json index 5f7ea2883..87331b9d5 100644 --- a/src/main/resources/assets/target/sounds.json +++ b/src/main/resources/assets/target/sounds.json @@ -122,6 +122,22 @@ } ] }, + "m79_far": { + "sounds": [ + { + "name": "target:m79/m79_far", + "stream": false + } + ] + }, + "m79_veryfar": { + "sounds": [ + { + "name": "target:m79/v_veryfar", + "stream": false + } + ] + }, "m79_reload": { "sounds": [ { @@ -327,10 +343,34 @@ ] }, - "rpg7_fire": { + "rpg7_fire_1p": { "sounds": [ { - "name": "target:rpg7_fire", + "name": "target:rpg/rpg7_fire_1p", + "stream": false + } + ] + }, + "rpg7_fire_3p": { + "sounds": [ + { + "name": "target:rpg/rpg7_fire_3p", + "stream": false + } + ] + }, + "rpg7_far": { + "sounds": [ + { + "name": "target:rpg/rpg7_far", + "stream": false + } + ] + }, + "rpg7_veryfar": { + "sounds": [ + { + "name": "target:rpg/rpg7_veryfar", "stream": false } ] @@ -338,191 +378,261 @@ "rpg7_reload": { "sounds": [ { - "name": "target:rpg7_reload", + "name": "target:rpg/rpg7_reload", "stream": false } ] }, - "mortar_fire": { + + "m4_fire_1p": { "sounds": [ { - "name": "target:mortar_fire", + "name": "target:m4/m4_fire_1p", "stream": false } ] }, - "mortar_load": { + "m4_fire_3p": { "sounds": [ { - "name": "target:mortar_load", + "name": "target:m4/m4_fire_3p", "stream": false } ] }, - "mortar_distant": { + "m4_far": { "sounds": [ { - "name": "target:mortar_distant", + "name": "target:m4/m4_far", "stream": false } ] }, - "firerate": { + "m4_veryfar": { "sounds": [ { - "name": "target:firerate", + "name": "target:m4/m4_veryfar", "stream": false } ] }, - "m4fire": { + "m4_reload_normal": { "sounds": [ { - "name": "target:m4fire", + "name": "target:m4/m4_reload_normal", "stream": false } ] }, - "m4reload": { + "m4_reload_empty": { "sounds": [ { - "name": "target:m4reload", + "name": "target:m4/m4_reload_empty", "stream": false } ] }, - "m4reload2": { + + "aa12_fire_1p": { "sounds": [ { - "name": "target:m4reload2", + "name": "target:aa12/aa12_fire_1p", "stream": false } ] }, - "aa12fire": { + "aa12_fire_3p": { "sounds": [ { - "name": "target:aa12_fire", + "name": "target:aa12/aa12_fire_3p", "stream": false } ] }, - "aa12reload": { + "aa12_far": { "sounds": [ { - "name": "target:aa12reload", + "name": "target:aa12/aa12_far", "stream": false } ] }, - "aa12reload2": { + "aa12_veryfar": { "sounds": [ { - "name": "target:aa12reload2", + "name": "target:aa12/aa12_veryfar", "stream": false } ] }, - "bowpull": { + "aa12_reload_normal": { "sounds": [ { - "name": "target:bow_pull", + "name": "target:aa12/aa12_reload_normal", "stream": false } ] }, - "bowfire1p": { + "aa12_reload_empty": { "sounds": [ { - "name": "target:bow_fire_1p", + "name": "target:aa12/aa12_reload_empty", "stream": false } ] }, - "bowfire3p": { + + "bocek_zoom_fire_1p": { "sounds": [ { - "name": "target:bow_fire_3p", + "name": "target:bocek/bocek_zoom_fire_1p", "stream": false } ] }, - "shotfire": { + "bocek_zoom_fire_3p": { "sounds": [ { - "name": "target:shotfire", + "name": "target:bocek/bocek_zoom_fire_3p", "stream": false } ] }, - "shotfire3p": { + "bocek_shatter_cap_fire_1p": { "sounds": [ { - "name": "target:shotfire_3p", + "name": "target:bocek/bocek_shatter_cap_fire_1p", "stream": false } ] }, - "bowpull1p": { + "bocek_shatter_cap_fire_3p": { "sounds": [ { - "name": "target:bow_pull_1p", + "name": "target:bocek/bocek_shatter_cap_fire_3p", "stream": false } ] }, - "hk416reload": { + "bocek_pull_1p": { "sounds": [ { - "name": "target:hk416reload", + "name": "target:bocek/bocek_pull_1p", "stream": false } ] }, - "hk416reload2": { + "bocek_pull_3p": { "sounds": [ { - "name": "target:hk416reload2", + "name": "target:bocek/bocek_pull_3p", "stream": false } ] }, - "hk416fire": { + + "hk416_fire_1p": { "sounds": [ { - "name": "target:hk416_fire_s", + "name": "target:hk416/hk416_fire_1p", "stream": false } ] }, - "rpkfire": { + "hk416_fire_3p": { "sounds": [ { - "name": "target:rpk_fire", + "name": "target:hk416/hk416_fire_3p", "stream": false } ] }, - "rpkreload": { + "hk416_far": { "sounds": [ { - "name": "target:akreload", + "name": "target:hk416/hk416_far", "stream": false } ] }, - "rpkreload2": { + "hk416_veryfar": { "sounds": [ { - "name": "target:akreload2", + "name": "target:hk416/hk416_veryfar", "stream": false } ] }, + "hk416_reload_normal": { + "sounds": [ + { + "name": "target:hk416/hk416_reload_normal", + "stream": false + } + ] + }, + "hk416_reload_empty": { + "sounds": [ + { + "name": "target:hk416/hk416_reload_empty", + "stream": false + } + ] + }, + + "rpk_fire_1p": { + "sounds": [ + { + "name": "target:rpk/rpk_fire_1p", + "stream": false + } + ] + }, + "rpk_fire_3p": { + "sounds": [ + { + "name": "target:rpk/rpk_fire_3p", + "stream": false + } + ] + }, + "rpk_far": { + "sounds": [ + { + "name": "target:rpk/rpk_far", + "stream": false + } + ] + }, + "rpk_veryfar": { + "sounds": [ + { + "name": "target:rpk/rpk_veryfar", + "stream": false + } + ] + }, + "rpk_reload_normal": { + "sounds": [ + { + "name": "target:rpk/rpk_reload_normal", + "stream": false + } + ] + }, + "rpk_reload_empty": { + "sounds": [ + { + "name": "target:rpk/rpk_reload_empty", + "stream": false + } + ] + }, + "kraber_fire_1p": { "sounds": [ { - "name": "target:kraber_fire_1p", + "name": "target:kraber/kraber_fire_1p", "stream": false } ] @@ -530,71 +640,97 @@ "kraber_fire_3p": { "sounds": [ { - "name": "target:kraber_fire_3p", + "name": "target:kraber/kraber_fire_3p", "stream": false } ] }, - "kraberreload1": { + "kraber_far": { "sounds": [ { - "name": "target:kraber_reload_norm", + "name": "target:kraber/kraber_far", "stream": false } ] }, - "kraberreload2": { + "kraber_veryfar": { "sounds": [ { - "name": "target:kraber_reload_empty", + "name": "target:kraber/kraber_veryfar", "stream": false } ] }, - "vec1": { + "kraber_reload_normal": { "sounds": [ { - "name": "target:vector_fire_1p", + "name": "target:kraber/kraber_reload_normal", "stream": false } ] }, - "vec3": { + "kraber_reload_empty": { "sounds": [ { - "name": "target:vector_fire_3p", + "name": "target:kraber/kraber_reload_empty", "stream": false } ] }, - "vecreload": { + + "vector_fire_1p": { "sounds": [ { - "name": "target:vecreload", + "name": "target:vector/vector_fire_1p", "stream": false } ] }, - "vecreload2": { + "vector_fire_3p": { "sounds": [ { - "name": "target:vecreload2", + "name": "target:vector/vector_fire_3p", "stream": false } ] }, - "minigunstop": { + "vector_far": { "sounds": [ { - "name": "target:minigun_stop", + "name": "target:vector/vector_far", "stream": false } ] }, + "vector_veryfar": { + "sounds": [ + { + "name": "target:vector/vector_veryfar", + "stream": false + } + ] + }, + "vector_reload_normal": { + "sounds": [ + { + "name": "target:vector/vector_reload_normal", + "stream": false + } + ] + }, + "vector_reload_empty": { + "sounds": [ + { + "name": "target:vector/vector_reload_empty", + "stream": false + } + ] + }, + "minigun_fire_1p": { "sounds": [ { - "name": "target:minigun_fire", + "name": "target:minigun/minigun_fire_1p", "stream": false } ] @@ -602,39 +738,72 @@ "minigun_fire_3p": { "sounds": [ { - "name": "target:minigun_fire_3p", + "name": "target:minigun/minigun_fire_3p", "stream": false } ] }, - "overheat": { + "minigun_far": { "sounds": [ { - "name": "target:minigun_overheat", + "name": "target:minigun/minigun_far", "stream": false } ] }, - "overheat_warn": { + "minigun_veryfar": { "sounds": [ { - "name": "target:overheat", + "name": "target:minigun/minigun_veryfar", "stream": false } ] }, - "mk14fire": { + "minigun_rot": { "sounds": [ { - "name": "target:mk14ebr_fire", + "name": "target:minigun/minigun_rot", "stream": false } ] }, - "mk14_reload_empty": { + "minigun_overheat": { "sounds": [ { - "name": "target:mk14_reload_empty", + "name": "target:minigun/minigun_overheat", + "stream": false + } + ] + }, + + "mk14_fire_1p": { + "sounds": [ + { + "name": "target:mk14/mk14_fire_1p", + "stream": false + } + ] + }, + "mk14_fire_3p": { + "sounds": [ + { + "name": "target:mk14/mk14_fire_3p", + "stream": false + } + ] + }, + "mk14_far": { + "sounds": [ + { + "name": "target:mk14/mk14_far", + "stream": false + } + ] + }, + "mk14_veryfar": { + "sounds": [ + { + "name": "target:mk14/mk14_veryfar", "stream": false } ] @@ -642,91 +811,362 @@ "mk14_reload_normal": { "sounds": [ { - "name": "target:mk14_reload_norm", + "name": "target:mk14/mk14_reload_normal", "stream": false } ] }, - "sentinelfire1": { + "mk14_reload_empty": { "sounds": [ { - "name": "target:sentinel_fire_1", + "name": "target:mk14/mk14_reload_empty", "stream": false } ] }, - "sentinelfire3": { + + "sentinel_fire_1p": { "sounds": [ { - "name": "target:sentinel_fire_3", + "name": "target:sentinel/sentinel_fire_1p", "stream": false } ] }, - "sentinelfirecharge1": { + "sentinel_fire_3p": { "sounds": [ { - "name": "target:sentinel_fire_charge1", + "name": "target:sentinel/sentinel_fire_3p", "stream": false } ] }, - "sentinelfirecharge3": { + "sentinel_charge_fire_1p": { "sounds": [ { - "name": "target:sentinel_fire_charge3", + "name": "target:sentinel/sentinel_charge_fire_1p", "stream": false } ] }, - "charge": { + "sentinel_charge_fire_3p": { "sounds": [ { - "name": "target:charge", + "name": "target:sentinel/sentinel_charge_fire_3p", "stream": false } ] }, - "sentinel_reload": { + "sentinel_far": { "sounds": [ { - "name": "target:sentinel_reload", + "name": "target:sentinel/sentinel_far", "stream": false } ] }, - "sentinel_reload2": { + "sentinel_veryfar": { "sounds": [ { - "name": "target:sentinel_reload2", + "name": "target:sentinel/sentinel_veryfar", "stream": false } ] }, - "m60reload": { + "sentinel_charge_far": { "sounds": [ { - "name": "target:m60_reload", + "name": "target:sentinel/sentinel_charge_far", "stream": false } ] }, - "m60reload2": { + "sentinel_charge_veryfar": { "sounds": [ { - "name": "target:m60_reload2", + "name": "target:sentinel/sentinel_charge_veryfar", "stream": false } ] }, - "m60fire": { + "sentinel_reload_normal": { "sounds": [ { - "name": "target:m60_fire", + "name": "target:sentinel/sentinel_reload_normal", "stream": false } ] }, + "sentinel_reload_empty": { + "sounds": [ + { + "name": "target:sentinel/sentinel_reload_empty", + "stream": false + } + ] + }, + "sentinel_charge": { + "sounds": [ + { + "name": "target:sentinel/sentinel_charge", + "stream": false + } + ] + }, + + "m60_fire_1p": { + "sounds": [ + { + "name": "target:m60/m60_fire_1p", + "stream": false + } + ] + }, + "m60_fire_3p": { + "sounds": [ + { + "name": "target:m60/m60_fire_3p", + "stream": false + } + ] + }, + "m60_far": { + "sounds": [ + { + "name": "target:m60/m60_far", + "stream": false + } + ] + }, + "m60_veryfar": { + "sounds": [ + { + "name": "target:m60/m60_veryfar", + "stream": false + } + ] + }, + "m60_reload_normal": { + "sounds": [ + { + "name": "target:m60/m60_reload_normal", + "stream": false + } + ] + }, + "m60_reload_empty": { + "sounds": [ + { + "name": "target:m60/m60_reload_empty", + "stream": false + } + ] + }, + + "svd_fire_1p": { + "sounds": [ + { + "name": "target:svd/svd_fire_1p", + "stream": false + } + ] + }, + "svd_fire_3p": { + "sounds": [ + { + "name": "target:svd/svd_fire_3p", + "stream": false + } + ] + }, + "svd_far": { + "sounds": [ + { + "name": "target:svd/svd_far", + "stream": false + } + ] + }, + "svd_veryfar": { + "sounds": [ + { + "name": "target:svd/svd_veryfar", + "stream": false + } + ] + }, + "svd_reload_normal": { + "sounds": [ + { + "name": "target:svd/svd_reload_normal", + "stream": false + } + ] + }, + "svd_reload_empty": { + "sounds": [ + { + "name": "target:svd/svd_reload_empty", + "stream": false + } + ] + }, + + "m98b_fire_1p": { + "sounds": [ + { + "name": "target:m98b/m98b_fire_1p", + "stream": false + } + ] + }, + "m98b_fire_3p": { + "sounds": [ + { + "name": "target:m98b/m98b_fire_3p", + "stream": false + } + ] + }, + "m98b_far": { + "sounds": [ + { + "name": "target:m98b/m98b_far", + "stream": false + } + ] + }, + "m98b_veryfar": { + "sounds": [ + { + "name": "target:m98b/m98b_veryfar", + "stream": false + } + ] + }, + "m98b_reload_normal": { + "sounds": [ + { + "name": "target:m98b/m98b_reload_normal", + "stream": false + } + ] + }, + "m98b_reload_empty": { + "sounds": [ + { + "name": "target:m98b/m98b_reload_empty", + "stream": false + } + ] + }, + + "marlin_fire_1p": { + "sounds": [ + { + "name": "target:marlin/marlin_fire_1p", + "stream": false + } + ] + }, + "marlin_fire_3p": { + "sounds": [ + { + "name": "target:marlin/marlin_fire_3p", + "stream": false + } + ] + }, + "marlin_far": { + "sounds": [ + { + "name": "target:marlin/marlin_far", + "stream": false + } + ] + }, + "marlin_veryfar": { + "sounds": [ + { + "name": "target:marlin/marlin_veryfar", + "stream": false + } + ] + }, + "marlin_loop": { + "sounds": [ + { + "name": "target:marlin/marlin_loop", + "stream": false + } + ] + }, + "marlin_start": { + "sounds": [ + { + "name": "target:marlin/marlin_start", + "stream": false + } + ] + }, + "marlin_end": { + "sounds": [ + { + "name": "target:marlin/marlin_end", + "stream": false + } + ] + }, + + "m870_fire_1p": { + "sounds": [ + { + "name": "target:m870/ m870_fire_1p", + "stream": false + } + ] + }, + "m870_fire_3p": { + "sounds": [ + { + "name": "target:m870/m870_fire_3p", + "stream": false + } + ] + }, + "m870_far": { + "sounds": [ + { + "name": "target:m870/m870_far", + "stream": false + } + ] + }, + "m870_veryfar": { + "sounds": [ + { + "name": "target:m870/m870_veryfar", + "stream": false + } + ] + }, + "m870_preparealt": { + "sounds": [ + { + "name": "target:m870/m870_preparealt", + "stream": false + } + ] + }, + "m870_reloadloop": { + "sounds": [ + { + "name": "target:m870/m870_reload_loop", + "stream": false + } + ] + }, + "lightsaber": { "sounds": [ { @@ -743,142 +1183,6 @@ } ] }, - "svdreload": { - "sounds": [ - { - "name": "target:svdreload", - "stream": false - } - ] - }, - "svdreload2": { - "sounds": [ - { - "name": "target:svdreload2", - "stream": false - } - ] - }, - "svdfire1p": { - "sounds": [ - { - "name": "target:svd_fire_1p", - "stream": false - } - ] - }, - "svdfire3p": { - "sounds": [ - { - "name": "target:svd_fire_3p", - "stream": false - } - ] - }, - "marlin_fire1p": { - "sounds": [ - { - "name": "target:marlin__fire1p", - "stream": false - } - ] - }, - "marlin_fire3p": { - "sounds": [ - { - "name": "target:marlin__fire3p", - "stream": false - } - ] - }, - "marlin_loop": { - "sounds": [ - { - "name": "target:marlin_loop", - "stream": false - } - ] - }, - "marlin_start": { - "sounds": [ - { - "name": "target:marlin_start", - "stream": false - } - ] - }, - "marlin_end": { - "sounds": [ - { - "name": "target:marlin_end", - "stream": false - } - ] - }, - "m870_fire1p": { - "sounds": [ - { - "name": "target:m870_fire1p", - "stream": false - } - ] - }, - "m870_fire3p": { - "sounds": [ - { - "name": "target:m870_fire3p", - "stream": false - } - ] - }, - "m870_preparealt": { - "sounds": [ - { - "name": "target:m870_preparealt", - "stream": false - } - ] - }, - "m870_reloadloop": { - "sounds": [ - { - "name": "target:m870_reload_loop", - "stream": false - } - ] - }, - "m98b_fire_1p": { - "sounds": [ - { - "name": "target:m98b_fire_1p", - "stream": false - } - ] - }, - "m98b_fire_3p": { - "sounds": [ - { - "name": "target:m98b_fire_3p", - "stream": false - } - ] - }, - "m98breload": { - "sounds": [ - { - "name": "target:m98breload", - "stream": false - } - ] - }, - "m98breload2": { - "sounds": [ - { - "name": "target:m98breload2", - "stream": false - } - ] - }, "bulletsupply": { "sounds": [ { @@ -887,119 +1191,6 @@ } ] }, - "m4fire_3p": { - "sounds": [ - { - "name": "target:m4fire_3p", - "stream": false - } - ] - }, - "m4far": { - "sounds": [ - { - "name": "target:m4_far", - "stream": false - } - ] - }, - "m4veryfar": { - "sounds": [ - { - "name": "target:m4_very_far", - "stream": false - } - ] - }, - "rpk_fire1p": { - "sounds": [ - { - "name": "target:rpk_fire1p", - "stream": false - } - ] - }, - "kraberfar": { - "sounds": [ - { - "name": "target:kraberfar", - "stream": false - } - ] - }, - "kraberveryfar": { - "sounds": [ - { - "name": "target:kraberveryfar", - "stream": false - } - ] - }, - "svdfar": { - "sounds": [ - { - "name": "target:svdfar", - "stream": false - } - ] - }, - "svdveryfar": { - "sounds": [ - { - "name": "target:svdveryfar", - "stream": false - } - ] - }, - "hk416_fire1p": { - "sounds": [ - { - "name": "target:hk416_fire1p", - "stream": false - } - ] - }, - "hk_far": { - "sounds": [ - { - "name": "target:hk_far", - "stream": false - } - ] - }, - "hk_very_far": { - "sounds": [ - { - "name": "target:hk_very_far", - "stream": false - } - ] - }, - "aa12_fire_1p": { - "sounds": [ - { - "name": "target:aa12_fire_1p", - "stream": false - } - ] - }, - "aa12_far": { - "sounds": [ - { - "name": "target:aa12_far", - "stream": false - } - ] - }, - "aa12_very_far": { - "sounds": [ - { - "name": "target:aa12_very_far", - "stream": false - } - ] - }, - "shock": { "sounds": [ { @@ -1251,5 +1442,37 @@ "stream": false } ] + }, + "mortar_fire": { + "sounds": [ + { + "name": "target:mortar_fire", + "stream": false + } + ] + }, + "mortar_distant": { + "sounds": [ + { + "name": "target:mortar_distant", + "stream": false + } + ] + }, + "mortar_load": { + "sounds": [ + { + "name": "target:mortar_load", + "stream": false + } + ] + }, + "firerate": { + "sounds": [ + { + "name": "target:firerate", + "stream": false + } + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/target/sounds/aa12_far.ogg b/src/main/resources/assets/target/sounds/aa12_far.ogg deleted file mode 100644 index 86ed46d66..000000000 Binary files a/src/main/resources/assets/target/sounds/aa12_far.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/aa12_fire.ogg b/src/main/resources/assets/target/sounds/aa12_fire.ogg deleted file mode 100644 index 161dba1d3..000000000 Binary files a/src/main/resources/assets/target/sounds/aa12_fire.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/aa12_fire_1p.ogg b/src/main/resources/assets/target/sounds/aa12_fire_1p.ogg deleted file mode 100644 index 6648bb5ce..000000000 Binary files a/src/main/resources/assets/target/sounds/aa12_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/aa12_very_far.ogg b/src/main/resources/assets/target/sounds/aa12_very_far.ogg deleted file mode 100644 index a6d0536d1..000000000 Binary files a/src/main/resources/assets/target/sounds/aa12_very_far.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/aa12reload.ogg b/src/main/resources/assets/target/sounds/aa12reload.ogg deleted file mode 100644 index 60d502cf8..000000000 Binary files a/src/main/resources/assets/target/sounds/aa12reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/aa12reload2.ogg b/src/main/resources/assets/target/sounds/aa12reload2.ogg deleted file mode 100644 index 7364f36ae..000000000 Binary files a/src/main/resources/assets/target/sounds/aa12reload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/bow_fire_1p.ogg b/src/main/resources/assets/target/sounds/bow_fire_1p.ogg deleted file mode 100644 index f5ccbf5c0..000000000 Binary files a/src/main/resources/assets/target/sounds/bow_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/bow_fire_3p.ogg b/src/main/resources/assets/target/sounds/bow_fire_3p.ogg deleted file mode 100644 index d0ca36062..000000000 Binary files a/src/main/resources/assets/target/sounds/bow_fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/bow_pull.ogg b/src/main/resources/assets/target/sounds/bow_pull.ogg deleted file mode 100644 index c0ef139af..000000000 Binary files a/src/main/resources/assets/target/sounds/bow_pull.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/bow_pull_1p.ogg b/src/main/resources/assets/target/sounds/bow_pull_1p.ogg deleted file mode 100644 index d99bf7268..000000000 Binary files a/src/main/resources/assets/target/sounds/bow_pull_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/charge.ogg b/src/main/resources/assets/target/sounds/charge.ogg deleted file mode 100644 index 51ddf3119..000000000 Binary files a/src/main/resources/assets/target/sounds/charge.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/hk416_fire1p.ogg b/src/main/resources/assets/target/sounds/hk416_fire1p.ogg deleted file mode 100644 index c6ab954f0..000000000 Binary files a/src/main/resources/assets/target/sounds/hk416_fire1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/hk416_fire_s.ogg b/src/main/resources/assets/target/sounds/hk416_fire_s.ogg deleted file mode 100644 index ff39ca5dd..000000000 Binary files a/src/main/resources/assets/target/sounds/hk416_fire_s.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/hk416reload.ogg b/src/main/resources/assets/target/sounds/hk416reload.ogg deleted file mode 100644 index 843325b53..000000000 Binary files a/src/main/resources/assets/target/sounds/hk416reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/hk416reload2.ogg b/src/main/resources/assets/target/sounds/hk416reload2.ogg deleted file mode 100644 index 215a7133a..000000000 Binary files a/src/main/resources/assets/target/sounds/hk416reload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/hk_far.ogg b/src/main/resources/assets/target/sounds/hk_far.ogg deleted file mode 100644 index 072bf67df..000000000 Binary files a/src/main/resources/assets/target/sounds/hk_far.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/hk_very_far.ogg b/src/main/resources/assets/target/sounds/hk_very_far.ogg deleted file mode 100644 index e213e60c9..000000000 Binary files a/src/main/resources/assets/target/sounds/hk_very_far.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/kraber_fire_1p.ogg b/src/main/resources/assets/target/sounds/kraber_fire_1p.ogg deleted file mode 100644 index 4b538681a..000000000 Binary files a/src/main/resources/assets/target/sounds/kraber_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/kraber_fire_3p.ogg b/src/main/resources/assets/target/sounds/kraber_fire_3p.ogg deleted file mode 100644 index 1de0ebae6..000000000 Binary files a/src/main/resources/assets/target/sounds/kraber_fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/kraber_reload_empty.ogg b/src/main/resources/assets/target/sounds/kraber_reload_empty.ogg deleted file mode 100644 index 59d08442b..000000000 Binary files a/src/main/resources/assets/target/sounds/kraber_reload_empty.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/kraber_reload_norm.ogg b/src/main/resources/assets/target/sounds/kraber_reload_norm.ogg deleted file mode 100644 index ac0a270d8..000000000 Binary files a/src/main/resources/assets/target/sounds/kraber_reload_norm.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/kraberfar.ogg b/src/main/resources/assets/target/sounds/kraberfar.ogg deleted file mode 100644 index 5dfca5710..000000000 Binary files a/src/main/resources/assets/target/sounds/kraberfar.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/kraberveryfar.ogg b/src/main/resources/assets/target/sounds/kraberveryfar.ogg deleted file mode 100644 index 95c0a95bd..000000000 Binary files a/src/main/resources/assets/target/sounds/kraberveryfar.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m4_far.ogg b/src/main/resources/assets/target/sounds/m4_far.ogg deleted file mode 100644 index 9c11a1f82..000000000 Binary files a/src/main/resources/assets/target/sounds/m4_far.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m4_very_far.ogg b/src/main/resources/assets/target/sounds/m4_very_far.ogg deleted file mode 100644 index c0931eede..000000000 Binary files a/src/main/resources/assets/target/sounds/m4_very_far.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m4fire.ogg b/src/main/resources/assets/target/sounds/m4fire.ogg deleted file mode 100644 index f90dbeaa3..000000000 Binary files a/src/main/resources/assets/target/sounds/m4fire.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m4fire_3p.ogg b/src/main/resources/assets/target/sounds/m4fire_3p.ogg deleted file mode 100644 index 9b5f04fc0..000000000 Binary files a/src/main/resources/assets/target/sounds/m4fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m4reload.ogg b/src/main/resources/assets/target/sounds/m4reload.ogg deleted file mode 100644 index 843325b53..000000000 Binary files a/src/main/resources/assets/target/sounds/m4reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m4reload2.ogg b/src/main/resources/assets/target/sounds/m4reload2.ogg deleted file mode 100644 index 215a7133a..000000000 Binary files a/src/main/resources/assets/target/sounds/m4reload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m60_fire.ogg b/src/main/resources/assets/target/sounds/m60_fire.ogg deleted file mode 100644 index 866b6b9a5..000000000 Binary files a/src/main/resources/assets/target/sounds/m60_fire.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m60_reload.ogg b/src/main/resources/assets/target/sounds/m60_reload.ogg deleted file mode 100644 index db5c41f2b..000000000 Binary files a/src/main/resources/assets/target/sounds/m60_reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m60_reload2.ogg b/src/main/resources/assets/target/sounds/m60_reload2.ogg deleted file mode 100644 index f9b8d5860..000000000 Binary files a/src/main/resources/assets/target/sounds/m60_reload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m870_fire1p.ogg b/src/main/resources/assets/target/sounds/m870_fire1p.ogg deleted file mode 100644 index 350bdf965..000000000 Binary files a/src/main/resources/assets/target/sounds/m870_fire1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m870_fire3p.ogg b/src/main/resources/assets/target/sounds/m870_fire3p.ogg deleted file mode 100644 index 4d04b032d..000000000 Binary files a/src/main/resources/assets/target/sounds/m870_fire3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m870_preparealt.ogg b/src/main/resources/assets/target/sounds/m870_preparealt.ogg deleted file mode 100644 index e302f78ec..000000000 Binary files a/src/main/resources/assets/target/sounds/m870_preparealt.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m870_reload_loop.ogg b/src/main/resources/assets/target/sounds/m870_reload_loop.ogg deleted file mode 100644 index 07458e085..000000000 Binary files a/src/main/resources/assets/target/sounds/m870_reload_loop.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m98b_fire_1p.ogg b/src/main/resources/assets/target/sounds/m98b_fire_1p.ogg deleted file mode 100644 index 42f3735eb..000000000 Binary files a/src/main/resources/assets/target/sounds/m98b_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m98b_fire_3p.ogg b/src/main/resources/assets/target/sounds/m98b_fire_3p.ogg deleted file mode 100644 index 84dab7423..000000000 Binary files a/src/main/resources/assets/target/sounds/m98b_fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m98breload.ogg b/src/main/resources/assets/target/sounds/m98breload.ogg deleted file mode 100644 index cf44b4198..000000000 Binary files a/src/main/resources/assets/target/sounds/m98breload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m98breload2.ogg b/src/main/resources/assets/target/sounds/m98breload2.ogg deleted file mode 100644 index 199bbf104..000000000 Binary files a/src/main/resources/assets/target/sounds/m98breload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/marlin__fire1p.ogg b/src/main/resources/assets/target/sounds/marlin__fire1p.ogg deleted file mode 100644 index 40316924a..000000000 Binary files a/src/main/resources/assets/target/sounds/marlin__fire1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/marlin__fire3p.ogg b/src/main/resources/assets/target/sounds/marlin__fire3p.ogg deleted file mode 100644 index a584a6090..000000000 Binary files a/src/main/resources/assets/target/sounds/marlin__fire3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/marlin_end.ogg b/src/main/resources/assets/target/sounds/marlin_end.ogg deleted file mode 100644 index 7d691664b..000000000 Binary files a/src/main/resources/assets/target/sounds/marlin_end.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/marlin_loop.ogg b/src/main/resources/assets/target/sounds/marlin_loop.ogg deleted file mode 100644 index 7e4246956..000000000 Binary files a/src/main/resources/assets/target/sounds/marlin_loop.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/marlin_start.ogg b/src/main/resources/assets/target/sounds/marlin_start.ogg deleted file mode 100644 index cea356deb..000000000 Binary files a/src/main/resources/assets/target/sounds/marlin_start.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/minigun_fire.ogg b/src/main/resources/assets/target/sounds/minigun_fire.ogg deleted file mode 100644 index 820455870..000000000 Binary files a/src/main/resources/assets/target/sounds/minigun_fire.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/minigun_fire_3p.ogg b/src/main/resources/assets/target/sounds/minigun_fire_3p.ogg deleted file mode 100644 index 05f9ec70d..000000000 Binary files a/src/main/resources/assets/target/sounds/minigun_fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/minigun_overheat.ogg b/src/main/resources/assets/target/sounds/minigun_overheat.ogg deleted file mode 100644 index 3728a1fd4..000000000 Binary files a/src/main/resources/assets/target/sounds/minigun_overheat.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/minigun_stop.ogg b/src/main/resources/assets/target/sounds/minigun_stop.ogg deleted file mode 100644 index dcd67a0d0..000000000 Binary files a/src/main/resources/assets/target/sounds/minigun_stop.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/mk14_reload_empty.ogg b/src/main/resources/assets/target/sounds/mk14_reload_empty.ogg deleted file mode 100644 index 446502ead..000000000 Binary files a/src/main/resources/assets/target/sounds/mk14_reload_empty.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/mk14_reload_norm.ogg b/src/main/resources/assets/target/sounds/mk14_reload_norm.ogg deleted file mode 100644 index b8b3fbed4..000000000 Binary files a/src/main/resources/assets/target/sounds/mk14_reload_norm.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/mk14ebr_fire.ogg b/src/main/resources/assets/target/sounds/mk14ebr_fire.ogg deleted file mode 100644 index 2bd0c5fd9..000000000 Binary files a/src/main/resources/assets/target/sounds/mk14ebr_fire.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/overheat.ogg b/src/main/resources/assets/target/sounds/overheat.ogg deleted file mode 100644 index afee83db3..000000000 Binary files a/src/main/resources/assets/target/sounds/overheat.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/rpg7_fire.ogg b/src/main/resources/assets/target/sounds/rpg7_fire.ogg deleted file mode 100644 index ddf4ca06e..000000000 Binary files a/src/main/resources/assets/target/sounds/rpg7_fire.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/rpg7_reload.ogg b/src/main/resources/assets/target/sounds/rpg7_reload.ogg deleted file mode 100644 index bbf25b482..000000000 Binary files a/src/main/resources/assets/target/sounds/rpg7_reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/rpk_fire.ogg b/src/main/resources/assets/target/sounds/rpk_fire.ogg deleted file mode 100644 index 7e0dfa595..000000000 Binary files a/src/main/resources/assets/target/sounds/rpk_fire.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/rpk_fire1p.ogg b/src/main/resources/assets/target/sounds/rpk_fire1p.ogg deleted file mode 100644 index 107a163d9..000000000 Binary files a/src/main/resources/assets/target/sounds/rpk_fire1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/sentinel_fire_1.ogg b/src/main/resources/assets/target/sounds/sentinel_fire_1.ogg deleted file mode 100644 index 16e41282b..000000000 Binary files a/src/main/resources/assets/target/sounds/sentinel_fire_1.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/sentinel_fire_3.ogg b/src/main/resources/assets/target/sounds/sentinel_fire_3.ogg deleted file mode 100644 index 17868a8a8..000000000 Binary files a/src/main/resources/assets/target/sounds/sentinel_fire_3.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/sentinel_fire_charge1.ogg b/src/main/resources/assets/target/sounds/sentinel_fire_charge1.ogg deleted file mode 100644 index 7d2357fc3..000000000 Binary files a/src/main/resources/assets/target/sounds/sentinel_fire_charge1.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/sentinel_fire_charge3.ogg b/src/main/resources/assets/target/sounds/sentinel_fire_charge3.ogg deleted file mode 100644 index 8a761c1d4..000000000 Binary files a/src/main/resources/assets/target/sounds/sentinel_fire_charge3.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/sentinel_reload.ogg b/src/main/resources/assets/target/sounds/sentinel_reload.ogg deleted file mode 100644 index 96c0507ab..000000000 Binary files a/src/main/resources/assets/target/sounds/sentinel_reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/sentinel_reload2.ogg b/src/main/resources/assets/target/sounds/sentinel_reload2.ogg deleted file mode 100644 index 65914d1a7..000000000 Binary files a/src/main/resources/assets/target/sounds/sentinel_reload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/shotfire.ogg b/src/main/resources/assets/target/sounds/shotfire.ogg deleted file mode 100644 index 4495a0953..000000000 Binary files a/src/main/resources/assets/target/sounds/shotfire.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/shotfire_3p.ogg b/src/main/resources/assets/target/sounds/shotfire_3p.ogg deleted file mode 100644 index 4ba02cd5f..000000000 Binary files a/src/main/resources/assets/target/sounds/shotfire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/svd_fire_1p.ogg b/src/main/resources/assets/target/sounds/svd_fire_1p.ogg deleted file mode 100644 index cf301d64f..000000000 Binary files a/src/main/resources/assets/target/sounds/svd_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/svd_fire_3p.ogg b/src/main/resources/assets/target/sounds/svd_fire_3p.ogg deleted file mode 100644 index 56d3a0e07..000000000 Binary files a/src/main/resources/assets/target/sounds/svd_fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/svdfar.ogg b/src/main/resources/assets/target/sounds/svdfar.ogg deleted file mode 100644 index 052db216a..000000000 Binary files a/src/main/resources/assets/target/sounds/svdfar.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/svdreload.ogg b/src/main/resources/assets/target/sounds/svdreload.ogg deleted file mode 100644 index 1bff8b89e..000000000 Binary files a/src/main/resources/assets/target/sounds/svdreload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/svdreload2.ogg b/src/main/resources/assets/target/sounds/svdreload2.ogg deleted file mode 100644 index 886fe2007..000000000 Binary files a/src/main/resources/assets/target/sounds/svdreload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/svdveryfar.ogg b/src/main/resources/assets/target/sounds/svdveryfar.ogg deleted file mode 100644 index 39695e7c0..000000000 Binary files a/src/main/resources/assets/target/sounds/svdveryfar.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/vecreload.ogg b/src/main/resources/assets/target/sounds/vecreload.ogg deleted file mode 100644 index d9bde56a2..000000000 Binary files a/src/main/resources/assets/target/sounds/vecreload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/vecreload2.ogg b/src/main/resources/assets/target/sounds/vecreload2.ogg deleted file mode 100644 index a225a8b9e..000000000 Binary files a/src/main/resources/assets/target/sounds/vecreload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/vector_fire_1p.ogg b/src/main/resources/assets/target/sounds/vector_fire_1p.ogg deleted file mode 100644 index f70d2b20b..000000000 Binary files a/src/main/resources/assets/target/sounds/vector_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/vector_fire_3p.ogg b/src/main/resources/assets/target/sounds/vector_fire_3p.ogg deleted file mode 100644 index 49ac1ce12..000000000 Binary files a/src/main/resources/assets/target/sounds/vector_fire_3p.ogg and /dev/null differ