upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-13 00:37:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some legacy config handling, make all turbine values configurable

Browse Source
This commit is contained in:
aidancbrady committed 2016-01-30 08:46:36 -07:00
1 parent 345feedf70
commit 7c52d03cb5
5 files changed
+38 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
+15 -22
View File
@@ -92,14 +92,19 @@ public class GeneratorsCommonProxy implements IGuiProvider
*/
public void loadConfiguration()
{
generators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble(300D);
generators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble(350D);
generators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble(150D);
generators.heatGenerationLava = Mekanism.configuration.get("generation", "HeatGenerationLava", 5D).getDouble(5D);
generators.heatGenerationNether = Mekanism.configuration.get("generation", "HeatGenerationNether", 100D).getDouble(100D);
generators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble(50D);
generators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble();
generators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble();
generators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble();
generators.heatGenerationLava = Mekanism.configuration.get("generation", "HeatGenerationLava", 5D).getDouble();
generators.heatGenerationNether = Mekanism.configuration.get("generation", "HeatGenerationNether", 100D).getDouble();
generators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble();
loadWindConfiguration();
generators.turbineBladesPerCoil = Mekanism.configuration.get("generation", "TurbineBladesPerCoil", 4).getInt();
generators.turbineBaseEnergyPerSteam = Mekanism.configuration.get("generation", "TurbineBaseEnergyPerSteam", 10D).getDouble();
generators.turbineVentGasFlow = Mekanism.configuration.get("generation", "TurbineVentGasFlow", 16000D).getDouble();
generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble();
if(Mekanism.configuration.hasChanged())
{
@@ -109,24 +114,12 @@ public class GeneratorsCommonProxy implements IGuiProvider
private void loadWindConfiguration()
{
if(Mekanism.configuration.hasKey("generation", "WindGeneration"))
{
//Migrate the old wind generation config
final double legacyWindGeneration = Mekanism.configuration.get("generation", "WindGeneration", 60D).getDouble(60D);
final double windGenerationMax = legacyWindGeneration * 8D;
Mekanism.configuration.getCategory("generation").remove("WindGeneration");
generators.windGenerationMin = Mekanism.configuration.get("generation", "WindGenerationMin", legacyWindGeneration).getDouble(legacyWindGeneration);
generators.windGenerationMax = Mekanism.configuration.get("generation", "WindGenerationMax", windGenerationMax).getDouble(windGenerationMax);
}
else {
generators.windGenerationMin = Mekanism.configuration.get("generation", "WindGenerationMin", 60D).getDouble(60D);
generators.windGenerationMax = Mekanism.configuration.get("generation", "WindGenerationMax", 480D).getDouble(480D);
}
generators.windGenerationMin = Mekanism.configuration.get("generation", "WindGenerationMin", 60D).getDouble();
generators.windGenerationMax = Mekanism.configuration.get("generation", "WindGenerationMax", 480D).getDouble();
//Ensure max > min to avoid division by zero later
final int minY = Mekanism.configuration.get("generation", "WindGenerationMinY", 24).getInt(24);
final int maxY = Mekanism.configuration.get("generation", "WindGenerationMaxY", 255).getInt(255);
final int minY = Mekanism.configuration.get("generation", "WindGenerationMinY", 24).getInt();
final int maxY = Mekanism.configuration.get("generation", "WindGenerationMaxY", 255).getInt();
generators.windGenerationMinY = minY;
generators.windGenerationMaxY = Math.max(minY + 1, maxY);