From d1bca34ffb3fd488cf76821feedcfe33d56651ad Mon Sep 17 00:00:00 2001 From: Feefkroete Date: Wed, 5 Apr 2023 16:56:46 +0200 Subject: [PATCH 1/2] Fix silenced guns not shooting silently --- src/main/java/com/flansmod/common/guns/ItemGun.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/flansmod/common/guns/ItemGun.java b/src/main/java/com/flansmod/common/guns/ItemGun.java index 99e252138..1597599c9 100644 --- a/src/main/java/com/flansmod/common/guns/ItemGun.java +++ b/src/main/java/com/flansmod/common/guns/ItemGun.java @@ -637,7 +637,7 @@ public void playShotSound(World world, Vector3f position, Boolean silenced) { // Play shot sounds if(soundDelay <= 0 && type.shootSound != null) { - PacketPlaySound.sendSoundPacket(position.x, position.y, position.z, FlansMod.soundRange, world.provider.getDimension(), type.shootSound, silenced); + PacketPlaySound.sendSoundPacket(position.x, position.y, position.z, FlansMod.soundRange, world.provider.getDimension(), type.shootSound, type.distortSound, silenced); soundDelay = type.idleSoundLength; } } From 6418c86b40d14460ddb966c116e59f994e650577 Mon Sep 17 00:00:00 2001 From: Feefkroete Date: Sat, 8 Apr 2023 23:39:10 +0200 Subject: [PATCH 2/2] Reduce silenced gun volume to 0.5, was originally set to 2 --- src/main/java/com/flansmod/common/network/PacketPlaySound.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/flansmod/common/network/PacketPlaySound.java b/src/main/java/com/flansmod/common/network/PacketPlaySound.java index 8f0e2d319..eeb5dce40 100644 --- a/src/main/java/com/flansmod/common/network/PacketPlaySound.java +++ b/src/main/java/com/flansmod/common/network/PacketPlaySound.java @@ -103,7 +103,7 @@ public void handleClientSide(EntityPlayer clientPlayer) FMLClientHandler.instance().getClient().getSoundHandler().playSound( new PositionedSoundRecord(event, SoundCategory.PLAYERS, - silenced ? 2F : 4F, + silenced ? 0.5F : 4F, (distort ? 1.0F / (rand.nextFloat() * 0.4F + 0.8F) : 1.0F) * (silenced ? 2F : 1F), posX, posY, posZ));