Make SoundHandler static, remove some unneeded stuff.

This commit is contained in:
Ben Spiers committed 2014-08-30 01:51:42 +01:00
1 parent c4d1fd32f4
commit 2a52ba36af
11 files changed
+30 -107

No files matched your search

+3 -11
View File
@@ -88,7 +88,6 @@ import mekanism.client.render.tileentity.RenderRotaryCondensentrator;
import mekanism.client.render.tileentity.RenderSalinationController;
import mekanism.client.render.tileentity.RenderSeismicVibrator;
import mekanism.client.render.tileentity.RenderTeleporter;
import mekanism.client.sound.SoundHandler;
import mekanism.common.CommonProxy;
import mekanism.common.Mekanism;
import mekanism.common.MekanismBlocks;
@@ -181,12 +180,14 @@ public class ClientProxy extends CommonProxy
{
super.loadConfiguration();
client.enableSounds = Mekanism.configuration.get("client", "EnableSounds", true).getBoolean(true);
client.enablePlayerSounds = Mekanism.configuration.get("client", "EnableSounds", 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.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,
"If true, will reduce lagging between player sounds. Setting to false will reduce GC load").getBoolean();
if(Mekanism.configuration.hasChanged())
Mekanism.configuration.save();
@@ -482,15 +483,6 @@ public class ClientProxy extends CommonProxy
HolidayManager.init();
}
@Override
public void loadSoundHandler()
{
if(client.enableSounds)
{
MekanismClient.audioHandler = new SoundHandler();
}
}
@Override
public void preInit()
{