diff --git a/src/main/java/net/mcreator/target/init/TargetModSounds.java b/src/main/java/net/mcreator/target/init/TargetModSounds.java index 5d3c63885..510560949 100644 --- a/src/main/java/net/mcreator/target/init/TargetModSounds.java +++ b/src/main/java/net/mcreator/target/init/TargetModSounds.java @@ -13,50 +13,65 @@ import net.minecraftforge.registries.RegistryObject; public class TargetModSounds { public static final DeferredRegister REGISTRY = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, TargetMod.MODID); - public static final RegistryObject TASERFIRE = REGISTRY.register("taserfire", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taserfire"))); + public static final RegistryObject TASER_FIRE_1P = REGISTRY.register("taser_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_fire_1p"))); + public static final RegistryObject TASER_FIRE_3P = REGISTRY.register("taser_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_fire_3p"))); + public static final RegistryObject TASER_RELOAD = REGISTRY.register("taser_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taser_reload"))); public static final RegistryObject SHOCK = REGISTRY.register("shock", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "shock"))); - public static final RegistryObject TRACHELIUM3P = REGISTRY.register("trachelium3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium3p"))); + public static final RegistryObject TRACHELIUM_FIRE_1P = REGISTRY.register("trachelium_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_fire_1p"))); + public static final RegistryObject TRACHELIUM_FIRE_3P = REGISTRY.register("trachelium_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_fire_3p"))); + public static final RegistryObject TRACHELIUM_FAR = REGISTRY.register("trachelium_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_far"))); + public static final RegistryObject TRACHELIUM_VERYFAR = REGISTRY.register("trachelium_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_veryfar"))); + public static final RegistryObject TRACHELIUM_RELOAD = REGISTRY.register("trachelium_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "trachelium_reload"))); public static final RegistryObject TRIGGERCLICK = REGISTRY.register("triggerclick", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "triggerclick"))); public static final RegistryObject HIT = REGISTRY.register("hit", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hit"))); - public static final RegistryObject TASERRELOAD = REGISTRY.register("taserreload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "taserreload"))); - public static final RegistryObject RELOAD = REGISTRY.register("reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "reload"))); public static final RegistryObject TARGETDOWN = REGISTRY.register("targetdown", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "targetdown"))); public static final RegistryObject INDICATION = REGISTRY.register("indication", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "indication"))); public static final RegistryObject JUMP = REGISTRY.register("jump", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "jump"))); public static final RegistryObject DOUBLEJUMP = REGISTRY.register("doublejump", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "doublejump"))); - public static final RegistryObject C4EXP = REGISTRY.register("c4exp", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "c4exp"))); public static final RegistryObject EXP = REGISTRY.register("exp", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "exp"))); public static final RegistryObject EXPFAR = REGISTRY.register("expfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "expfar"))); public static final RegistryObject EXPVERYFAR = REGISTRY.register("expveryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "expveryfar"))); - public static final RegistryObject HR_FIRE_1P = REGISTRY.register("hr_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hr_fire_1p"))); - public static final RegistryObject HR_RELOAD = REGISTRY.register("hr_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hr_reload"))); - public static final RegistryObject WAAO = REGISTRY.register("waao", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "waao"))); - public static final RegistryObject STIM = REGISTRY.register("stim", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "stim"))); + public static final RegistryObject HUNTING_RIFLE_FIRE_1P = REGISTRY.register("hunting_rifle_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_fire_1p"))); + public static final RegistryObject HUNTING_RIFLE_FIRE_3P = REGISTRY.register("hunting_rifle_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_fire_3p"))); + public static final RegistryObject HUNTING_RIFLE_FAR = REGISTRY.register("hunting_rifle_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_far"))); + public static final RegistryObject HUNTING_RIFLE_VERYFAR = REGISTRY.register("hunting_rifle_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_veryfar"))); + public static final RegistryObject HUNTING_RIFLE_RELOAD = REGISTRY.register("hunting_rifle_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "hunting_rifle_reload"))); public static final RegistryObject OUCH = REGISTRY.register("ouch", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ouch"))); public static final RegistryObject STEP = REGISTRY.register("step", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "step"))); public static final RegistryObject GROWL = REGISTRY.register("growl", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "growl"))); public static final RegistryObject IDLE = REGISTRY.register("idle", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "idle"))); public static final RegistryObject M79_FIRE_1P = REGISTRY.register("m79_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m79_fire_1p"))); - public static final RegistryObject M79RELOAD = REGISTRY.register("m79reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m79reload"))); - public static final RegistryObject AK_FIRE_3P = REGISTRY.register("ak_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak_fire_3p"))); - public static final RegistryObject AKRELOAD = REGISTRY.register("akreload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "akreload"))); - public static final RegistryObject ELBOW_START = REGISTRY.register("elbow_start", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "elbow_start"))); - public static final RegistryObject ELBOW_HIT = REGISTRY.register("elbow_hit", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "elbow_hit"))); - public static final RegistryObject AKRELOAD2 = REGISTRY.register("akreload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "akreload2"))); + 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_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"))); + public static final RegistryObject SKS_RELOAD_NORMAL = REGISTRY.register("sks_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_reload_normal"))); + public static final RegistryObject SKS_RELOAD_EMPTY = REGISTRY.register("sks_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_reload_empty"))); + public static final RegistryObject SKS_FAR = REGISTRY.register("sks_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_far"))); + public static final RegistryObject SKS_VERYFAR = REGISTRY.register("sks_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sks_veryfar"))); + public static final RegistryObject ABEKIRI_FIRE_1P = REGISTRY.register("abekiri_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_fire_1p"))); + public static final RegistryObject ABEKIRI_FIRE_3P = REGISTRY.register("abekiri_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_fire_3p"))); + public static final RegistryObject ABEKIRI_FAR = REGISTRY.register("abekiri_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_far"))); + public static final RegistryObject ABEKIRI_VERYFAR = REGISTRY.register("abekiri_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_veryfar"))); + public static final RegistryObject ABEKIRI_RELOAD_NORMAL = REGISTRY.register("abekiri_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_reload_normal"))); + public static final RegistryObject ABEKIRI_RELOAD_EMPTY = REGISTRY.register("abekiri_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abekiri_reload_empty"))); + public static final RegistryObject AK47_FIRE_1P = REGISTRY.register("ak47_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47_fire_1p"))); + public static final RegistryObject AK47_FIRE_3P = REGISTRY.register("ak47_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47_fire_3p"))); + public static final RegistryObject AK47_FAR = REGISTRY.register("ak47_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47_far"))); + public static final RegistryObject AK47_VERYFAR = REGISTRY.register("ak47_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47_veryfar"))); + public static final RegistryObject AK47_RELOAD_NORMAL = REGISTRY.register("ak47_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47_reload_normal"))); + 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 ABKR_FIRE_3P = REGISTRY.register("abkr_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abkr_fire_3p"))); - public static final RegistryObject ABKR_RELOAD = REGISTRY.register("abkr_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abkr_reload"))); - public static final RegistryObject ABKR_RELOAD2 = REGISTRY.register("abkr_reload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "abkr_reload2"))); 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 AK47RELOAD = REGISTRY.register("ak47reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47reload"))); - public static final RegistryObject AK47RELOAD2 = REGISTRY.register("ak47reload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47reload2"))); - public static final RegistryObject AK47_FIRE_3P = REGISTRY.register("ak47_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47_fire_3p"))); + 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"))); - public static final RegistryObject DEVOTION_RELOAD = REGISTRY.register("devotion_reload", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_reload"))); - public static final RegistryObject DEVOTION_RELOAD2 = REGISTRY.register("devotion_reload2", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_reload2"))); + public static final RegistryObject DEVOTION_FAR = REGISTRY.register("devotion_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_far"))); + 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_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"))); @@ -129,14 +144,7 @@ public class TargetModSounds { 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 DEVOTION_FIRE_1P = REGISTRY.register("devotion_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "devotion_fire_1p"))); - public static final RegistryObject AKFAR = REGISTRY.register("akfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "akfar"))); - public static final RegistryObject AKVERYFAR = REGISTRY.register("akveryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "akveryfar"))); - public static final RegistryObject AK47_FIRE_1P = REGISTRY.register("ak47_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak47_fire_1p"))); - public static final RegistryObject AK_FIRE_1P = REGISTRY.register("ak_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "ak_fire_1p"))); public static final RegistryObject RPK_FIRE1P = REGISTRY.register("rpk_fire1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "rpk_fire1p"))); - public static final RegistryObject SKSFAR = REGISTRY.register("sksfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sksfar"))); - public static final RegistryObject SKSVERYFAR = REGISTRY.register("sksveryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "sksveryfar"))); 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"))); diff --git a/src/main/java/net/mcreator/target/procedures/AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 56101e1e5..fa1229a97 100644 --- a/src/main/java/net/mcreator/target/procedures/AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -24,7 +24,7 @@ public class AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:ak47reload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -47,7 +47,7 @@ public class AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:ak47reload2 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/Aa12DsProcedure.java b/src/main/java/net/mcreator/target/procedures/Aa12DsProcedure.java deleted file mode 100644 index cc2c0cab6..000000000 --- a/src/main/java/net/mcreator/target/procedures/Aa12DsProcedure.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; - -public class Aa12DsProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - { - if (!entity.level().isClientSide() && entity.getServer() != null) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:aa12_far player @a ~ ~ ~ 16 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:aa12_very_far player @a ~ ~ ~ 32 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:aa12_far"); - } - } - { - 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:aa12_very_far"); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 4d003c684..36133fbd7 100644 --- a/src/main/java/net/mcreator/target/procedures/AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -27,7 +27,7 @@ public class AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:abkr_reload2 player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:abekiri_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -71,7 +71,7 @@ public class AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:abkr_reload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:abekiri_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/AbkrfireProcedure.java b/src/main/java/net/mcreator/target/procedures/AbkrfireProcedure.java index c00c5f6ac..cc07443c7 100644 --- a/src/main/java/net/mcreator/target/procedures/AbkrfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/AbkrfireProcedure.java @@ -34,7 +34,13 @@ public class AbkrfireProcedure { 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:abkr_fire_3p player @a ~ ~ ~ 4 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:abekiri_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:abekiri_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:abekiri_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:abekiri_veryfar player @a ~ ~ ~ 24 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/AkDsProcedure.java b/src/main/java/net/mcreator/target/procedures/AkDsProcedure.java deleted file mode 100644 index d9fcfe1c3..000000000 --- a/src/main/java/net/mcreator/target/procedures/AkDsProcedure.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; - -public class AkDsProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - { - 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:akfar player @a ~ ~ ~ 12 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:akveryfar player @a ~ ~ ~ 24 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:akfar"); - } - } - { - 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:akveryfar"); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/ArDsProcedure.java b/src/main/java/net/mcreator/target/procedures/ArDsProcedure.java deleted file mode 100644 index b021afa5a..000000000 --- a/src/main/java/net/mcreator/target/procedures/ArDsProcedure.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; - -public class ArDsProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - { - 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:m4far player @a ~ ~ ~ 12 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:m4veryfar player @a ~ ~ ~ 24 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:m4far"); - } - } - { - 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:m4veryfar"); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 86af2ef6c..d6b6a794e 100644 --- a/src/main/java/net/mcreator/target/procedures/DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -24,7 +24,7 @@ public class DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { if (!entity.level().isClientSide() && entity.getServer() != null) { entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_reload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -48,7 +48,7 @@ public class DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:devotion_reload2 player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:devotion_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/HkDsProcedure.java b/src/main/java/net/mcreator/target/procedures/HkDsProcedure.java deleted file mode 100644 index dfe157c6e..000000000 --- a/src/main/java/net/mcreator/target/procedures/HkDsProcedure.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; - -public class HkDsProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - { - 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:hk_far player @a ~ ~ ~ 12 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:hk_very_far player @a ~ ~ ~ 24 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:hk_far"); - } - } - { - 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:hk_very_far"); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/HrrelodingProcedure.java b/src/main/java/net/mcreator/target/procedures/HrrelodingProcedure.java index 8b91f506e..2c9293d1a 100644 --- a/src/main/java/net/mcreator/target/procedures/HrrelodingProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/HrrelodingProcedure.java @@ -26,7 +26,7 @@ public class HrrelodingProcedure { { 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:hr_reload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hunting_rifle_reload player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/KraberDsProcedure.java b/src/main/java/net/mcreator/target/procedures/KraberDsProcedure.java deleted file mode 100644 index e7d5ccc4c..000000000 --- a/src/main/java/net/mcreator/target/procedures/KraberDsProcedure.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; - -public class KraberDsProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - { - 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:kraberfar player @a ~ ~ ~ 16 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:kraberveryfar player @a ~ ~ ~ 32 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:kraberfar"); - } - } - { - 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:kraberveryfar"); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java b/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java index 93a6b5861..a3a1eb880 100644 --- a/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/KraberfireProcedure.java @@ -17,7 +17,6 @@ public class KraberfireProcedure { && usehand.getOrCreateTag().getDouble("ammo") > 0) { usehand.getOrCreateTag().putDouble("fireanim", 40); BulletFireNormalProcedure.execute(entity); - KraberDsProcedure.execute(entity); if (entity instanceof Player _player) _player.getCooldowns().addCooldown(usehand.getItem(), 40); @@ -27,7 +26,9 @@ 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_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), "stopsound @s player target:kraber_fire_3p"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:kraberfar player @a ~ ~ ~ 16 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"); } usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); } diff --git a/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 9a55b607c..58ca8d663 100644 --- a/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -28,7 +28,7 @@ public class M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { { 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:m79reload player @s ~ ~ ~ 100 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:m79_reload 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 dec3f0ec0..0adec5f6d 100644 --- a/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79fireProcedure.java @@ -59,7 +59,9 @@ public class M79fireProcedure { 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:m79_fire_1p player @a ~ ~ ~ 4 1"); + 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"); } usehand.getOrCreateTag().putDouble("fireanim", 2); usehand.getOrCreateTag().putDouble("ammo", (usehand.getOrCreateTag().getDouble("ammo") - 1)); diff --git a/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java b/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java index 20e7f476f..157dfa0d9 100644 --- a/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java +++ b/src/main/java/net/mcreator/target/procedures/NormalMagGunFire.java @@ -62,239 +62,163 @@ public class NormalMagGunFire { } if (usehand.getItem() == TargetModItems.AK_47.get()) { { - 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:ak47_fire_1p player @s ~ ~ ~ 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:ak47_fire_1p player @s ~ ~ ~ 2 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_fire_3p player @a ~ ~ ~ 4 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_far player @a ~ ~ ~ 12 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:ak47_veryfar player @a ~ ~ ~ 24 1"); } } - { - 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:ak47_fire_3p player @a ~ ~ ~ 4 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:ak47_fire_3p"); - } - } - // 这个是远处的枪声 - AkDsProcedure.execute(entity); } if (usehand.getItem() == TargetModItems.AA_12.get()) { { - 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:aa12_fire_1p player @s ~ ~ ~ 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: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.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.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 _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:aa12fire player @a ~ ~ ~ 6 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:aa12fire"); - } - } - Aa12DsProcedure.execute(entity); } if (usehand.getItem() == TargetModItems.DEVOTION.get()) { { - 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:devotion_fire_1p player @s ~ ~ ~ 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:devotion_fire_1p player @s ~ ~ ~ 2 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_fire_3p player @a ~ ~ ~ 4 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_far player @a ~ ~ ~ 12 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:devotion_veryfar player @a ~ ~ ~ 24 1"); } } - { - 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:devotion_fire_3p player @a ~ ~ ~ 4 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:devotion_fire_3p"); - } - } - ArDsProcedure.execute(entity); } if (usehand.getItem() == TargetModItems.HK_416.get()) { { - 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:hk416_fire1p player @s ~ ~ ~ 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:hk416_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:hk416fire 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.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 _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:hk416fire player @a ~ ~ ~ 4 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:hk416fire"); - } - } - HkDsProcedure.execute(entity); } if (usehand.getItem() == TargetModItems.M_4.get()) { { - 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:m4fire player @s ~ ~ ~ 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:m4fire 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.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.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 _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:m4fire_3p player @a ~ ~ ~ 4 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:m4fire_3p"); - } - } - ArDsProcedure.execute(entity); } if (usehand.getItem() == TargetModItems.M_60.get()) { { - 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:m60fire 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), "playsound target:m60fire player @a ~ ~ ~ 4 1"); } } } if (usehand.getItem() == TargetModItems.SKS.get()) { { - 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:ak_fire_1p player @s ~ ~ ~ 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:sks_fire_1p player @s ~ ~ ~ 2 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sks_fire_3p player @a ~ ~ ~ 5 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sks_far player @a ~ ~ ~ 12 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:sks_veryfar player @a ~ ~ ~ 24 1"); } } - { - 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:ak_fire_3p player @a ~ ~ ~ 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:ak_fire_3p"); - } - } - SksDsProcedure.execute(entity); } if (usehand.getItem() == TargetModItems.MK_14.get()) { { - 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:mk14fire 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), "playsound target:mk14fire player @a ~ ~ ~ 4 1"); } } } if (usehand.getItem() == TargetModItems.RPK.get()) { { - 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:rpk_fire1p player @s ~ ~ ~ 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:rpk_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), "stopsound @s player target:rpkfire"); + 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 _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:rpkfire player @a ~ ~ ~ 4 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:rpkfire"); - } - } - AkDsProcedure.execute(entity); } if (usehand.getItem() == TargetModItems.SVD.get()) { { - 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:svdfire1p player @s ~ ~ ~ 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:svdfire1p 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.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.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 _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:svdfire3p player @a ~ ~ ~ 6 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:svdfire3p"); - } - } - SvdDsProcedure.execute(entity); } if (usehand.getItem() == TargetModItems.VECTOR.get()) { { - 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:vec3 player @a ~ ~ ~ 2 1"); } } } if (usehand.getItem() == TargetModItems.TRACHELIUM.get()) { { - 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:trachelium3p 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), "playsound target:trachelium_fire_1p player @s ~ ~ ~ 2 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:trachelium_fire_3p player @a ~ ~ ~ 4 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:trachelium_veryfar player @a ~ ~ ~ 16 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"); } } } if (usehand.getItem() == TargetModItems.HUNTING_RIFLE.get()) { { - 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:hr_fire_1p 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), "playsound target:hunting_rifle_fire_1p player @s ~ ~ ~ 1 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hunting_rifle_fire_3p player @a ~ ~ ~ 4 1"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:hunting_rifle_far player @a ~ ~ ~ 16 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"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index 0f57c3137..471c24045 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -21,7 +21,8 @@ public class PlayerReloadProcedure { if (player.getMainHandItem().getItem() == TargetModItems.TASER.get() && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && tag.getDouble("reloading") == 0 - && tag.getDouble("ammo") < 1) { + && tag.getDouble("ammo") < 1 + && tag.getDouble("maxammo") > 0) { tag.putDouble("reloading", 1); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); tag.putDouble("reloadtime", 55); diff --git a/src/main/java/net/mcreator/target/procedures/ReloadingProcedure.java b/src/main/java/net/mcreator/target/procedures/ReloadingProcedure.java index f4fa335ec..1c52473cf 100644 --- a/src/main/java/net/mcreator/target/procedures/ReloadingProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ReloadingProcedure.java @@ -26,7 +26,7 @@ public class ReloadingProcedure { 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:reload player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:trachelium_reload player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java index 374302d10..05ced91a1 100644 --- a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java @@ -34,243 +34,116 @@ public class ReloadsoundstopProcedure { return; if ((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") != entity.getPersistentData().getDouble("id")) { { - 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:taserreload"); - } - } - { - 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:ak47reload"); - } - } - { - 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:ak47reload2"); - } - } - { - 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:reload"); - } - } - { - 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:hr_reload"); - } - } - { - 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:m79reload"); - } - } - { - 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:akreload"); - } - } - { - 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:akreload2"); - } - } - { - 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:abkr_reload2"); - } - } - { - 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:abkr_reload"); - } - } - { - 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:m98breload"); - } - } - { - 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:m98breload2"); - } - } - { - 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:m4reload"); - } - } - { - 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:m4reload2"); - } - } - { - 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:devotion_reload"); - } - } - { - 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:devotion_reload2"); - } - } - { - 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:rpg7_reload"); - } - } - { - 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:aa12reload"); - } - } - { - 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:aa12reload2"); - } - } - { - 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:hk416reload"); - } - } - { - 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:hk416reload2"); - } - } - { - 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:rpkreload"); - } - } - { - 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:rpkreload2"); - } - } - { - 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:kraberreload"); - } - } - { - 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:kraberreload2"); - } - } - { - 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:vecreload"); - } - } - { - 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:vecreload2"); - } - } - { - 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:sentinel_reload"); - } - } - { - 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:sentinel_reload2"); - } - } - { - 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"); - } - } - { - 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:m60reload"); - } - } - { - 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:m60reload2"); - } - } - { - 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:svdreload"); - } - } - { - 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:svdreload2"); + 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:taser_reload"); + + + 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:ak47_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:ak47_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:trachelium_reload"); + + + 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:hunting_rifle_reload"); + + + 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:m79_reload"); + + + 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:sks_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:sks_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:abekiri_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:abekiri_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:m98breload"); + 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.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.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.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:devotion_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:devotion_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:rpg7_reload"); + + + 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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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"); } } + } if (!((entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getItem() == TargetModItems.MARLIN.get())) { { @@ -278,18 +151,8 @@ public class ReloadsoundstopProcedure { 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:marlin_loop"); - } - } - { - 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:marlin_start"); - } - } - { - 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:marlin_end"); } @@ -301,11 +164,6 @@ public class ReloadsoundstopProcedure { 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:m870_reloadloop"); - } - } - { - 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:m870_preparealt"); } diff --git a/src/main/java/net/mcreator/target/procedures/SksDsProcedure.java b/src/main/java/net/mcreator/target/procedures/SksDsProcedure.java deleted file mode 100644 index b838d2198..000000000 --- a/src/main/java/net/mcreator/target/procedures/SksDsProcedure.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; - -public class SksDsProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - { - 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:sksfar player @a ~ ~ ~ 12 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:sksveryfar player @a ~ ~ ~ 24 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:sksfar"); - } - } - { - 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:sksveryfar"); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 81b24f6d3..0b34e4edc 100644 --- a/src/main/java/net/mcreator/target/procedures/SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -25,7 +25,7 @@ public class SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:akreload player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:sks_reload_empty player @s ~ ~ ~ 100 1"); } } } @@ -52,7 +52,7 @@ public class SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { 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:akreload2 player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:sks_reload_normal player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/SvdDsProcedure.java b/src/main/java/net/mcreator/target/procedures/SvdDsProcedure.java deleted file mode 100644 index 5ef4cffe5..000000000 --- a/src/main/java/net/mcreator/target/procedures/SvdDsProcedure.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.mcreator.target.procedures; - -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; - -public class SvdDsProcedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack usehand = ItemStack.EMPTY; - { - 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:svdfar player @a ~ ~ ~ 16 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:svdveryfar player @a ~ ~ ~ 32 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:svdfar"); - } - } - { - 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:svdveryfar"); - } - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java b/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java index 2b071b44d..839ca48e2 100644 --- a/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java @@ -27,7 +27,7 @@ public class TasercooldownProcedure { 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:taserreload player @s ~ ~ ~ 100 1"); + _ent.getName().getString(), _ent.getDisplayName(), _ent.level().getServer(), _ent), "playsound target:taser_reload player @s ~ ~ ~ 100 1"); } } } diff --git a/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java b/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java index 9d23fa4b9..04ac2b0f3 100644 --- a/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TaserfireProcedure.java @@ -34,7 +34,21 @@ public class TaserfireProcedure { 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:taserfire player @a ~ ~ ~ 1 1"); + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "playsound target:taser_fire_1p player @s ~ ~ ~ 1 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:taser_fire_3p player @a ~ ~ ~ 1 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:taser_fire_3p"); + } } Level projectileLevel = entity.level(); diff --git a/src/main/resources/assets/target/sounds.json b/src/main/resources/assets/target/sounds.json index e6203ba71..5f7ea2883 100644 --- a/src/main/resources/assets/target/sounds.json +++ b/src/main/resources/assets/target/sounds.json @@ -1,480 +1,238 @@ { - "taserfire": { + "taser_fire_1p": { "sounds": [ { - "name": "target:taserfire", + "name": "target:taser/taser_fire_1p", "stream": false } ] }, - "shock": { + "taser_fire_3p": { "sounds": [ { - "name": "target:shock", + "name": "target:taser/taser_fire_3p", "stream": false } ] }, - "trachelium3p": { + "taser_reload": { "sounds": [ { - "name": "target:trachelium_3p", + "name": "target:taser/taser_reload", "stream": false } ] }, - "triggerclick": { + + "trachelium_fire_1p": { "sounds": [ { - "name": "target:trigger_click", + "name": "target:trachelium/trachelium_fire_1p", "stream": false } ] }, - "hit": { + "trachelium_fire_3p": { "sounds": [ { - "name": "target:metal_01", - "stream": false - }, - { - "name": "target:metal_02", - "stream": false - }, - { - "name": "target:metal_03", - "stream": false - }, - { - "name": "target:metal_04", - "stream": false - }, - { - "name": "target:metal_05", + "name": "target:trachelium/trachelium_fire_3p", "stream": false } ] }, - "taserreload": { + "trachelium_far": { "sounds": [ { - "name": "target:taserreload", + "name": "target:trachelium/trachelium_far", "stream": false } ] }, - "reload": { + "trachelium_veryfar": { "sounds": [ { - "name": "target:reload", + "name": "target:trachelium/trachelium_veryfar", "stream": false } ] }, - "targetdown": { + "trachelium_reload": { "sounds": [ { - "name": "target:targetdown", + "name": "target:trachelium/trachelium_reload", "stream": false } ] }, - "indication": { + + "hunting_rifle_fire_1p": { "sounds": [ { - "name": "target:indication", + "name": "target:hunting_rifle/hunting_rifle_fire_1p", "stream": false } ] }, - "jump": { + "hunting_rifle_fire_3p": { "sounds": [ { - "name": "target:jump", + "name": "target:hunting_rifle/hunting_rifle_fire_3p", "stream": false } ] }, - "doublejump": { + "hunting_rifle_far": { "sounds": [ { - "name": "target:doublejump", + "name": "target:hunting_rifle/hunting_rifle_far", "stream": false } ] }, - "c4exp": { + "hunting_rifle_veryfar": { "sounds": [ { - "name": "target:c4exp", - "stream": false - }, - { - "name": "target:c4exp2", - "stream": false - }, - { - "name": "target:c4exp3", - "stream": false - }, - { - "name": "target:c4exp4", - "stream": false - }, - { - "name": "target:c4exp5", - "stream": false - }, - { - "name": "target:c4exp6", + "name": "target:hunting_rifle/hunting_rifle_veryfar", "stream": false } ] }, - "exp": { + "hunting_rifle_reload": { "sounds": [ { - "name": "target:near1", - "stream": false - }, - { - "name": "target:near2", - "stream": false - }, - { - "name": "target:near3", - "stream": false - } - ] - }, - "expfar": { - "sounds": [ - { - "name": "target:close", - "stream": false - }, - { - "name": "target:close2", - "stream": false - }, - { - "name": "target:close3", - "stream": false - } - ] - }, - "expveryfar": { - "sounds": [ - { - "name": "target:far", - "stream": false - }, - { - "name": "target:far2", - "stream": false - } - ] - }, - "hr_fire_1p": { - "sounds": [ - { - "name": "target:hr_fire_1p", - "stream": false - } - ] - }, - "hr_reload": { - "sounds": [ - { - "name": "target:hr_reload", - "stream": false - } - ] - }, - "waao": { - "sounds": [ - { - "name": "target:waao", - "stream": false - } - ] - }, - "stim": { - "sounds": [ - { - "name": "target:stim1", - "stream": false - }, - { - "name": "target:stim2", - "stream": false - }, - { - "name": "target:stim3", - "stream": false - }, - { - "name": "target:stim4", - "stream": false - }, - { - "name": "target:stim5", - "stream": false - } - ] - }, - "ouch": { - "sounds": [ - { - "name": "target:ouch", - "stream": false - } - ] - }, - "step": { - "sounds": [ - { - "name": "target:step1", - "stream": false - }, - { - "name": "target:step2", - "stream": false - }, - { - "name": "target:step3", - "stream": false - }, - { - "name": "target:step4", - "stream": false - } - ] - }, - "growl": { - "sounds": [ - { - "name": "target:growl", - "stream": false - } - ] - }, - "idle": { - "sounds": [ - { - "name": "target:heng", - "stream": false - }, - { - "name": "target:hengheng", - "stream": false - }, - { - "name": "target:yarimasune", + "name": "target:hunting_rifle/hunting_rifle_reload", "stream": false } ] }, + "m79_fire_1p": { "sounds": [ { - "name": "target:m79_fire_1p", + "name": "target:m79/m79_fire_1p", "stream": false } ] }, - "m79reload": { + "m79_fire_3p": { "sounds": [ { - "name": "target:m79reload", + "name": "target:m79/m79_fire_3p", "stream": false } ] }, - "ak_fire_3p": { + "m79_reload": { "sounds": [ { - "name": "target:ak_fire_3p", + "name": "target:m79/m79_reload", "stream": false } ] }, - "akreload": { + + "sks_fire_1p": { "sounds": [ { - "name": "target:akreload", + "name": "target:sks/sks_fire_1p", "stream": false } ] }, - "elbow_start": { + "sks_fire_3p": { "sounds": [ { - "name": "target:elbow_start", + "name": "target:sks/sks_fire_3p", "stream": false } ] }, - "elbow_hit": { + "sks_reload_normal": { "sounds": [ { - "name": "target:elbow_hit1", - "stream": false - }, - { - "name": "target:elbow_hit2", - "stream": false - }, - { - "name": "target:elbow_hit3", + "name": "target:sks/sks_reload_normal", "stream": false } ] }, - "akreload2": { + "sks_reload_empty": { "sounds": [ { - "name": "target:akreload2", + "name": "target:sks/sks_reload_empty", "stream": false } ] }, - "land": { + "sks_far": { "sounds": [ { - "name": "target:1", - "stream": false - }, - { - "name": "target:2", - "stream": false - }, - { - "name": "target:3", - "stream": false - }, - { - "name": "target:4", - "stream": false - }, - { - "name": "target:5", - "stream": false - }, - { - "name": "target:6", - "stream": false - }, - { - "name": "target:7", - "stream": false - }, - { - "name": "target:8", - "stream": false - }, - { - "name": "target:9", - "stream": false - }, - { - "name": "target:10", - "stream": false - }, - { - "name": "target:11", - "stream": false - }, - { - "name": "target:12", - "stream": false - }, - { - "name": "target:13", - "stream": false - }, - { - "name": "target:14", - "stream": false - }, - { - "name": "target:15", - "stream": false - }, - { - "name": "target:16", + "name": "target:sks/sks_far", "stream": false } ] }, - "abkr_fire_3p": { + "sks_veryfar": { "sounds": [ { - "name": "target:abkr_fire_3p", + "name": "target:sks/sks_veryfar", "stream": false } ] }, - "abkr_reload": { + + "abekiri_fire_1p": { "sounds": [ { - "name": "target:abkr_reload", + "name": "target:abekiri/abekiri_fire_1p", "stream": false } ] }, - "abkr_reload2": { + "abekiri_fire_3p": { "sounds": [ { - "name": "target:abkr_reload2", + "name": "target:abekiri/abekiri_fire_3p", "stream": false } ] }, - "shift": { + "abekiri_far": { "sounds": [ { - "name": "target:shift", + "name": "target:abekiri/abekiri_far", "stream": false } ] }, - "enemy_spot": { + "abekiri_veryfar": { "sounds": [ { - "name": "target:enemy_spot", + "name": "target:abekiri/abekiri_veryfar", "stream": false } ] }, - "enemy_spot_1p": { + "abekiri_reload_normal": { "sounds": [ { - "name": "target:enemy_spot_1p", + "name": "target:abekiri/abekiri_reload_normal", "stream": false } ] }, - "headshot": { + "abekiri_reload_empty": { "sounds": [ { - "name": "target:headshot", + "name": "target:abekiri/abekiri_reload_empty", "stream": false } ] }, - "ak47reload": { + + "ak47_fire_1p": { "sounds": [ { - "name": "target:akreload", - "stream": false - } - ] - }, - "ak47reload2": { - "sounds": [ - { - "name": "target:akreload2", + "name": "target:ak47/ak47_fire_1p", "stream": false } ] @@ -482,7 +240,48 @@ "ak47_fire_3p": { "sounds": [ { - "name": "target:ak47_fire_3p", + "name": "target:ak47/ak47_fire_3p", + "stream": false + } + ] + }, + "ak47_far": { + "sounds": [ + { + "name": "target:ak47/ak47_far", + "stream": false + } + ] + }, + "ak47_veryfar": { + "sounds": [ + { + "name": "target:ak47/ak47_veryfar", + "stream": false + } + ] + }, + "ak47_reload_normal": { + "sounds": [ + { + "name": "target:ak47/ak47_reload_normal", + "stream": false + } + ] + }, + "ak47_reload_empty": { + "sounds": [ + { + "name": "target:ak47/ak47_reload_empty", + "stream": false + } + ] + }, + + "devotion_fire_1p": { + "sounds": [ + { + "name": "target:devotion/devotion_fire_1p", "stream": false } ] @@ -490,27 +289,44 @@ "devotion_fire_3p": { "sounds": [ { - "name": "target:devotion_fire_3p", + "name": "target:devotion/devotion_fire_3p", "stream": false } ] }, - "devotion_reload": { + "devotion_far": { "sounds": [ { - "name": "target:devotion_reload", + "name": "target:devotion/devotion_far", "stream": false } ] }, - "devotion_reload2": { + "devotion_veryfar": { "sounds": [ { - "name": "target:devotion_reload2", + "name": "target:devotion/devotion_veryfar", "stream": false } ] }, + "devotion_reload_normal": { + "sounds": [ + { + "name": "target:devotion/devotion_reload_normal", + "stream": false + } + ] + }, + "devotion_reload_empty": { + "sounds": [ + { + "name": "target:devotion/devotion_reload_empty", + "stream": false + } + ] + }, + "rpg7_fire": { "sounds": [ { @@ -1095,46 +911,6 @@ } ] }, - "devotion_fire_1p": { - "sounds": [ - { - "name": "target:devotion_fire_1p", - "stream": false - } - ] - }, - "akfar": { - "sounds": [ - { - "name": "target:akfar", - "stream": false - } - ] - }, - "akveryfar": { - "sounds": [ - { - "name": "target:akveryfar", - "stream": false - } - ] - }, - "ak47_fire_1p": { - "sounds": [ - { - "name": "target:ak47_fire_1p", - "stream": false - } - ] - }, - "ak_fire_1p": { - "sounds": [ - { - "name": "target:ak_fire_1p", - "stream": false - } - ] - }, "rpk_fire1p": { "sounds": [ { @@ -1143,22 +919,6 @@ } ] }, - "sksfar": { - "sounds": [ - { - "name": "target:sksfar", - "stream": false - } - ] - }, - "sksveryfar": { - "sounds": [ - { - "name": "target:sksveryfar", - "stream": false - } - ] - }, "kraberfar": { "sounds": [ { @@ -1238,5 +998,258 @@ "stream": false } ] + }, + + "shock": { + "sounds": [ + { + "name": "target:shock", + "stream": false + } + ] + }, + "triggerclick": { + "sounds": [ + { + "name": "target:trigger_click", + "stream": false + } + ] + }, + "hit": { + "sounds": [ + { + "name": "target:bullet/metal_01", + "stream": false + }, + { + "name": "target:bullet/metal_02", + "stream": false + }, + { + "name": "target:bullet/metal_03", + "stream": false + }, + { + "name": "target:bullet/metal_04", + "stream": false + }, + { + "name": "target:bullet/metal_05", + "stream": false + } + ] + }, + "targetdown": { + "sounds": [ + { + "name": "target:targetdown", + "stream": false + } + ] + }, + "indication": { + "sounds": [ + { + "name": "target:indication", + "stream": false + } + ] + }, + "jump": { + "sounds": [ + { + "name": "target:jump", + "stream": false + } + ] + }, + "doublejump": { + "sounds": [ + { + "name": "target:doublejump", + "stream": false + } + ] + }, + "exp": { + "sounds": [ + { + "name": "target:explosion/exp", + "stream": false + }, + { + "name": "target:explosion/exp2", + "stream": false + }, + { + "name": "target:explosion/exp3", + "stream": false + } + ] + }, + "expfar": { + "sounds": [ + { + "name": "target:explosion/far", + "stream": false + }, + { + "name": "target:explosion/far2", + "stream": false + }, + { + "name": "target:explosion/far3", + "stream": false + } + ] + }, + "expveryfar": { + "sounds": [ + { + "name": "target:explosion/veryfar", + "stream": false + }, + { + "name": "target:explosion/veryfar2", + "stream": false + } + ] + }, + "ouch": { + "sounds": [ + { + "name": "target:ouch", + "stream": false + } + ] + }, + "step": { + "sounds": [ + { + "name": "target:step1", + "stream": false + }, + { + "name": "target:step2", + "stream": false + }, + { + "name": "target:step3", + "stream": false + }, + { + "name": "target:step4", + "stream": false + } + ] + }, + "growl": { + "sounds": [ + { + "name": "target:growl", + "stream": false + } + ] + }, + "idle": { + "sounds": [ + { + "name": "target:heng", + "stream": false + }, + { + "name": "target:hengheng", + "stream": false + }, + { + "name": "target:yarimasune", + "stream": false + } + ] + }, + "land": { + "sounds": [ + { + "name": "target:bullet/1", + "stream": false + }, + { + "name": "target:bullet/2", + "stream": false + }, + { + "name": "target:bullet/3", + "stream": false + }, + { + "name": "target:bullet/4", + "stream": false + }, + { + "name": "target:bullet/5", + "stream": false + }, + { + "name": "target:bullet/6", + "stream": false + }, + { + "name": "target:bullet/7", + "stream": false + }, + { + "name": "target:bullet/8", + "stream": false + }, + { + "name": "target:bullet/9", + "stream": false + }, + { + "name": "target:bullet/10", + "stream": false + }, + { + "name": "target:bullet/11", + "stream": false + }, + { + "name": "target:bullet/12", + "stream": false + }, + { + "name": "target:bullet/13", + "stream": false + }, + { + "name": "target:bullet/14", + "stream": false + }, + { + "name": "target:bullet/15", + "stream": false + }, + { + "name": "target:bullet/16", + "stream": false + } + ] + }, + "shift": { + "sounds": [ + { + "name": "target:shift", + "stream": false + } + ] + }, + "headshot": { + "sounds": [ + { + "name": "target:headshot", + "stream": false + } + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/target/sounds/1.ogg b/src/main/resources/assets/target/sounds/1.ogg deleted file mode 100644 index eaa5461fe..000000000 Binary files a/src/main/resources/assets/target/sounds/1.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/10.ogg b/src/main/resources/assets/target/sounds/10.ogg deleted file mode 100644 index ecd973a74..000000000 Binary files a/src/main/resources/assets/target/sounds/10.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/11.ogg b/src/main/resources/assets/target/sounds/11.ogg deleted file mode 100644 index 9e4335ec9..000000000 Binary files a/src/main/resources/assets/target/sounds/11.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/12.ogg b/src/main/resources/assets/target/sounds/12.ogg deleted file mode 100644 index 048968bed..000000000 Binary files a/src/main/resources/assets/target/sounds/12.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/13.ogg b/src/main/resources/assets/target/sounds/13.ogg deleted file mode 100644 index eae376aa8..000000000 Binary files a/src/main/resources/assets/target/sounds/13.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/14.ogg b/src/main/resources/assets/target/sounds/14.ogg deleted file mode 100644 index 68bde026d..000000000 Binary files a/src/main/resources/assets/target/sounds/14.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/15.ogg b/src/main/resources/assets/target/sounds/15.ogg deleted file mode 100644 index f79ce1835..000000000 Binary files a/src/main/resources/assets/target/sounds/15.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/16.ogg b/src/main/resources/assets/target/sounds/16.ogg deleted file mode 100644 index 7297b7573..000000000 Binary files a/src/main/resources/assets/target/sounds/16.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/2.ogg b/src/main/resources/assets/target/sounds/2.ogg deleted file mode 100644 index 00af40054..000000000 Binary files a/src/main/resources/assets/target/sounds/2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/3.ogg b/src/main/resources/assets/target/sounds/3.ogg deleted file mode 100644 index 86fcc578e..000000000 Binary files a/src/main/resources/assets/target/sounds/3.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/4.ogg b/src/main/resources/assets/target/sounds/4.ogg deleted file mode 100644 index 5407284d3..000000000 Binary files a/src/main/resources/assets/target/sounds/4.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/5.ogg b/src/main/resources/assets/target/sounds/5.ogg deleted file mode 100644 index 9388fbfe7..000000000 Binary files a/src/main/resources/assets/target/sounds/5.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/6.ogg b/src/main/resources/assets/target/sounds/6.ogg deleted file mode 100644 index a04338101..000000000 Binary files a/src/main/resources/assets/target/sounds/6.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/7.ogg b/src/main/resources/assets/target/sounds/7.ogg deleted file mode 100644 index 6a096532b..000000000 Binary files a/src/main/resources/assets/target/sounds/7.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/8.ogg b/src/main/resources/assets/target/sounds/8.ogg deleted file mode 100644 index a6f89c234..000000000 Binary files a/src/main/resources/assets/target/sounds/8.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/9.ogg b/src/main/resources/assets/target/sounds/9.ogg deleted file mode 100644 index e9c292403..000000000 Binary files a/src/main/resources/assets/target/sounds/9.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/abkr_fire_3p.ogg b/src/main/resources/assets/target/sounds/abkr_fire_3p.ogg deleted file mode 100644 index 31a03dee7..000000000 Binary files a/src/main/resources/assets/target/sounds/abkr_fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/abkr_reload.ogg b/src/main/resources/assets/target/sounds/abkr_reload.ogg deleted file mode 100644 index d9fff2e28..000000000 Binary files a/src/main/resources/assets/target/sounds/abkr_reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/abkr_reload2.ogg b/src/main/resources/assets/target/sounds/abkr_reload2.ogg deleted file mode 100644 index fdb8ae084..000000000 Binary files a/src/main/resources/assets/target/sounds/abkr_reload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/ak47_fire_1p.ogg b/src/main/resources/assets/target/sounds/ak47_fire_1p.ogg deleted file mode 100644 index 7f3551f5b..000000000 Binary files a/src/main/resources/assets/target/sounds/ak47_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/ak47_fire_3p.ogg b/src/main/resources/assets/target/sounds/ak47_fire_3p.ogg deleted file mode 100644 index 6066e0933..000000000 Binary files a/src/main/resources/assets/target/sounds/ak47_fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/ak_fire_1p.ogg b/src/main/resources/assets/target/sounds/ak_fire_1p.ogg deleted file mode 100644 index 3ca993f77..000000000 Binary files a/src/main/resources/assets/target/sounds/ak_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/ak_fire_3p.ogg b/src/main/resources/assets/target/sounds/ak_fire_3p.ogg deleted file mode 100644 index 68442e0ff..000000000 Binary files a/src/main/resources/assets/target/sounds/ak_fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/akfar.ogg b/src/main/resources/assets/target/sounds/akfar.ogg deleted file mode 100644 index 2657f8383..000000000 Binary files a/src/main/resources/assets/target/sounds/akfar.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/akreload.ogg b/src/main/resources/assets/target/sounds/akreload.ogg deleted file mode 100644 index 1bff8b89e..000000000 Binary files a/src/main/resources/assets/target/sounds/akreload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/akreload2.ogg b/src/main/resources/assets/target/sounds/akreload2.ogg deleted file mode 100644 index 886fe2007..000000000 Binary files a/src/main/resources/assets/target/sounds/akreload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/akveryfar.ogg b/src/main/resources/assets/target/sounds/akveryfar.ogg deleted file mode 100644 index 17095266e..000000000 Binary files a/src/main/resources/assets/target/sounds/akveryfar.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/c4exp.ogg b/src/main/resources/assets/target/sounds/c4exp.ogg deleted file mode 100644 index 0883c936c..000000000 Binary files a/src/main/resources/assets/target/sounds/c4exp.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/c4exp2.ogg b/src/main/resources/assets/target/sounds/c4exp2.ogg deleted file mode 100644 index 5bfa8f819..000000000 Binary files a/src/main/resources/assets/target/sounds/c4exp2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/c4exp3.ogg b/src/main/resources/assets/target/sounds/c4exp3.ogg deleted file mode 100644 index e4684fb40..000000000 Binary files a/src/main/resources/assets/target/sounds/c4exp3.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/c4exp4.ogg b/src/main/resources/assets/target/sounds/c4exp4.ogg deleted file mode 100644 index be8a96967..000000000 Binary files a/src/main/resources/assets/target/sounds/c4exp4.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/c4exp5.ogg b/src/main/resources/assets/target/sounds/c4exp5.ogg deleted file mode 100644 index f7dc99c68..000000000 Binary files a/src/main/resources/assets/target/sounds/c4exp5.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/c4exp6.ogg b/src/main/resources/assets/target/sounds/c4exp6.ogg deleted file mode 100644 index 3584b212f..000000000 Binary files a/src/main/resources/assets/target/sounds/c4exp6.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/close.ogg b/src/main/resources/assets/target/sounds/close.ogg deleted file mode 100644 index a84e743e2..000000000 Binary files a/src/main/resources/assets/target/sounds/close.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/close2.ogg b/src/main/resources/assets/target/sounds/close2.ogg deleted file mode 100644 index 99777fc5b..000000000 Binary files a/src/main/resources/assets/target/sounds/close2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/close3.ogg b/src/main/resources/assets/target/sounds/close3.ogg deleted file mode 100644 index 812cb83b5..000000000 Binary files a/src/main/resources/assets/target/sounds/close3.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/devotion_fire_1p.ogg b/src/main/resources/assets/target/sounds/devotion_fire_1p.ogg deleted file mode 100644 index 8afaf6b64..000000000 Binary files a/src/main/resources/assets/target/sounds/devotion_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/devotion_fire_3p.ogg b/src/main/resources/assets/target/sounds/devotion_fire_3p.ogg deleted file mode 100644 index 2f4b1d354..000000000 Binary files a/src/main/resources/assets/target/sounds/devotion_fire_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/devotion_reload.ogg b/src/main/resources/assets/target/sounds/devotion_reload.ogg deleted file mode 100644 index be6c31be3..000000000 Binary files a/src/main/resources/assets/target/sounds/devotion_reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/devotion_reload2.ogg b/src/main/resources/assets/target/sounds/devotion_reload2.ogg deleted file mode 100644 index 9ec2f3200..000000000 Binary files a/src/main/resources/assets/target/sounds/devotion_reload2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/elbow_hit1.ogg b/src/main/resources/assets/target/sounds/elbow_hit1.ogg deleted file mode 100644 index f1dd75216..000000000 Binary files a/src/main/resources/assets/target/sounds/elbow_hit1.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/elbow_hit2.ogg b/src/main/resources/assets/target/sounds/elbow_hit2.ogg deleted file mode 100644 index c4ba75cf7..000000000 Binary files a/src/main/resources/assets/target/sounds/elbow_hit2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/elbow_hit3.ogg b/src/main/resources/assets/target/sounds/elbow_hit3.ogg deleted file mode 100644 index dee931f1d..000000000 Binary files a/src/main/resources/assets/target/sounds/elbow_hit3.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/elbow_start.ogg b/src/main/resources/assets/target/sounds/elbow_start.ogg deleted file mode 100644 index 3c78dfed4..000000000 Binary files a/src/main/resources/assets/target/sounds/elbow_start.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/enemy_spot.ogg b/src/main/resources/assets/target/sounds/enemy_spot.ogg deleted file mode 100644 index 61626c760..000000000 Binary files a/src/main/resources/assets/target/sounds/enemy_spot.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/enemy_spot_1p.ogg b/src/main/resources/assets/target/sounds/enemy_spot_1p.ogg deleted file mode 100644 index 2ac16922e..000000000 Binary files a/src/main/resources/assets/target/sounds/enemy_spot_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/far.ogg b/src/main/resources/assets/target/sounds/far.ogg deleted file mode 100644 index e47a0d3bf..000000000 Binary files a/src/main/resources/assets/target/sounds/far.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/far2.ogg b/src/main/resources/assets/target/sounds/far2.ogg deleted file mode 100644 index c1182ad6a..000000000 Binary files a/src/main/resources/assets/target/sounds/far2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/hr_fire_1p.ogg b/src/main/resources/assets/target/sounds/hr_fire_1p.ogg deleted file mode 100644 index 8b3455008..000000000 Binary files a/src/main/resources/assets/target/sounds/hr_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/hr_reload.ogg b/src/main/resources/assets/target/sounds/hr_reload.ogg deleted file mode 100644 index 07322c65e..000000000 Binary files a/src/main/resources/assets/target/sounds/hr_reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m79_fire_1p.ogg b/src/main/resources/assets/target/sounds/m79_fire_1p.ogg deleted file mode 100644 index e20fce101..000000000 Binary files a/src/main/resources/assets/target/sounds/m79_fire_1p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/m79reload.ogg b/src/main/resources/assets/target/sounds/m79reload.ogg deleted file mode 100644 index 8aa7e571d..000000000 Binary files a/src/main/resources/assets/target/sounds/m79reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/metal_01.ogg b/src/main/resources/assets/target/sounds/metal_01.ogg deleted file mode 100644 index e75dbc1c9..000000000 Binary files a/src/main/resources/assets/target/sounds/metal_01.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/metal_02.ogg b/src/main/resources/assets/target/sounds/metal_02.ogg deleted file mode 100644 index 51cedb636..000000000 Binary files a/src/main/resources/assets/target/sounds/metal_02.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/metal_03.ogg b/src/main/resources/assets/target/sounds/metal_03.ogg deleted file mode 100644 index aa939e14d..000000000 Binary files a/src/main/resources/assets/target/sounds/metal_03.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/metal_04.ogg b/src/main/resources/assets/target/sounds/metal_04.ogg deleted file mode 100644 index 28e920d26..000000000 Binary files a/src/main/resources/assets/target/sounds/metal_04.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/metal_05.ogg b/src/main/resources/assets/target/sounds/metal_05.ogg deleted file mode 100644 index 3f00fbabb..000000000 Binary files a/src/main/resources/assets/target/sounds/metal_05.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/near1.ogg b/src/main/resources/assets/target/sounds/near1.ogg deleted file mode 100644 index 87de8b9e4..000000000 Binary files a/src/main/resources/assets/target/sounds/near1.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/near2.ogg b/src/main/resources/assets/target/sounds/near2.ogg deleted file mode 100644 index 9110c2403..000000000 Binary files a/src/main/resources/assets/target/sounds/near2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/near3.ogg b/src/main/resources/assets/target/sounds/near3.ogg deleted file mode 100644 index 082d3259d..000000000 Binary files a/src/main/resources/assets/target/sounds/near3.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/reload.ogg b/src/main/resources/assets/target/sounds/reload.ogg deleted file mode 100644 index b21fe2ab0..000000000 Binary files a/src/main/resources/assets/target/sounds/reload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/sksfar.ogg b/src/main/resources/assets/target/sounds/sksfar.ogg deleted file mode 100644 index 55d3cdf41..000000000 Binary files a/src/main/resources/assets/target/sounds/sksfar.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/sksveryfar.ogg b/src/main/resources/assets/target/sounds/sksveryfar.ogg deleted file mode 100644 index df7422138..000000000 Binary files a/src/main/resources/assets/target/sounds/sksveryfar.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/stim1.ogg b/src/main/resources/assets/target/sounds/stim1.ogg deleted file mode 100644 index 0d8df29d0..000000000 Binary files a/src/main/resources/assets/target/sounds/stim1.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/stim2.ogg b/src/main/resources/assets/target/sounds/stim2.ogg deleted file mode 100644 index b6f815035..000000000 Binary files a/src/main/resources/assets/target/sounds/stim2.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/stim3.ogg b/src/main/resources/assets/target/sounds/stim3.ogg deleted file mode 100644 index 3cb645b34..000000000 Binary files a/src/main/resources/assets/target/sounds/stim3.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/stim4.ogg b/src/main/resources/assets/target/sounds/stim4.ogg deleted file mode 100644 index 8526737d1..000000000 Binary files a/src/main/resources/assets/target/sounds/stim4.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/stim5.ogg b/src/main/resources/assets/target/sounds/stim5.ogg deleted file mode 100644 index e25b5a37a..000000000 Binary files a/src/main/resources/assets/target/sounds/stim5.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/taserfire.ogg b/src/main/resources/assets/target/sounds/taserfire.ogg deleted file mode 100644 index f89582ada..000000000 Binary files a/src/main/resources/assets/target/sounds/taserfire.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/taserreload.ogg b/src/main/resources/assets/target/sounds/taserreload.ogg deleted file mode 100644 index 8de31a2e2..000000000 Binary files a/src/main/resources/assets/target/sounds/taserreload.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/trachelium_3p.ogg b/src/main/resources/assets/target/sounds/trachelium_3p.ogg deleted file mode 100644 index 25a7e93df..000000000 Binary files a/src/main/resources/assets/target/sounds/trachelium_3p.ogg and /dev/null differ diff --git a/src/main/resources/assets/target/sounds/waao.ogg b/src/main/resources/assets/target/sounds/waao.ogg deleted file mode 100644 index 77bd9ab64..000000000 Binary files a/src/main/resources/assets/target/sounds/waao.ogg and /dev/null differ