From 779759ac1ef34dbe2b557e6221cb842a704a5fd6 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 30 Aug 2014 02:37:02 +0100 Subject: [PATCH] Make the sound config options apply again. --- src/main/java/mekanism/api/MekanismConfig.java | 3 ++- src/main/java/mekanism/client/ClientProxy.java | 5 +++-- src/main/java/mekanism/client/sound/Sound.java | 4 +++- .../mekanism/common/tile/TileEntityNoisyElectricBlock.java | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 42c2b3d72..dc3b67a72 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -40,9 +40,10 @@ public class MekanismConfig public static class client { public static boolean enablePlayerSounds = true; + public static boolean enableMachineSounds = true; public static boolean fancyUniversalCableRender = true; public static boolean holidays = true; - public static double baseSoundVolume = 1; + public static float baseSoundVolume = 1F; public static boolean machineEffects = true; public static boolean oldTransmitterRender = false; public static boolean replaceSoundsWhenResuming = true; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index c965a65eb..4a0c62652 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -180,10 +180,11 @@ public class ClientProxy extends CommonProxy { super.loadConfiguration(); - client.enablePlayerSounds = Mekanism.configuration.get("client", "EnableSounds", true).getBoolean(true); + client.enablePlayerSounds = Mekanism.configuration.get("client", "EnablePlayerSounds", true).getBoolean(true); + client.enableMachineSounds = Mekanism.configuration.get("client", "EnableMachineSounds", true).getBoolean(true); client.fancyUniversalCableRender = Mekanism.configuration.get("client", "FancyUniversalCableRender", true).getBoolean(true); client.holidays = Mekanism.configuration.get("client", "Holidays", true).getBoolean(true); - client.baseSoundVolume = Mekanism.configuration.get("client", "SoundVolume", 1D).getDouble(1D); + client.baseSoundVolume = (float)Mekanism.configuration.get("client", "SoundVolume", 1D).getDouble(1D); client.machineEffects = Mekanism.configuration.get("client", "MachineEffects", true).getBoolean(true); client.oldTransmitterRender = Mekanism.configuration.get("client", "OldTransmitterRender", false).getBoolean(); client.replaceSoundsWhenResuming = Mekanism.configuration.get("client", "ReplaceSoundsWhenResuming", true, diff --git a/src/main/java/mekanism/client/sound/Sound.java b/src/main/java/mekanism/client/sound/Sound.java index 8b94fd153..2d4e5e849 100644 --- a/src/main/java/mekanism/client/sound/Sound.java +++ b/src/main/java/mekanism/client/sound/Sound.java @@ -1,5 +1,7 @@ package mekanism.client.sound; +import mekanism.api.MekanismConfig.client; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -136,7 +138,7 @@ public class Sound implements ISound { @Override public float getVolume() { - return volume; + return volume * client.baseSoundVolume; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java index 5ee9540d8..5ac8bd23c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java @@ -1,5 +1,6 @@ package mekanism.common.tile; +import mekanism.api.MekanismConfig.client; import mekanism.api.Pos3D; import mekanism.client.sound.IHasSound; import mekanism.client.sound.IResettableSound; @@ -104,7 +105,7 @@ public abstract class TileEntityNoisyElectricBlock extends TileEntityElectricBlo @Override public void onUpdate() { - if(worldObj.isRemote && shouldPlaySound() && SoundHandler.canRestartSound(sound)) + if(worldObj.isRemote && shouldPlaySound() && SoundHandler.canRestartSound(sound) && client.enableMachineSounds) { sound.reset(); SoundHandler.playSound(sound);