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

Added additional power generation configuration (#1164)

Browse Source 
* Can now configure heat generator power from adjacent lava
 * Can now configure heat generator power from the nether
 * Wind power is now configured by specifying minimal and maximal Y levels and generation values.
    * Defaults to 60J/t at Y 24 and 480J/t at Y 255
This commit is contained in:
Byron Shelden committed 2014-08-02 12:56:41 -07:00
1 parent 7e378dd796
commit 020d347ee3
5 files changed
+80 -20
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
+24 -1
View File
@@ -51,13 +51,36 @@ public class GeneratorsCommonProxy
MekanismGenerators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble(300D);
MekanismGenerators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble(350D);
MekanismGenerators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble(150D);
MekanismGenerators.heatGenerationLava = Mekanism.configuration.get("generation", "HeatGenerationLava", 5D).getDouble(5D);
MekanismGenerators.heatGenerationNether = Mekanism.configuration.get("generation", "HeatGenerationNether", 100D).getDouble(100D);
MekanismGenerators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble(50D);
MekanismGenerators.windGeneration = Mekanism.configuration.get("generation", "WindGeneration", 60D).getDouble(60D);
loadWindConfiguration();
if(Mekanism.configuration.hasChanged())
Mekanism.configuration.save();
}
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");
MekanismGenerators.windGenerationMin = Mekanism.configuration.get("generation", "WindGenerationMin", legacyWindGeneration).getDouble(legacyWindGeneration);
MekanismGenerators.windGenerationMax = Mekanism.configuration.get("generation", "WindGenerationMax", windGenerationMax).getDouble(windGenerationMax);
} else {
MekanismGenerators.windGenerationMin = Mekanism.configuration.get("generation", "WindGenerationMin", 60D).getDouble(60D);
MekanismGenerators.windGenerationMax = Mekanism.configuration.get("generation", "WindGenerationMax", 480D).getDouble(480D);
}
// 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);
MekanismGenerators.windGenerationMinY = minY;
MekanismGenerators.windGenerationMaxY = Math.max(minY + 1, maxY);
}
/**
* Get the actual interface for a GUI. Client-only.
* @param ID - gui ID