remove oasis pools

CHANGELOG.md

@@ -81,6 +81,7 @@ hi
 - Added Clovers.
   - Clovers generate in biomes in the `wilderwild:feature/has_clovers` tag.
 - Fixed Wilder Wild's blocks having incorrect flammability values.
+- Removed shallow pools from the Oasis biome as they weren't visually pleasing.
 
 # Music
 - Added three new tracks by Willow/pictochats_.

src/main/generated/data/wilderwild/worldgen/biome/oasis.json

@@ -29,9 +29,7 @@
     [],
     [
       "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface",
-      "wilderwild:sand_pool",
-      "wilderwild:messy_sand_pool"
+      "minecraft:lake_lava_surface"
     ],
     [
       "minecraft:amethyst_geode"

src/main/java/net/frozenblock/wilderwild/worldgen/biome/Oasis.java

@@ -66,7 +66,7 @@ public final class Oasis extends FrozenBiome {
 	public static final int FOG_COLOR = WWSharedWorldgen.STOCK_FOG_COLOR;
 	public static final int SKY_COLOR = OverworldBiomes.calculateSkyColor(TEMP);
 	public static final int FOLIAGE_COLOR = 3193611;
-	public static final int GRASS_COLOR = 8569413;
+	public static final int OLD_GRASS_COLOR = 8569413;
 	public static final Oasis INSTANCE = new Oasis();
 
 	@Override
@@ -135,7 +135,7 @@ public int waterFogColor() {
 	}
 
 	@Override
-	public @Nullable AmbientMoodSettings ambientMoodSettings() {
+	public @NotNull AmbientMoodSettings ambientMoodSettings() {
 		return AmbientMoodSettings.LEGACY_CAVE_SETTINGS;
 	}
 
@@ -145,7 +145,7 @@ public int waterFogColor() {
 	}
 
 	@Override
-	public @Nullable Music backgroundMusic() {
+	public @NotNull Music backgroundMusic() {
 		return Musics.createGameMusic(SoundEvents.MUSIC_BIOME_DESERT);
 	}
 
@@ -162,8 +162,6 @@ public void addFeatures(@NotNull BiomeGenerationSettings.Builder features) {
 		BiomeDefaultFeatures.addDesertExtraDecoration(features);
 		features.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUGAR_CANE_DESERT);
 		features.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, AquaticPlacements.SEAGRASS_RIVER);
-		features.addFeature(GenerationStep.Decoration.LAKES, WWMiscPlaced.SAND_POOL.getKey());
-		features.addFeature(GenerationStep.Decoration.LAKES, WWMiscPlaced.MESSY_SAND_POOL.getKey());
 		features.addFeature(GenerationStep.Decoration.UNDERGROUND_ORES, WWMiscPlaced.GRASS_PATH.getKey());
 		features.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, WWPlacedFeatures.OASIS_GRASS_PLACED.getKey());
 		features.addFeature(GenerationStep.Decoration.VEGETAL_DECORATION, WWPlacedFeatures.OASIS_CACTUS_PLACED.getKey());

src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWMiscConfigured.java

@@ -125,8 +125,6 @@ public final class WWMiscConfigured {
 	public static final FrozenLibConfiguredFeature<FadingDiskTagBiomeFeatureConfig, ConfiguredFeature<FadingDiskTagBiomeFeatureConfig, ?>> RED_SAND_TRANSITION_DISK = register("red_sand_transition");
 
 	// OASIS
-	public static final FrozenLibConfiguredFeature<VegetationPatchConfiguration, ConfiguredFeature<VegetationPatchConfiguration, ?>> SAND_POOL = register("sand_pool");
-	public static final FrozenLibConfiguredFeature<LakeFeature.Configuration, ConfiguredFeature<LakeFeature.Configuration, ?>> MESSY_SAND_POOL = register("messy_sand_pool");
 	public static final FrozenLibConfiguredFeature<PathSwapUnderWaterFeatureConfig, ConfiguredFeature<PathSwapUnderWaterFeatureConfig, ?>> GRASS_PATH = register("grass_path");
 	public static final FrozenLibConfiguredFeature<PathFeatureConfig, ConfiguredFeature<PathFeatureConfig, ?>> MOSS_PATH_OASIS = register("moss_path_oasis");
 
@@ -775,28 +773,6 @@ public static void registerMiscConfigured() {
 
 		// OASIS
 
-		SAND_POOL.makeAndSetHolder(FrozenLibFeatures.CIRCULAR_WATERLOGGED_VEGETATION_PATCH,
-			new VegetationPatchConfiguration(
-				WWBlockTags.SAND_POOL_REPLACEABLE,
-				BlockStateProvider.simple(Blocks.SAND),
-				PlacementUtils.inlinePlaced(EMPTY.getHolder()),
-				CaveSurface.FLOOR,
-				ConstantInt.of(5),
-				0.8F,
-				1,
-				0.000F,
-				UniformInt.of(8, 14),
-				0.7F
-			)
-		);
-
-		MESSY_SAND_POOL.makeAndSetHolder(Feature.LAKE,
-			new LakeFeature.Configuration(
-				BlockStateProvider.simple(Blocks.WATER.defaultBlockState()),
-				BlockStateProvider.simple(Blocks.SAND.defaultBlockState())
-			)
-		);
-
 		GRASS_PATH.makeAndSetHolder(FrozenLibFeatures.NOISE_PATH_SWAP_UNDER_WATER_FEATURE,
 			new PathSwapUnderWaterFeatureConfig(
 				BlockStateProvider.simple(Blocks.GRASS_BLOCK),

src/main/java/net/frozenblock/wilderwild/worldgen/feature/placed/WWMiscPlaced.java

@@ -108,8 +108,6 @@ public final class WWMiscPlaced {
 	public static final FrozenLibPlacedFeature RED_SAND_TRANSITION = WWPlacementUtils.register("red_sand_transition");
 
 	// OASIS
-	public static final FrozenLibPlacedFeature SAND_POOL = WWPlacementUtils.register("sand_pool");
-	public static final FrozenLibPlacedFeature MESSY_SAND_POOL = WWPlacementUtils.register("messy_sand_pool");
 	public static final FrozenLibPlacedFeature GRASS_PATH = WWPlacementUtils.register("grass_path");
 	public static final FrozenLibPlacedFeature MOSS_PATH_OASIS = WWPlacementUtils.register("moss_path_oasis");
 	public static final FrozenLibPlacedFeature DESERT_WELL = WWPlacementUtils.register("desert_well");
@@ -421,25 +419,6 @@ public static void registerMiscPlaced(@NotNull BootstrapContext<PlacedFeature> e
 
 		// OASIS
 
-		SAND_POOL.makeAndSetHolder(WWMiscConfigured.SAND_POOL.getHolder(),
-			InSquarePlacement.spread(),
-			PlacementUtils.HEIGHTMAP_WORLD_SURFACE,
-			HeightRangePlacement.uniform(VerticalAnchor.absolute(63), VerticalAnchor.aboveBottom(256)),
-			EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.solid(), BlockPredicate.ONLY_IN_AIR_PREDICATE, 12),
-			RandomOffsetPlacement.vertical(ConstantInt.of(1)),
-			BiomeFilter.biome()
-		);
-
-		MESSY_SAND_POOL.makeAndSetHolder(WWMiscConfigured.MESSY_SAND_POOL.getHolder(),
-			CountPlacement.of(2),
-			InSquarePlacement.spread(),
-			PlacementUtils.HEIGHTMAP_WORLD_SURFACE,
-			HeightRangePlacement.uniform(VerticalAnchor.absolute(63), VerticalAnchor.aboveBottom(256)),
-			EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.solid(), BlockPredicate.ONLY_IN_AIR_PREDICATE, 12),
-			RandomOffsetPlacement.vertical(ConstantInt.of(1)),
-			BiomeFilter.biome()
-		);
-
 		GRASS_PATH.makeAndSetHolder(WWMiscConfigured.GRASS_PATH.getHolder(),
 			CountPlacement.of(4),
 			InSquarePlacement.spread(),