LESS!!

FrozenBlock · Feb 7, 2025 · 09ce75c · 09ce75c
1 parent 4ddbf03
commit 09ce75c
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 33 deletions.
diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/beta_beach/multi_layer_sand.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/beta_beach/multi_layer_sand.json
@@ -1,10 +1,8 @@
 {
   "values": [
-    "minecraft:bamboo_jungle",
     "minecraft:jungle",
     "minecraft:savanna",
     "minecraft:sparse_jungle",
-    "minecraft:cherry_grove",
     {
       "id": "wilderwild:birch_jungle",
       "required": false

diff --git a/src/main/generated/data/wilderwild/tags/worldgen/biome/beta_beach/sand.json b/src/main/generated/data/wilderwild/tags/worldgen/biome/beta_beach/sand.json
@@ -5,6 +5,7 @@
     "minecraft:forest",
     "minecraft:frozen_river",
     "minecraft:river",
+    "minecraft:cherry_grove",
     {
       "id": "wilderwild:parched_forest",
       "required": false

diff --git a/...in/generated/data/wilderwild/tags/worldgen/biome/feature/has_forest_clearing_flowers.json b/...in/generated/data/wilderwild/tags/worldgen/biome/feature/has_forest_clearing_flowers.json
@@ -10,14 +10,6 @@
     {
       "id": "wilderwild:rainforest",
       "required": false
-    },
-    {
-      "id": "wilderwild:dying_forest",
-      "required": false
-    },
-    {
-      "id": "wilderwild:dying_mixed_forest",
-      "required": false
     }
   ]
 }
diff --git a/src/main/generated/data/wilderwild/worldgen/placed_feature/marigold.json b/src/main/generated/data/wilderwild/worldgen/placed_feature/marigold.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 4
+      "chance": 5
     },
     {
       "type": "minecraft:in_square"

diff --git a/src/main/generated/data/wilderwild/worldgen/placed_feature/marigold_sparse.json b/src/main/generated/data/wilderwild/worldgen/placed_feature/marigold_sparse.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:rarity_filter",
-      "chance": 7
+      "chance": 8
     },
     {
       "type": "minecraft:in_square"

diff --git a/src/main/java/net/frozenblock/wilderwild/datagen/tag/WWBiomeTagProvider.java b/src/main/java/net/frozenblock/wilderwild/datagen/tag/WWBiomeTagProvider.java
@@ -649,8 +649,8 @@ private void generateUtilityTags() {
 			.addOptionalTag(BiomeTags.IS_BADLANDS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_CLAY_PATH)
-			.addOptionalTag(WWBiomeTags.SAND_BEACHES)
-			.addOptionalTag(WWBiomeTags.MULTI_LAYER_SAND_BEACHES)
+			.addOptionalTag(WWBiomeTags.BETA_BEACH_SAND)
+			.addOptionalTag(WWBiomeTags.BETA_BEACH_MULTI_LAYER_SAND)
 			.addOptional(WWBiomes.OASIS)
 			.addOptional(WWBiomes.WARM_RIVER)
 			.addOptional(WWBiomes.WARM_BEACH);
@@ -706,7 +706,7 @@ private void generateUtilityTags() {
 			.addOptional(WWBiomes.OASIS)
 			.addOptional(WWBiomes.CYPRESS_WETLANDS);
 
-		this.getOrCreateTagBuilder(WWBiomeTags.GRAVEL_BEACH)
+		this.getOrCreateTagBuilder(WWBiomeTags.BETA_BEACH_GRAVEL)
 			.add(Biomes.BIRCH_FOREST)
 			.add(Biomes.FROZEN_RIVER)
 			.add(Biomes.OLD_GROWTH_BIRCH_FOREST)
@@ -725,24 +725,23 @@ private void generateUtilityTags() {
 			.addOptional(WWBiomes.DYING_MIXED_FOREST)
 			.addOptional(WWBiomes.SNOWY_DYING_MIXED_FOREST);
 
-		this.getOrCreateTagBuilder(WWBiomeTags.SAND_BEACHES)
+		this.getOrCreateTagBuilder(WWBiomeTags.BETA_BEACH_SAND)
 			.add(Biomes.DARK_FOREST)
 			.add(Biomes.FLOWER_FOREST)
 			.add(Biomes.FOREST)
 			.add(Biomes.FROZEN_RIVER)
 			.add(Biomes.RIVER)
+			.add(Biomes.CHERRY_GROVE)
 			.addOptional(WWBiomes.PARCHED_FOREST)
 			.addOptional(WWBiomes.ARID_FOREST)
 			.addOptional(WWBiomes.OLD_GROWTH_DARK_FOREST)
 			.addOptional(WWBiomes.SEMI_BIRCH_FOREST)
 			.addOptional(WWBiomes.SPARSE_FOREST);
 
-		this.getOrCreateTagBuilder(WWBiomeTags.MULTI_LAYER_SAND_BEACHES)
-			.add(Biomes.BAMBOO_JUNGLE)
+		this.getOrCreateTagBuilder(WWBiomeTags.BETA_BEACH_MULTI_LAYER_SAND)
 			.add(Biomes.JUNGLE)
 			.add(Biomes.SAVANNA)
 			.add(Biomes.SPARSE_JUNGLE)
-			.add(Biomes.CHERRY_GROVE)
 			.addOptional(WWBiomes.BIRCH_JUNGLE)
 			.addOptional(WWBiomes.SPARSE_BIRCH_JUNGLE)
 			.addOptional(WWBiomes.ARID_SAVANNA)
@@ -1781,9 +1780,7 @@ private void generateFeatureTags() {
 			.add(Biomes.FLOWER_FOREST)
 			.add(Biomes.DARK_FOREST)
 			.addOptional(WWBiomes.MIXED_FOREST)
-			.addOptional(WWBiomes.RAINFOREST)
-			.addOptional(WWBiomes.DYING_FOREST)
-			.addOptional(WWBiomes.DYING_MIXED_FOREST);
+			.addOptional(WWBiomes.RAINFOREST);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_SCORCHED_SAND)
 			.add(Biomes.DESERT)
@@ -1822,11 +1819,11 @@ private void generateFeatureTags() {
 			.add(Biomes.WINDSWEPT_HILLS);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_BETA_BEACH_SAND_TRANSITION)
-			.addOptionalTag(WWBiomeTags.SAND_BEACHES)
-			.addOptionalTag(WWBiomeTags.MULTI_LAYER_SAND_BEACHES);
+			.addOptionalTag(WWBiomeTags.BETA_BEACH_SAND)
+			.addOptionalTag(WWBiomeTags.BETA_BEACH_MULTI_LAYER_SAND);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_BETA_BEACH_GRAVEL_TRANSITION)
-			.addOptionalTag(WWBiomeTags.GRAVEL_BEACH);
+			.addOptionalTag(WWBiomeTags.BETA_BEACH_GRAVEL);
 
 		this.getOrCreateTagBuilder(WWBiomeTags.HAS_GRAVEL_TRANSITION)
 			.add(Biomes.WINDSWEPT_GRAVELLY_HILLS);

diff --git a/src/main/java/net/frozenblock/wilderwild/registry/WWSurfaceRules.java b/src/main/java/net/frozenblock/wilderwild/registry/WWSurfaceRules.java
@@ -387,7 +387,7 @@ public static SurfaceRules.RuleSource tundraRules() {
 	@NotNull
 	public static SurfaceRules.RuleSource gravelBetaBeaches() {
 		return SurfaceRules.ifTrue(
-			FrozenSurfaceRules.isBiomeTagOptimized(WWBiomeTags.GRAVEL_BEACH),
+			FrozenSurfaceRules.isBiomeTagOptimized(WWBiomeTags.BETA_BEACH_GRAVEL),
 			SurfaceRules.ifTrue(
 				SurfaceRules.UNDER_FLOOR,
 				SurfaceRules.ifTrue(
@@ -407,7 +407,7 @@ public static SurfaceRules.RuleSource gravelBetaBeaches() {
 	@NotNull
 	public static SurfaceRules.RuleSource sandBetaBeaches() {
 		return SurfaceRules.ifTrue(
-			FrozenSurfaceRules.isBiomeTagOptimized(WWBiomeTags.SAND_BEACHES),
+			FrozenSurfaceRules.isBiomeTagOptimized(WWBiomeTags.BETA_BEACH_SAND),
 			SurfaceRules.ifTrue(
 				SurfaceRules.DEEP_UNDER_FLOOR,
 				SurfaceRules.ifTrue(
@@ -427,7 +427,7 @@ public static SurfaceRules.RuleSource sandBetaBeaches() {
 	@NotNull
 	public static SurfaceRules.RuleSource multiLayerSandBetaBeaches() {
 		return SurfaceRules.ifTrue(
-			FrozenSurfaceRules.isBiomeTagOptimized(WWBiomeTags.MULTI_LAYER_SAND_BEACHES),
+			FrozenSurfaceRules.isBiomeTagOptimized(WWBiomeTags.BETA_BEACH_MULTI_LAYER_SAND),
 			SurfaceRules.ifTrue(
 				SurfaceRules.DEEP_UNDER_FLOOR,
 				SurfaceRules.ifTrue(

diff --git a/src/main/java/net/frozenblock/wilderwild/tag/WWBiomeTags.java b/src/main/java/net/frozenblock/wilderwild/tag/WWBiomeTags.java
@@ -76,9 +76,9 @@ public final class WWBiomeTags {
 	public static final TagKey<Biome> DARK_FOREST = bind("dark_forest");
 	public static final TagKey<Biome> MEADOW = bind("meadow");
 
-	public static final TagKey<Biome> GRAVEL_BEACH = bind("beta_beach/gravel");
-	public static final TagKey<Biome> SAND_BEACHES = bind("beta_beach/sand");
-	public static final TagKey<Biome> MULTI_LAYER_SAND_BEACHES = bind("beta_beach/multi_layer_sand");
+	public static final TagKey<Biome> BETA_BEACH_GRAVEL = bind("beta_beach/gravel");
+	public static final TagKey<Biome> BETA_BEACH_SAND = bind("beta_beach/sand");
+	public static final TagKey<Biome> BETA_BEACH_MULTI_LAYER_SAND = bind("beta_beach/multi_layer_sand");
 
 	public static final TagKey<Biome> BELOW_SURFACE_SNOW = bind("below_surface_snow");
 

diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/feature/placed/WWPlacedFeatures.java b/src/main/java/net/frozenblock/wilderwild/worldgen/feature/placed/WWPlacedFeatures.java
@@ -1472,14 +1472,14 @@ public static void registerPlacedFeatures(@NotNull BootstrapContext<PlacedFeatur
 		);
 
 		MARIGOLD.makeAndSetHolder(WWConfiguredFeatures.MARIGOLD.getHolder(),
-			RarityFilter.onAverageOnceEvery(4),
+			RarityFilter.onAverageOnceEvery(5),
 			InSquarePlacement.spread(),
 			PlacementUtils.HEIGHTMAP_WORLD_SURFACE,
 			BiomeFilter.biome()
 		);
 
 		MARIGOLD_SPARSE.makeAndSetHolder(WWConfiguredFeatures.MARIGOLD_SPARSE.getHolder(),
-			RarityFilter.onAverageOnceEvery(7),
+			RarityFilter.onAverageOnceEvery(8),
 			InSquarePlacement.spread(),
 			PlacementUtils.HEIGHTMAP_WORLD_SURFACE,
 			BiomeFilter.biome()