diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 6558b47d4..b8c6a4bd9 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -152,9 +152,6 @@ public class MekanismConfig { public static double advancedSolarGeneration; public static double bioGeneration; - public static int ethanolDuration; - public static int biogasDuration; - public static double ethanolMultiplier; public static double heatGeneration; public static double heatGenerationLava; public static double heatGenerationNether; @@ -169,6 +166,13 @@ public class MekanismConfig public static double turbineVentGasFlow; public static double turbineDisperserGasFlow; public static int condenserRate; + } + + public static class mekce_generators + { + public static int ethanolDuration; + public static int biogasDuration; + public static double ethanolMultiplier; public static boolean enableWindmillWhitelist; public static List winddimensionids; } diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 98d8de93d..25997ba3f 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -1,6 +1,7 @@ package mekanism.generators.common; import mekanism.api.MekanismConfig.generators; +import mekanism.api.MekanismConfig.mekce_generators; import mekanism.api.MekanismConfig.generatorsrecipes; import mekanism.common.Mekanism; import mekanism.common.base.IGuiProvider; @@ -101,9 +102,9 @@ public class GeneratorsCommonProxy implements IGuiProvider { generators.advancedSolarGeneration = Mekanism.configurationgenerators.get("generation", "AdvancedSolarGeneration", 300D).getDouble(); generators.bioGeneration = Mekanism.configurationgenerators.get("generation", "BioGeneration", 100D).getDouble(); - generators.biogasDuration = Mekanism.configurationgenerators.get("generation", "BiogasDuration", 1).getInt(); - generators.ethanolDuration = Mekanism.configurationgenerators.get("generation", "EthanolDuration", 2).getInt(); - generators.ethanolMultiplier = Mekanism.configurationgenerators.get("generation", "EthanolMultiplier", 3D).getDouble(); + mekce_generators.biogasDuration = Mekanism.configurationce.get("mekce_generation", "BiogasDuration", 1).getInt(); + mekce_generators.ethanolDuration = Mekanism.configurationce.get("mekce_generation", "EthanolDuration", 2).getInt(); + mekce_generators.ethanolMultiplier = Mekanism.configurationce.get("mekce_generation", "EthanolMultiplier", 3D).getDouble(); generators.heatGeneration = Mekanism.configurationgenerators.get("generation", "HeatGeneration", 150D).getDouble(); generators.heatGenerationLava = Mekanism.configurationgenerators.get("generation", "HeatGenerationLava", 5D).getDouble(); generators.heatGenerationNether = Mekanism.configurationgenerators.get("generation", "HeatGenerationNether", 100D).getDouble(); @@ -116,7 +117,7 @@ public class GeneratorsCommonProxy implements IGuiProvider generators.turbineVentGasFlow = Mekanism.configurationgenerators.get("generation", "TurbineVentGasFlow", 16000D).getDouble(); generators.turbineDisperserGasFlow = Mekanism.configurationgenerators.get("generation", "TurbineDisperserGasFlow", 640D).getDouble(); generators.condenserRate = Mekanism.configurationgenerators.get("generation", "TurbineCondenserFlowRate", 32000).getInt(); - generators.enableWindmillWhitelist = Mekanism.configurationce.get("mekce_generation", "EnableWindmillWhitelist", true).getBoolean(); + mekce_generators.enableWindmillWhitelist = Mekanism.configurationce.get("mekce_generation", "EnableWindmillWhitelist", true).getBoolean(); generatorsrecipes.enableHeatGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableHeatGenerator", true).getBoolean(); generatorsrecipes.enableSolarGenerator = Mekanism.configurationrecipes.get("generationrecipes","enableSolarGenerator", true).getBoolean(); @@ -152,8 +153,8 @@ public class GeneratorsCommonProxy implements IGuiProvider public void loadwinddimension() { String[] windid = {"0"}; - generators.winddimensionids = Arrays.asList(Mekanism.configurationce.getStringList("winddimensionids", "mekce_generation", windid, "List of dimension id's to be whitelisted")); - dimid = generators.winddimensionids.stream().map(Integer::parseInt).collect(Collectors.toList()); + mekce_generators.winddimensionids = Arrays.asList(Mekanism.configurationce.getStringList("winddimensionids", "mekce_generation", windid, "List of dimension id's to be whitelisted")); + dimid = mekce_generators.winddimensionids.stream().map(Integer::parseInt).collect(Collectors.toList()); System.out.println("Windmill whitelist : " + dimid); } diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index e2ecca1c7..a3d38b19e 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -6,6 +6,7 @@ import java.io.IOException; import mekanism.api.MekanismConfig.general; import mekanism.api.MekanismConfig.generators; +import mekanism.api.MekanismConfig.mekce_generators; import mekanism.api.MekanismConfig.generatorsrecipes; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -264,9 +265,9 @@ public class MekanismGenerators implements IModule { dataStream.writeDouble(generators.advancedSolarGeneration); dataStream.writeDouble(generators.bioGeneration); - dataStream.writeInt(generators.biogasDuration); - dataStream.writeInt(generators.ethanolDuration); - dataStream.writeDouble(generators.ethanolMultiplier); + dataStream.writeInt(mekce_generators.biogasDuration); + dataStream.writeInt(mekce_generators.ethanolDuration); + dataStream.writeDouble(mekce_generators.ethanolMultiplier); dataStream.writeDouble(generators.heatGeneration); dataStream.writeDouble(generators.heatGenerationLava); dataStream.writeDouble(generators.heatGenerationNether); @@ -284,7 +285,7 @@ public class MekanismGenerators implements IModule dataStream.writeDouble(generators.turbineVentGasFlow); dataStream.writeDouble(generators.turbineDisperserGasFlow); dataStream.writeInt(generators.condenserRate); - dataStream.writeBoolean(generators.enableWindmillWhitelist); + dataStream.writeBoolean(mekce_generators.enableWindmillWhitelist); dataStream.writeBoolean(generatorsrecipes.enableHeatGenerator); dataStream.writeBoolean(generatorsrecipes.enableSolarGenerator); @@ -314,9 +315,9 @@ public class MekanismGenerators implements IModule { generators.advancedSolarGeneration = dataStream.readDouble(); generators.bioGeneration = dataStream.readDouble(); - generators.biogasDuration = dataStream.readInt(); - generators.ethanolDuration = dataStream.readInt(); - generators.ethanolMultiplier = dataStream.readDouble(); + mekce_generators.biogasDuration = dataStream.readInt(); + mekce_generators.ethanolDuration = dataStream.readInt(); + mekce_generators.ethanolMultiplier = dataStream.readDouble(); generators.heatGeneration = dataStream.readDouble(); generators.heatGenerationLava = dataStream.readDouble(); generators.heatGenerationNether = dataStream.readDouble(); @@ -334,7 +335,7 @@ public class MekanismGenerators implements IModule generators.turbineVentGasFlow = dataStream.readDouble(); generators.turbineDisperserGasFlow = dataStream.readDouble(); generators.condenserRate = dataStream.readInt(); - generators.enableWindmillWhitelist = dataStream.readBoolean(); + mekce_generators.enableWindmillWhitelist = dataStream.readBoolean(); generatorsrecipes.enableHeatGenerator = dataStream.readBoolean(); generatorsrecipes.enableSolarGenerator = dataStream.readBoolean(); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 8025f01fe..21d02decb 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -4,7 +4,9 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.api.MekanismConfig; import mekanism.api.MekanismConfig.generators; +import mekanism.api.MekanismConfig.mekce_generators; import mekanism.api.gas.*; import mekanism.api.gas.GasTank; import mekanism.common.base.ISustainedData; @@ -26,7 +28,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IGasH public TileEntityBioGenerator() { - super("bio", "BioGenerator", 180000, generators.bioGeneration * generators.ethanolMultiplier * 2); + super("bio", "BioGenerator", 180000, generators.bioGeneration * mekce_generators.ethanolMultiplier * 2); inventory = new ItemStack[2]; fuelTank = new GasTank(MAX_GAS); } @@ -82,7 +84,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IGasH if (gasDuration <= 0) { fuelTank.setGas(new GasStack(fuelTank.getGasType(), fuelTank.getStored() - 1)); - gasDuration = (fuelTank.getGas().getGas() == GasRegistry.getGas("bioethanol")) ? generators.ethanolDuration : generators.biogasDuration; + gasDuration = (fuelTank.getGas().getGas() == GasRegistry.getGas("bioethanol")) ? MekanismConfig.mekce_generators.ethanolDuration : MekanismConfig.mekce_generators.biogasDuration; } else gasDuration--; } else { //reset @@ -165,7 +167,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IGasH { if (gas == GasRegistry.getGas("bioethanol")) { - return generators.ethanolMultiplier; + return mekce_generators.ethanolMultiplier; } return 1; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java index 79f9268c0..434a4245e 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindGenerator.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.generators; +import mekanism.api.MekanismConfig.mekce_generators; import mekanism.common.base.IBoundingBlock; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; @@ -98,7 +99,7 @@ public class TileEntityWindGenerator extends TileEntityGenerator implements IBou } public boolean isInWhitelistedDimension() { - if (!generators.enableWindmillWhitelist) + if (!mekce_generators.enableWindmillWhitelist) { return true; }