dont gen snowy dying forests next to autumn biomes

FrozenBlock · Feb 21, 2025 · 9307f9c · 9307f9c
1 parent 0fc0807
commit 9307f9c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/src/main/java/net/frozenblock/wilderwild/registry/WWSurfaceRules.java b/src/main/java/net/frozenblock/wilderwild/registry/WWSurfaceRules.java
@@ -350,7 +350,7 @@ public static SurfaceRules.RuleSource mapleForestRules() {
 	}
 
 	@NotNull
-	public static SurfaceRules.RuleSource tundraRules() {
+	public static SurfaceRules.RuleSource autumnalPlainsRules() {
 		return SurfaceRules.ifTrue(
 			SurfaceRules.isBiome(WWBiomes.AUTUMNAL_PLAINS),
 			SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR,
@@ -470,7 +470,7 @@ public void addOverworldSurfaceRules(@NotNull List<SurfaceRules.RuleSource> cont
 				rainforestRules(),
 				dyingForestRules(),
 				mapleForestRules(),
-				tundraRules()
+				autumnalPlainsRules()
 			)
 		);
 		WWConstants.log("Wilder Wild's Overworld Surface Rules have been added!", true);

diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/biome/DyingForest.java b/src/main/java/net/frozenblock/wilderwild/worldgen/biome/DyingForest.java
@@ -50,8 +50,9 @@
 import org.jetbrains.annotations.Nullable;
 
 public final class DyingForest extends FrozenBiome {
-	public static final Climate.Parameter TEMPERATURE_A = Climate.Parameter.span(-0.465F, -0.300F);
-	public static final Climate.Parameter HUMIDITY_A = Climate.Parameter.span(-0.105F, 0.050F);
+	public static final Climate.Parameter TEMPERATURE = Climate.Parameter.span(-0.465F, -0.300F);
+	public static final Climate.Parameter TEMPERATURE_AUTUMNAL_PLAINS = Climate.Parameter.span(-0.495F, -0.300F);
+	public static final Climate.Parameter HUMIDITY = Climate.Parameter.span(-0.105F, 0.050F);
 	public static final float TEMP = 0.35F;
 	public static final float DOWNFALL = 0.65F;
 	public static final int WATER_COLOR = WWSharedWorldgen.STOCK_WATER_COLOR;
@@ -164,11 +165,13 @@ public void addSpawns(MobSpawnSettings.Builder spawns) {
 	@Override
 	public void injectToOverworld(Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> parameters) {
 		if (WWWorldgenConfig.get().biomeGeneration.generateDyingForest) {
+			boolean generateAutumnalPlains = WWWorldgenConfig.get().biomeGeneration.generateAutumnalPlains;
+
 			for (Climate.ParameterPoint point : OverworldBiomeBuilderParameters.points(Biomes.FOREST)) {
 				this.addSurfaceBiome(
 					parameters,
-					TEMPERATURE_A,
-					HUMIDITY_A,
+					generateAutumnalPlains ? TEMPERATURE_AUTUMNAL_PLAINS : TEMPERATURE,
+					HUMIDITY,
 					point.continentalness(),
 					point.erosion(),
 					point.weirdness(),

diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/biome/DyingMixedForest.java b/src/main/java/net/frozenblock/wilderwild/worldgen/biome/DyingMixedForest.java
@@ -50,9 +50,11 @@
 import org.jetbrains.annotations.Nullable;
 
 public final class DyingMixedForest extends FrozenBiome {
-	public static final Climate.Parameter TEMPERATURE_A = Climate.Parameter.span(-0.465F, -0.255F);
-	public static final Climate.Parameter HUMIDITY_A = Climate.Parameter.span(0.050F, 0.155F);
+	public static final Climate.Parameter TEMPERATURE = Climate.Parameter.span(-0.465F, -0.255F);
+	public static final Climate.Parameter TEMPERATURE_AUTUMNAL_PLAINS = Climate.Parameter.span(-0.495F, -0.255F);
+	public static final Climate.Parameter HUMIDITY = Climate.Parameter.span(0.050F, 0.155F);
 	public static final Climate.Parameter TEMPERATURE_WEIRD = Climate.Parameter.span(-0.465F, -0.425F);
+	public static final Climate.Parameter TEMPERATURE_WEIRD_AUTUMNAL_PLAINS = Climate.Parameter.span(-0.495F, -0.425F);
 	public static final Climate.Parameter HUMIDITY_WEIRD = Climate.Parameter.span(-0.105F, 0.100F);
 	public static final float TEMP = 0.35F;
 	public static final float DOWNFALL = 0.55F;
@@ -166,12 +168,14 @@ public void addSpawns(MobSpawnSettings.Builder spawns) {
 	@Override
 	public void injectToOverworld(Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> parameters) {
 		if (WWWorldgenConfig.get().biomeGeneration.generateDyingMixedForest) {
+			boolean generateAutumnalPlains = WWWorldgenConfig.get().biomeGeneration.generateAutumnalPlains;
+
 			for (Climate.ParameterPoint point : OverworldBiomeBuilderParameters.points(Biomes.SNOWY_TAIGA)) {
 				boolean weird = point.weirdness().max() < 0L;
 				this.addSurfaceBiome(
 					parameters,
-					TEMPERATURE_A,
-					HUMIDITY_A,
+					generateAutumnalPlains ? TEMPERATURE_AUTUMNAL_PLAINS : TEMPERATURE,
+					HUMIDITY,
 					point.continentalness(),
 					point.erosion(),
 					point.weirdness(),
@@ -180,7 +184,7 @@ public void injectToOverworld(Consumer<Pair<Climate.ParameterPoint, ResourceKey<
 				if (weird) {
 					this.addSurfaceBiome(
 						parameters,
-						TEMPERATURE_WEIRD,
+						generateAutumnalPlains ? TEMPERATURE_WEIRD_AUTUMNAL_PLAINS : TEMPERATURE_WEIRD,
 						HUMIDITY_WEIRD,
 						point.continentalness(),
 						point.erosion(),

diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/biome/SnowyDyingForest.java b/src/main/java/net/frozenblock/wilderwild/worldgen/biome/SnowyDyingForest.java
@@ -49,6 +49,7 @@
 
 public final class SnowyDyingForest extends FrozenBiome {
 	public static final Climate.Parameter TEMPERATURE = Climate.Parameter.span(-0.485F, -0.465F);
+	public static final Climate.Parameter TEMPERATURE_AUTUMNAL_PLAINS = Climate.Parameter.span(-0.505F, -0.495F);
 	public static final Climate.Parameter HUMIDITY = Climate.Parameter.span(-0.105F, 0.050F);
 	public static final float TEMP = 0.05F;
 	public static final float DOWNFALL = 0.575F;
@@ -162,11 +163,13 @@ public void addSpawns(MobSpawnSettings.@NotNull Builder spawns) {
 	@Override
 	public void injectToOverworld(Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> parameters) {
 		if (WWWorldgenConfig.get().biomeGeneration.generateSnowyDyingForest) {
+			boolean generateAutumnalPlains = WWWorldgenConfig.get().biomeGeneration.generateAutumnalPlains;
+
 			for (Climate.ParameterPoint point : OverworldBiomeBuilderParameters.points(Biomes.FOREST)) {
 				if (point.weirdness().max() >= 0L) {
 					this.addSurfaceBiome(
 						parameters,
-						TEMPERATURE,
+						generateAutumnalPlains ? TEMPERATURE_AUTUMNAL_PLAINS : TEMPERATURE,
 						HUMIDITY,
 						point.continentalness(),
 						point.erosion(),

diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/biome/SnowyDyingMixedForest.java b/src/main/java/net/frozenblock/wilderwild/worldgen/biome/SnowyDyingMixedForest.java
@@ -54,9 +54,9 @@
 
 public final class SnowyDyingMixedForest extends FrozenBiome {
 	public static final Climate.Parameter TEMPERATURE = Climate.Parameter.span(-0.485F, -0.465F);
+	public static final Climate.Parameter TEMPERATURE_AUTUMNAL_PLAINS = Climate.Parameter.span(-0.505F, -0.495F);
 	public static final Climate.Parameter HUMIDITY = Climate.Parameter.span(0.050F, 0.155F);
 	public static final Climate.Parameter HUMIDITY_WEIRD = Climate.Parameter.span(-0.105F, 0.155F);
-	public static final Climate.Parameter TEMPERATURE_MAPLE = Climate.Parameter.span(-0.475F, -0.45F);
 	public static final Climate.Parameter HUMIDITY_MAPLE = Climate.Parameter.span(-1F, 0.105F);
 	public static final Climate.Parameter WEIRDNESS_MAPLE = Climate.Parameter.span(-0.205F, 0.605F);
 	public static final Climate.Parameter EROSION_MAPLE = Climate.Parameter.span(Erosion.EROSION_3, Erosion.EROSION_6);
@@ -176,22 +176,24 @@ public void addSpawns(MobSpawnSettings.Builder spawns) {
 	@Override
 	public void injectToOverworld(Consumer<Pair<Climate.ParameterPoint, ResourceKey<Biome>>> parameters) {
 		if (WWWorldgenConfig.get().biomeGeneration.generateSnowyDyingMixedForest) {
+			boolean generateAutumnalPlains = WWWorldgenConfig.get().biomeGeneration.generateAutumnalPlains;
+
 			for (Climate.ParameterPoint point : OverworldBiomeBuilderParameters.points(Biomes.SNOWY_TAIGA)) {
 				boolean weird = FrozenBiomeParameters.isWeird(point);
 				this.addSurfaceBiome(
 					parameters,
-					TEMPERATURE,
+					generateAutumnalPlains ? TEMPERATURE_AUTUMNAL_PLAINS : TEMPERATURE,
 					weird ? HUMIDITY_WEIRD : HUMIDITY,
 					point.continentalness(),
 					point.erosion(),
 					point.weirdness(),
 					point.offset()
 				);
 			}
-			if (WWWorldgenConfig.get().biomeGeneration.generateMapleForest) {
+			if (WWWorldgenConfig.get().biomeGeneration.generateMapleForest || generateAutumnalPlains) {
 				this.addSurfaceBiome(
 					parameters,
-					TEMPERATURE_MAPLE,
+					TEMPERATURE_AUTUMNAL_PLAINS,
 					HUMIDITY_MAPLE,
 					CONTINENTALNESS_MAPLE,
 					EROSION_MAPLE,