From 5951a1aa7e8e3eb66464f39208c5b39c0c3cfaa0 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Sun, 12 May 2024 21:37:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E6=8D=A2=E5=BC=B9=E9=9F=B3?= =?UTF-8?q?=E6=95=88=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../target/event/PlayerEventHandler.java | 151 ++++++++++++++++ .../mcreator/target/item/gun/AK47Item.java | 8 + .../mcreator/target/item/gun/Aa12Item.java | 8 + .../net/mcreator/target/item/gun/Abekiri.java | 8 + .../mcreator/target/item/gun/Devotion.java | 8 + .../net/mcreator/target/item/gun/GunItem.java | 9 +- .../mcreator/target/item/gun/Hk416Item.java | 8 + .../target/item/gun/HuntingRifle.java | 8 + .../net/mcreator/target/item/gun/Kraber.java | 8 + .../net/mcreator/target/item/gun/M4Item.java | 8 + .../net/mcreator/target/item/gun/M60Item.java | 8 + .../net/mcreator/target/item/gun/M79Item.java | 8 + .../mcreator/target/item/gun/M870Item.java | 8 + .../mcreator/target/item/gun/M98bItem.java | 8 + .../mcreator/target/item/gun/MarlinItem.java | 8 + .../mcreator/target/item/gun/Mk14Item.java | 8 + .../net/mcreator/target/item/gun/RpgItem.java | 8 + .../net/mcreator/target/item/gun/RpkItem.java | 8 + .../target/item/gun/SentinelItem.java | 8 + .../net/mcreator/target/item/gun/SksItem.java | 8 + .../net/mcreator/target/item/gun/SvdItem.java | 8 + .../net/mcreator/target/item/gun/Taser.java | 8 + .../mcreator/target/item/gun/Trachelium.java | 8 + .../mcreator/target/item/gun/VectorItem.java | 7 + .../procedures/ReloadsoundstopProcedure.java | 162 ------------------ 25 files changed, 334 insertions(+), 163 deletions(-) delete mode 100644 src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java index 0ed08e309..fc043b949 100644 --- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java @@ -3,12 +3,15 @@ package net.mcreator.target.event; import net.mcreator.target.init.TargetModItems; import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.init.TargetModTags; +import net.mcreator.target.item.gun.GunItem; +import net.mcreator.target.item.gun.MarlinItem; import net.mcreator.target.network.TargetModVariables; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.game.ClientboundStopSoundPacket; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundSource; @@ -68,6 +71,7 @@ public class PlayerEventHandler { handleDistantRange(player); renderDamageIndicator(player); bocekPulling(player); + stopLastGunReloadSound(player); } } @@ -394,4 +398,151 @@ public class PlayerEventHandler { }); } } + + private static void stopLastGunReloadSound(Player entity) { + if (entity.level().isClientSide() || entity.getServer() == null) return; + + var server = (ServerLevel) entity.level(); + + ItemStack mainHandItem = entity.getMainHandItem(); + if (mainHandItem.getOrCreateTag().getDouble("id") != entity.getPersistentData().getDouble("id")) { +// if (mainHandItem.getItem() instanceof GunItem gun) { +// stopReloadSound(server, gun); +// } + + // TODO 把这坨修改成正确的实现（停止播放上一把枪的音效） + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(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:m98b_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m98b_reload_empty"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m4_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m4_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: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:aa12_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:aa12_reload_empty"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:hk416_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:hk416_reload_empty"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:rpk_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:rpk_reload_empty"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:kraber_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:kraber_reload_empty"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:vector_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:vector_reload_empty"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:mk14_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:mk14_reload_empty"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:sentinel_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:sentinel_reload_empty"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:sentinel_charge"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m60_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m60_reload_empty"); + + + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:svd_reload_normal"); + entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, + entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:svd_reload_empty"); + + + } + + if (mainHandItem.getItem() != TargetModItems.MARLIN.get()) { + stopGunReloadSound(server, (MarlinItem) TargetModItems.MARLIN.get()); + } + + if (mainHandItem.getItem() != TargetModItems.M_870.get()) { + stopGunReloadSound(server, (GunItem) TargetModItems.M_870.get()); + } + + if (mainHandItem.getOrCreateTag().getDouble("cid") != entity.getPersistentData().getDouble("cid")) { + stopGunReloadSound(server, (GunItem) TargetModItems.SENTINEL.get()); + } + } + + private static void stopGunReloadSound(ServerLevel server, GunItem gun) { + gun.getReloadSound().forEach(sound -> { + var clientboundstopsoundpacket = new ClientboundStopSoundPacket(sound.getLocation(), SoundSource.PLAYERS); + server.players().forEach(p -> p.connection.send(clientboundstopsoundpacket)); + }); + } } diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java index 87c94baad..234c2fb94 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.AK47ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -42,6 +45,11 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { public String animationProcedure = "empty"; public static ItemDisplayContext transformType; + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.AK_47_RELOAD_EMPTY.get(), TargetModSounds.AK_47_RELOAD_NORMAL.get()); + } + public AK47Item() { super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java index 016abf645..e116011a8 100644 --- a/src/main/java/net/mcreator/target/item/gun/Aa12Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Aa12Item.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.Aa12ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -15,6 +16,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -39,6 +41,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -173,6 +176,11 @@ public class Aa12Item extends GunItem implements GeoItem, AnimatedItem { Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.AA_12_RELOAD_EMPTY.get(), TargetModSounds.AA_12_RELOAD_NORMAL.get()); + } + public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.AA_12.get()); GunsTool.initCreativeGun(stack, TargetModItems.AA_12.getId().getPath()); diff --git a/src/main/java/net/mcreator/target/item/gun/Abekiri.java b/src/main/java/net/mcreator/target/item/gun/Abekiri.java index c74783b83..9decb9a71 100644 --- a/src/main/java/net/mcreator/target/item/gun/Abekiri.java +++ b/src/main/java/net/mcreator/target/item/gun/Abekiri.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.AbekiriItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.AbekiriWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -35,6 +37,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -43,6 +46,11 @@ public class Abekiri extends GunItem implements GeoItem, AnimatedItem { public String animationProcedure = "empty"; public static ItemDisplayContext transformType; + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.ABEKIRI_RELOAD_EMPTY.get(), TargetModSounds.ABEKIRI_RELOAD_NORMAL.get()); + } + public Abekiri() { super(new Item.Properties().durability(24).rarity(Rarity.COMMON)); } diff --git a/src/main/java/net/mcreator/target/item/gun/Devotion.java b/src/main/java/net/mcreator/target/item/gun/Devotion.java index e8bff2924..f1e3625a3 100644 --- a/src/main/java/net/mcreator/target/item/gun/Devotion.java +++ b/src/main/java/net/mcreator/target/item/gun/Devotion.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.DevotionItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -159,6 +162,11 @@ public class Devotion extends GunItem implements GeoItem, AnimatedItem { DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.DEVOTION_RELOAD_EMPTY.get(), TargetModSounds.DEVOTION_RELOAD_NORMAL.get()); + } + public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.DEVOTION.get()); GunsTool.initCreativeGun(stack, TargetModItems.DEVOTION.getId().getPath()); diff --git a/src/main/java/net/mcreator/target/item/gun/GunItem.java b/src/main/java/net/mcreator/target/item/gun/GunItem.java index e84cb51d4..2482c7ef6 100644 --- a/src/main/java/net/mcreator/target/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/target/item/gun/GunItem.java @@ -4,6 +4,7 @@ import net.mcreator.target.init.TargetModTags; import net.mcreator.target.tools.GunsTool; import net.mcreator.target.tools.ItemNBTTool; import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; @@ -14,8 +15,10 @@ import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import java.util.Set; + @Mod.EventBusSubscriber -public class GunItem extends Item { +public abstract class GunItem extends Item { public GunItem(Properties properties) { super(properties); } @@ -35,6 +38,10 @@ public class GunItem extends Item { GunsTool.pvpModeCheck(itemstack, level); } + public Set getReloadSound() { + return Set.of(); + } + @Override public boolean isFoil(ItemStack stack) { return stack.getOrCreateTag().getBoolean("beast"); diff --git a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java index 2facc733c..5d6c12215 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.Hk416ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -168,6 +171,11 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.HK_416_RELOAD_EMPTY.get(), TargetModSounds.HK_416_RELOAD_NORMAL.get()); + } + public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.HK_416.get()); GunsTool.initCreativeGun(stack, TargetModItems.HK_416.getId().getPath()); diff --git a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java index f611bb3d3..6bf2c98bd 100644 --- a/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java +++ b/src/main/java/net/mcreator/target/item/gun/HuntingRifle.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.HuntingRifleItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.HrrelodingProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -46,6 +49,11 @@ public class HuntingRifle extends GunItem implements GeoItem, AnimatedItem { super(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.HUNTING_RIFLE_RELOAD.get()); + } + @Override public void initializeClient(Consumer consumer) { super.initializeClient(consumer); diff --git a/src/main/java/net/mcreator/target/item/gun/Kraber.java b/src/main/java/net/mcreator/target/item/gun/Kraber.java index e3eb24431..7de72a29a 100644 --- a/src/main/java/net/mcreator/target/item/gun/Kraber.java +++ b/src/main/java/net/mcreator/target/item/gun/Kraber.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.KraberItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.KraberWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -15,6 +16,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -38,6 +40,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -50,6 +53,11 @@ public class Kraber extends GunItem implements GeoItem, AnimatedItem { super(new Item.Properties().stacksTo(1).rarity(RarityTool.SPECIAL)); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.KRABER_RELOAD_EMPTY.get(), TargetModSounds.KRABER_RELOAD_NORMAL.get()); + } + @Override public void initializeClient(Consumer consumer) { super.initializeClient(consumer); diff --git a/src/main/java/net/mcreator/target/item/gun/M4Item.java b/src/main/java/net/mcreator/target/item/gun/M4Item.java index e85024588..4db953640 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M4ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -168,6 +171,11 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.M_4_RELOAD_EMPTY.get(), TargetModSounds.M_4_RELOAD_NORMAL.get()); + } + public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_4.get()); GunsTool.initCreativeGun(stack, TargetModItems.M_4.getId().getPath()); diff --git a/src/main/java/net/mcreator/target/item/gun/M60Item.java b/src/main/java/net/mcreator/target/item/gun/M60Item.java index 71c0b542e..67f2cee22 100644 --- a/src/main/java/net/mcreator/target/item/gun/M60Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M60Item.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M60ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -150,6 +153,11 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.M_60_RELOAD_EMPTY.get(), TargetModSounds.M_60_RELOAD_NORMAL.get()); + } + @Override public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { return true; diff --git a/src/main/java/net/mcreator/target/item/gun/M79Item.java b/src/main/java/net/mcreator/target/item/gun/M79Item.java index a0159ca18..e3ca62b6f 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M79ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -35,6 +37,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -43,6 +46,11 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { public String animationProcedure = "empty"; public static ItemDisplayContext transformType; + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.M_79_RELOAD.get()); + } + public M79Item() { super(new Item.Properties().stacksTo(1).fireResistant().rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/gun/M870Item.java b/src/main/java/net/mcreator/target/item/gun/M870Item.java index 271e53d71..101efeb0f 100644 --- a/src/main/java/net/mcreator/target/item/gun/M870Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M870Item.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M870ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -35,6 +37,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -155,6 +158,11 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { M870WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.M_870_PREPAREALT.get(), TargetModSounds.M_870_RELOADLOOP.get()); + } + @Override public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { return true; diff --git a/src/main/java/net/mcreator/target/item/gun/M98bItem.java b/src/main/java/net/mcreator/target/item/gun/M98bItem.java index f4b2dcda7..f79d57438 100644 --- a/src/main/java/net/mcreator/target/item/gun/M98bItem.java +++ b/src/main/java/net/mcreator/target/item/gun/M98bItem.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.M98bItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -164,6 +167,11 @@ public class M98bItem extends GunItem implements GeoItem, AnimatedItem { M98bWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.M_98B_RELOAD_EMPTY.get(), TargetModSounds.M_98B_RELOAD_NORMAL.get()); + } + public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.M_98B.get()); GunsTool.initCreativeGun(stack, TargetModItems.M_98B.getId().getPath()); diff --git a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java index cda282874..a974db3cb 100644 --- a/src/main/java/net/mcreator/target/item/gun/MarlinItem.java +++ b/src/main/java/net/mcreator/target/item/gun/MarlinItem.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.MarlinItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -162,6 +165,11 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { MarlinWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.MARLIN_LOOP.get(), TargetModSounds.MARLIN_START.get(), TargetModSounds.MARLIN_END.get()); + } + @Override public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { return true; diff --git a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java index c1e742c5a..00cb03cc8 100644 --- a/src/main/java/net/mcreator/target/item/gun/Mk14Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Mk14Item.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.Mk14ItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -146,6 +149,11 @@ public class Mk14Item extends GunItem implements GeoItem, AnimatedItem { Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.MK_14_RELOAD_EMPTY.get(), TargetModSounds.MK_14_RELOAD_NORMAL.get()); + } + @Override public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { return true; diff --git a/src/main/java/net/mcreator/target/item/gun/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index 6eead8e49..8474b3b30 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.RpgItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -35,6 +37,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -160,6 +163,11 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.RPG_RELOAD.get()); + } + public static double getAmmoCount(Player player) { double sum = 0.0; for (int i = 0; i < player.getInventory().getContainerSize(); ++i) { diff --git a/src/main/java/net/mcreator/target/item/gun/RpkItem.java b/src/main/java/net/mcreator/target/item/gun/RpkItem.java index 3a4b6e340..607a9259d 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.RpkItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -168,6 +171,11 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.RPK_RELOAD_EMPTY.get(), TargetModSounds.RPK_RELOAD_NORMAL.get()); + } + public static ItemStack getGunInstance() { ItemStack stack = new ItemStack(TargetModItems.RPK.get()); GunsTool.initCreativeGun(stack, TargetModItems.RPK.getId().getPath()); diff --git a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java index 0f28d5559..aacf9b6e6 100644 --- a/src/main/java/net/mcreator/target/item/gun/SentinelItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SentinelItem.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.SentinelItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -16,6 +17,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -39,6 +41,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -175,6 +178,11 @@ public class SentinelItem extends GunItem implements GeoItem, AnimatedItem { SentinelWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.SENTINEL_RELOAD_EMPTY.get(), TargetModSounds.SENTINEL_RELOAD_NORMAL.get(), TargetModSounds.SENTINEL_CHARGE.get()); + } + @Override public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { return true; diff --git a/src/main/java/net/mcreator/target/item/gun/SksItem.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java index b28838218..d0b750078 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.SksItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -42,6 +45,11 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { public String animationProcedure = "empty"; public static ItemDisplayContext transformType; + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.SKS_RELOAD_EMPTY.get(), TargetModSounds.SKS_RELOAD_NORMAL.get()); + } + public SksItem() { super(new Item.Properties().stacksTo(1).rarity(Rarity.RARE)); } diff --git a/src/main/java/net/mcreator/target/item/gun/SvdItem.java b/src/main/java/net/mcreator/target/item/gun/SvdItem.java index 90771f561..f5042fab0 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.SvdItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -34,6 +36,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -139,6 +142,11 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.SVD_RELOAD_EMPTY.get(), TargetModSounds.SVD_RELOAD_NORMAL.get()); + } + @Override public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { return true; diff --git a/src/main/java/net/mcreator/target/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index 8b4605d24..64cc5a090 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.TaserItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.TasercooldownProcedure; import net.mcreator.target.tools.GunsTool; @@ -14,6 +15,7 @@ import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -35,6 +37,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -48,6 +51,11 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.TASER_RELOAD.get()); + } + @Override public void initializeClient(Consumer consumer) { super.initializeClient(consumer); diff --git a/src/main/java/net/mcreator/target/item/gun/Trachelium.java b/src/main/java/net/mcreator/target/item/gun/Trachelium.java index 5128e9abb..e8131ccaf 100644 --- a/src/main/java/net/mcreator/target/item/gun/Trachelium.java +++ b/src/main/java/net/mcreator/target/item/gun/Trachelium.java @@ -5,6 +5,7 @@ import com.google.common.collect.Multimap; import net.mcreator.target.TargetMod; import net.mcreator.target.client.renderer.item.TracheliumItemRenderer; import net.mcreator.target.init.TargetModItems; +import net.mcreator.target.init.TargetModSounds; import net.mcreator.target.item.AnimatedItem; import net.mcreator.target.procedures.ReloadingProcedure; import net.mcreator.target.tools.GunsTool; @@ -17,6 +18,7 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Style; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -41,6 +43,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -53,6 +56,11 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { super(new Item.Properties().stacksTo(1).rarity(RarityTool.LEGENDARY)); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.TRACHELIUM_RELOAD.get()); + } + @Override public void initializeClient(Consumer consumer) { super.initializeClient(consumer); diff --git a/src/main/java/net/mcreator/target/item/gun/VectorItem.java b/src/main/java/net/mcreator/target/item/gun/VectorItem.java index 5654b4d26..0656aa0ab 100644 --- a/src/main/java/net/mcreator/target/item/gun/VectorItem.java +++ b/src/main/java/net/mcreator/target/item/gun/VectorItem.java @@ -19,6 +19,7 @@ import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; @@ -43,6 +44,7 @@ import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.GeckoLibUtil; import java.util.List; +import java.util.Set; import java.util.UUID; import java.util.function.Consumer; @@ -204,6 +206,11 @@ public class VectorItem extends GunItem implements GeoItem, AnimatedItem { WeaponDrawLightProcedure.execute(entity, itemStack); } + @Override + public Set getReloadSound() { + return Set.of(TargetModSounds.VECTOR_RELOAD_NORMAL.get(), TargetModSounds.VECTOR_RELOAD_EMPTY.get()); + } + @Override public boolean onEntitySwing(ItemStack stack, LivingEntity entity) { return true; diff --git a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java b/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java deleted file mode 100644 index f7f862f20..000000000 --- a/src/main/java/net/mcreator/target/procedures/ReloadsoundstopProcedure.java +++ /dev/null @@ -1,162 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.commands.CommandSource; -import net.minecraft.commands.CommandSourceStack; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.entity.player.Player; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber -public class ReloadsoundstopProcedure { - @SubscribeEvent - public static void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.phase == TickEvent.Phase.END) { - execute(event.player); - } - } - - private static void execute(Player entity) { - if (entity.level().isClientSide() || entity.getServer() == null) return; - if (entity.getMainHandItem().getOrCreateTag().getDouble("id") != entity.getPersistentData().getDouble("id")) { - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(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:m98b_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m98b_reload_empty"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m4_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m4_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: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:aa12_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:aa12_reload_empty"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:hk416_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:hk416_reload_empty"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:rpk_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:rpk_reload_empty"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:kraber_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:kraber_reload_empty"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:vector_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:vector_reload_empty"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:mk14_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:mk14_reload_empty"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:sentinel_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:sentinel_reload_empty"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:sentinel_charge"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m60_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m60_reload_empty"); - - - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:svd_reload_normal"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:svd_reload_empty"); - - } - if (!(entity.getMainHandItem().getItem() == TargetModItems.MARLIN.get())) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:marlin_loop"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:marlin_start"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:marlin_end"); - - } - if (!(entity.getMainHandItem().getItem() == TargetModItems.M_870.get())) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m870_reloadloop"); - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, entity.position(), entity.getRotationVector(), entity.level() instanceof ServerLevel ? (ServerLevel) entity.level() : null, 4, - entity.getName().getString(), entity.getDisplayName(), entity.level().getServer(), entity), "stopsound @s player target:m870_preparealt"); - - } - if (entity.getMainHandItem().getOrCreateTag().getDouble("cid") != entity.getPersistentData().getDouble("cid")) { - entity.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(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_charge"); - - } - } -}