diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index 069d9d70d..0c0bfb7ca 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -5,9 +5,12 @@ import net.mcreator.target.init.TargetModAttributes; import net.mcreator.target.init.TargetModTags; import net.mcreator.target.procedures.BulletFireNormalProcedure; import net.mcreator.target.tools.ItemNBTTool; +import net.minecraft.core.Holder; +import net.minecraft.network.protocol.game.ClientboundSoundPacket; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraftforge.event.TickEvent; @@ -137,10 +140,10 @@ public class GunEventHandler { } playGunSounds(player); - } } + public static void playGunSounds(Player player) { ItemStack stack = player.getMainHandItem(); if (!stack.is(TargetModTags.Items.GUN)) { @@ -151,16 +154,18 @@ public class GunEventHandler { String origin = stack.getItem().getDescriptionId(); String name = origin.substring(origin.lastIndexOf(".") + 1); - ResourceLocation resourceLocation = new ResourceLocation(TargetMod.MODID, name + "_fire_1p"); - - System.out.println(resourceLocation); - - SoundEvent sound = ForgeRegistries.SOUND_EVENTS.getValue(resourceLocation); - if (sound != null) { - player.playSound(sound); + SoundEvent sound1p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(TargetMod.MODID, name + "_fire_1p")); + if (sound1p != null && player instanceof ServerPlayer serverPlayer) { + serverPlayer.connection.send(new ClientboundSoundPacket(new Holder.Direct<>(sound1p), + SoundSource.PLAYERS, serverPlayer.getX(), serverPlayer.getY(), serverPlayer.getZ(), 2f, 1f, serverPlayer.level().random.nextLong())); } -// ((ServerPlayer) player).connection.send + SoundEvent sound3p = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(TargetMod.MODID, name + "_fire_3p")); + if (sound3p != null) { + player.playSound(sound3p, 4f, 1f); + } + + } diff --git a/src/main/java/net/mcreator/target/init/TargetModSounds.java b/src/main/java/net/mcreator/target/init/TargetModSounds.java index bcd592dca..cbcae8d7a 100644 --- a/src/main/java/net/mcreator/target/init/TargetModSounds.java +++ b/src/main/java/net/mcreator/target/init/TargetModSounds.java @@ -78,18 +78,18 @@ public class TargetModSounds { public static final RegistryObject MORTAR_LOAD = REGISTRY.register("mortar_load", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_load"))); public static final RegistryObject MORTAR_DISTANT = REGISTRY.register("mortar_distant", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "mortar_distant"))); public static final RegistryObject FIRERATE = REGISTRY.register("firerate", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "firerate"))); - public static final RegistryObject M4_FIRE_1P = REGISTRY.register("m4_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_fire_1p"))); - public static final RegistryObject M4_FIRE_3P = REGISTRY.register("m4_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_fire_3p"))); - public static final RegistryObject M4_FAR = REGISTRY.register("m4_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_far"))); - public static final RegistryObject M4_VERYFAR = REGISTRY.register("m4_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_veryfar"))); - public static final RegistryObject M4_RELOAD_NORMAL = REGISTRY.register("m4_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_reload_normal"))); - public static final RegistryObject M4_RELOAD_EMPTY = REGISTRY.register("m4_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m4_reload_empty"))); - public static final RegistryObject AA12_FIRE_1P = REGISTRY.register("aa12_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_fire_1p"))); - public static final RegistryObject AA12_FIRE_3P = REGISTRY.register("aa12_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_fire_3p"))); - public static final RegistryObject AA12_FAR = REGISTRY.register("aa12_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_far"))); - public static final RegistryObject AA12_VERYFAR = REGISTRY.register("aa12_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_veryfar"))); - public static final RegistryObject AA12_RELOAD_NORMAL = REGISTRY.register("aa12_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_reload_normal"))); - public static final RegistryObject AA12_RELOAD_EMPTY = REGISTRY.register("aa12_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa12_reload_empty"))); + public static final RegistryObject M_4_FIRE_1P = REGISTRY.register("m_4_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_fire_1p"))); + public static final RegistryObject M_4_FIRE_3P = REGISTRY.register("m_4_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_fire_3p"))); + public static final RegistryObject M_4_FAR = REGISTRY.register("m_4_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_far"))); + public static final RegistryObject M_4_VERYFAR = REGISTRY.register("m_4_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_veryfar"))); + public static final RegistryObject M_4_RELOAD_NORMAL = REGISTRY.register("m_4_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_reload_normal"))); + public static final RegistryObject M_4_RELOAD_EMPTY = REGISTRY.register("m_4_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "m_4_reload_empty"))); + public static final RegistryObject AA_12_FIRE_1P = REGISTRY.register("aa_12_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_fire_1p"))); + public static final RegistryObject AA_12_FIRE_3P = REGISTRY.register("aa_12_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_fire_3p"))); + public static final RegistryObject AA_12_FAR = REGISTRY.register("aa_12_far", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_far"))); + public static final RegistryObject AA_12_VERYFAR = REGISTRY.register("aa_12_veryfar", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_veryfar"))); + public static final RegistryObject AA_12_RELOAD_NORMAL = REGISTRY.register("aa_12_reload_normal", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_reload_normal"))); + public static final RegistryObject AA_12_RELOAD_EMPTY = REGISTRY.register("aa_12_reload_empty", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "aa_12_reload_empty"))); public static final RegistryObject BOCEK_ZOOM_FIRE_1P = REGISTRY.register("bocek_zoom_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_zoom_fire_1p"))); public static final RegistryObject BOCEK_ZOOM_FIRE_3P = REGISTRY.register("bocek_zoom_fire_3p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_zoom_fire_3p"))); public static final RegistryObject BOCEK_SHATTER_CAP_FIRE_1P = REGISTRY.register("bocek_shatter_cap_fire_1p", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation("target", "bocek_shatter_cap_fire_1p"))); diff --git a/src/main/resources/assets/target/sounds.json b/src/main/resources/assets/target/sounds.json index c7dce920e..bf4c7861d 100644 --- a/src/main/resources/assets/target/sounds.json +++ b/src/main/resources/assets/target/sounds.json @@ -384,99 +384,99 @@ ] }, - "m4_fire_1p": { + "m_4_fire_1p": { "sounds": [ { - "name": "target:m4/m4_fire_1p", + "name": "target:m_4/m_4_fire_1p", "stream": false } ] }, - "m4_fire_3p": { + "m_4_fire_3p": { "sounds": [ { - "name": "target:m4/m4_fire_3p", + "name": "target:m_4/m_4_fire_3p", "stream": false } ] }, - "m4_far": { + "m_4_far": { "sounds": [ { - "name": "target:m4/m4_far", + "name": "target:m_4/m_4_far", "stream": false } ] }, - "m4_veryfar": { + "m_4_veryfar": { "sounds": [ { - "name": "target:m4/m4_veryfar", + "name": "target:m_4/m_4_veryfar", "stream": false } ] }, - "m4_reload_normal": { + "m_4_reload_normal": { "sounds": [ { - "name": "target:m4/m4_reload_normal", + "name": "target:m_4/m_4_reload_normal", "stream": false } ] }, - "m4_reload_empty": { + "m_4_reload_empty": { "sounds": [ { - "name": "target:m4/m4_reload_empty", + "name": "target:m_4/m_4_reload_empty", "stream": false } ] }, - "aa12_fire_1p": { + "aa_12_fire_1p": { "sounds": [ { - "name": "target:aa12/aa12_fire_1p", + "name": "target:aa_12/aa_12_fire_1p", "stream": false } ] }, - "aa12_fire_3p": { + "aa_12_fire_3p": { "sounds": [ { - "name": "target:aa12/aa12_fire_3p", + "name": "target:aa_12/aa_12_fire_3p", "stream": false } ] }, - "aa12_far": { + "aa_12_far": { "sounds": [ { - "name": "target:aa12/aa12_far", + "name": "target:aa_12/aa_12_far", "stream": false } ] }, - "aa12_veryfar": { + "aa_12_veryfar": { "sounds": [ { - "name": "target:aa12/aa12_veryfar", + "name": "target:aa_12/aa_12_veryfar", "stream": false } ] }, - "aa12_reload_normal": { + "aa_12_reload_normal": { "sounds": [ { - "name": "target:aa12/aa12_reload_normal", + "name": "target:aa_12/aa_12_reload_normal", "stream": false } ] }, - "aa12_reload_empty": { + "aa_12_reload_empty": { "sounds": [ { - "name": "target:aa12/aa12_reload_empty", + "name": "target:aa_12/aa_12_reload_empty", "stream": false } ] diff --git a/src/main/resources/assets/target/sounds/aa12/aa12_far.ogg b/src/main/resources/assets/target/sounds/aa_12/aa_12_far.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/aa12/aa12_far.ogg rename to src/main/resources/assets/target/sounds/aa_12/aa_12_far.ogg diff --git a/src/main/resources/assets/target/sounds/aa12/aa12_fire_1p.ogg b/src/main/resources/assets/target/sounds/aa_12/aa_12_fire_1p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/aa12/aa12_fire_1p.ogg rename to src/main/resources/assets/target/sounds/aa_12/aa_12_fire_1p.ogg diff --git a/src/main/resources/assets/target/sounds/aa12/aa12_fire_3p.ogg b/src/main/resources/assets/target/sounds/aa_12/aa_12_fire_3p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/aa12/aa12_fire_3p.ogg rename to src/main/resources/assets/target/sounds/aa_12/aa_12_fire_3p.ogg diff --git a/src/main/resources/assets/target/sounds/aa12/aa12_reload_empty.ogg b/src/main/resources/assets/target/sounds/aa_12/aa_12_reload_empty.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/aa12/aa12_reload_empty.ogg rename to src/main/resources/assets/target/sounds/aa_12/aa_12_reload_empty.ogg diff --git a/src/main/resources/assets/target/sounds/aa12/aa12_reload_normal.ogg b/src/main/resources/assets/target/sounds/aa_12/aa_12_reload_normal.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/aa12/aa12_reload_normal.ogg rename to src/main/resources/assets/target/sounds/aa_12/aa_12_reload_normal.ogg diff --git a/src/main/resources/assets/target/sounds/aa12/aa12_veryfar.ogg b/src/main/resources/assets/target/sounds/aa_12/aa_12_veryfar.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/aa12/aa12_veryfar.ogg rename to src/main/resources/assets/target/sounds/aa_12/aa_12_veryfar.ogg diff --git a/src/main/resources/assets/target/sounds/m4/m4_far.ogg b/src/main/resources/assets/target/sounds/m_4/m_4_far.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m4/m4_far.ogg rename to src/main/resources/assets/target/sounds/m_4/m_4_far.ogg diff --git a/src/main/resources/assets/target/sounds/m4/m4_fire_1p.ogg b/src/main/resources/assets/target/sounds/m_4/m_4_fire_1p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m4/m4_fire_1p.ogg rename to src/main/resources/assets/target/sounds/m_4/m_4_fire_1p.ogg diff --git a/src/main/resources/assets/target/sounds/m4/m4_fire_3p.ogg b/src/main/resources/assets/target/sounds/m_4/m_4_fire_3p.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m4/m4_fire_3p.ogg rename to src/main/resources/assets/target/sounds/m_4/m_4_fire_3p.ogg diff --git a/src/main/resources/assets/target/sounds/m4/m4_reload_empty.ogg b/src/main/resources/assets/target/sounds/m_4/m_4_reload_empty.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m4/m4_reload_empty.ogg rename to src/main/resources/assets/target/sounds/m_4/m_4_reload_empty.ogg diff --git a/src/main/resources/assets/target/sounds/m4/m4_reload_normal.ogg b/src/main/resources/assets/target/sounds/m_4/m_4_reload_normal.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m4/m4_reload_normal.ogg rename to src/main/resources/assets/target/sounds/m_4/m_4_reload_normal.ogg diff --git a/src/main/resources/assets/target/sounds/m4/m4_veryfar.ogg b/src/main/resources/assets/target/sounds/m_4/m_4_veryfar.ogg similarity index 100% rename from src/main/resources/assets/target/sounds/m4/m4_veryfar.ogg rename to src/main/resources/assets/target/sounds/m_4/m_4_veryfar.ogg