Cleanup
This commit is contained in:
parent
ed9db80245
commit
873af4be2e
2 changed files with 15 additions and 7 deletions
|
@ -57,26 +57,32 @@ public class GeneratorsCommonProxy
|
|||
loadWindConfiguration();
|
||||
|
||||
if(Mekanism.configuration.hasChanged())
|
||||
{
|
||||
Mekanism.configuration.save();
|
||||
}
|
||||
}
|
||||
|
||||
private void loadWindConfiguration() {
|
||||
if (Mekanism.configuration.hasKey("generation", "WindGeneration")) {
|
||||
// Migrate the old wind generation config
|
||||
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 {
|
||||
}
|
||||
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
|
||||
//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);
|
||||
}
|
||||
|
|
|
@ -45,7 +45,8 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound
|
|||
/** Determines the current output multiplier, taking sky visibility and height into account. **/
|
||||
public float getMultiplier()
|
||||
{
|
||||
if (worldObj.canBlockSeeTheSky(xCoord, yCoord+4, zCoord)) {
|
||||
if(worldObj.canBlockSeeTheSky(xCoord, yCoord+4, zCoord))
|
||||
{
|
||||
final float minY = (float) MekanismGenerators.windGenerationMinY;
|
||||
final float maxY = (float) MekanismGenerators.windGenerationMaxY;
|
||||
final float minG = (float) MekanismGenerators.windGenerationMin;
|
||||
|
@ -58,7 +59,8 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound
|
|||
final float toGen = slope * clampedY + intercept;
|
||||
|
||||
return toGen / minG;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue