From b1d7dc1738d8b33ad5b1f7ba15fe6d5c67ba8dda Mon Sep 17 00:00:00 2001 From: George Paton Date: Thu, 1 Feb 2024 22:07:54 +1100 Subject: [PATCH] Why not fix up the audio while I'm eeeere --- src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java | 1 + src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java | 1 + src/main/java/com/hbm/items/weapon/ItemGunBase.java | 2 ++ 3 files changed, 4 insertions(+) diff --git a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java index 5ff3a41b0..267ed5228 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java @@ -101,6 +101,7 @@ public class Gun12GaugeFactory { config.allowsInfinity = true; config.crosshair = Crosshair.CIRCLE; config.reloadSound = GunConfiguration.RSOUND_SHOTGUN; + config.reloadSoundEnd = false; config.firingSound = "hbm:weapon.shotgunPump"; config.name = "spas12"; diff --git a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java index de94a6be9..786346617 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java @@ -78,6 +78,7 @@ public class Gun4GaugeFactory { config.durability = 3000; config.reloadSound = GunConfiguration.RSOUND_SHOTGUN; + config.reloadSoundEnd = false; config.firingSound = "hbm:weapon.revolverShootAlt"; config.firingPitch = 0.65F; diff --git a/src/main/java/com/hbm/items/weapon/ItemGunBase.java b/src/main/java/com/hbm/items/weapon/ItemGunBase.java index 6b5af4a37..4edb48d46 100644 --- a/src/main/java/com/hbm/items/weapon/ItemGunBase.java +++ b/src/main/java/com/hbm/items/weapon/ItemGunBase.java @@ -374,6 +374,8 @@ public class ItemGunBase extends Item implements IHoldableWeapon, IItemHUD, IEqu resetReloadCycle(player, stack); AnimType animType = availableFills <= 1 ? AnimType.RELOAD_END : AnimType.RELOAD_CYCLE; PacketDispatcher.wrapper.sendTo(new GunAnimationPacket(animType.ordinal()), (EntityPlayerMP) player); + if (availableFills > 1 && !mainConfig.reloadSoundEnd) + world.playSoundAtEntity(player, mainConfig.reloadSound, 1.0F, 1.0F); } if(hasLoaded && mainConfig.reloadSoundEnd)