diff --git a/src/main/java/forestry/greenhouse/climate/ClimateSource.java b/src/main/java/forestry/greenhouse/climate/ClimateSource.java index a1ee55c8e..3852918d3 100644 --- a/src/main/java/forestry/greenhouse/climate/ClimateSource.java +++ b/src/main/java/forestry/greenhouse/climate/ClimateSource.java @@ -27,7 +27,7 @@ import forestry.greenhouse.api.greenhouse.GreenhouseManager; public abstract class ClimateSource implements IClimateSource { - protected final float range; + protected final float boundModifier; protected final ClimateSourceType sourceType; protected O owner; private IClimateState state; @@ -38,13 +38,13 @@ public abstract class ClimateSource implements IC protected boolean addedToManager; protected boolean isActive; - public ClimateSource(float change, float range, ClimateSourceType sourceType) { + public ClimateSource(float change, float boundModifier, ClimateSourceType sourceType) { this.change = change; - this.range = range; + this.boundModifier = boundModifier; this.sourceType = sourceType; this.temperatureMode = ClimateSourceMode.NONE; this.humidityMode = ClimateSourceMode.NONE; - this.state = ClimateStates.INSTANCE.absent(); + this.state = ClimateStates.extendedZero(); } public void setHumidityMode(ClimateSourceMode humidityMode) { @@ -63,22 +63,22 @@ public abstract class ClimateSource implements IC public float getBoundaryModifier(ClimateType type, boolean boundaryUp) { if(type == ClimateType.HUMIDITY){ if(humidityMode == ClimateSourceMode.POSITIVE && boundaryUp){ - return getRange(ClimateType.HUMIDITY); + return getBoundModifier(ClimateType.HUMIDITY); }else if(humidityMode == ClimateSourceMode.NEGATIVE && !boundaryUp){ - return getRange(ClimateType.HUMIDITY); + return getBoundModifier(ClimateType.HUMIDITY); } }else { if(temperatureMode == ClimateSourceMode.POSITIVE && boundaryUp){ - return getRange(ClimateType.TEMPERATURE); + return getBoundModifier(ClimateType.TEMPERATURE); }else if(temperatureMode == ClimateSourceMode.NEGATIVE && !boundaryUp){ - return getRange(ClimateType.TEMPERATURE); + return getBoundModifier(ClimateType.TEMPERATURE); } } return 0; } - - protected float getRange(ClimateType type){ - return range; + + protected float getBoundModifier(ClimateType type) { + return boundModifier; } protected float getChange(ClimateType type) { diff --git a/src/main/java/forestry/greenhouse/climate/ClimateSourceCircuitable.java b/src/main/java/forestry/greenhouse/climate/ClimateSourceCircuitable.java index d1186ede3..aeb6badb7 100644 --- a/src/main/java/forestry/greenhouse/climate/ClimateSourceCircuitable.java +++ b/src/main/java/forestry/greenhouse/climate/ClimateSourceCircuitable.java @@ -21,8 +21,8 @@ public abstract class ClimateSourceCircuitable ex protected float rangeMultiplierHumidity = 1.0f; protected float energyChange = 1.0F; - public ClimateSourceCircuitable(float change, float range, ClimateSourceType sourceType) { - super(change, range, sourceType); + public ClimateSourceCircuitable(float change, float boundModifier, ClimateSourceType sourceType) { + super(change, boundModifier, sourceType); } @Override @@ -48,14 +48,14 @@ public abstract class ClimateSourceCircuitable ex } @Override - protected float getRange(ClimateType type) { + protected float getBoundModifier(ClimateType type) { float rangeMultiplier; if (type == ClimateType.TEMPERATURE) { rangeMultiplier = rangeMultiplierTemperature; } else { rangeMultiplier = rangeMultiplierHumidity; } - return super.getRange(type) * rangeMultiplier; + return super.getBoundModifier(type) * rangeMultiplier; } @Override diff --git a/src/main/java/forestry/greenhouse/climate/ClimateSourceClimatiser.java b/src/main/java/forestry/greenhouse/climate/ClimateSourceClimatiser.java index 510274c28..09779e359 100644 --- a/src/main/java/forestry/greenhouse/climate/ClimateSourceClimatiser.java +++ b/src/main/java/forestry/greenhouse/climate/ClimateSourceClimatiser.java @@ -26,8 +26,8 @@ public class ClimateSourceClimatiser extends ClimateSo protected static final int ENERGY_PER_OPERATION = 75; - public ClimateSourceClimatiser(ClimateSourceType type, float change, float range) { - super(change, range, type); + public ClimateSourceClimatiser(ClimateSourceType type, float change, float boundModifier) { + super(change, boundModifier, type); if (type.canChangeTemperature()) { setTemperatureMode(change > 0 ? ClimateSourceMode.POSITIVE : ClimateSourceMode.NEGATIVE); } else { diff --git a/src/main/java/forestry/greenhouse/climate/ClimateSourceHygroregulator.java b/src/main/java/forestry/greenhouse/climate/ClimateSourceHygroregulator.java index 2baf8698d..2c40b5e4a 100644 --- a/src/main/java/forestry/greenhouse/climate/ClimateSourceHygroregulator.java +++ b/src/main/java/forestry/greenhouse/climate/ClimateSourceHygroregulator.java @@ -25,8 +25,8 @@ public class ClimateSourceHygroregulator extends ClimateSourceCircuitable