diff --git a/src/main/java/mekanism/client/ClientConnectionHandler.java b/src/main/java/mekanism/client/ClientConnectionHandler.java index fe606b21f..b3d6b2032 100644 --- a/src/main/java/mekanism/client/ClientConnectionHandler.java +++ b/src/main/java/mekanism/client/ClientConnectionHandler.java @@ -3,7 +3,7 @@ package mekanism.client; import java.net.InetSocketAddress; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; import net.minecraftforge.fml.relauncher.Side; @@ -14,12 +14,13 @@ public class ClientConnectionHandler { @SubscribeEvent public void onConnection(ClientConnectedToServerEvent event) { - if (general.voiceServerEnabled) { + if (MekanismConfig.current().general.voiceServerEnabled.val()) { if (event.isLocal()) { // If the client is connecting to its own corresponding integrated server. try { MekanismClient.voiceClient = new VoiceClient("127.0.0.1"); // Will probably not work when multiple integrateds are running on one computer + MekanismClient.voiceClient.start();//start here as config sync is not sent } catch (Throwable e) { Mekanism.logger.error("Unable to establish VoiceClient on local connection.", e); } diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index b81964657..c93e69967 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -113,8 +113,8 @@ import mekanism.common.CommonProxy; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; -import mekanism.common.Tier.BaseTier; -import mekanism.common.Tier.GasTankTier; +import mekanism.common.tier.BaseTier; +import mekanism.common.tier.GasTankTier; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; @@ -130,8 +130,7 @@ import mekanism.common.block.states.BlockStateOre.EnumOreType; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockStateMapper; import mekanism.common.block.states.BlockStateTransmitter.TransmitterStateMapper; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; -import mekanism.common.config.MekanismConfig.client; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; @@ -236,7 +235,6 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; @@ -268,38 +266,7 @@ public class ClientProxy extends CommonProxy { public void loadConfiguration() { super.loadConfiguration(); - client.enablePlayerSounds = Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "EnablePlayerSounds", true, - "Play sounds for Jetpack/Gas Mask/Flamethrower (all players).").getBoolean(); - client.enableMachineSounds = Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "EnableMachineSounds", true, - "If enabled machines play their sounds while running.").getBoolean(); - client.holidays = Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "Holidays", true, "Christmas/New Years greetings in chat.") - .getBoolean(); - client.baseSoundVolume = (float) Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "SoundVolume", 1D, - "Adjust Mekanism sounds' base volume. < 1 is softer, higher is louder.").getDouble(); - client.machineEffects = Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "MachineEffects", true, "Show particles when machines active.") - .getBoolean(); - client.enableAmbientLighting = Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "EnableAmbientLighting", true, - "Should active machines produce block light.").getBoolean(); - client.ambientLightingLevel = Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "AmbientLightingLevel", 15, - "How much light to produce if ambient lighting is enabled.", 1, 15).getInt(); - client.opaqueTransmitters = Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "OpaqueTransmitterRender", false, - "If true, don't render Cables/Pipes/Tubes as transparent and don't render their contents.") - .getBoolean(); - client.allowConfiguratorModeScroll = Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "ConfiguratorModeScroll", true, - "Allow sneak+scroll to change Configurator modes.").getBoolean(); - client.enableMultiblockFormationParticles = Mekanism.configuration - .get(Configuration.CATEGORY_CLIENT, "MultiblockFormParticles", true, - "Set to false to prevent particle spam when loading multiblocks (notification message will still display).") - .getBoolean(); + MekanismConfig.current().client.load(Mekanism.configuration); if (Mekanism.configuration.hasChanged()) { Mekanism.configuration.save(); @@ -1003,7 +970,7 @@ public class ClientProxy extends CommonProxy { EntityPlayerSP player = Minecraft.getMinecraft().player; // If player is within 16 blocks (256 = 16^2), show the status message/sparkles if (tileEntity.getPos().distanceSq(player.getPosition()) <= 256) { - if (client.enableMultiblockFormationParticles) { + if (MekanismConfig.current().client.enableMultiblockFormationParticles.val()) { anim.run(); } else { player.sendStatusMessage( @@ -1094,7 +1061,7 @@ public class ClientProxy extends CommonProxy { @Override public void onConfigSync(boolean fromPacket) { super.onConfigSync(fromPacket); - if (fromPacket && general.voiceServerEnabled && MekanismClient.voiceClient != null) { + if (fromPacket && MekanismConfig.current().general.voiceServerEnabled.val() && MekanismClient.voiceClient != null) { MekanismClient.voiceClient.start(); } } diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index d7ff4e5bc..1e44221cb 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -14,8 +14,7 @@ import mekanism.client.render.RenderTickHandler; import mekanism.common.CommonPlayerTickHandler; import mekanism.common.KeySync; import mekanism.common.Mekanism; -import mekanism.common.config.MekanismConfig.client; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.frequency.Frequency; import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemConfigurator.ConfiguratorMode; @@ -159,12 +158,12 @@ public class ClientTickHandler { } public static void portableTeleport(EntityPlayer player, EnumHand hand, Frequency freq) { - if (general.portableTeleporterDelay == 0) { + if (MekanismConfig.current().general.portableTeleporterDelay.val() == 0) { Mekanism.packetHandler .sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.TELEPORT, hand, freq)); } else { - portableTeleports - .put(player, new TeleportData(hand, freq, mc.world.getWorldTime() + general.portableTeleporterDelay)); + portableTeleports.put(player, new TeleportData(hand, freq, + mc.world.getWorldTime() + MekanismConfig.current().general.portableTeleporterDelay.val())); } } @@ -326,7 +325,8 @@ public class ClientTickHandler { @SubscribeEvent public void onMouseEvent(MouseEvent event) { - if (client.allowConfiguratorModeScroll && mc.player != null && mc.player.isSneaking()) { + if (MekanismConfig.current().client.allowConfiguratorModeScroll.val() && mc.player != null && mc.player + .isSneaking()) { ItemStack stack = mc.player.getHeldItemMainhand(); int delta = event.getDwheel(); diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index 0776d1f72..9a22cef7c 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -5,7 +5,7 @@ import java.util.Calendar; import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; -import mekanism.common.config.MekanismConfig.client; +import mekanism.common.config.MekanismConfig; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; @@ -20,7 +20,7 @@ public final class HolidayManager { private static List holidaysNotified = new ArrayList<>(); public static void init() { - if (client.holidays) { + if (MekanismConfig.current().client.holidays.val()) { holidays.add(new Christmas()); holidays.add(new NewYear()); } @@ -45,7 +45,7 @@ public final class HolidayManager { } public static ResourceLocation filterSound(ResourceLocation sound) { - if (!client.holidays) { + if (!MekanismConfig.current().client.holidays.val()) { return sound; } diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index 8afe3f4c2..3748d9dca 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -9,7 +9,7 @@ import mekanism.client.render.obj.TransmitterModel; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; import mekanism.common.base.IModule; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.network.PacketKey.KeyMessage; import mekanism.common.security.SecurityData; @@ -38,7 +38,7 @@ public class MekanismClient extends Mekanism { clientSecurityMap.clear(); clientUUIDMap.clear(); - if (general.voiceServerEnabled) { + if (MekanismConfig.current().general.voiceServerEnabled.val()) { if (MekanismClient.voiceClient != null) { MekanismClient.voiceClient.disconnect(); MekanismClient.voiceClient = null; @@ -60,12 +60,11 @@ public class MekanismClient extends Mekanism { SynchronizedBoilerData.clientHotMap.clear(); + MekanismConfig.setSyncedConfig(null); + Mekanism.proxy.onConfigSync(false); + for (IModule module : Mekanism.modulesLoaded) { module.resetClient(); } - - Mekanism.proxy.loadConfiguration(); - - Mekanism.logger.info("Reloaded config."); } } diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index b95b7d498..5cc8976e1 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -2,9 +2,8 @@ package mekanism.client; import java.util.Iterator; import java.util.concurrent.ThreadLocalRandom; -import mekanism.common.Mekanism; import mekanism.common.MekanismSounds; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; @@ -38,7 +37,7 @@ public class SparkleAnimation { public void run() { - if (general.dynamicTankEasterEgg) { + if (MekanismConfig.current().general.dynamicTankEasterEgg.val()) { tile.getWorld() .playSound(null, tile.getPos().getX(), tile.getPos().getY(), tile.getPos().getZ(), MekanismSounds.CJ_EASTER_EGG, SoundCategory.BLOCKS, 1F, 1F); diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java index 0df880e6b..96a7efe15 100644 --- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java +++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java @@ -5,7 +5,7 @@ import mekanism.client.gui.element.GuiBoilerTab; import mekanism.client.gui.element.GuiBoilerTab.BoilerTab; import mekanism.client.gui.element.GuiGraph; import mekanism.client.gui.element.GuiHeatInfo; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.tile.TileEntityBoilerCasing; @@ -31,7 +31,7 @@ public class GuiBoilerStats extends GuiMekanismTile { ResourceLocation resource = getGuiLocation(); addGuiElement(new GuiBoilerTab(this, tileEntity, BoilerTab.MAIN, 6, resource)); addGuiElement(new GuiHeatInfo(() -> { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + TemperatureUnit unit = TemperatureUnit.values()[MekanismConfig.current().general.tempUnit.val().ordinal()]; String environment = UnitDisplayUtils .getDisplayShort(tileEntity.structure.lastEnvironmentLoss * unit.intervalSize, false, unit); return Collections.singletonList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); @@ -40,8 +40,9 @@ public class GuiBoilerStats extends GuiMekanismTile { data -> LangUtils.localize("gui.boilRate") + ": " + data + " mB/t")); addGuiElement(maxGraph = new GuiGraph(this, resource, 8, 122, 160, 36, data -> LangUtils.localize("gui.maxBoil") + ": " + data + " mB/t")); - maxGraph.enableFixedScale((int) ((tileEntity.structure.superheatingElements * general.superheatingHeatTransfer) - / SynchronizedBoilerData.getHeatEnthalpy())); + maxGraph.enableFixedScale((int) ( + (tileEntity.structure.superheatingElements * MekanismConfig.current().general.superheatingHeatTransfer + .val()) / SynchronizedBoilerData.getHeatEnthalpy())); } @Override @@ -58,8 +59,9 @@ public class GuiBoilerStats extends GuiMekanismTile { fontRenderer .drawString(LangUtils.localize("gui.superheaters") + ": " + tileEntity.structure.superheatingElements, 14, 58, 0x404040); - int boilCapacity = (int) ((tileEntity.structure.superheatingElements * general.superheatingHeatTransfer) - / SynchronizedBoilerData.getHeatEnthalpy()); + int boilCapacity = (int) ((tileEntity.structure.superheatingElements * + MekanismConfig.current().general.superheatingHeatTransfer.val()) / SynchronizedBoilerData + .getHeatEnthalpy()); fontRenderer .drawString(LangUtils.localize("gui.boilCapacity") + ": " + boilCapacity + " mB/t", 8, 72, 0x404040); super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 9e6d183dd..e0dbf32d6 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -13,7 +13,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.OreDictCache; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.content.miner.MItemStackFilter; import mekanism.common.content.miner.MMaterialFilter; import mekanism.common.content.miner.MModIDFilter; @@ -340,7 +340,8 @@ public class GuiDigitalMinerConfig extends GuiMekanismTile addGuiElement(new GuiSlot(SlotType.NORMAL, this, resource, 14, 28)); addGuiElement(new GuiSecurityTab(this, tileEntity, resource)); addGuiElement(new GuiHeatInfo(() -> { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + TemperatureUnit unit = TemperatureUnit.values()[MekanismConfig.current().general.tempUnit.val().ordinal()]; String environment = UnitDisplayUtils .getDisplayShort(tileEntity.lastEnvironmentLoss * unit.intervalSize, false, unit); return Collections.singletonList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); diff --git a/src/main/java/mekanism/client/gui/GuiGasTank.java b/src/main/java/mekanism/client/gui/GuiGasTank.java index 88c93cc8a..261d36464 100644 --- a/src/main/java/mekanism/client/gui/GuiGasTank.java +++ b/src/main/java/mekanism/client/gui/GuiGasTank.java @@ -2,6 +2,7 @@ package mekanism.client.gui; import java.io.IOException; import mekanism.api.Coord4D; +import mekanism.api.TileNetworkList; import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSideConfigurationTab; @@ -11,7 +12,6 @@ import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.api.TileNetworkList; import mekanism.common.inventory.container.ContainerGasTank; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityGasTank; @@ -44,8 +44,8 @@ public class GuiGasTank extends GuiMekanismTile { String stored = "" + (tileEntity.gasTank.getStored() == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") : tileEntity.gasTank.getStored()); String capacityInfo = - stored + " / " + (tileEntity.tier.storage == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") - : tileEntity.tier.storage); + stored + " / " + (tileEntity.tier.getStorage() == Integer.MAX_VALUE ? LangUtils.localize("gui.infinite") + : tileEntity.tier.getStorage()); fontRenderer .drawString(tileEntity.getName(), (xSize / 2) - (fontRenderer.getStringWidth(tileEntity.getName()) / 2), 6, 0x404040); @@ -71,7 +71,7 @@ public class GuiGasTank extends GuiMekanismTile { int displayInt = chooseByMode(tileEntity.dumping, 10, 18, 26); drawTexturedModalRect(guiWidth + 160, guiHeight + 73, 176, displayInt, 8, 8); if (tileEntity.gasTank.getGas() != null) { - int scale = (int) (((double) tileEntity.gasTank.getStored() / tileEntity.tier.storage) * 72); + int scale = (int) (((double) tileEntity.gasTank.getStored() / tileEntity.tier.getStorage()) * 72); drawTexturedModalRect(guiWidth + 65, guiHeight + 17, 176, 0, scale, 10); } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java index d3967039b..624d823e7 100644 --- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java +++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collections; import mekanism.api.Coord4D; +import mekanism.api.TileNetworkList; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiHeatInfo; import mekanism.client.gui.element.GuiPowerBar; @@ -14,8 +15,7 @@ import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.api.TileNetworkList; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.inventory.container.ContainerResistiveHeater; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityResistiveHeater; @@ -52,7 +52,7 @@ public class GuiResistiveHeater extends GuiMekanismTile { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + TemperatureUnit unit = TemperatureUnit.values()[MekanismConfig.current().general.tempUnit.val().ordinal()]; String environment = UnitDisplayUtils .getDisplayShort(tileEntity.lastEnvironmentLoss * unit.intervalSize, false, unit); return Collections.singletonList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java index f85b7d420..fdaca2a32 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java @@ -8,7 +8,7 @@ import mekanism.client.gui.element.GuiSecurityTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; -import mekanism.common.config.MekanismConfig.usage; +import mekanism.common.config.MekanismConfig; import mekanism.common.inventory.container.ContainerSeismicVibrator; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.util.LangUtils; @@ -30,7 +30,8 @@ public class GuiSeismicVibrator extends GuiMekanismTile { - String multiplier = MekanismUtils.getEnergyDisplay(usage.seismicVibratorUsage); + String multiplier = MekanismUtils + .getEnergyDisplay(MekanismConfig.current().usage.seismicVibratorUsage.val()); return Arrays.asList(LangUtils.localize("gui.using") + ": " + multiplier + "/t", LangUtils.localize("gui.needed") + ": " + MekanismUtils .getEnergyDisplay(tileEntity.getMaxEnergy() - tileEntity.getEnergy())); diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java index 8aaabd62a..5ad5ae446 100644 --- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java +++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java @@ -4,7 +4,7 @@ import java.util.Collections; import mekanism.client.gui.element.GuiFluidGauge; import mekanism.client.gui.element.GuiGauge; import mekanism.client.gui.element.GuiHeatInfo; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.inventory.container.ContainerThermalEvaporationController; import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.util.LangUtils; @@ -28,7 +28,7 @@ public class GuiThermalEvaporationController extends GuiMekanismTile tileEntity.outputTank, GuiGauge.Type.STANDARD, this, resource, 152, 13)); addGuiElement(new GuiHeatInfo(() -> { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + TemperatureUnit unit = TemperatureUnit.values()[MekanismConfig.current().general.tempUnit.val().ordinal()]; String environment = UnitDisplayUtils .getDisplayShort(tileEntity.totalLoss * unit.intervalSize, false, unit); return Collections.singletonList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java index 0f2dcc853..6a19242a8 100644 --- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java +++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java @@ -8,7 +8,7 @@ import mekanism.client.gui.element.GuiRateBar; import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.FluidType; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.tile.TileEntityBoilerCasing; @@ -50,13 +50,13 @@ public class GuiThermoelectricBoiler extends GuiMekanismTile { - TemperatureUnit unit = TemperatureUnit.values()[general.tempUnit.ordinal()]; + TemperatureUnit unit = TemperatureUnit.values()[MekanismConfig.current().general.tempUnit.val().ordinal()]; String environment = UnitDisplayUtils .getDisplayShort(tileEntity.structure.lastEnvironmentLoss * unit.intervalSize, false, unit); return Collections.singletonList(LangUtils.localize("gui.dissipated") + ": " + environment + "/t"); diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java index a58a65063..1655abd47 100644 --- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java @@ -3,7 +3,7 @@ package mekanism.client.gui.element; import java.util.ArrayList; import java.util.List; import mekanism.client.gui.IGuiWrapper; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -43,7 +43,7 @@ public class GuiEnergyInfo extends GuiElement { public void renderForeground(int xAxis, int yAxis) { if (inBounds(xAxis, yAxis)) { List info = new ArrayList<>(infoHandler.getInfo()); - info.add(LangUtils.localize("gui.unit") + ": " + general.energyUnit); + info.add(LangUtils.localize("gui.unit") + ": " + MekanismConfig.current().general.energyUnit.val()); displayTooltips(info, xAxis, yAxis); } } @@ -55,7 +55,9 @@ public class GuiEnergyInfo extends GuiElement { @Override public void mouseClicked(int xAxis, int yAxis, int button) { if (button == 0 && inBounds(xAxis, yAxis)) { - general.energyUnit = EnergyType.values()[(general.energyUnit.ordinal() + 1) % EnergyType.values().length]; + MekanismConfig.current().general.energyUnit + .set(EnergyType.values()[(MekanismConfig.current().general.energyUnit.val().ordinal() + 1) + % EnergyType.values().length]); } } } \ No newline at end of file diff --git a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java index 430ef4f5c..9c2d1e9f2 100644 --- a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java +++ b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java @@ -3,7 +3,7 @@ package mekanism.client.gui.element; import java.util.ArrayList; import java.util.List; import mekanism.client.gui.IGuiWrapper; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; @@ -43,7 +43,7 @@ public class GuiHeatInfo extends GuiElement { public void renderForeground(int xAxis, int yAxis) { if (inBounds(xAxis, yAxis)) { List info = new ArrayList<>(infoHandler.getInfo()); - info.add(LangUtils.localize("gui.unit") + ": " + general.tempUnit); + info.add(LangUtils.localize("gui.unit") + ": " + MekanismConfig.current().general.tempUnit.val()); displayTooltips(info, xAxis, yAxis); } } @@ -55,7 +55,9 @@ public class GuiHeatInfo extends GuiElement { @Override public void mouseClicked(int xAxis, int yAxis, int button) { if (button == 0 && inBounds(xAxis, yAxis)) { - general.tempUnit = TempType.values()[(general.tempUnit.ordinal() + 1) % TempType.values().length]; + MekanismConfig.current().general.tempUnit + .set(TempType.values()[(MekanismConfig.current().general.tempUnit.val().ordinal() + 1) % TempType + .values().length]); } } } \ No newline at end of file diff --git a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java index db8513b43..53246ce4c 100644 --- a/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java +++ b/src/main/java/mekanism/client/gui/element/GuiSecurityTab.java @@ -8,7 +8,7 @@ import mekanism.client.MekanismClient; import mekanism.client.gui.IGuiWrapper; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.network.PacketSecurityMode.SecurityModeMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; @@ -104,7 +104,7 @@ public class GuiSecurityTab extends GuiTileEntityElement { } private SecurityMode getSecurity() { - if (!general.allowProtection) { + if (!MekanismConfig.current().general.allowProtection.val()) { return SecurityMode.PUBLIC; } @@ -152,7 +152,7 @@ public class GuiSecurityTab extends GuiTileEntityElement { @Override public void mouseClicked(int xAxis, int yAxis, int button) { - if (button == 0 && general.allowProtection) { + if (button == 0 && MekanismConfig.current().general.allowProtection.val()) { if (getOwner() != null && mc.player.getUniqueID().equals(getOwner())) { if (inBounds(xAxis, yAxis)) { SecurityMode current = getSecurity(); diff --git a/src/main/java/mekanism/client/jei/RecipeRegistryHelper.java b/src/main/java/mekanism/client/jei/RecipeRegistryHelper.java index 382d616c0..82a19224e 100644 --- a/src/main/java/mekanism/client/jei/RecipeRegistryHelper.java +++ b/src/main/java/mekanism/client/jei/RecipeRegistryHelper.java @@ -41,7 +41,6 @@ import mekanism.client.jei.machine.other.PRCRecipeWrapper; import mekanism.client.jei.machine.other.RotaryCondensentratorRecipeWrapper; import mekanism.client.jei.machine.other.SolarNeutronRecipeWrapper; import mekanism.client.jei.machine.other.ThermalEvaporationRecipeWrapper; -import mekanism.common.Tier; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateMachine.MachineType; @@ -67,6 +66,7 @@ import mekanism.common.recipe.machines.SmeltingRecipe; import mekanism.common.recipe.machines.SolarNeutronRecipe; import mekanism.common.recipe.machines.ThermalEvaporationRecipe; import mekanism.common.recipe.machines.WasherRecipe; +import mekanism.common.tier.FactoryTier; import mekanism.common.util.MekanismUtils; import mezz.jei.api.IModRegistry; import mezz.jei.api.recipe.IRecipeWrapperFactory; @@ -326,7 +326,7 @@ public class RecipeRegistryHelper { private static void registerVanillaSmeltingRecipeCatalyst(IModRegistry registry) { registry.addRecipeCatalyst(MachineType.ENERGIZED_SMELTER.getStack(), VanillaRecipeCategoryUid.SMELTING); - for (Tier.FactoryTier tier : Tier.FactoryTier.values()) { + for (FactoryTier tier : FactoryTier.values()) { if (tier.machineType.isEnabled()) { registry.addRecipeCatalyst(MekanismUtils.getFactory(tier, RecipeType.SMELTING), VanillaRecipeCategoryUid.SMELTING); @@ -353,7 +353,7 @@ public class RecipeRegistryHelper { } } if (factoryType != null) { - for (Tier.FactoryTier tier : Tier.FactoryTier.values()) { + for (FactoryTier tier : FactoryTier.values()) { if (tier.machineType.isEnabled()) { registry.addRecipeCatalyst(MekanismUtils.getFactory(tier, factoryType), recipe.getJEICategory()); } diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index 7b272dee3..b125cf91e 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -3,7 +3,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.common.SideData.IOState; -import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.tier.EnergyCubeTier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/mekanism/client/model/ModelFluidTank.java b/src/main/java/mekanism/client/model/ModelFluidTank.java index c5769ec72..10f921ec3 100644 --- a/src/main/java/mekanism/client/model/ModelFluidTank.java +++ b/src/main/java/mekanism/client/model/ModelFluidTank.java @@ -1,7 +1,7 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; -import mekanism.common.Tier.FluidTankTier; +import mekanism.common.tier.FluidTankTier; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/client/render/item/RenderEnergyCubeItem.java b/src/main/java/mekanism/client/render/item/RenderEnergyCubeItem.java index 2043dbef2..d9ba00586 100644 --- a/src/main/java/mekanism/client/render/item/RenderEnergyCubeItem.java +++ b/src/main/java/mekanism/client/render/item/RenderEnergyCubeItem.java @@ -7,7 +7,7 @@ import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.common.SideData.IOState; -import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.tier.EnergyCubeTier; import mekanism.common.base.ITierItem; import mekanism.common.util.ItemDataUtils; import net.minecraft.client.Minecraft; @@ -51,7 +51,7 @@ public class RenderEnergyCubeItem extends MekanismItemStackRenderer { double energy = ItemDataUtils.getDouble(stack, "energyStored"); - if (energy / tier.maxEnergy > 0.1) { + if (energy / tier.getMaxEnergy() > 0.1) { GlStateManager.pushMatrix(); MekanismRenderer.bindTexture(RenderEnergyCube.coreTexture); @@ -63,7 +63,7 @@ public class RenderEnergyCubeItem extends MekanismItemStackRenderer { GlStateManager.pushMatrix(); GlStateManager.scale(0.4F, 0.4F, 0.4F); GL11.glColor4f((float) c[0] / 255F, (float) c[1] / 255F, (float) c[2] / 255F, - (float) (energy / tier.maxEnergy)); + (float) (energy / tier.getMaxEnergy())); GlStateManager.translate(0, (float) Math.sin(Math.toRadians(MekanismClient.ticksPassed * 3)) / 7, 0); GlStateManager.rotate(MekanismClient.ticksPassed * 4, 0, 1, 0); GlStateManager.rotate(36F + MekanismClient.ticksPassed * 4, 0, 1, 1); diff --git a/src/main/java/mekanism/client/render/item/machine/RenderFluidTankItem.java b/src/main/java/mekanism/client/render/item/machine/RenderFluidTankItem.java index e58c7c8cf..252fa28d1 100644 --- a/src/main/java/mekanism/client/render/item/machine/RenderFluidTankItem.java +++ b/src/main/java/mekanism/client/render/item/machine/RenderFluidTankItem.java @@ -7,7 +7,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.Tier.FluidTankTier; +import mekanism.common.tier.FluidTankTier; import mekanism.common.item.ItemBlockMachine; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index 9dff24fcf..5fd708e33 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -15,7 +15,7 @@ import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; import mekanism.common.block.property.PropertyColor; import mekanism.common.block.property.PropertyConnection; -import mekanism.common.config.MekanismConfig.client; +import mekanism.common.config.MekanismConfig; import mekanism.common.tile.transmitter.TileEntitySidedPipe; import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType; import net.minecraft.block.state.IBlockState; @@ -188,7 +188,7 @@ public class TransmitterModel extends OBJBakedModelBase { boolean sideIconOverride = connection != null && getIconStatus(side, connection) > 0; if (MinecraftForgeClient.getRenderLayer() == BlockRenderLayer.TRANSLUCENT) { - int opaqueVal = client.opaqueTransmitters ? 1 : 0; + int opaqueVal = MekanismConfig.current().client.opaqueTransmitters.val() ? 1 : 0; if (prop != null && prop.color != null) { return (!sideIconOverride && f.getMaterialName().contains("Center")) @@ -204,15 +204,13 @@ public class TransmitterModel extends OBJBakedModelBase { continue; } - if (!s.contains("Center") && !s.contains("Centre") && (client.opaqueTransmitters == s - .contains("Opaque"))) { + if (!s.contains("Center") && !s.contains("Centre") && ( + MekanismConfig.current().client.opaqueTransmitters.val() == s.contains("Opaque"))) { return textureMap.get(s); } } - } else { - if (client.opaqueTransmitters) { - return textureMap.get(f.getMaterialName() + "_Opaque"); - } + } else if (MekanismConfig.current().client.opaqueTransmitters.val()) { + return textureMap.get(f.getMaterialName() + "_Opaque"); } } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 9006e0176..318df8be0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -7,7 +7,7 @@ import mekanism.client.MekanismClient; import mekanism.client.model.ModelEnergyCube; import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; import mekanism.client.render.MekanismRenderer; -import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.tier.EnergyCubeTier; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java index 2b1600fb8..5e4dcf54d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java @@ -5,7 +5,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.FluidType; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.Tier.FluidTankTier; +import mekanism.common.tier.FluidTankTier; import mekanism.common.tile.TileEntityFluidTank; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java index 7a17f1ad7..fa279f5c1 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -6,8 +6,7 @@ import mekanism.client.model.ModelTransporterBox; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.Mekanism; -import mekanism.common.config.MekanismConfig.client; +import mekanism.common.config.MekanismConfig; import mekanism.common.content.transporter.TransporterStack; import mekanism.common.item.ItemConfigurator; import mekanism.common.tile.transmitter.TileEntityDiversionTransporter; @@ -55,7 +54,7 @@ public class RenderLogisticalTransporter extends RenderTransmitterBaseSteam rate.") - .getDouble(); - general.maxEnergyPerSteam = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "MaxEnergyPerSteam", 100D, - "Maximum Joules per mB of Steam. Also affects Thermoelectric Boiler.").getDouble(); - general.superheatingHeatTransfer = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "SuperheatingHeatTransfer", 10000D, - "Amount of heat each Boiler heating element produces.").getDouble(); - general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D, - "Amount of heat produced per fuel tick of a fuel's burn time in the Fuelwood Heater.") - .getDouble(); - general.allowTransmitterAlloyUpgrade = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "AllowTransmitterAlloyUpgrade", true, - "Allow right clicking on Cables/Pipes/Tubes with alloys to upgrade the tier.").getBoolean(); - general.allowChunkloading = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "AllowChunkloading", true, - "Disable to make the anchor upgrade not do anything.").getBoolean(); - general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true, - "Enable the security system for players to prevent others from accessing their machines. Does NOT affect Frequencies.") - .getBoolean(); - general.portableTeleporterDelay = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "PortableTeleporterDelay", 0, - "Delay in ticks before a player is teleported after clicking the Teleport button in the portable teleporter.") - .getInt(); - general.quantumEntangloporterEnergyTransfer = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "QuantumEntangloporterEnergyTransfer", 16000000D, - "Maximum buffer of an Entangoloporter frequency.").getDouble(); - - general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false, - "Disables IC2 power integration. Requires world restart (server-side option in SMP).").getBoolean(); - general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false, - "Disables Thermal Expansion RedstoneFlux power integration. Requires world restart (server-side option in SMP).") - .getBoolean(); - general.blacklistTesla = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "BlacklistTeslaPower", false, - "Disables Tesla power integration. Requires world restart (server-side option in SMP).") - .getBoolean(); - general.blacklistForge = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "BlacklistForgePower", false, - "Disables Forge Energy (FE,IF,uF,CF) power integration. Requires world restart (server-side option in SMP).") - .getBoolean(); - - String s = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "EnergyType", "RF", "Displayed energy type in Mekanism GUIs.", - new String[]{"J", "RF", "EU", "T"}) - .getString().trim().toLowerCase(); - - switch (s) { - case "joules": - general.energyUnit = EnergyType.J; - break; - case "eu": - case "ic2": - general.energyUnit = EnergyType.EU; - break; - case "tesla": - general.energyUnit = EnergyType.T; - break; - default: - general.energyUnit = EnergyType.RF; - } - - s = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "Temperature Units", "K", - "Displayed temperature unit in Mekanism GUIs.", new String[]{"K", "C", "R", "F"}) - .getString(); - - if (s != null) { - if (s.trim().equalsIgnoreCase("k") || s.trim().equalsIgnoreCase("kelvin")) { - general.tempUnit = TempType.K; - } else if (s.trim().equalsIgnoreCase("c") || s.trim().equalsIgnoreCase("celsius") || s.trim() - .equalsIgnoreCase("centigrade")) { - general.tempUnit = TempType.C; - } else if (s.trim().equalsIgnoreCase("r") || s.trim().equalsIgnoreCase("rankine")) { - general.tempUnit = TempType.R; - } else if (s.trim().equalsIgnoreCase("f") || s.trim().equalsIgnoreCase("fahrenheit")) { - general.tempUnit = TempType.F; - } else if (s.trim().equalsIgnoreCase("a") || s.trim().equalsIgnoreCase("ambient") || s.trim() - .equalsIgnoreCase("stp")) { - general.tempUnit = TempType.STP; - } - } - - general.laserRange = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "LaserRange", 64, "How far (in blocks) a laser can travel.") - .getInt(); - general.laserEnergyNeededPerHardness = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "LaserDiggingEnergy", 100000, - "Energy needed to destroy or attract blocks with a Laser (per block hardness level).") - .getInt(); - general.destroyDisabledBlocks = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "DestroyDisabledBlocks", true, - "If machine is disabled in config, do we set its block to air if it is found in world?") - .getBoolean(); - general.digitalMinerMaxRadius = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "DigitalMinerMaxRadius", 32, - "Maximum radius in blocks that the Digital Miner can reach. " - + "(Increasing this may have negative effects on stability and/or performance. " - + "We strongly recommend you leave it at the default value.)", - 1, Integer.MAX_VALUE).getInt(); - - for (MachineType type : BlockStateMachine.MachineType.getValidMachines()) { - general.machinesManager.setEntry(type.blockName, - Mekanism.configuration.get("machines", type.blockName + "Enabled", true, - "Allow " + type.blockName + " to be used/crafted.").getBoolean()); - } - - general.sawdustChancePlank = Mekanism.configuration - .get(Configuration.CATEGORY_GENERAL, "SawdustChancePlank", 0.25D, - "Chance of producing sawdust per operation in the precision sawmill when turning planks into sticks.") - .getDouble(); - general.sawdustChanceLog = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SawdustChanceLog", 1D, - "Chance of producing sawdust per operation in the precision sawmill when turning logs into planks.") - .getDouble(); - - usage.enrichmentChamberUsage = Mekanism.configuration - .get("usage", "EnrichmentChamberUsage", 50D, "Energy per operation tick (Joules).").getDouble(); - usage.osmiumCompressorUsage = Mekanism.configuration - .get("usage", "OsmiumCompressorUsage", 100D, "Energy per operation tick (Joules).").getDouble(); - usage.combinerUsage = Mekanism.configuration - .get("usage", "CombinerUsage", 50D, "Energy per operation tick (Joules).").getDouble(); - usage.crusherUsage = Mekanism.configuration - .get("usage", "CrusherUsage", 50D, "Energy per operation tick (Joules).").getDouble(); - usage.metallurgicInfuserUsage = Mekanism.configuration - .get("usage", "MetallurgicInfuserUsage", 50D, "Energy per operation tick (Joules).").getDouble(); - usage.purificationChamberUsage = Mekanism.configuration - .get("usage", "PurificationChamberUsage", 200D, "Energy per operation tick (Joules).") - .getDouble(); - usage.energizedSmelterUsage = Mekanism.configuration - .get("usage", "EnergizedSmelterUsage", 50D, "Energy per operation tick (Joules).").getDouble(); - usage.digitalMinerUsage = Mekanism.configuration - .get("usage", "DigitalMinerUsage", 100D, "Energy per operation tick (Joules).").getDouble(); - usage.electricPumpUsage = Mekanism.configuration - .get("usage", "ElectricPumpUsage", 100D, "Energy per operation tick (Joules).").getDouble(); - usage.rotaryCondensentratorUsage = Mekanism.configuration - .get("usage", "RotaryCondensentratorUsage", 50D, "Energy per operation tick (Joules).") - .getDouble(); - usage.oxidationChamberUsage = Mekanism.configuration - .get("usage", "OxidationChamberUsage", 200D, "Energy per operation tick (Joules).").getDouble(); - usage.chemicalInfuserUsage = Mekanism.configuration - .get("usage", "ChemicalInfuserUsage", 200D, "Energy per operation tick (Joules).").getDouble(); - usage.chemicalInjectionChamberUsage = Mekanism.configuration - .get("usage", "ChemicalInjectionChamberUsage", 400D, "Energy per operation tick (Joules).") - .getDouble(); - usage.precisionSawmillUsage = Mekanism.configuration - .get("usage", "PrecisionSawmillUsage", 50D, "Energy per operation tick (Joules).").getDouble(); - usage.chemicalDissolutionChamberUsage = Mekanism.configuration - .get("usage", "ChemicalDissolutionChamberUsage", 400D, "Energy per operation tick (Joules).").getDouble(); - usage.chemicalWasherUsage = Mekanism.configuration - .get("usage", "ChemicalWasherUsage", 200D, "Energy per operation tick (Joules).").getDouble(); - usage.chemicalCrystallizerUsage = Mekanism.configuration - .get("usage", "ChemicalCrystallizerUsage", 400D, "Energy per operation tick (Joules).") - .getDouble(); - usage.seismicVibratorUsage = Mekanism.configuration - .get("usage", "SeismicVibratorUsage", 50D, "Energy per operation tick (Joules).").getDouble(); - usage.pressurizedReactionBaseUsage = Mekanism.configuration - .get("usage", "PressurizedReactionBaseUsage", 5D, "Energy per operation tick (Joules).") - .getDouble(); - usage.fluidicPlenisherUsage = Mekanism.configuration - .get("usage", "FluidicPlenisherUsage", 100D, "Energy per operation tick (Joules).").getDouble(); - usage.laserUsage = Mekanism.configuration - .get("usage", "LaserUsage", 5000D, "Energy per operation tick (Joules).").getDouble(); - usage.heavyWaterElectrolysisUsage = Mekanism.configuration.get("usage", "HeavyWaterElectrolysisUsage", 800D, - "Energy needed for one [recipe unit] of heavy water production (Joules).") - .getDouble(); - usage.formulaicAssemblicatorUsage = Mekanism.configuration - .get("usage", "FormulaicAssemblicatorUsage", 100D, "Energy per operation tick (Joules).") - .getDouble(); - usage.teleporterBaseUsage = Mekanism.configuration - .get("usage", "TeleporterBaseUsage", 1000, "Base Joules cost for a teleportation.") - .getInt(); - usage.teleporterDistanceUsage = Mekanism.configuration.get("usage", "TeleporterDistanceUsage", 10, - "Joules per unit of distance travelled during teleportation - sqrt(xDiff^2 + yDiff^2 + zDiff^2).") - .getInt(); - usage.teleporterDimensionPenalty = Mekanism.configuration - .get("usage", "TeleporterDimensionPenalty", 10000, - "Flat additional cost for interdimensional teleportation.").getInt(); - - Tier.loadConfig(); + MekanismConfig.local().general.load(Mekanism.configuration); + MekanismConfig.local().usage.load(Mekanism.configuration); if (Mekanism.configuration.hasChanged()) { Mekanism.configuration.save(); @@ -720,7 +393,7 @@ public class CommonProxy implements IGuiProvider { } public void onConfigSync(boolean fromPacket) { - if (general.cardboardSpawners) { + if (MekanismConfig.current().general.cardboardSpawners.val()) { MekanismAPI.removeBoxBlacklist(Blocks.MOB_SPAWNER, OreDictionary.WILDCARD_VALUE); } else { MekanismAPI.addBoxBlacklist(Blocks.MOB_SPAWNER, OreDictionary.WILDCARD_VALUE); @@ -728,7 +401,7 @@ public class CommonProxy implements IGuiProvider { BlockStateMachine.MachineType.updateAllUsages(); - if (general.voiceServerEnabled && Mekanism.voiceManager == null) { + if (MekanismConfig.current().general.voiceServerEnabled.val() && Mekanism.voiceManager == null) { Mekanism.voiceManager = new VoiceServerManager(); } if (fromPacket) { diff --git a/src/main/java/mekanism/common/FuelHandler.java b/src/main/java/mekanism/common/FuelHandler.java index a6df53b40..393efc260 100644 --- a/src/main/java/mekanism/common/FuelHandler.java +++ b/src/main/java/mekanism/common/FuelHandler.java @@ -5,7 +5,7 @@ import buildcraft.api.fuels.IFuel; import buildcraft.api.mj.MjAPI; import java.util.HashMap; import mekanism.api.gas.Gas; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.util.MekanismUtils; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -59,7 +59,8 @@ public class FuelHandler { // getPowerPerCycle returns value in 1 BuildCraft micro MJ // 1 BuildCraft MJ equals 20 RF - energyPerTick = bcFuel.getPowerPerCycle() / (double) MjAPI.MJ * 20 * general.FROM_RF; + energyPerTick = + bcFuel.getPowerPerCycle() / (double) MjAPI.MJ * 20 * MekanismConfig.current().general.FROM_RF.val(); } } } diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index ef17ebb25..0e05c4591 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -5,7 +5,7 @@ import mekanism.api.Coord4D; import mekanism.api.Pos3D; import mekanism.api.lasers.ILaserReceptor; import mekanism.common.capabilities.Capabilities; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.util.CapabilityUtils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -30,7 +30,7 @@ public class LaserManager { } public static LaserInfo fireLaser(Pos3D from, EnumFacing direction, double energy, World world) { - Pos3D to = from.clone().translate(direction, general.laserRange - 0.002); + Pos3D to = from.clone().translate(direction, MekanismConfig.current().general.laserRange.val() - 0.002); RayTraceResult mop = world.rayTraceBlocks(from, to); @@ -69,7 +69,7 @@ public class LaserManager { } public static List breakBlock(Coord4D blockCoord, boolean dropAtBlock, World world, BlockPos laserPos) { - if (!general.aestheticWorldDamage) { + if (!MekanismConfig.current().general.aestheticWorldDamage.val()) { return null; } @@ -104,7 +104,7 @@ public class LaserManager { } public static RayTraceResult fireLaserClient(Pos3D from, EnumFacing direction, double energy, World world) { - Pos3D to = from.clone().translate(direction, general.laserRange - 0.002); + Pos3D to = from.clone().translate(direction, MekanismConfig.current().general.laserRange.val() - 0.002); RayTraceResult mop = world.rayTraceBlocks(from, to); if (mop != null) { diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index d34d14051..af5448e7b 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -26,15 +26,14 @@ import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest; import mekanism.api.transmitters.DynamicNetwork.TransmittersAddedEvent; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.client.ClientTickHandler; -import mekanism.common.Tier.BaseTier; +import mekanism.common.tier.BaseTier; import mekanism.common.base.IModule; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateTransmitter.TransmitterType; import mekanism.common.capabilities.Capabilities; import mekanism.common.chunkloading.ChunkManager; import mekanism.common.command.CommandMek; -import mekanism.common.config.MekanismConfig.general; -import mekanism.common.config.MekanismConfig.usage; +import mekanism.common.config.MekanismConfig; import mekanism.common.content.boiler.SynchronizedBoilerData; import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.content.matrix.SynchronizedMatrixData; @@ -358,7 +357,8 @@ public class Mekanism { new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F); //Enrichment Chamber Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.ENRICHMENT_CHAMBER)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.ENRICHMENT_CHAMBER)) { RecipeHandler .addEnrichmentChamberRecipe(new ItemStack(Blocks.REDSTONE_ORE), new ItemStack(Items.REDSTONE, 12)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.OBSIDIAN), @@ -405,7 +405,7 @@ public class Mekanism { } //Combiner recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.COMBINER)) { + if (MekanismConfig.current().general.machinesManager.isEnabled(BlockStateMachine.MachineType.COMBINER)) { RecipeHandler.addCombinerRecipe(new ItemStack(Items.REDSTONE, 16), new ItemStack(Blocks.COBBLESTONE), new ItemStack(Blocks.REDSTONE_ORE)); RecipeHandler.addCombinerRecipe(new ItemStack(Items.DYE, 16, 4), new ItemStack(Blocks.COBBLESTONE), @@ -421,13 +421,14 @@ public class Mekanism { } //Osmium Compressor Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.OSMIUM_COMPRESSOR)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.OSMIUM_COMPRESSOR)) { RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.GLOWSTONE_DUST), new ItemStack(MekanismItems.Ingot, 1, 3)); } //Crusher Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.CRUSHER)) { + if (MekanismConfig.current().general.machinesManager.isEnabled(BlockStateMachine.MachineType.CRUSHER)) { RecipeHandler.addCrusherRecipe(new ItemStack(Items.DIAMOND), new ItemStack(MekanismItems.OtherDust, 1, 0)); RecipeHandler.addCrusherRecipe(new ItemStack(Items.IRON_INGOT), new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal())); @@ -472,12 +473,14 @@ public class Mekanism { } //Purification Chamber Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.PURIFICATION_CHAMBER)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.PURIFICATION_CHAMBER)) { RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT)); } //Chemical Injection Chamber Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.CHEMICAL_INJECTION_CHAMBER)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.CHEMICAL_INJECTION_CHAMBER)) { RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.DIRT), MekanismFluids.Water, new ItemStack(Blocks.CLAY)); RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.HARDENED_CLAY), MekanismFluids.Water, @@ -490,7 +493,8 @@ public class Mekanism { } //Precision Sawmill Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.PRECISION_SAWMILL)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.PRECISION_SAWMILL)) { RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.LADDER, 3), new ItemStack(Items.STICK, 7)); RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.TORCH, 4), new ItemStack(Items.STICK), new ItemStack(Items.COAL), 1); @@ -546,7 +550,8 @@ public class Mekanism { } //Metallurgic Infuser Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.METALLURGIC_INFUSER)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.METALLURGIC_INFUSER)) { RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, new ItemStack(Items.IRON_INGOT), new ItemStack(MekanismItems.EnrichedIron)); RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, @@ -572,7 +577,8 @@ public class Mekanism { } //Chemical Infuser Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.CHEMICAL_INFUSER)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.CHEMICAL_INFUSER)) { RecipeHandler.addChemicalInfuserRecipe(new GasStack(MekanismFluids.Oxygen, 1), new GasStack(MekanismFluids.SulfurDioxide, 2), new GasStack(MekanismFluids.SulfurTrioxide, 2)); RecipeHandler.addChemicalInfuserRecipe(new GasStack(MekanismFluids.SulfurTrioxide, 1), @@ -584,13 +590,17 @@ public class Mekanism { } //Electrolytic Separator Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.ELECTROLYTIC_SEPARATOR)) { - RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("water", 2), 2 * general.FROM_H2, + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.ELECTROLYTIC_SEPARATOR)) { + RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("water", 2), + 2 * MekanismConfig.current().general.FROM_H2.val(), new GasStack(MekanismFluids.Hydrogen, 2), new GasStack(MekanismFluids.Oxygen, 1)); - RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("brine", 10), 2 * general.FROM_H2, + RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("brine", 10), + 2 * MekanismConfig.current().general.FROM_H2.val(), new GasStack(MekanismFluids.Sodium, 1), new GasStack(MekanismFluids.Chlorine, 1)); RecipeHandler.addElectrolyticSeparatorRecipe(FluidRegistry.getFluidStack("heavywater", 2), - usage.heavyWaterElectrolysisUsage, new GasStack(MekanismFluids.Deuterium, 2), + MekanismConfig.current().usage.heavyWaterElectrolysisUsage.val(), + new GasStack(MekanismFluids.Deuterium, 2), new GasStack(MekanismFluids.Oxygen, 1)); } @@ -601,7 +611,8 @@ public class Mekanism { FluidRegistry.getFluidStack("liquidlithium", 1)); //Chemical Crystallizer Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.CHEMICAL_CRYSTALLIZER)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.CHEMICAL_CRYSTALLIZER)) { RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(MekanismFluids.Lithium, 100), new ItemStack(MekanismItems.OtherDust, 1, 4)); RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(MekanismFluids.Brine, 15), @@ -613,14 +624,15 @@ public class Mekanism { if (gas instanceof OreGas && !((OreGas) gas).isClean()) { OreGas oreGas = (OreGas) gas; - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.CHEMICAL_WASHER)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.CHEMICAL_WASHER)) { RecipeHandler .addChemicalWasherRecipe(new GasStack(oreGas, 1), new GasStack(oreGas.getCleanGas(), 1)); } //do the crystallizer only if it's one of ours! Resource gasResource = Resource.getFromName(oreGas.getName()); - if (gasResource != null && general.machinesManager + if (gasResource != null && MekanismConfig.current().general.machinesManager .isEnabled(BlockStateMachine.MachineType.CHEMICAL_CRYSTALLIZER)) { RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(oreGas.getCleanGas(), 200), new ItemStack(MekanismItems.Crystal, 1, gasResource.ordinal())); @@ -629,7 +641,8 @@ public class Mekanism { } //Pressurized Reaction Chamber Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.PRESSURIZED_REACTION_CHAMBER)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.PRESSURIZED_REACTION_CHAMBER)) { RecipeHandler.addPRCRecipe( new ItemStack(MekanismItems.BioFuel, 2), new FluidStack(FluidRegistry.WATER, 10), new GasStack(MekanismFluids.Hydrogen, 100), @@ -654,7 +667,8 @@ public class Mekanism { } //Solar Neutron Activator Recipes - if (general.machinesManager.isEnabled(BlockStateMachine.MachineType.SOLAR_NEUTRON_ACTIVATOR)) { + if (MekanismConfig.current().general.machinesManager + .isEnabled(BlockStateMachine.MachineType.SOLAR_NEUTRON_ACTIVATOR)) { RecipeHandler.addSolarNeutronRecipe(new GasStack(MekanismFluids.Lithium, 1), new GasStack(MekanismFluids.Tritium, 1)); } @@ -688,7 +702,7 @@ public class Mekanism { new InfuseObject(InfuseRegistry.get("OBSIDIAN"), 80)); //Fuel Gases - FuelHandler.addGas(MekanismFluids.Hydrogen, 1, general.FROM_H2); + FuelHandler.addGas(MekanismFluids.Hydrogen, 1, MekanismConfig.current().general.FROM_H2.val()); } /** @@ -764,7 +778,7 @@ public class Mekanism { OreDictionary.registerOre("oreCopper", new ItemStack(MekanismBlocks.OreBlock, 1, 1)); OreDictionary.registerOre("oreTin", new ItemStack(MekanismBlocks.OreBlock, 1, 2)); - if (general.controlCircuitOreDict) { + if (MekanismConfig.current().general.controlCircuitOreDict.val()) { OreDictionary.registerOre("circuitBasic", new ItemStack(MekanismItems.ControlCircuit, 1, 0)); OreDictionary.registerOre("circuitAdvanced", new ItemStack(MekanismItems.ControlCircuit, 1, 1)); OreDictionary.registerOre("circuitElite", new ItemStack(MekanismItems.ControlCircuit, 1, 2)); @@ -869,7 +883,7 @@ public class Mekanism { @EventHandler public void serverStarting(FMLServerStartingEvent event) { - if (general.voiceServerEnabled) { + if (MekanismConfig.current().general.voiceServerEnabled.val()) { voiceManager.start(); } CommandMek.register(event); @@ -877,7 +891,7 @@ public class Mekanism { @EventHandler public void serverStopping(FMLServerStoppingEvent event) { - if (general.voiceServerEnabled) { + if (MekanismConfig.current().general.voiceServerEnabled.val()) { voiceManager.stop(); } @@ -917,9 +931,6 @@ public class Mekanism { //Set the mod's configuration configuration = new Configuration(config); - //Register tier information - Tier.init(); - //Load configuration proxy.loadConfiguration(); proxy.onConfigSync(false); @@ -992,7 +1003,7 @@ public class Mekanism { PacketSimpleGui.handlers.add(0, proxy); //Set up VoiceServerManager - if (general.voiceServerEnabled) { + if (MekanismConfig.current().general.voiceServerEnabled.val()) { voiceManager = new VoiceServerManager(); } @@ -1000,7 +1011,7 @@ public class Mekanism { TransmitterNetworkRegistry.initiate(); //Add baby skeleton spawner - if (general.spawnBabySkeletons) { + if (MekanismConfig.current().general.spawnBabySkeletons.val()) { for (Biome biome : BiomeProvider.allowedBiomes) { if (biome.getSpawnableList(EnumCreatureType.MONSTER) != null && biome.getSpawnableList(EnumCreatureType.MONSTER).size() > 0) { @@ -1160,18 +1171,19 @@ public class Mekanism { NBTTagCompound nbtTags = event.getData(); nbtTags.setInteger("MekanismWorldGen", baseWorldGenVersion); - nbtTags.setInteger("MekanismUserWorldGen", general.userWorldGenVersion); + nbtTags.setInteger("MekanismUserWorldGen", MekanismConfig.current().general.userWorldGenVersion.val()); } } @SubscribeEvent public synchronized void onChunkDataLoad(ChunkDataEvent.Load event) { if (!event.getWorld().isRemote) { - if (general.enableWorldRegeneration) { + if (MekanismConfig.current().general.enableWorldRegeneration.val()) { NBTTagCompound loadData = event.getData(); if (loadData.getInteger("MekanismWorldGen") == baseWorldGenVersion - && loadData.getInteger("MekanismUserWorldGen") == general.userWorldGenVersion) { + && loadData.getInteger("MekanismUserWorldGen") == MekanismConfig + .current().general.userWorldGenVersion.val()) { return; } diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 6c4f61d78..8f22f81ad 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.UUID; import javax.annotation.Nonnull; import mekanism.api.Range4D; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.network.PacketBoxBlacklist; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; import mekanism.common.network.PacketConfigSync; @@ -170,7 +170,7 @@ public class PacketHandler { } public static void log(String log) { - if (general.logPackets) { + if (MekanismConfig.current().general.logPackets.val()) { Mekanism.logger.info(log); } } diff --git a/src/main/java/mekanism/common/PlayerState.java b/src/main/java/mekanism/common/PlayerState.java index 542a74c99..84ca5c7d9 100644 --- a/src/main/java/mekanism/common/PlayerState.java +++ b/src/main/java/mekanism/common/PlayerState.java @@ -62,7 +62,7 @@ public class PlayerState { } // Start a sound playing if the person is now flying - if (isActive && MekanismConfig.client.enablePlayerSounds) { + if (isActive && MekanismConfig.current().client.enablePlayerSounds.val()) { SoundHandler.startSound(world.getPlayerEntityByUUID(uuid), "jetpack"); } } @@ -107,7 +107,7 @@ public class PlayerState { } // Start a sound playing if the person is now using a gasmask - if (isActive && MekanismConfig.client.enablePlayerSounds) { + if (isActive && MekanismConfig.current().client.enablePlayerSounds.val()) { SoundHandler.startSound(world.getPlayerEntityByUUID(uuid), "gasmask"); } } @@ -152,7 +152,7 @@ public class PlayerState { } // Start a sound playing if the person is now using a flamethrower - if (isActive && MekanismConfig.client.enablePlayerSounds) { + if (isActive && MekanismConfig.current().client.enablePlayerSounds.val()) { SoundHandler.startSound(world.getPlayerEntityByUUID(uuid), "flamethrower"); } } diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java deleted file mode 100644 index 0e6540ca4..000000000 --- a/src/main/java/mekanism/common/Tier.java +++ /dev/null @@ -1,676 +0,0 @@ -package mekanism.common; - -import io.netty.buffer.ByteBuf; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import mekanism.api.EnumColor; -import mekanism.common.block.states.BlockStateMachine; -import mekanism.common.util.LangUtils; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; - -/** - * Tier information for Mekanism. This currently includes tiers for Energy Cubes and Smelting Factories. - * - * @author aidancbrady - */ -public final class Tier { - - private static List tierTypes = new ArrayList<>(); - - private static boolean initiated = false; - - public static void init() { - if (initiated) { - return; - } - - for (Class c : Tier.class.getDeclaredClasses()) { - if (c.isEnum()) { - try { - for (Object obj : c.getEnumConstants()) { - if (obj instanceof ITier) { - tierTypes.add((ITier) obj); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - initiated = true; - } - - public static void loadConfig() { - for (ITier tier : tierTypes) { - tier.loadConfig(); - } - } - - public static void readConfig(ByteBuf dataStream) { - for (ITier tier : tierTypes) { - tier.readConfig(dataStream); - } - } - - public static void writeConfig(ByteBuf dataStream) { - for (ITier tier : tierTypes) { - tier.writeConfig(dataStream); - } - } - - /** - * The default tiers used in Mekanism. - * - * @author aidancbrady - */ - public enum BaseTier implements IStringSerializable { - BASIC("Basic", EnumColor.BRIGHT_GREEN), - ADVANCED("Advanced", EnumColor.DARK_RED), - ELITE("Elite", EnumColor.DARK_BLUE), - ULTIMATE("Ultimate", EnumColor.PURPLE), - CREATIVE("Creative", EnumColor.BLACK); - - private String name; - private EnumColor color; - - BaseTier(String s, EnumColor c) { - name = s; - color = c; - } - - public String getSimpleName() { - return name; - } - - public String getLocalizedName() { - return LangUtils.localize("tier." + getSimpleName()); - } - - public EnumColor getColor() { - return color; - } - - public boolean isObtainable() { - return this != CREATIVE; - } - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - } - - public enum EnergyCubeTier implements ITier, IStringSerializable { - BASIC(2000000, 800), - ADVANCED(8000000, 3200), - ELITE(32000000, 12800), - ULTIMATE(128000000, 51200), - CREATIVE(Double.MAX_VALUE, Double.MAX_VALUE); - - public double maxEnergy; - public double output; - private double baseMaxEnergy; - private double baseOutput; - - EnergyCubeTier(double max, double out) { - baseMaxEnergy = maxEnergy = max; - baseOutput = output = out; - } - - @Override - public void loadConfig() { - if (this != CREATIVE) { - String name = getBaseTier().getSimpleName(); - maxEnergy = Mekanism.configuration.get("tier", name + "EnergyCubeMaxEnergy", baseMaxEnergy, - "Maximum number of Joules a " + name + " energy cube can store.").getDouble(); - output = Mekanism.configuration.get("tier", name + "EnergyCubeOutput", baseOutput, - "Output rate in Joules of a " + name + " energy cube.").getDouble(); - } - } - - @Override - public void readConfig(ByteBuf dataStream) { - if (this != CREATIVE) { - maxEnergy = dataStream.readDouble(); - output = dataStream.readDouble(); - } - } - - @Override - public void writeConfig(ByteBuf dataStream) { - if (this != CREATIVE) { - dataStream.writeDouble(maxEnergy); - dataStream.writeDouble(output); - } - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - } - - public enum InductionCellTier implements ITier { - BASIC(1E9D), - ADVANCED(8E9D), - ELITE(64E9D), - ULTIMATE(512E9D); - - public double maxEnergy; - private double baseMaxEnergy; - - InductionCellTier(double max) { - baseMaxEnergy = maxEnergy = max; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - maxEnergy = Mekanism.configuration.get("tier", name + "InductionCellMaxEnergy", baseMaxEnergy, - "Maximum number of Joules a " + name + " induction cell can store.").getDouble(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - maxEnergy = dataStream.readDouble(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeDouble(maxEnergy); - } - } - - public enum InductionProviderTier implements ITier { - BASIC(64000), - ADVANCED(512000), - ELITE(4096000), - ULTIMATE(32768000); - - public double output; - private double baseOutput; - - InductionProviderTier(double out) { - baseOutput = output = out; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - output = Mekanism.configuration.get("tier", name + "InductionProviderOutput", baseOutput, - "Maximum number of Joules a " + name + " induction provider can output or accept.").getDouble(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - output = dataStream.readDouble(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeDouble(output); - } - } - - public enum FactoryTier { - BASIC(3, new ResourceLocation("mekanism", "gui/factory/GuiBasicFactory.png"), - BlockStateMachine.MachineType.BASIC_FACTORY), - ADVANCED(5, new ResourceLocation("mekanism", "gui/factory/GuiAdvancedFactory.png"), - BlockStateMachine.MachineType.ADVANCED_FACTORY), - ELITE(7, new ResourceLocation("mekanism", "gui/factory/GuiEliteFactory.png"), - BlockStateMachine.MachineType.ELITE_FACTORY); - - public final BlockStateMachine.MachineType machineType; - public int processes; - public ResourceLocation guiLocation; - - FactoryTier(int process, ResourceLocation gui, BlockStateMachine.MachineType machineTypeIn) { - processes = process; - guiLocation = gui; - machineType = machineTypeIn; - } - - public static FactoryTier getFromName(String tierName) { - for (FactoryTier tier : values()) { - if (tierName.contains(tier.getBaseTier().getSimpleName())) { - return tier; - } - } - - Mekanism.logger.error("Invalid tier identifier when retrieving with name."); - return BASIC; - } - - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - } - - public enum CableTier implements ITier { - BASIC(3200), - ADVANCED(12800), - ELITE(64000), - ULTIMATE(320000); - - public int cableCapacity; - private int baseCapacity; - - CableTier(int capacity) { - baseCapacity = cableCapacity = capacity; - } - - public static CableTier get(BaseTier tier) { - for (CableTier transmitter : values()) { - if (transmitter.getBaseTier() == tier) { - return transmitter; - } - } - - return BASIC; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - cableCapacity = Mekanism.configuration.get("tier", name + "CableCapacity", baseCapacity, - "Internal buffer in Joules of each " + name + " universal cable.").getInt(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - cableCapacity = dataStream.readInt(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeInt(cableCapacity); - } - } - - public enum PipeTier implements ITier { - BASIC(1000, 100), - ADVANCED(4000, 400), - ELITE(16000, 1600), - ULTIMATE(64000, 6400); - - public int pipeCapacity; - public int pipePullAmount; - private int baseCapacity; - private int basePull; - - PipeTier(int capacity, int pullAmount) { - baseCapacity = pipeCapacity = capacity; - basePull = pipePullAmount = pullAmount; - } - - public static PipeTier get(BaseTier tier) { - for (PipeTier transmitter : values()) { - if (transmitter.getBaseTier() == tier) { - return transmitter; - } - } - - return BASIC; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - pipeCapacity = Mekanism.configuration.get("tier", name + "PipeCapacity", baseCapacity, - "Capacity of " + name + " mechanical pipe in mB.").getInt(); - pipePullAmount = Mekanism.configuration.get("tier", name + "PipePullAmount", basePull, - "Pump rate of " + name + " mechanical pipe in mB/t.").getInt(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - pipeCapacity = dataStream.readInt(); - pipePullAmount = dataStream.readInt(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeInt(pipeCapacity); - dataStream.writeInt(pipePullAmount); - } - } - - public enum TubeTier implements ITier { - BASIC(256, 64), - ADVANCED(1024, 256), - ELITE(4096, 1024), - ULTIMATE(16384, 4096); - - public int tubeCapacity; - public int tubePullAmount; - private int baseCapacity; - private int basePull; - - TubeTier(int capacity, int pullAmount) { - baseCapacity = tubeCapacity = capacity; - basePull = tubePullAmount = pullAmount; - } - - public static TubeTier get(BaseTier tier) { - for (TubeTier transmitter : values()) { - if (transmitter.getBaseTier() == tier) { - return transmitter; - } - } - - return BASIC; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - tubeCapacity = Mekanism.configuration.get("tier", name + "TubeCapacity", baseCapacity, - "Capacity of " + name + " pressurized tube in mB.").getInt(); - tubePullAmount = Mekanism.configuration.get("tier", name + "TubePullAmount", basePull, - "Pump rate of " + name + " pressurized tube in mB/t.").getInt(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - tubeCapacity = dataStream.readInt(); - tubePullAmount = dataStream.readInt(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeInt(tubeCapacity); - dataStream.writeInt(tubePullAmount); - } - } - - public enum TransporterTier implements ITier { - BASIC(1, 5), - ADVANCED(16, 10), - ELITE(32, 20), - ULTIMATE(64, 50); - - public int pullAmount; - public int speed; - private int basePull; - private int baseSpeed; - - TransporterTier(int pull, int s) { - basePull = pullAmount = pull; - baseSpeed = speed = s; - } - - public static TransporterTier get(BaseTier tier) { - for (TransporterTier transmitter : values()) { - if (transmitter.getBaseTier() == tier) { - return transmitter; - } - } - - return BASIC; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - pullAmount = Mekanism.configuration.get("tier", name + "TransporterPullAmount", basePull, - "Item throughput rate of " + name + " logistical transporter in items/s.").getInt(); - speed = Mekanism.configuration.get("tier", name + "TransporterSpeed", baseSpeed, - "Five times travel speed of " + name + " logistical transporter.").getInt(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - pullAmount = dataStream.readInt(); - speed = dataStream.readInt(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeInt(pullAmount); - dataStream.writeInt(speed); - } - } - - public enum ConductorTier implements ITier { - BASIC(5, 1, 10, new ColourRGBA(0.2, 0.2, 0.2, 1)), - ADVANCED(5, 1, 400, new ColourRGBA(0.2, 0.2, 0.2, 1)), - ELITE(5, 1, 8000, new ColourRGBA(0.2, 0.2, 0.2, 1)), - ULTIMATE(5, 1, 100000, new ColourRGBA(0.2, 0.2, 0.2, 1)); - - public double inverseConduction; - public double inverseHeatCapacity; - public double inverseConductionInsulation; - public ColourRGBA baseColour; - private double baseConduction; - private double baseHeatCapacity; - private double baseConductionInsulation; - - ConductorTier(double inversek, double inverseC, double insulationInversek, ColourRGBA colour) { - baseConduction = inverseConduction = inversek; - baseHeatCapacity = inverseHeatCapacity = inverseC; - baseConductionInsulation = inverseConductionInsulation = insulationInversek; - - baseColour = colour; - } - - public static ConductorTier get(BaseTier tier) { - for (ConductorTier transmitter : values()) { - if (transmitter.getBaseTier() == tier) { - return transmitter; - } - } - - return BASIC; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - inverseConduction = Mekanism.configuration.get("tier", name + "ConductorInverseConduction", baseConduction, - "Conduction value of " + name + " thermodynamic conductor.").getDouble(); - inverseHeatCapacity = Mekanism.configuration.get("tier", name + "ConductorHeatCapacity", baseHeatCapacity, - "Heat capacity of " + name + " thermodynamic conductor.").getDouble(); - inverseConductionInsulation = Mekanism.configuration - .get("tier", name + "ConductorConductionInsulation", baseConductionInsulation, - "Insulation value of " + name + " thermodynamic conductor.").getDouble(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - inverseConduction = dataStream.readDouble(); - inverseHeatCapacity = dataStream.readDouble(); - inverseConductionInsulation = dataStream.readDouble(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeDouble(inverseConduction); - dataStream.writeDouble(inverseHeatCapacity); - dataStream.writeDouble(inverseConductionInsulation); - } - } - - public enum FluidTankTier implements ITier { - BASIC(14000, 400), - ADVANCED(28000, 800), - ELITE(56000, 1600), - ULTIMATE(112000, 3200), - CREATIVE(Integer.MAX_VALUE, Integer.MAX_VALUE / 2); - - public int storage; - public int output; - private int baseStorage; - private int baseOutput; - - FluidTankTier(int s, int o) { - baseStorage = storage = s; - baseOutput = output = o; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - storage = Mekanism.configuration.get("tier", name + "FluidTankStorage", baseStorage, - "Storage size of " + name + " gas tank in mB.").getInt(); - output = Mekanism.configuration.get("tier", name + "FluidTankOutput", baseOutput, - "Output rate of " + name + " gas tank in mB.").getInt(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - storage = dataStream.readInt(); - output = dataStream.readInt(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeInt(storage); - dataStream.writeInt(output); - } - } - - public enum GasTankTier implements ITier, IStringSerializable { - BASIC(64000, 256), - ADVANCED(128000, 512), - ELITE(256000, 1028), - ULTIMATE(512000, 2056), - CREATIVE(Integer.MAX_VALUE, Integer.MAX_VALUE / 2); - - public int storage; - public int output; - private int baseStorage; - private int baseOutput; - - GasTankTier(int s, int o) { - baseStorage = storage = s; - baseOutput = output = o; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - storage = Mekanism.configuration.get("tier", name + "GasTankStorage", baseStorage, - "Storage size of " + name + " gas tank in mB.").getInt(); - output = Mekanism.configuration.get("tier", name + "GasTankOutput", baseOutput, - "Output rate of " + name + " gas tank in mB.").getInt(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - storage = dataStream.readInt(); - output = dataStream.readInt(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeInt(storage); - dataStream.writeInt(output); - } - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - } - - public enum BinTier implements ITier { - BASIC(4096), - ADVANCED(8192), - ELITE(32768), - ULTIMATE(262144), - CREATIVE(Integer.MAX_VALUE); - - public int storage; - private int baseStorage; - - BinTier(int s) { - baseStorage = storage = s; - } - - @Override - public BaseTier getBaseTier() { - return BaseTier.values()[ordinal()]; - } - - @Override - public void loadConfig() { - String name = getBaseTier().getSimpleName(); - storage = Mekanism.configuration.get("tier", name + "BinStorage", baseStorage, - "The number of items a " + name + " bin can store.").getInt(); - } - - @Override - public void readConfig(ByteBuf dataStream) { - storage = dataStream.readInt(); - } - - @Override - public void writeConfig(ByteBuf dataStream) { - dataStream.writeInt(storage); - } - } - - public interface ITier { - - BaseTier getBaseTier(); - - void loadConfig(); - - void readConfig(ByteBuf dataStream); - - void writeConfig(ByteBuf dataStream); - } -} diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index 8b430893c..87ab7c729 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -7,7 +7,7 @@ import java.util.Map; import javax.annotation.Nullable; import mekanism.api.EnumColor; import mekanism.common.base.IUpgradeTile; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.util.LangUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -128,8 +128,8 @@ public enum Upgrade { List ret = new ArrayList<>(); if (canMultiply()) { - double effect = Math - .pow(general.maxUpgradeMultiplier, (float) tile.getComponent().getUpgrades(this) / (float) getMax()); + double effect = Math.pow(MekanismConfig.current().general.maxUpgradeMultiplier.val(), + (float) tile.getComponent().getUpgrades(this) / (float) getMax()); ret.add(LangUtils.localize("gui.upgrades.effect") + ": " + (Math.round(effect * 100) / 100F) + "x"); } diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 623127c96..55f4167d6 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -8,7 +8,7 @@ import java.util.function.Function; import mekanism.api.Coord4D; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.common.capabilities.Capabilities; -import mekanism.common.config.MekanismConfig.general; +import mekanism.common.config.MekanismConfig; import mekanism.common.util.CapabilityUtils; import mekanism.common.util.MekanismUtils; import net.darkhax.tesla.api.ITeslaConsumer; @@ -121,11 +121,11 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { } public int toRF(double joules) { - return (int) Math.round(joules * general.TO_RF); + return (int) Math.round(joules * MekanismConfig.current().general.TO_RF.val()); } public double fromRF(int rf) { - return rf * general.FROM_RF; + return rf * MekanismConfig.current().general.FROM_RF.val(); } } @@ -156,11 +156,11 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { } public double toEU(double joules) { - return joules * general.TO_IC2; + return joules * MekanismConfig.current().general.TO_IC2.val(); } public double fromEU(double eu) { - return eu * general.FROM_IC2; + return eu * MekanismConfig.current().general.FROM_IC2.val(); } } @@ -188,11 +188,11 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { } public long toTesla(double joules) { - return Math.round(joules * general.TO_TESLA); + return Math.round(joules * MekanismConfig.current().general.TO_TESLA.val()); } public double fromTesla(double tesla) { - return tesla * general.FROM_TESLA; + return tesla * MekanismConfig.current().general.FROM_TESLA.val(); } } @@ -220,11 +220,11 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor { } public int toForge(double joules) { - return (int) Math.round(joules * general.TO_FORGE); + return (int) Math.round(joules * MekanismConfig.current().general.TO_FORGE.val()); } public double fromForge(double forge) { - return forge * general.FROM_FORGE; + return forge * MekanismConfig.current().general.FROM_FORGE.val(); } } } diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java index 79574a731..4514c3a12 100644 --- a/src/main/java/mekanism/common/base/IModule.java +++ b/src/main/java/mekanism/common/base/IModule.java @@ -2,6 +2,7 @@ package mekanism.common.base; import io.netty.buffer.ByteBuf; import mekanism.common.Version; +import mekanism.common.config.MekanismConfig; /** * Implement in your main class if your mod happens to be completely reliant on Mekanism, or in other words, is a @@ -30,15 +31,17 @@ public interface IModule { * Writes this module's configuration to a ConfigSync packet. * * @param dataStream - the ByteBuf of the sync packet + * @param config - the configuration to write */ - void writeConfig(ByteBuf dataStream); + void writeConfig(ByteBuf dataStream, MekanismConfig config); /** * Reads this module's configuration from the original ConfigSync packet. * * @param dataStream - the incoming ByteBuf of the sync packet + * @param destConfig - configuration to read to */ - void readConfig(ByteBuf dataStream); + void readConfig(ByteBuf dataStream, MekanismConfig destConfig); /** * Called when the player returns to the main menu. diff --git a/src/main/java/mekanism/common/base/ITierItem.java b/src/main/java/mekanism/common/base/ITierItem.java index aa5dda012..9b9d7e50c 100644 --- a/src/main/java/mekanism/common/base/ITierItem.java +++ b/src/main/java/mekanism/common/base/ITierItem.java @@ -1,6 +1,6 @@ package mekanism.common.base; -import mekanism.common.Tier.BaseTier; +import mekanism.common.tier.BaseTier; import net.minecraft.item.ItemStack; public interface ITierItem { diff --git a/src/main/java/mekanism/common/base/ITierUpgradeable.java b/src/main/java/mekanism/common/base/ITierUpgradeable.java index 4814257da..bb9b21eea 100644 --- a/src/main/java/mekanism/common/base/ITierUpgradeable.java +++ b/src/main/java/mekanism/common/base/ITierUpgradeable.java @@ -1,6 +1,6 @@ package mekanism.common.base; -import mekanism.common.Tier.BaseTier; +import mekanism.common.tier.BaseTier; public interface ITierUpgradeable { diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 8aeb3f406..559ca413e 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -8,7 +8,7 @@ import mekanism.api.IMekWrench; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; -import mekanism.common.Tier.BaseTier; +import mekanism.common.tier.BaseTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.ITierItem; @@ -481,7 +481,7 @@ public abstract class BlockBasic extends Block { } if (!world.isRemote) { - if (bin.getItemCount() < bin.tier.storage) { + if (bin.getItemCount() < bin.tier.getStorage()) { if (bin.addTicks == 0) { if (!stack.isEmpty()) { ItemStack remain = bin.add(stack); @@ -492,7 +492,7 @@ public abstract class BlockBasic extends Block { NonNullList inv = entityplayer.inventory.mainInventory; for (int i = 0; i < inv.size(); i++) { - if (bin.getItemCount() == bin.tier.storage) { + if (bin.getItemCount() == bin.tier.getStorage()) { break; } diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index f8fd8dfbb..5a02921fd 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -6,7 +6,7 @@ import mekanism.api.IMekWrench; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; -import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.tier.EnergyCubeTier; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; @@ -165,7 +165,7 @@ public class BlockEnergyCube extends BlockContainer { list.add(discharged); ItemStack charged = new ItemStack(this); ((ItemBlockEnergyCube) charged.getItem()).setBaseTier(charged, tier.getBaseTier()); - ((ItemBlockEnergyCube) charged.getItem()).setEnergy(charged, tier.maxEnergy); + ((ItemBlockEnergyCube) charged.getItem()).setEnergy(charged, tier.getMaxEnergy()); list.add(charged); } } diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index ce1058ae1..9de9c054c 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -8,7 +8,7 @@ import mekanism.api.IMekWrench; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; -import mekanism.common.Tier.FluidTankTier; +import mekanism.common.tier.FluidTankTier; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IFactory; @@ -24,7 +24,7 @@ import mekanism.common.block.states.BlockStateFacing; import mekanism.common.block.states.BlockStateMachine; import mekanism.common.block.states.BlockStateMachine.MachineBlock; import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.config.MekanismConfig.client; +import mekanism.common.config.MekanismConfig; import mekanism.common.content.entangloporter.InventoryFrequency; import mekanism.common.integration.wrenches.Wrenches; import mekanism.common.item.ItemBlockMachine; @@ -252,7 +252,8 @@ public abstract class BlockMachine extends BlockContainer { return; } - if (MekanismUtils.isActive(world, pos) && ((IActiveState) tileEntity).renderUpdate() && client.machineEffects) { + if (MekanismUtils.isActive(world, pos) && ((IActiveState) tileEntity).renderUpdate() && MekanismConfig + .current().client.machineEffects.val()) { float xRandom = (float) pos.getX() + 0.5F; float yRandom = (float) pos.getY() + 0.0F + random.nextFloat() * 6.0F / 16.0F; float zRandom = (float) pos.getZ() + 0.5F; @@ -298,12 +299,12 @@ public abstract class BlockMachine extends BlockContainer { @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { - if (client.enableAmbientLighting) { + if (MekanismConfig.current().client.enableAmbientLighting.val()) { TileEntity tileEntity = MekanismUtils.getTileEntitySafe(world, pos); if (tileEntity instanceof IActiveState && ((IActiveState) tileEntity).lightUpdate() && ((IActiveState) tileEntity).wasActiveRecently()) { - return client.ambientLightingLevel; + return MekanismConfig.current().client.ambientLightingLevel.val(); } } diff --git a/src/main/java/mekanism/common/block/BlockTransmitter.java b/src/main/java/mekanism/common/block/BlockTransmitter.java index d054fdad8..1fc6af8dd 100644 --- a/src/main/java/mekanism/common/block/BlockTransmitter.java +++ b/src/main/java/mekanism/common/block/BlockTransmitter.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; import mekanism.api.IMekWrench; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; -import mekanism.common.Tier.BaseTier; +import mekanism.common.tier.BaseTier; import mekanism.common.base.ITierItem; import mekanism.common.block.property.PropertyConnection; import mekanism.common.block.states.BlockStateTransmitter; diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index c36b1c3c4..067a8c152 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -7,7 +7,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; -import mekanism.common.Tier.BaseTier; +import mekanism.common.tier.BaseTier; import mekanism.common.block.BlockBasic; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityBoilerCasing; diff --git a/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java b/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java index 8d4f18bb1..9942e4a1a 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java +++ b/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java @@ -1,7 +1,7 @@ package mekanism.common.block.states; -import mekanism.common.Tier; import mekanism.common.block.BlockEnergyCube; +import mekanism.common.tier.EnergyCubeTier; import net.minecraft.block.properties.PropertyEnum; /** @@ -9,8 +9,8 @@ import net.minecraft.block.properties.PropertyEnum; */ public class BlockStateEnergyCube extends BlockStateFacing { - public static final PropertyEnum typeProperty = PropertyEnum - .create("tier", Tier.EnergyCubeTier.class); + public static final PropertyEnum typeProperty = PropertyEnum + .create("tier", EnergyCubeTier.class); public BlockStateEnergyCube(BlockEnergyCube block) { super(block, typeProperty); diff --git a/src/main/java/mekanism/common/block/states/BlockStateFacing.java b/src/main/java/mekanism/common/block/states/BlockStateFacing.java index 01aea3320..d43718159 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateFacing.java +++ b/src/main/java/mekanism/common/block/states/BlockStateFacing.java @@ -1,6 +1,6 @@ package mekanism.common.block.states; -import mekanism.common.Tier.BaseTier; +import mekanism.common.tier.BaseTier; import mekanism.common.base.IFactory.RecipeType; import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyBool; diff --git a/src/main/java/mekanism/common/block/states/BlockStateGasTank.java b/src/main/java/mekanism/common/block/states/BlockStateGasTank.java index c1f79f9b3..1029b780b 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateGasTank.java +++ b/src/main/java/mekanism/common/block/states/BlockStateGasTank.java @@ -1,7 +1,7 @@ package mekanism.common.block.states; -import mekanism.common.Tier; import mekanism.common.block.BlockGasTank; +import mekanism.common.tier.GasTankTier; import net.minecraft.block.properties.PropertyEnum; /** @@ -9,8 +9,8 @@ import net.minecraft.block.properties.PropertyEnum; */ public class BlockStateGasTank extends BlockStateFacing { - public static final PropertyEnum typeProperty = PropertyEnum - .create("tier", Tier.GasTankTier.class); + public static final PropertyEnum typeProperty = PropertyEnum + .create("tier", GasTankTier.class); public BlockStateGasTank(BlockGasTank block) { super(block, typeProperty); diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index d2d697801..c0c6b50aa 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -8,13 +8,12 @@ import java.util.Locale; import javax.annotation.Nonnull; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; -import mekanism.common.Tier; -import mekanism.common.Tier.BaseTier; +import mekanism.common.tier.BaseTier; import mekanism.common.base.IBlockType; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.BlockMachine; -import mekanism.common.config.MekanismConfig.general; -import mekanism.common.config.MekanismConfig.usage; +import mekanism.common.config.MekanismConfig; +import mekanism.common.tier.FactoryTier; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityChargepad; @@ -123,11 +122,11 @@ public class BlockStateMachine extends ExtendedBlockState { DIGITAL_MINER(MachineBlock.MACHINE_BLOCK_1, 4, "DigitalMiner", 2, TileEntityDigitalMiner.class, true, true, true, Plane.HORIZONTAL, true), BASIC_FACTORY(MachineBlock.MACHINE_BLOCK_1, 5, "Factory", 11, TileEntityFactory.class, true, false, true, - Plane.HORIZONTAL, true, Tier.FactoryTier.BASIC), + Plane.HORIZONTAL, true, FactoryTier.BASIC), ADVANCED_FACTORY(MachineBlock.MACHINE_BLOCK_1, 6, "Factory", 11, TileEntityAdvancedFactory.class, true, false, - true, Plane.HORIZONTAL, true, Tier.FactoryTier.ADVANCED), + true, Plane.HORIZONTAL, true, FactoryTier.ADVANCED), ELITE_FACTORY(MachineBlock.MACHINE_BLOCK_1, 7, "Factory", 11, TileEntityEliteFactory.class, true, false, true, - Plane.HORIZONTAL, true, Tier.FactoryTier.ELITE), + Plane.HORIZONTAL, true, FactoryTier.ELITE), METALLURGIC_INFUSER(MachineBlock.MACHINE_BLOCK_1, 8, "MetallurgicInfuser", 12, TileEntityMetallurgicInfuser.class, true, true, true, Plane.HORIZONTAL, false), PURIFICATION_CHAMBER(MachineBlock.MACHINE_BLOCK_1, 9, "PurificationChamber", 15, @@ -202,7 +201,7 @@ public class BlockStateMachine extends ExtendedBlockState { public boolean supportsUpgrades; public Predicate facingPredicate; public boolean activable; - public Tier.FactoryTier factoryTier; + public FactoryTier factoryTier; MachineType(MachineBlock block, int i, String s, int j, Class tileClass, boolean electric, boolean model, boolean upgrades, Predicate predicate, boolean hasActiveTexture) { @@ -211,7 +210,7 @@ public class BlockStateMachine extends ExtendedBlockState { MachineType(MachineBlock block, int i, String s, int j, Class tileClass, boolean electric, boolean model, boolean upgrades, Predicate predicate, boolean hasActiveTexture, - Tier.FactoryTier factoryTier) { + FactoryTier factoryTier) { typeBlock = block; meta = i; blockName = s; @@ -225,16 +224,20 @@ public class BlockStateMachine extends ExtendedBlockState { this.factoryTier = factoryTier; } - public static List getValidMachines() { + private static final List VALID_MACHINES = new ArrayList<>(); + + static { List ret = new ArrayList<>(); for (MachineType type : MachineType.values()) { if (type.isValidMachine()) { - ret.add(type); + VALID_MACHINES.add(type); } } + } - return ret; + public static List getValidMachines() { + return VALID_MACHINES; } public static MachineType get(Block block, int meta) { @@ -272,7 +275,7 @@ public class BlockStateMachine extends ExtendedBlockState { @Override public boolean isEnabled() { - return general.machinesManager.isEnabled(blockName); + return MekanismConfig.current().general.machinesManager.isEnabled(this); } public boolean isValidMachine() { @@ -295,25 +298,25 @@ public class BlockStateMachine extends ExtendedBlockState { public double getUsage() { switch (this) { case ENRICHMENT_CHAMBER: - return usage.enrichmentChamberUsage; + return MekanismConfig.current().usage.enrichmentChamberUsage.val(); case OSMIUM_COMPRESSOR: - return usage.osmiumCompressorUsage; + return MekanismConfig.current().usage.osmiumCompressorUsage.val(); case COMBINER: - return usage.combinerUsage; + return MekanismConfig.current().usage.combinerUsage.val(); case CRUSHER: - return usage.crusherUsage; + return MekanismConfig.current().usage.crusherUsage.val(); case DIGITAL_MINER: - return usage.digitalMinerUsage; + return MekanismConfig.current().usage.digitalMinerUsage.val(); case METALLURGIC_INFUSER: - return usage.metallurgicInfuserUsage; + return MekanismConfig.current().usage.metallurgicInfuserUsage.val(); case PURIFICATION_CHAMBER: - return usage.purificationChamberUsage; + return MekanismConfig.current().usage.purificationChamberUsage.val(); case ENERGIZED_SMELTER: - return usage.energizedSmelterUsage; + return MekanismConfig.current().usage.energizedSmelterUsage.val(); case TELEPORTER: return 12500; case ELECTRIC_PUMP: - return usage.electricPumpUsage; + return MekanismConfig.current().usage.electricPumpUsage.val(); case PERSONAL_CHEST: return 30; case CHARGEPAD: @@ -321,33 +324,33 @@ public class BlockStateMachine extends ExtendedBlockState { case LOGISTICAL_SORTER: return 0; case ROTARY_CONDENSENTRATOR: - return usage.rotaryCondensentratorUsage; + return MekanismConfig.current().usage.rotaryCondensentratorUsage.val(); case CHEMICAL_OXIDIZER: - return usage.oxidationChamberUsage; + return MekanismConfig.current().usage.oxidationChamberUsage.val(); case CHEMICAL_INFUSER: - return usage.chemicalInfuserUsage; + return MekanismConfig.current().usage.chemicalInfuserUsage.val(); case CHEMICAL_INJECTION_CHAMBER: - return usage.chemicalInjectionChamberUsage; + return MekanismConfig.current().usage.chemicalInjectionChamberUsage.val(); case ELECTROLYTIC_SEPARATOR: - return general.FROM_H2 * 2; + return MekanismConfig.current().general.FROM_H2.val() * 2; case PRECISION_SAWMILL: - return usage.precisionSawmillUsage; + return MekanismConfig.current().usage.precisionSawmillUsage.val(); case CHEMICAL_DISSOLUTION_CHAMBER: - return usage.chemicalDissolutionChamberUsage; + return MekanismConfig.current().usage.chemicalDissolutionChamberUsage.val(); case CHEMICAL_WASHER: - return usage.chemicalWasherUsage; + return MekanismConfig.current().usage.chemicalWasherUsage.val(); case CHEMICAL_CRYSTALLIZER: - return usage.chemicalCrystallizerUsage; + return MekanismConfig.current().usage.chemicalCrystallizerUsage.val(); case SEISMIC_VIBRATOR: - return usage.seismicVibratorUsage; + return MekanismConfig.current().usage.seismicVibratorUsage.val(); case PRESSURIZED_REACTION_CHAMBER: - return usage.pressurizedReactionBaseUsage; + return MekanismConfig.current().usage.pressurizedReactionBaseUsage.val(); case FLUID_TANK: return 0; case FLUIDIC_PLENISHER: - return usage.fluidicPlenisherUsage; + return MekanismConfig.current().usage.fluidicPlenisherUsage.val(); case LASER: - return usage.laserUsage; + return MekanismConfig.current().usage.laserUsage.val(); case LASER_AMPLIFIER: return 0; case LASER_TRACTOR_BEAM: @@ -361,7 +364,7 @@ public class BlockStateMachine extends ExtendedBlockState { case RESISTIVE_HEATER: return 100; case FORMULAIC_ASSEMBLICATOR: - return usage.formulaicAssemblicatorUsage; + return MekanismConfig.current().usage.formulaicAssemblicatorUsage.val(); default: return 0; diff --git a/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java b/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java index a51622088..5f7a6a863 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java +++ b/src/main/java/mekanism/common/block/states/BlockStateTransmitter.java @@ -3,7 +3,7 @@ package mekanism.common.block.states; import java.util.Locale; import javax.annotation.Nonnull; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.Tier.BaseTier; +import mekanism.common.tier.BaseTier; import mekanism.common.block.BlockTransmitter; import mekanism.common.block.property.PropertyColor; import mekanism.common.block.property.PropertyConnection; diff --git a/src/main/java/mekanism/common/config/BaseConfig.java b/src/main/java/mekanism/common/config/BaseConfig.java new file mode 100644 index 000000000..4e6422d61 --- /dev/null +++ b/src/main/java/mekanism/common/config/BaseConfig.java @@ -0,0 +1,60 @@ +package mekanism.common.config; + +import io.netty.buffer.ByteBuf; +import java.util.ArrayList; +import java.util.List; +import mekanism.common.config.options.Option; +import net.minecraftforge.common.config.Configuration; + +/** + * Created by Thiakil on 15/03/2019. + */ +public abstract class BaseConfig { + + /** + * No-op owner for making option fields not be null + */ + protected static BaseConfig NULL_OWNER = new BaseConfig() { + @Override + public void registerOption(Option option) { + } + }; + + private List