Anvilcraft
/
aether-legacy
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport seasonal config.

This commit is contained in:
bconlon 2020-12-25 21:50:13 -08:00
parent 7557d8129a
commit 1ac17e5d56
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gildedgames/the_aether/AetherConfig.java
View File

@ -11,7 +11,7 @@ public class AetherConfig {
private static int max_life_shards;
private static boolean christmas_content, tallgrass;
private static boolean christmas_content, tallgrass, seasonal_christmas;
private static int aether_biome_id, aether_dimension_id;
@ -49,6 +49,7 @@ public class AetherConfig {
config.load();
christmas_content = config.get("Aether World Generation", "Christmas Content", false).getBoolean(false);
seasonal_christmas = config.get("Aether World Generation", "Spawns Holiday Trees during December and January automatically. Christmas Content overrides this.", true).getBoolean(true);
tallgrass = config.get("Aether World Generation", "Enable Tall Grass", false).getBoolean(false);
aether_dimension_id = config.get("World Identification", "Aether Dimension ID", 4).getInt(4);
@ -177,4 +178,8 @@ public class AetherConfig {
{
return disable_eternal_day;
}
public static boolean allowSeasonalChristmas() {
return seasonal_christmas;
}
}

5
src/main/java/com/gildedgames/the_aether/world/biome/AetherBiomeDecorator.java
View File

@ -1,5 +1,6 @@
package com.gildedgames.the_aether.world.biome;
import java.util.Calendar;
import java.util.Random;
import com.gildedgames.the_aether.AetherConfig;
@ -97,8 +98,8 @@ public class AetherBiomeDecorator extends BiomeDecorator {
this.getTree().generate(this.world, this.rand, x, y, z);
}
if (AetherConfig.shouldLoadHolidayContent()) {
if ((AetherConfig.shouldLoadHolidayContent()) || (AetherConfig.allowSeasonalChristmas() &&
(Calendar.getInstance().get(Calendar.MONTH) + 1 == 12 || Calendar.getInstance().get(Calendar.MONTH) + 1 == 1))) {
if (this.shouldSpawn(15)) {
int x = this.chunk_X + 8;
int z = this.chunk_Z + 8;