Remove Surface Lava Pools from Forest Like biomes

Fix ores not genning in Eroded Borealis
Potion-Studios · Jul 29, 2024 · a562ea4 · a562ea4
1 parent 461649f
commit a562ea4
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,4 +7,6 @@
 - Fix Podzol Floors in Cakes under Sakura Grove
 - Fix incompatibility with William Wythers' Overhauled Overworld
 - Add BWG Logs to Logs That Burn Tag
-- Fix a bunch of incorrect rendertypes around Plant like blocks
+- Fix a bunch of incorrect rendertypes around Plant like blocks
+- Remove Surface Lava Pools from Forest like biomes
+- Fix ores not genning in Eroded Borealis
diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/aspen_boreal.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/aspen_boreal.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/black_forest.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/black_forest.json
@@ -27,8 +27,7 @@
       "biomeswevegone:rocky_stone_boulder"
     ],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode",

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/cika_woods.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/cika_woods.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/...on/src/main/generated/resources/data/biomeswevegone/worldgen/biome/coniferous_forest.json b/...on/src/main/generated/resources/data/biomeswevegone/worldgen/biome/coniferous_forest.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode",

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/ebony_woods.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/ebony_woods.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/eroded_borealis.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/eroded_borealis.json
@@ -36,8 +36,7 @@
       "biomeswevegone:borealis_ice_sharpened_spike"
     ],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"
@@ -57,7 +56,26 @@
       "minecraft:ore_diorite_lower",
       "minecraft:ore_andesite_upper",
       "minecraft:ore_andesite_lower",
-      "minecraft:ore_tuff"
+      "minecraft:ore_tuff",
+      "minecraft:ore_coal_upper",
+      "minecraft:ore_coal_lower",
+      "minecraft:ore_iron_upper",
+      "minecraft:ore_iron_middle",
+      "minecraft:ore_iron_small",
+      "minecraft:ore_gold",
+      "minecraft:ore_gold_lower",
+      "minecraft:ore_redstone",
+      "minecraft:ore_redstone_lower",
+      "minecraft:ore_diamond",
+      "minecraft:ore_diamond_large",
+      "minecraft:ore_diamond_buried",
+      "minecraft:ore_lapis",
+      "minecraft:ore_lapis_buried",
+      "minecraft:ore_copper",
+      "minecraft:underwater_magma",
+      "minecraft:disk_sand",
+      "minecraft:disk_clay",
+      "minecraft:disk_gravel"
     ],
     [],
     [

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/forgotten_forest.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/forgotten_forest.json
@@ -36,8 +36,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/...ain/generated/resources/data/biomeswevegone/worldgen/biome/frosted_coniferous_forest.json b/...ain/generated/resources/data/biomeswevegone/worldgen/biome/frosted_coniferous_forest.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode",

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/orchard.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/orchard.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/...src/main/generated/resources/data/biomeswevegone/worldgen/biome/overgrowth_woodlands.json b/...src/main/generated/resources/data/biomeswevegone/worldgen/biome/overgrowth_woodlands.json
@@ -30,8 +30,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/redwood_thicket.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/redwood_thicket.json
@@ -28,8 +28,7 @@
       "biomeswevegone:rocky_stone_boulder"
     ],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/sakura_grove.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/sakura_grove.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/temperate_grove.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/temperate_grove.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/...src/main/generated/resources/data/biomeswevegone/worldgen/biome/weeping_witch_forest.json b/...src/main/generated/resources/data/biomeswevegone/worldgen/biome/weeping_witch_forest.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/zelkova_forest.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/biome/zelkova_forest.json
@@ -24,8 +24,7 @@
   "features": [
     [],
     [
-      "minecraft:lake_lava_underground",
-      "minecraft:lake_lava_surface"
+      "minecraft:lake_lava_underground"
     ],
     [
       "minecraft:amethyst_geode"

diff --git a/.../java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGOverworldBiomes.java b/.../java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGOverworldBiomes.java
@@ -122,7 +122,7 @@ protected static Biome araucariaSavanna(HolderGetter<PlacedFeature> placedFeatur
     }
 
     protected static Biome aspenBoreal(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         BiomeDefaultFeatures.addForestFlowers(generationSettings);
         BiomeDefaultFeatures.addDefaultGrass(generationSettings);
@@ -243,7 +243,7 @@ protected static Biome bayou(HolderGetter<PlacedFeature> placedFeatureGetter, Ho
     }
 
     protected static Biome blackForest(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         BiomeDefaultFeatures.addMossyStoneBlock(generationSettings);
         BiomeDefaultFeatures.addFerns(generationSettings);
@@ -340,7 +340,7 @@ protected static Biome crimsonTundra(HolderGetter<PlacedFeature> placedFeatureGe
     }
 
     protected static Biome sakuraGrove(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         BiomeDefaultFeatures.addForestFlowers(generationSettings);
         BiomeDefaultFeatures.addDefaultFlowers(generationSettings);
@@ -371,7 +371,7 @@ protected static Biome sakuraGrove(HolderGetter<PlacedFeature> placedFeatureGett
     }
 
     protected static Biome cikaWoods(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         BiomeDefaultFeatures.addDefaultGrass(generationSettings);
         BiomeDefaultFeatures.addForestGrass(generationSettings);
@@ -401,7 +401,7 @@ protected static Biome cikaWoods(HolderGetter<PlacedFeature> placedFeatureGetter
     }
 
     protected static Biome coniferousForest(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter, boolean snowy) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         BiomeDefaultFeatures.addMossyStoneBlock(generationSettings);
         BiomeDefaultFeatures.addFerns(generationSettings);
@@ -622,7 +622,7 @@ protected static Biome windsweptDesert(HolderGetter<PlacedFeature> placedFeature
     }
 
     protected static Biome ebonyWoods(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
         BWGOverworldDefaultFeatures.addHugeMushrooms(generationSettings);
 
         BiomeDefaultFeatures.addDefaultGrass(generationSettings);
@@ -717,7 +717,7 @@ protected static Biome frostedTaiga(HolderGetter<PlacedFeature> placedFeatureGet
     }
 
     protected static Biome temperateGrove(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         BiomeDefaultFeatures.addPlainGrass(generationSettings);
         addVegetal(generationSettings, VegetationPlacements.PATCH_SUNFLOWER);
@@ -878,16 +878,15 @@ protected static Biome coconinoMeadow(HolderGetter<PlacedFeature> placedFeatureG
     }
 
     protected static Biome deadSea(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        MobSpawnSettings.Builder spawnSettings = new MobSpawnSettings.Builder();
         BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
 
         addRawGeneration(generationSettings, BWGPlacedFeatures.DRIPSTONE_ROUNDED_ROCK);
 
         addVegetal(generationSettings, AquaticPlacements.SEAGRASS_NORMAL);
         BiomeDefaultFeatures.addDripstone(generationSettings);
 
-//        BYGDefaultBiomeFeatures.addDeadSeaSpires(generationSettings);
 
+        MobSpawnSettings.Builder spawnSettings = new MobSpawnSettings.Builder();
         addSpawn(spawnSettings, EntityType.BAT, 10, 8, 8);
         BiomeDefaultFeatures.monsters(spawnSettings, 95, 5, 100, true);
 
@@ -922,8 +921,7 @@ protected static Biome mojaveDesert(HolderGetter<PlacedFeature> placedFeatureGet
     }
 
     protected static Biome orchard(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        MobSpawnSettings.Builder spawnSettings = new MobSpawnSettings.Builder();
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         BiomeDefaultFeatures.addDefaultFlowers(generationSettings);
         BiomeDefaultFeatures.addSavannaExtraGrass(generationSettings);
@@ -939,6 +937,7 @@ protected static Biome orchard(HolderGetter<PlacedFeature> placedFeatureGetter,
 //        BYGDefaultBiomeFeatures.addBeeHive(generationSettings);
         BWGOverworldDefaultFeatures.addBWGMushrooms(generationSettings);
 
+        MobSpawnSettings.Builder spawnSettings = new MobSpawnSettings.Builder();
         BiomeDefaultFeatures.plainsSpawns(spawnSettings);
 
         float temperature = 0.8F;
@@ -979,7 +978,7 @@ protected static Biome rainbowBeach(HolderGetter<PlacedFeature> placedFeatureGet
     }
 
     protected static Biome overgrowthWoodlands(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         BiomeDefaultFeatures.addForestFlowers(generationSettings);
         BiomeDefaultFeatures.addFerns(generationSettings);
@@ -1018,7 +1017,6 @@ protected static Biome overgrowthWoodlands(HolderGetter<PlacedFeature> placedFea
     protected static Biome redRockValley(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
         BiomeGenerationSettings.Builder generationSettings = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
         BiomeDefaultFeatures.addFossilDecoration(generationSettings);
-//        generationSettings.addFeature(GenerationStep.Decoration.RAW_GENERATION, BYGPlacedFeatures.RED_ROCK_SPIKES);
         addDefaultOverworldGeneration(generationSettings);
 
         BiomeDefaultFeatures.addDefaultFlowers(generationSettings);
@@ -1048,7 +1046,7 @@ protected static Biome redRockValley(HolderGetter<PlacedFeature> placedFeatureGe
     }
 
     protected static Biome redwoodThicket(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         addRawGeneration(generationSettings, BWGPlacedFeatures.BOULDER);
         BiomeDefaultFeatures.addForestFlowers(generationSettings);
@@ -1269,16 +1267,8 @@ protected static Biome ironwoodGour(HolderGetter<PlacedFeature> placedFeatureGet
         return new Biome.BiomeBuilder().hasPrecipitation(true).temperature(temperature).downfall(0.1F).specialEffects((new BiomeSpecialEffects.Builder()).waterColor(4159204).waterFogColor(329011).grassColorOverride(10855786).foliageColorOverride(10855786).fogColor(12638463).skyColor(OverworldBiomes.calculateSkyColor(temperature)).ambientMoodSound(AmbientMoodSettings.LEGACY_CAVE_SETTINGS).build()).mobSpawnSettings(spawnSettings.build()).generationSettings(generationSettings.build()).build();
     }
 
-    //TODO: Configure properties
     protected static Biome erodedBorealis(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = new BiomeGenerationSettings.Builder(placedFeatureGetter, carverGetter);
-
-        BiomeDefaultFeatures.addDefaultCarversAndLakes(generationSettings);
-        BiomeDefaultFeatures.addDefaultCrystalFormations(generationSettings);
-        BiomeDefaultFeatures.addDefaultMonsterRoom(generationSettings);
-        BiomeDefaultFeatures.addDefaultUndergroundVariety(generationSettings);
-        BiomeDefaultFeatures.addDefaultSprings(generationSettings);
-        generationSettings.addFeature(GenerationStep.Decoration.TOP_LAYER_MODIFICATION, MiscOverworldPlacements.FREEZE_TOP_LAYER);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         addRawGeneration(generationSettings, BWGPlacedFeatures.BOREALIS_ICE_SHARPENED_SPIKE);
         BiomeDefaultFeatures.addFerns(generationSettings);
@@ -1472,7 +1462,7 @@ protected static Biome tropicalIsland(HolderGetter<PlacedFeature> placedFeatureG
     }
 
     protected static Biome weepingWitchForest(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
         BWGOverworldDefaultFeatures.addHugeMushrooms(generationSettings);
 
         BiomeDefaultFeatures.addForestGrass(generationSettings);
@@ -1504,7 +1494,7 @@ protected static Biome weepingWitchForest(HolderGetter<PlacedFeature> placedFeat
     }
 
     protected static Biome forgottenForest(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
         BWGOverworldDefaultFeatures.addHugeMushrooms(generationSettings);
 
         BiomeDefaultFeatures.addJungleGrass(generationSettings);
@@ -1537,7 +1527,7 @@ protected static Biome forgottenForest(HolderGetter<PlacedFeature> placedFeature
     }
 
     protected static Biome zelkovaForest(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter) {
-        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGeneration(placedFeatureGetter, carverGetter);
+        BiomeGenerationSettings.Builder generationSettings = setupDefaultOverworldGenerationWithoutLava(placedFeatureGetter, carverGetter);
 
         BiomeDefaultFeatures.addFerns(generationSettings);