diff --git a/src/main/java/enviromine/core/EM_ConfigHandler.java b/src/main/java/enviromine/core/EM_ConfigHandler.java index 596bf99..657b0fd 100644 --- a/src/main/java/enviromine/core/EM_ConfigHandler.java +++ b/src/main/java/enviromine/core/EM_ConfigHandler.java @@ -366,19 +366,6 @@ private static void loadGlobalConfig(File file) EM_Settings.HydrogenSulfideSeverePoisoningLevel = config.getInt("Hydrogen Sulfide Severe Poisoning Level",Configuration.CATEGORY_GENERAL, 1, 0, 65536, "What level of poisoning applies when player is severe Hydrogen Sulfide poisoned?"); EM_Settings.HydrogenSulfidePoisoningChance = config.getInt("Chance of Hydrogen Sulfide Poisoning",Configuration.CATEGORY_GENERAL, 5, 1, 65536, "What is the chance of Hydrogen Sulfide poisoning if the player has no protection?"); - EM_Settings.biomeTemperatureRainBool = config.getBoolean("Biome temperature should rain change", Configuration.CATEGORY_GENERAL, true, "Should the biome temperature decreases if it rains?"); - EM_Settings.biomeTemperatureRain = config.getFloat("Biome temperature rain change",Configuration.CATEGORY_GENERAL, 10F, 1F, 65536F, "Biome temperature decreases by n degrees if it rains"); - - EM_Settings.biomeTemperatureThunderBool = config.getBoolean("Biome temperature should thunder change", Configuration.CATEGORY_GENERAL, true, "Should the biome temperature decreases if there is a thunderstorm?"); - EM_Settings.biomeTemperatureThunder = config.getFloat("Biome temperature thunder change",Configuration.CATEGORY_GENERAL, 12F, 1F, 65536F, "Biome temperature decreases by n degrees if there is a thunderstorm"); - - EM_Settings.biome_DAY_TEMPERATURE = config.getFloat("Absolute maximum of the day",Configuration.CATEGORY_GENERAL, 0F, -128F, 65536F, "temperatureChange will be equal to this number at exactly noon. Read more about this setting in changelog 1.3.139"); - EM_Settings.biome_NIGHT_TEMPERATURE = config.getFloat("Absolute maximum of the night",Configuration.CATEGORY_GENERAL, 8F, -128F, 65536F, "temperatureChange will be equal to this number at exactly midnight. Read more about this setting in changelog 1.3.139"); - - EM_Settings.biome_DAWN_TEMPERATURE = config.getFloat("Absolute dawn",Configuration.CATEGORY_GENERAL, 4F, -128F, 65536F, "temperatureChange will be equal to this number at exactly dawn"); - EM_Settings.biome_DUSK_TEMPERATURE = config.getFloat("Absolute dusk",Configuration.CATEGORY_GENERAL, 4F, -128F, 65536F, "temperatureChange will be equal to this number at exactly dusk"); - - EM_Settings.versionChecker = config.getBoolean("Version Checker", Configuration.CATEGORY_GENERAL, false, "Displays a client-side chat message on login if there's an update available."); EM_Settings.loggerVerbosity = config.getInt("Logger Verbosity", Configuration.CATEGORY_GENERAL, 2, 0, 3, "Amount of messaging to dump to the console." + "\n0: No log messages are printed whatsoever" diff --git a/src/main/java/enviromine/core/EM_Settings.java b/src/main/java/enviromine/core/EM_Settings.java index 719503b..5a70ddf 100644 --- a/src/main/java/enviromine/core/EM_Settings.java +++ b/src/main/java/enviromine/core/EM_Settings.java @@ -88,17 +88,6 @@ public class EM_Settings public static int HydrogenSulfidePoisoningChance; //HydrogenSulfide - public static boolean biomeTemperatureRainBool; - public static float biomeTemperatureRain; - - public static boolean biomeTemperatureThunderBool; - public static float biomeTemperatureThunder; - - public static float biome_DAY_TEMPERATURE; - public static float biome_NIGHT_TEMPERATURE; - public static float biome_DAWN_TEMPERATURE; - public static float biome_DUSK_TEMPERATURE; - public static boolean hardcoregases = false; public static boolean enablePhysics = false; diff --git a/src/main/java/enviromine/handlers/EM_StatusManager.java b/src/main/java/enviromine/handlers/EM_StatusManager.java index ada304b..1165f72 100644 --- a/src/main/java/enviromine/handlers/EM_StatusManager.java +++ b/src/main/java/enviromine/handlers/EM_StatusManager.java @@ -436,15 +436,38 @@ public static float[] getSurroundingData(EntityLivingBase entityLiving, int cube if (dimensionProp != null && dimensionProp.override && !dimensionProp.weatherAffectsTemp) { } else { - if (entityLiving.worldObj.isRaining() && biome.rainfall != 0.0F && EM_Settings.biomeTemperatureRainBool) { - biomeTemperature -= EM_Settings.biomeTemperatureRain; + float biomeTemperatureRain = 6F; + float biomeTemperatureThunder = 8F; + float biomeTemperatureShade = 2.5F; + + boolean biomeTemperatureRainBool = false; + boolean biomeTemperatureThunderBool = false; + + if (biome != null) { + BiomeProperties biomeOverride = null; + if (BiomeProperties.base.hasProperty(biome)) { + biomeOverride = BiomeProperties.base.getProperty(biome); + } + if (biomeOverride != null && biomeOverride.biomeOveride) { + biomeTemperatureRain = biomeOverride.TemperatureRainDecrease; + biomeTemperatureThunder = biomeOverride.TemperatureThunderDecrease; + biomeTemperatureRainBool = biomeOverride.TemperatureRainBool; + biomeTemperatureThunderBool = biomeOverride.TemperatureThunderBool; + biomeTemperatureShade = biomeOverride.TemperatureShadeDecrease; + } + } + + if (entityLiving.worldObj.isRaining() && biome.rainfall != 0.0F && biomeTemperatureRainBool) { + biomeTemperature -= biomeTemperatureRain; animalHostility = -1; if (entityLiving.worldObj.canBlockSeeTheSky(i, j, k)) { dropSpeed = 0.01F; } - } else if (entityLiving.worldObj.isThundering() && biome.rainfall != 0.0F && EM_Settings.biomeTemperatureThunderBool) { - biomeTemperature -= EM_Settings.biomeTemperatureThunder; + } else if (entityLiving.worldObj.isThundering() && biome.rainfall != 0.0F && biomeTemperatureThunderBool) { + + + biomeTemperature -= biomeTemperatureThunder; animalHostility = -1; if (entityLiving.worldObj.canBlockSeeTheSky(i, j, k)) { @@ -454,9 +477,18 @@ public static float[] getSurroundingData(EntityLivingBase entityLiving, int cube } // Dimension Overrides End + float biomeTemperatureShade = 2.5F; + if (biome != null) { + BiomeProperties biomeOverride = null; + if (BiomeProperties.base.hasProperty(biome)) { + biomeOverride = BiomeProperties.base.getProperty(biome); + } if (biomeOverride != null && biomeOverride.biomeOveride) { + biomeTemperatureShade = biomeOverride.TemperatureShadeDecrease; + } + } // Shade if (!entityLiving.worldObj.canBlockSeeTheSky(i, j, k) && isDay && !entityLiving.worldObj.isRaining()) { - biomeTemperature -= 2.5F; + biomeTemperature -= biomeTemperatureShade; } if ((!entityLiving.worldObj.provider.hasNoSky && dimensionProp == null) || (dimensionProp != null && dimensionProp.override && dimensionProp.dayNightTemp)) { @@ -473,23 +505,14 @@ public static float[] getSurroundingData(EntityLivingBase entityLiving, int cube //| 18000 - 23000 |After midnight | //| 23000 - 24000 (0) |Dawn | - - - -//LogManager.getLogger().fatal("biomeTemperature old " + biomeTemperature); - - - float currentTime = (entityLiving.worldObj.getWorldTime() % 24000L); -//LogManager.getLogger().fatal("currentTime " + currentTime); - - float temperatureChange = calculateTemperatureChange(currentTime); -//LogManager.getLogger().fatal("temperatureChange " + temperatureChange); - - biomeTemperature -= temperatureChange; - boolean isDesertBiome = false; float DesertBiomeTemperatureMultiplier = 1F; + float biome_DAWN_TEMPERATURE = 4F; + float biome_DAY_TEMPERATURE = 0F; + float biome_DUSK_TEMPERATURE = 4F; + float biome_NIGHT_TEMPERATURE = 8F; + if (biome != null) { BiomeProperties biomeOverride = null; if (BiomeProperties.base.hasProperty(biome)) { @@ -499,13 +522,25 @@ public static float[] getSurroundingData(EntityLivingBase entityLiving, int cube isDesertBiome = biomeOverride.isDesertBiome; DesertBiomeTemperatureMultiplier = biomeOverride.DesertBiomeTemperatureMultiplier; + + biome_DAWN_TEMPERATURE = biomeOverride.DAWN_TEMPERATURE; + biome_DAY_TEMPERATURE = biomeOverride.DAY_TEMPERATURE; + biome_DUSK_TEMPERATURE = biomeOverride.DUSK_TEMPERATURE; + biome_NIGHT_TEMPERATURE = biomeOverride.NIGHT_TEMPERATURE; } } + float currentTime = (entityLiving.worldObj.getWorldTime() % 24000L); +//LogManager.getLogger().fatal("currentTime " + currentTime); + + float temperatureChange = calculateTemperatureChange(currentTime, biome_DAWN_TEMPERATURE, biome_DAY_TEMPERATURE, biome_DUSK_TEMPERATURE, biome_NIGHT_TEMPERATURE); +//LogManager.getLogger().fatal("temperatureChange " + temperatureChange); + + biomeTemperature -= temperatureChange; + if (biome.rainfall <= 0F || isDesertBiome) { biomeTemperature -= temperatureChange * DesertBiomeTemperatureMultiplier; } -//LogManager.getLogger().fatal("biomeTemperature new " + biomeTemperature); } @SuppressWarnings("unchecked") @@ -1041,14 +1076,14 @@ else if (!entityLiving.isPotionActive(Potion.fireResistance)) { //public static final float NIGHT_TEMPERATURE = EM_Settings.biome_NIGHT_TEMPERATURE; //Will be at midnight, this/2 at dawn|dusk, also affects at the function increase | maximum function value //Time const - public static final float DAY_TEMPERATURE = EM_Settings.biome_DAY_TEMPERATURE; // Will be at noon - public static final float NIGHT_TEMPERATURE = EM_Settings.biome_NIGHT_TEMPERATURE; // Will be at midnight - public static final float DAWN_TEMPERATURE = EM_Settings.biome_DAWN_TEMPERATURE; // Will be at dawn - public static final float DUSK_TEMPERATURE = EM_Settings.biome_DUSK_TEMPERATURE; // Will be at dusk +// public static final float DAY_TEMPERATURE = EM_Settings.biome_DAY_TEMPERATURE; // Will be at noon +// public static final float NIGHT_TEMPERATURE = EM_Settings.biome_NIGHT_TEMPERATURE; // Will be at midnight +// public static final float DAWN_TEMPERATURE = EM_Settings.biome_DAWN_TEMPERATURE; // Will be at dawn +// public static final float DUSK_TEMPERATURE = EM_Settings.biome_DUSK_TEMPERATURE; // Will be at dusk // Function to calculate temperature change - public static float calculateTemperatureChange(float currentTime/*, float DAY_TEMPERATURE, float NIGHT_TEMPERATURE,float DAWN_TEMPERATURE, float DUSK_TEMPERATURE*/) { + public static float calculateTemperatureChange(float currentTime, float DAWN_TEMPERATURE, float DAY_TEMPERATURE, float DUSK_TEMPERATURE, float NIGHT_TEMPERATURE) { float temperatureChange; // from 0 to 6000 ticks (dawn to noon) diff --git a/src/main/java/enviromine/trackers/properties/BiomeProperties.java b/src/main/java/enviromine/trackers/properties/BiomeProperties.java index e72db06..d9cfb76 100644 --- a/src/main/java/enviromine/trackers/properties/BiomeProperties.java +++ b/src/main/java/enviromine/trackers/properties/BiomeProperties.java @@ -36,12 +36,19 @@ public class BiomeProperties implements SerialisableProperty, PropertyBase public float dehydrateRate; public float airRate; public String loadedFrom; - public boolean isDesertBiome; - public float DesertBiomeTemperatureMultiplier; + public float DAWN_TEMPERATURE; + public float DAY_TEMPERATURE; + public float DUSK_TEMPERATURE; + public float NIGHT_TEMPERATURE; + public float TemperatureRainDecrease; + public float TemperatureThunderDecrease; + public boolean TemperatureRainBool; + public boolean TemperatureThunderBool; + public float TemperatureShadeDecrease; public BiomeProperties(NBTTagCompound tags) { @@ -58,8 +65,30 @@ public BiomeProperties() } } - public BiomeProperties(int id, boolean biomeOveride, String waterQuality, float ambientTemp, float tempRate, float sanityRate, float dehydrateRate, float airRate, String filename, boolean isDesertBiome, float DesertBiomeTemperatureMultiplier) - { + public BiomeProperties ( + int id, + boolean biomeOveride, + String waterQuality, + float ambientTemp, + float tempRate, + float sanityRate, + float dehydrateRate, + float airRate, + String filename, + boolean isDesertBiome, + float DesertBiomeTemperatureMultiplier, + + float DAWN_TEMPERATURE, + float DAY_TEMPERATURE, + float DUSK_TEMPERATURE, + float NIGHT_TEMPERATURE, + + float TemperatureRainDecrease, + float TemperatureThunderDecrease, + boolean TemperatureRainBool, + boolean TemperatureThunderBool, + float TemperatureShadeDecrease + ) { this.id = id; this.biomeOveride = biomeOveride; this.waterQuality = waterQuality; @@ -71,6 +100,17 @@ public BiomeProperties(int id, boolean biomeOveride, String waterQuality, float this.loadedFrom = filename; this.isDesertBiome = isDesertBiome; this.DesertBiomeTemperatureMultiplier = DesertBiomeTemperatureMultiplier; + + this.DAWN_TEMPERATURE = DAWN_TEMPERATURE; + this.DAY_TEMPERATURE = DAY_TEMPERATURE; + this.DUSK_TEMPERATURE = DUSK_TEMPERATURE; + this.NIGHT_TEMPERATURE = NIGHT_TEMPERATURE; + + this.TemperatureRainDecrease = TemperatureRainDecrease; + this.TemperatureThunderDecrease = TemperatureThunderDecrease; + this.TemperatureRainBool = TemperatureRainBool; + this.TemperatureThunderBool = TemperatureThunderBool; + this.TemperatureShadeDecrease = TemperatureShadeDecrease; } /** * hasProperty(BiomeGenBase biome)

@@ -126,6 +166,18 @@ public NBTTagCompound WriteToNBT() tags.setFloat("dehydrateRate", this.dehydrateRate); tags.setBoolean("isDesertBiome", this.isDesertBiome); tags.setFloat("DesertBiomeTemperatureMultiplier", this.DesertBiomeTemperatureMultiplier); + + tags.setFloat("DAWN_TEMPERATURE", this.DAWN_TEMPERATURE); + tags.setFloat("DAY_TEMPERATURE", this.DAY_TEMPERATURE); + tags.setFloat("DUSK_TEMPERATURE", this.DUSK_TEMPERATURE); + tags.setFloat("NIGHT_TEMPERATURE", this.NIGHT_TEMPERATURE); + + tags.setFloat("TemperatureRainDecrease", this.TemperatureRainDecrease); + tags.setFloat("TemperatureThunderDecrease", this.TemperatureThunderDecrease); + tags.setBoolean("TemperatureRainBool", this.TemperatureRainBool); + tags.setBoolean("TemperatureThunderBool", this.TemperatureThunderBool); + tags.setFloat("TemperatureShadeDecrease", this.TemperatureShadeDecrease); + return tags; } @@ -141,6 +193,17 @@ public void ReadFromNBT(NBTTagCompound tags) this.dehydrateRate = tags.getFloat("dehydrateRate"); this.isDesertBiome = tags.getBoolean("isDesertBiome"); this.DesertBiomeTemperatureMultiplier = tags.getFloat("DesertBiomeTemperatureMultiplier"); + + this.DAWN_TEMPERATURE = tags.getFloat("DAWN_TEMPERATURE"); + this.DAY_TEMPERATURE = tags.getFloat("DAY_TEMPERATURE"); + this.DUSK_TEMPERATURE = tags.getFloat("DUSK_TEMPERATURE"); + this.NIGHT_TEMPERATURE = tags.getFloat("NIGHT_TEMPERATURE"); + + this.TemperatureRainDecrease = tags.getFloat("TemperatureRainDecrease"); + this.TemperatureThunderDecrease = tags.getFloat("TemperatureThunderDecrease"); + this.TemperatureRainBool = tags.getBoolean("TemperatureRainBool"); + this.TemperatureThunderBool = tags.getBoolean("TemperatureThunderBool"); + this.TemperatureShadeDecrease = tags.getFloat("TemperatureShadeDecrease"); } @Override @@ -171,7 +234,40 @@ public void LoadProperty(Configuration config, String category) boolean isDesertBiome = config.get(category, BOName[8], false).getBoolean(false); float DesertBiomeTemperatureMultiplier = (float)config.get(category, BOName[9], 1.0).getDouble(1.0); - BiomeProperties entry = new BiomeProperties(id, biomeOveride, waterQ, ambTemp, tempRate, sanRate, dehyRate, airRate, filename, isDesertBiome, DesertBiomeTemperatureMultiplier); + float DAWN_TEMPERATURE = (float)config.get(category, BOName[10], 4.0).getDouble(4.0); + float DAY_TEMPERATURE = (float)config.get(category, BOName[11], 0.0).getDouble(0.0); + float DUSK_TEMPERATURE = (float)config.get(category, BOName[12], 4.0).getDouble(4.0); + float NIGHT_TEMPERATURE = (float)config.get(category, BOName[13], 8.0).getDouble(8.0); + + float TemperatureRainDecrease = (float)config.get(category, BOName[14], 6.0).getDouble(6.0); + float TemperatureThunderDecrease = (float)config.get(category, BOName[15], 8.0).getDouble(8.0); + + boolean TemperatureRainBool = config.get(category, BOName[16], false).getBoolean(false); + boolean TemperatureThunderBool = config.get(category, BOName[17], false).getBoolean(false); + float TemperatureShadeDecrease = (float)config.get(category, BOName[18], 2.5).getDouble(2.5); + + BiomeProperties entry = new BiomeProperties ( + id, + biomeOveride, + waterQ, + ambTemp, + tempRate, + sanRate, + dehyRate, + airRate, + filename, + isDesertBiome, + DesertBiomeTemperatureMultiplier, + DAWN_TEMPERATURE, + DAY_TEMPERATURE, + DUSK_TEMPERATURE, + NIGHT_TEMPERATURE, + TemperatureRainDecrease, + TemperatureThunderDecrease, + TemperatureRainBool, + TemperatureThunderBool, + TemperatureShadeDecrease + ); if(EM_Settings.biomeProperties.containsKey(id) && !EM_ConfigHandler.loadedConfigs.contains(filename)) { @@ -192,7 +288,18 @@ public void SaveProperty(Configuration config, String category) config.get(category, BOName[6], this.dehydrateRate).getDouble(this.dehydrateRate); config.get(category, BOName[7], this.airRate).getDouble(this.airRate); config.get(category, BOName[8], this.isDesertBiome, "Affects the temperature difference at night / day (useful for deserts)").getBoolean(this.isDesertBiome); - config.get(category, BOName[9], this.DesertBiomeTemperatureMultiplier, "The temperatureChange will be multiplied by this number").getDouble(this.DesertBiomeTemperatureMultiplier); + config.get(category, BOName[9], this.DesertBiomeTemperatureMultiplier, "The temperatureChange will be multiplied by this number if isDesertBiome=true").getDouble(this.DesertBiomeTemperatureMultiplier); + + config.get(category, BOName[10], this.DAWN_TEMPERATURE, "The temperatureChange will be equal to this number at dawn").getDouble(this.DAWN_TEMPERATURE); + config.get(category, BOName[11], this.DAY_TEMPERATURE, "The temperatureChange will be equal to this number at day").getDouble(this.DAY_TEMPERATURE); + config.get(category, BOName[12], this.DUSK_TEMPERATURE, "The temperatureChange will be equal to this number at dusk").getDouble(this.DUSK_TEMPERATURE); + config.get(category, BOName[13], this.NIGHT_TEMPERATURE, "The temperatureChange will be equal to this number at midnight").getDouble(this.NIGHT_TEMPERATURE); +//TODO change + config.get(category, BOName[14], this.TemperatureRainDecrease, "Biome temperature decreases by n degrees if it rains").getDouble(this.TemperatureRainDecrease); + config.get(category, BOName[15], this.TemperatureThunderDecrease, "Biome temperature decreases by n degrees if there is a thunderstorm").getDouble(this.TemperatureThunderDecrease); + config.get(category, BOName[16], this.TemperatureRainBool, "Should the biome temperature decreases if it rains?").getBoolean(this.TemperatureRainBool); + config.get(category, BOName[17], this.TemperatureThunderBool, "Should the biome temperature decreases if there is a thunderstorm?").getBoolean(this.TemperatureThunderBool); + config.get(category, BOName[18], this.TemperatureShadeDecrease, "Biome temperature decreases by n degrees if player in the shadow").getDouble(this.TemperatureShadeDecrease); } @Override @@ -266,6 +373,18 @@ public void generateEmpty(Configuration config, Object obj) boolean isDesertBiome = typeList.contains(Type.DESERT) || typeList.contains(Type.DRY); //TODO change if needed double DesertBiomeTemperatureMultiplier = typeList.contains(Type.DESERT) || typeList.contains(Type.DRY)? 3D : 1D; + //TODO change if needed + double DAWN_TEMPERATURE = /*typeList.contains(Type.DESERT) || typeList.contains(Type.DRY)? 4D :*/ 4D; + double DAY_TEMPERATURE = /*typeList.contains(Type.DESERT) || typeList.contains(Type.DRY)? 0D :*/ 0D; + double DUSK_TEMPERATURE = /*typeList.contains(Type.DESERT) || typeList.contains(Type.DRY)? 4D :*/ 4D; + double NIGHT_TEMPERATURE = /*typeList.contains(Type.DESERT) || typeList.contains(Type.DRY)? 8D :*/ 8D; + + double TemperatureRainDecrease = typeList.contains(Type.WATER) ? 10D : typeList.contains(Type.JUNGLE)? 8D : 6D; + double TemperatureThunderDecrease = typeList.contains(Type.WATER) ? 12D : typeList.contains(Type.JUNGLE)? 10D : 8D; + boolean TemperatureRainBool = typeList.contains(Type.WATER) || typeList.contains(Type.WET) || typeList.contains(Type.JUNGLE) || (typeList.contains(Type.FOREST) && typeList.contains(Type.WET)) || (typeList.contains(Type.FOREST) && !typeList.contains(Type.COLD)) || (typeList.contains(Type.PLAINS) && !typeList.contains(Type.HOT)); + boolean TemperatureThunderBool = typeList.contains(Type.WATER) || typeList.contains(Type.WET) || typeList.contains(Type.JUNGLE) || (typeList.contains(Type.FOREST) && typeList.contains(Type.WET)) || (typeList.contains(Type.FOREST) && !typeList.contains(Type.COLD)); + double TemperatureShadeDecrease = /*typeList.contains(Type.WATER) ? 12D : typeList.contains(Type.JUNGLE)? 10D :*/ 2.5D; + String catName = this.categoryName() + "." + biome.biomeName; config.get(catName, BOName[0], biome.biomeID).getInt(biome.biomeID); @@ -278,7 +397,18 @@ public void generateEmpty(Configuration config, Object obj) config.get(catName, BOName[7], air).getDouble(air); config.get(catName, BOName[8], isDesertBiome).getBoolean(isDesertBiome); config.get(catName, BOName[9], DesertBiomeTemperatureMultiplier).getDouble(DesertBiomeTemperatureMultiplier); - } + + config.get(catName, BOName[10], DAWN_TEMPERATURE).getDouble(DAWN_TEMPERATURE); + config.get(catName, BOName[11], DAY_TEMPERATURE).getDouble(DAY_TEMPERATURE); + config.get(catName, BOName[12], DUSK_TEMPERATURE).getDouble(DUSK_TEMPERATURE); + config.get(catName, BOName[13], NIGHT_TEMPERATURE).getDouble(NIGHT_TEMPERATURE); + + config.get(catName, BOName[14], TemperatureRainDecrease).getDouble(TemperatureRainDecrease); + config.get(catName, BOName[15], TemperatureThunderDecrease).getDouble(TemperatureThunderDecrease); + config.get(catName, BOName[16], TemperatureRainBool).getBoolean(TemperatureRainBool); + config.get(catName, BOName[17], TemperatureThunderBool).getBoolean(TemperatureThunderBool); + config.get(catName, BOName[18], TemperatureShadeDecrease).getDouble(TemperatureShadeDecrease); + } @Override public boolean useCustomConfigs() @@ -293,7 +423,7 @@ public void customLoad() static { - BOName = new String[10]; + BOName = new String[19]; BOName[0] = "01.Biome ID"; BOName[1] = "02.Allow Config Override"; BOName[2] = "03.Water Quality"; @@ -302,7 +432,16 @@ public void customLoad() BOName[5] = "06.Sanity Rate"; BOName[6] = "07.Dehydrate Rate"; BOName[7] = "08.Air Quality Rate"; - BOName[8] = "09.Is desert biome"; + BOName[8] = "09.Is desert biome?"; BOName[9] = "10.Desert biome temperature multiplier"; + BOName[10] = "11.Dawn biome temperature"; + BOName[11] = "12.Day biome temperature"; + BOName[12] = "13.Dusk biome temperature"; + BOName[13] = "14.Night biome temperature"; + BOName[14] = "15.Biome temperature rain decrease"; + BOName[15] = "16.Biome temperature thunder decrease"; + BOName[16] = "17.Should biome temperature decrease when rain?"; + BOName[17] = "18.Should biome temperature decrease when thunder?"; + BOName[18] = "19.Biome temperature shadow decrease"; } }