diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index cd532eaee..40e44fcb0 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -72,7 +72,6 @@ public class MekanismConfig { public static boolean enablePlayerSounds = true; public static boolean enableMachineSounds = true; - public static boolean fancyUniversalCableRender = true; public static boolean holidays = true; public static float baseSoundVolume = 1F; public static boolean machineEffects = true; @@ -81,7 +80,7 @@ public class MekanismConfig public static boolean renderCTM = true; public static boolean enableAmbientLighting; public static int ambientLightingLevel; - public static boolean opaque = false; + public static boolean opaqueTransmitters = false; } public static class machines diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index d3833b42c..ee3fc7184 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -216,18 +216,18 @@ public class ClientProxy extends CommonProxy { super.loadConfiguration(); - 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 = (float)Mekanism.configuration.get("client", "SoundVolume", 1D).getDouble(1D); - client.machineEffects = Mekanism.configuration.get("client", "MachineEffects", true).getBoolean(true); + client.enablePlayerSounds = Mekanism.configuration.get("client", "EnablePlayerSounds", true).getBoolean(); + client.enableMachineSounds = Mekanism.configuration.get("client", "EnableMachineSounds", true).getBoolean(); + client.holidays = Mekanism.configuration.get("client", "Holidays", true).getBoolean(); + client.baseSoundVolume = (float)Mekanism.configuration.get("client", "SoundVolume", 1D).getDouble(); + client.machineEffects = Mekanism.configuration.get("client", "MachineEffects", true).getBoolean(); 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(); client.renderCTM = Mekanism.configuration.get("client", "CTMRenderer", true).getBoolean(); - client.enableAmbientLighting = Mekanism.configuration.get("general", "EnableAmbientLighting", true).getBoolean(); - client.ambientLightingLevel = Mekanism.configuration.get("general", "AmbientLightingLevel", 15).getInt(); + client.enableAmbientLighting = Mekanism.configuration.get("client", "EnableAmbientLighting", true).getBoolean(); + client.ambientLightingLevel = Mekanism.configuration.get("client", "AmbientLightingLevel", 15).getInt(); + client.opaqueTransmitters = Mekanism.configuration.get("client", "OpaqueTransmitterRender", false).getBoolean(); if(Mekanism.configuration.hasChanged()) { diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 2bd8de0c3..19a4bce76 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -7,6 +7,7 @@ import java.util.Collection; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.client; import mekanism.api.Range4D; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; @@ -48,7 +49,6 @@ public class PartLogisticalTransporter extends PartTransmitter implements IFluidHandler { public static TransmitterIcons pipeIcons = new TransmitterIcons(4, 8); - private static boolean opaque = Mekanism.configuration.get("client", "opaque", false).getBoolean(); public float currentScale; @@ -229,7 +228,7 @@ public class PartMechanicalPipe extends PartTransmitter