Improved Volcano lava pool/spring and Lush Desert/Rocky Rainforest wa…

…ter spring generation
Glitchfiend · Dec 2, 2023 · e4ddf4d · e4ddf4d
1 parent 9151fac
commit e4ddf4d
Show file tree

Hide file tree

Showing 15 changed files with 70 additions and 69 deletions.
diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.20.2	2023-12-01T05:58:34.6500989	Registries
+// 1.20.2	2023-12-02T00:39:59.5611429	Registries
 a09ddf53150a7fcf8767a311dd5cf040fa2e9221 data/biomesoplenty/damage_type/bramble.json
 2d0eab2cc85c4c6397fdc41dd0cedefbc4a7a150 data/biomesoplenty/damage_type/fumarole.json
 1db19ce8d33b8c131955b60ed830200bbee6a912 data/biomesoplenty/worldgen/biome/aspen_glade.json
@@ -28,7 +28,7 @@ c1a5b54c326719b757ca2d91d84761a8d5c63a6e data/biomesoplenty/worldgen/biome/jacar
 db467c12d72e4d7c68e40849a87a19d4f07a7547 data/biomesoplenty/worldgen/biome/jade_cliffs.json
 dbd2116f54e13f7637b0b6ea569506f7d9a66f14 data/biomesoplenty/worldgen/biome/lavender_field.json
 9271f8b08e20a5b849d6b7117e4f16e17f1073b4 data/biomesoplenty/worldgen/biome/lush_desert.json
-4289356071e43ee09b8e3f04a7f01c06205b1e16 data/biomesoplenty/worldgen/biome/lush_savanna.json
+e7b67fadf73cc6ef20430071a00ae224c09af64e data/biomesoplenty/worldgen/biome/lush_savanna.json
 fb8fed2ce44b547589d94ea42d3ae15b5252ec68 data/biomesoplenty/worldgen/biome/maple_woods.json
 c2cbdfcebec081e2f243cad5f56be4de684d50fc data/biomesoplenty/worldgen/biome/marsh.json
 720c0d07ae063e27eef09fde77687496afffbb6d data/biomesoplenty/worldgen/biome/mediterranean_forest.json
@@ -45,7 +45,7 @@ d069fd79392dfcb351dd0e634e6ea4f9e83ba9ff data/biomesoplenty/worldgen/biome/pastu
 c192e14c69fed976327bb9429a643ae0a77a7cac data/biomesoplenty/worldgen/biome/pumpkin_patch.json
 6c8e60f6976657e727ac444f8db4f1972c9ff975 data/biomesoplenty/worldgen/biome/rainforest.json
 21389471c642c1b46eb6679d54d2fcbd0aa966db data/biomesoplenty/worldgen/biome/redwood_forest.json
-4d63848202fdd27ec7e4dc58f7ef1f30521d358f data/biomesoplenty/worldgen/biome/rocky_rainforest.json
+c99832ea5ef904fb8be737b6167c8a43e6d4e570 data/biomesoplenty/worldgen/biome/rocky_rainforest.json
 7d21568158ce2c30daf4205345f0c0826c264551 data/biomesoplenty/worldgen/biome/rocky_shrubland.json
 3285061bd512a79cabe9f63087aadc35a58ec4d9 data/biomesoplenty/worldgen/biome/scrubland.json
 a90275f0d3e81663844572072a0359edf138f00f data/biomesoplenty/worldgen/biome/seasonal_forest.json
@@ -117,9 +117,9 @@ ec32f214d8a8878c92dc687211e549e807d411b7 data/biomesoplenty/worldgen/configured_
 b35f010f25e98eb3652c4d177268e089638b85a1 data/biomesoplenty/worldgen/configured_feature/disk_hot_spring_thermal_calcite.json
 5a0dcec2ace77b2e1ea31534938a3ec5cda18b58 data/biomesoplenty/worldgen/configured_feature/disk_mud.json
 d9b7c38b6c87551455bd1a8db476426235ac25e7 data/biomesoplenty/worldgen/configured_feature/disk_orange_sand.json
-1adb8e0fbe804536026590e8ec8ddc38f18dc4ad data/biomesoplenty/worldgen/configured_feature/disk_volcano_black_sandstone.json
-72d7c1009fdfcf4e011e4ef818fa98fdacb36c2d data/biomesoplenty/worldgen/configured_feature/disk_volcano_magma.json
-f620d40d3e464a5eeef5533f8853f2375e26b0f0 data/biomesoplenty/worldgen/configured_feature/disk_volcano_smooth_basalt.json
+593d885e52a4c5028d872c612ea2bbfa71ceb4fa data/biomesoplenty/worldgen/configured_feature/disk_volcano_black_sandstone.json
+ddd5cf32a45e1a8912a5fba97f2dab3431792537 data/biomesoplenty/worldgen/configured_feature/disk_volcano_magma.json
+ed89ea4c769889c41e7f9603f59a43a86dab7eb3 data/biomesoplenty/worldgen/configured_feature/disk_volcano_smooth_basalt.json
 7f2e0e858755f8995d0b42fc1215c455024a0158 data/biomesoplenty/worldgen/configured_feature/disk_white_sand.json
 af8e987479481448ebe8834baa2483a084856839 data/biomesoplenty/worldgen/configured_feature/disk_white_sandstone.json
 9c07f4690b547dfe2a4101fcd13c91f4b7e53a73 data/biomesoplenty/worldgen/configured_feature/disk_white_sand_extra.json
@@ -260,8 +260,8 @@ f9e433aba0886753c79fc8ccce4d8a060101f0f4 data/biomesoplenty/worldgen/configured_
 5b536b003147b324e218f2148075d2cb220ce2e3 data/biomesoplenty/worldgen/configured_feature/sparse_dune_grass.json
 d87d90916abd6fe071bf29076ed7d22cce851486 data/biomesoplenty/worldgen/configured_feature/sparse_oak_tree.json
 870ce7ba23a97234beb388426784af523660a2b5 data/biomesoplenty/worldgen/configured_feature/spider_egg.json
-80e87789a8f266316e1b72e177f66c0a96bad9ad data/biomesoplenty/worldgen/configured_feature/spring_lava_volcano.json
-aefd7e01e58dfc77b03fb8b552483d826d5695bb data/biomesoplenty/worldgen/configured_feature/spring_water_extra.json
+c7c6754b855b755d3c183e6f8e86e0ade2b878c5 data/biomesoplenty/worldgen/configured_feature/spring_lava_volcano.json
+3a4c60fa1ee57b5b8ba28a25bc0c41a86293fa45 data/biomesoplenty/worldgen/configured_feature/spring_water_extra.json
 490897b03b2cb822737519650a9abe093070f922 data/biomesoplenty/worldgen/configured_feature/sprouts_undergrowth.json
 37c885b65c9c00709ebb25c7b9d25e069e1577ee data/biomesoplenty/worldgen/configured_feature/spruce_bush.json
 74763ef1e31a7f95d3d177658f45404fd19f5ba9 data/biomesoplenty/worldgen/configured_feature/spruce_poplar_tree.json
@@ -443,7 +443,7 @@ abceee4b2a04c68a84d6d086154e291512b37689 data/biomesoplenty/worldgen/placed_feat
 1a5c87f14b211539a9fea39840245eaafc710265 data/biomesoplenty/worldgen/placed_feature/jungle_bush.json
 dbbf828549ff2cc7957b4251ecf155f77c5b7d4f data/biomesoplenty/worldgen/placed_feature/jungle_twiglet_tree.json
 400fc6d041df03cee9874d7d4da430ff9ae7c697 data/biomesoplenty/worldgen/placed_feature/lake_hot_spring.json
-99c568eeb046d0207fce426f88ab35b7df8e5dc4 data/biomesoplenty/worldgen/placed_feature/lake_lava_surface_extra.json
+6b0b7a80aa669806ec14b110f96a2da3d8b422d2 data/biomesoplenty/worldgen/placed_feature/lake_lava_surface_extra.json
 817a6bbff1dbd62c038f431c68b44381bec37518 data/biomesoplenty/worldgen/placed_feature/lake_water.json
 22ecea04b63f74952acbbc3547543a2b614edcea data/biomesoplenty/worldgen/placed_feature/lake_water_extra.json
 ad6f8ad60a22582d92a6dca5af350728836630fe data/biomesoplenty/worldgen/placed_feature/lake_water_marsh.json
@@ -555,8 +555,8 @@ b3202d631c685c6cf4802ffc21ff5ea596bcdb27 data/biomesoplenty/worldgen/placed_feat
 4bb80abc527ae89f74a3f864bdfb7a46529b096c data/biomesoplenty/worldgen/placed_feature/sparse_dune_grass.json
 7366fcdc2461b1abacaa7b2038774c8047f706ee data/biomesoplenty/worldgen/placed_feature/sparse_oak_tree.json
 d6bc04af30883b72799cb256c49a550e3d8afee9 data/biomesoplenty/worldgen/placed_feature/spider_eggs.json
-5096b0191b994760387e7239a2be9783834b6b40 data/biomesoplenty/worldgen/placed_feature/spring_lava_volcano.json
-e75b81938a6fffb5a3cb403972ba2d760c13e44d data/biomesoplenty/worldgen/placed_feature/spring_water_extra.json
+76dfc2afe7cbffb594337ffea5df43449c93f758 data/biomesoplenty/worldgen/placed_feature/spring_lava_volcano.json
+99ae840a7d0aa5fc5a1941126cc4b85a937b5996 data/biomesoplenty/worldgen/placed_feature/spring_water_extra.json
 ee7f4df006fd534f998daf475482bb1acca0cd3f data/biomesoplenty/worldgen/placed_feature/sprouts_undergrowth.json
 212bb036d2b8b398ce520a3670f6124efa9bd229 data/biomesoplenty/worldgen/placed_feature/spruce_bush.json
 e0d549bf2e58a98f405659b64f9831d25f979f88 data/biomesoplenty/worldgen/placed_feature/spruce_poplar_tree.json

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/biome/lush_savanna.json b/src/generated/resources/data/biomesoplenty/worldgen/biome/lush_savanna.json
@@ -76,8 +76,7 @@
     [],
     [
       "minecraft:spring_water",
-      "minecraft:spring_lava",
-      "biomesoplenty:spring_water_extra"
+      "minecraft:spring_lava"
     ],
     [
       "minecraft:glow_lichen",

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/biome/rocky_rainforest.json b/src/generated/resources/data/biomesoplenty/worldgen/biome/rocky_rainforest.json
@@ -74,7 +74,8 @@
     [],
     [
       "minecraft:spring_water",
-      "minecraft:spring_lava"
+      "minecraft:spring_lava",
+      "biomesoplenty:spring_water_extra"
     ],
     [
       "minecraft:glow_lichen",

diff --git a/...esources/data/biomesoplenty/worldgen/configured_feature/disk_volcano_black_sandstone.json b/...esources/data/biomesoplenty/worldgen/configured_feature/disk_volcano_black_sandstone.json
@@ -25,6 +25,7 @@
         "minecraft:light_gray_terracotta",
         "minecraft:cyan_terracotta",
         "minecraft:light_blue_terracotta",
+        "minecraft:blue_terracotta",
         "minecraft:dirt",
         "minecraft:coarse_dirt",
         "minecraft:podzol",

diff --git a/...enerated/resources/data/biomesoplenty/worldgen/configured_feature/disk_volcano_magma.json b/...enerated/resources/data/biomesoplenty/worldgen/configured_feature/disk_volcano_magma.json
@@ -25,6 +25,7 @@
         "minecraft:light_gray_terracotta",
         "minecraft:cyan_terracotta",
         "minecraft:light_blue_terracotta",
+        "minecraft:blue_terracotta",
         "minecraft:dirt",
         "minecraft:coarse_dirt",
         "minecraft:podzol",

diff --git a/.../resources/data/biomesoplenty/worldgen/configured_feature/disk_volcano_smooth_basalt.json b/.../resources/data/biomesoplenty/worldgen/configured_feature/disk_volcano_smooth_basalt.json
@@ -25,6 +25,7 @@
         "minecraft:light_gray_terracotta",
         "minecraft:cyan_terracotta",
         "minecraft:light_blue_terracotta",
+        "minecraft:blue_terracotta",
         "minecraft:dirt",
         "minecraft:coarse_dirt",
         "minecraft:podzol",

diff --git a/...nerated/resources/data/biomesoplenty/worldgen/configured_feature/spring_lava_volcano.json b/...nerated/resources/data/biomesoplenty/worldgen/configured_feature/spring_lava_volcano.json
@@ -12,13 +12,9 @@
     },
     "valid_blocks": [
       "minecraft:basalt",
+      "minecraft:smooth_basalt",
       "minecraft:magma_block",
-      "biomesoplenty:black_sand",
-      "biomesoplenty:black_sandstone",
-      "minecraft:stone",
-      "minecraft:granite",
-      "minecraft:diorite",
-      "minecraft:andesite"
+      "biomesoplenty:black_sandstone"
     ]
   }
 }
diff --git a/...enerated/resources/data/biomesoplenty/worldgen/configured_feature/spring_water_extra.json b/...enerated/resources/data/biomesoplenty/worldgen/configured_feature/spring_water_extra.json
@@ -13,6 +13,10 @@
     "valid_blocks": [
       "minecraft:dirt",
       "minecraft:terracotta",
+      "minecraft:light_gray_terracotta",
+      "minecraft:cyan_terracotta",
+      "minecraft:light_blue_terracotta",
+      "minecraft:blue_terracotta",
       "minecraft:stone",
       "minecraft:granite",
       "minecraft:diorite",

diff --git a/...nerated/resources/data/biomesoplenty/worldgen/placed_feature/lake_lava_surface_extra.json b/...nerated/resources/data/biomesoplenty/worldgen/placed_feature/lake_lava_surface_extra.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:count",
-      "count": 15
+      "count": 10
     },
     {
       "type": "minecraft:in_square"

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/spring_lava_volcano.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/spring_lava_volcano.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:count",
-      "count": 128
+      "count": 96
     },
     {
       "type": "minecraft:in_square"
@@ -13,10 +13,10 @@
       "height": {
         "type": "minecraft:uniform",
         "max_inclusive": {
-          "below_top": 0
+          "absolute": 192
         },
         "min_inclusive": {
-          "above_bottom": 0
+          "absolute": 96
         }
       }
     },

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/spring_water_extra.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/spring_water_extra.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:count",
-      "count": 128
+      "count": 96
     },
     {
       "type": "minecraft:in_square"
@@ -16,7 +16,7 @@
           "absolute": 192
         },
         "min_inclusive": {
-          "above_bottom": 0
+          "absolute": 72
         }
       }
     },

diff --git a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java
@@ -723,7 +723,6 @@ public static Biome lushSavanna(HolderGetter<PlacedFeature> placedFeatureGetter,
         globalOverworldGeneration(biomeBuilder);
         BiomeDefaultFeatures.addDefaultOres(biomeBuilder);
         BiomeDefaultFeatures.addDefaultSoftDisks(biomeBuilder);
-        addFeature(biomeBuilder, GenerationStep.Decoration.FLUID_SPRINGS, BOPMiscOverworldPlacements.SPRING_WATER_EXTRA);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUGAR_CANE);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_POPPY);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.ROSE_BUSH_EXTRA);
@@ -1115,6 +1114,7 @@ public static Biome rockyRainforest(HolderGetter<PlacedFeature> placedFeatureGet
         BiomeDefaultFeatures.addDefaultOres(biomeBuilder);
         addFeature(biomeBuilder, GenerationStep.Decoration.UNDERGROUND_ORES, BOPMiscOverworldPlacements.DISK_ORANGE_SAND);
         BiomeDefaultFeatures.addDefaultMushrooms(biomeBuilder);
+        addFeature(biomeBuilder, GenerationStep.Decoration.FLUID_SPRINGS, BOPMiscOverworldPlacements.SPRING_WATER_EXTRA);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, VegetationPlacements.PATCH_SUGAR_CANE);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.TREES_RAINFOREST_CLIFFS);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.FLOWER_RAINFOREST);

diff --git a/src/main/java/biomesoplenty/common/worldgen/BOPSurfaceRuleData.java b/src/main/java/biomesoplenty/common/worldgen/BOPSurfaceRuleData.java
@@ -57,25 +57,47 @@ private static SurfaceRules.RuleSource makeStateRule(Block p_194811_) {
         return SurfaceRules.state(p_194811_.defaultBlockState());
     }
 
-    public static SurfaceRules.RuleSource overworld() {
-        return overworldLike(true, false, true);
-    }
-
-    public static SurfaceRules.RuleSource overworldLike(boolean checkAbovePreliminarySurface, boolean p_198382_, boolean p_198383_)
+    public static SurfaceRules.RuleSource overworld()
     {
         SurfaceRules.RuleSource surfaceRules = SurfaceRules.sequence(
-            makeBOPRules());
+            makeBOPOverworldRules());
 
         ImmutableList.Builder<SurfaceRules.RuleSource> builder = ImmutableList.builder();
 
         SurfaceRules.RuleSource surfacerules$rulesource9 = SurfaceRules.ifTrue(SurfaceRules.abovePreliminarySurface(), surfaceRules);
-        builder.add(checkAbovePreliminarySurface ? surfacerules$rulesource9 : surfaceRules);
+        builder.add(surfacerules$rulesource9);
         return SurfaceRules.sequence(builder.build().toArray((p_198379_) -> {
             return new SurfaceRules.RuleSource[p_198379_];
         }));
     }
 
-    private static SurfaceRules.RuleSource makeBOPRules()
+    public static SurfaceRules.RuleSource nether()
+    {
+        SurfaceRules.ConditionSource surfacerules$conditionsource1 = SurfaceRules.yBlockCheck(VerticalAnchor.absolute(32), 0);
+        SurfaceRules.ConditionSource isTop5Blocks = SurfaceRules.yBlockCheck(VerticalAnchor.belowTop(5), 0);
+        SurfaceRules.ConditionSource isHole = SurfaceRules.hole();
+
+        return SurfaceRules.sequence(
+            SurfaceRules.ifTrue(
+                SurfaceRules.verticalGradient("bedrock_floor", VerticalAnchor.bottom(), VerticalAnchor.aboveBottom(5)),
+                BEDROCK
+            ),
+            SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.verticalGradient("bedrock_roof", VerticalAnchor.belowTop(5), VerticalAnchor.top())), BEDROCK),
+            SurfaceRules.ifTrue(isTop5Blocks, NETHERRACK),
+            makeBOPNetherRules(),
+            SurfaceRules.ifTrue(
+                SurfaceRules.ON_FLOOR,
+                SurfaceRules.sequence(
+                    SurfaceRules.ifTrue(
+                        SurfaceRules.not(surfacerules$conditionsource1),
+                        SurfaceRules.ifTrue(isHole, LAVA)
+                    )
+                )
+            ),
+            NETHERRACK);
+    }
+
+    private static SurfaceRules.RuleSource makeBOPOverworldRules()
     {
         // Conditions
         SurfaceRules.ConditionSource isAtOrAboveWaterLevel = SurfaceRules.waterBlockCheck(-1, 0);
@@ -301,32 +323,6 @@ private static SurfaceRules.RuleSource makeBOPNetherRules()
         );
     }
 
-    public static SurfaceRules.RuleSource nether()
-    {
-        SurfaceRules.ConditionSource surfacerules$conditionsource1 = SurfaceRules.yBlockCheck(VerticalAnchor.absolute(32), 0);
-        SurfaceRules.ConditionSource isTop5Blocks = SurfaceRules.yBlockCheck(VerticalAnchor.belowTop(5), 0);
-        SurfaceRules.ConditionSource isHole = SurfaceRules.hole();
-
-        return SurfaceRules.sequence(
-            SurfaceRules.ifTrue(
-                SurfaceRules.verticalGradient("bedrock_floor", VerticalAnchor.bottom(), VerticalAnchor.aboveBottom(5)),
-                BEDROCK
-            ),
-            SurfaceRules.ifTrue(SurfaceRules.not(SurfaceRules.verticalGradient("bedrock_roof", VerticalAnchor.belowTop(5), VerticalAnchor.top())), BEDROCK),
-            SurfaceRules.ifTrue(isTop5Blocks, NETHERRACK),
-            makeBOPNetherRules(),
-            SurfaceRules.ifTrue(
-                SurfaceRules.ON_FLOOR,
-                SurfaceRules.sequence(
-                    SurfaceRules.ifTrue(
-                        SurfaceRules.not(surfacerules$conditionsource1),
-                        SurfaceRules.ifTrue(isHole, LAVA)
-                    )
-                )
-            ),
-            NETHERRACK);
-    }
-
     private static SurfaceRules.ConditionSource surfaceNoiseAbove(double p_194809_) {
         return SurfaceRules.noiseCondition(Noises.SURFACE, p_194809_ / 8.25D, Double.MAX_VALUE);
     }