Worldgen stuff Im going to bed bye

hybridlabs · Dec 18, 2024 · ba6618a · ba6618a
1 parent 3d96031
commit ba6618a
Show file tree

Hide file tree

Showing 20 changed files with 138 additions and 206 deletions.
diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/configured_feature/anemone_patch.json b/src/generated/resources/data/hybrid-aquatic/worldgen/configured_feature/anemone_patch.json
@@ -20,8 +20,8 @@
         {
           "type": "minecraft:block_predicate_filter",
           "predicate": {
-            "type": "minecraft:matching_fluids",
-            "fluids": "minecraft:water"
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:water"
           }
         }
       ]

diff --git a/...erated/resources/data/hybrid-aquatic/worldgen/configured_feature/brown_seaweed_patch.json b/...erated/resources/data/hybrid-aquatic/worldgen/configured_feature/brown_seaweed_patch.json
@@ -17,8 +17,8 @@
         {
           "type": "minecraft:block_predicate_filter",
           "predicate": {
-            "type": "minecraft:matching_fluids",
-            "fluids": "minecraft:water"
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:water"
           }
         }
       ]

diff --git a/...generated/resources/data/hybrid-aquatic/worldgen/configured_feature/giant_clam_patch.json b/...generated/resources/data/hybrid-aquatic/worldgen/configured_feature/giant_clam_patch.json
@@ -38,8 +38,8 @@
         {
           "type": "minecraft:block_predicate_filter",
           "predicate": {
-            "type": "minecraft:matching_fluids",
-            "fluids": "minecraft:water"
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:water"
           }
         }
       ]

diff --git a/...erated/resources/data/hybrid-aquatic/worldgen/configured_feature/green_seaweed_patch.json b/...erated/resources/data/hybrid-aquatic/worldgen/configured_feature/green_seaweed_patch.json
@@ -17,8 +17,8 @@
         {
           "type": "minecraft:block_predicate_filter",
           "predicate": {
-            "type": "minecraft:matching_fluids",
-            "fluids": "minecraft:water"
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:water"
           }
         }
       ]

diff --git a/...enerated/resources/data/hybrid-aquatic/worldgen/configured_feature/red_seaweed_patch.json b/...enerated/resources/data/hybrid-aquatic/worldgen/configured_feature/red_seaweed_patch.json
@@ -17,8 +17,8 @@
         {
           "type": "minecraft:block_predicate_filter",
           "predicate": {
-            "type": "minecraft:matching_fluids",
-            "fluids": "minecraft:water"
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:water"
           }
         }
       ]

diff --git a/...enerated/resources/data/hybrid-aquatic/worldgen/configured_feature/tube_sponge_patch.json b/...enerated/resources/data/hybrid-aquatic/worldgen/configured_feature/tube_sponge_patch.json
@@ -20,8 +20,8 @@
         {
           "type": "minecraft:block_predicate_filter",
           "predicate": {
-            "type": "minecraft:matching_fluids",
-            "fluids": "minecraft:water"
+            "type": "minecraft:matching_blocks",
+            "blocks": "minecraft:water"
           }
         }
       ]

diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/anemone_patch.json b/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/anemone_patch.json
@@ -11,9 +11,6 @@
     {
       "type": "minecraft:count",
       "count": 1
-    },
-    {
-      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/brine_lake.json b/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/brine_lake.json
@@ -5,15 +5,24 @@
       "type": "minecraft:in_square"
     },
     {
-      "type": "minecraft:heightmap",
-      "heightmap": "OCEAN_FLOOR"
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:uniform",
+        "max_inclusive": {
+          "absolute": 256
+        },
+        "min_inclusive": {
+          "above_bottom": 0
+        }
+      }
     },
     {
-      "type": "minecraft:count",
-      "count": 4
+      "type": "minecraft:surface_relative_threshold_filter",
+      "heightmap": "OCEAN_FLOOR_WG"
     },
     {
-      "type": "minecraft:biome"
+      "type": "minecraft:count",
+      "count": 1
     }
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/brown_seaweed_patch.json b/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/brown_seaweed_patch.json
@@ -11,9 +11,6 @@
     {
       "type": "minecraft:count",
       "count": 1
-    },
-    {
-      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/...enerated/resources/data/hybrid-aquatic/worldgen/placed_feature/deep_ocean_vegetation.json b/...enerated/resources/data/hybrid-aquatic/worldgen/placed_feature/deep_ocean_vegetation.json
@@ -3,19 +3,16 @@
   "placement": [
     {
       "type": "minecraft:noise_based_count",
-      "noise_factor": 400.0,
+      "noise_factor": 200.0,
       "noise_offset": 0.0,
-      "noise_to_count_ratio": 20
+      "noise_to_count_ratio": 40
     },
     {
       "type": "minecraft:in_square"
     },
     {
       "type": "minecraft:heightmap",
       "heightmap": "OCEAN_FLOOR_WG"
-    },
-    {
-      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/giant_clam_patch.json b/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/giant_clam_patch.json
@@ -11,9 +11,6 @@
     {
       "type": "minecraft:count",
       "count": 1
-    },
-    {
-      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/green_seaweed_patch.json b/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/green_seaweed_patch.json
@@ -11,9 +11,6 @@
     {
       "type": "minecraft:count",
       "count": 1
-    },
-    {
-      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/message_in_a_bottle.json b/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/message_in_a_bottle.json
@@ -11,9 +11,6 @@
     {
       "type": "minecraft:rarity_filter",
       "chance": 150
-    },
-    {
-      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/red_seaweed_patch.json b/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/red_seaweed_patch.json
@@ -11,9 +11,6 @@
     {
       "type": "minecraft:count",
       "count": 1
-    },
-    {
-      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/sponge_patch.json b/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/sponge_patch.json
@@ -11,9 +11,6 @@
     {
       "type": "minecraft:count",
       "count": 1
-    },
-    {
-      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/thermal_vent_patch.json b/src/generated/resources/data/hybrid-aquatic/worldgen/placed_feature/thermal_vent_patch.json
@@ -3,7 +3,7 @@
   "placement": [
     {
       "type": "minecraft:noise_based_count",
-      "noise_factor": 200.0,
+      "noise_factor": 100.0,
       "noise_offset": 0.0,
       "noise_to_count_ratio": 5
     },
@@ -30,9 +30,6 @@
     {
       "type": "minecraft:count",
       "count": 1
-    },
-    {
-      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/ConfiguredFeatureProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/ConfiguredFeatureProvider.kt
@@ -10,7 +10,6 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider
 import net.minecraft.block.BlockState
 import net.minecraft.block.Blocks
 import net.minecraft.block.HorizontalFacingBlock
-import net.minecraft.fluid.Fluids
 import net.minecraft.registry.RegistryWrapper
 import net.minecraft.registry.entry.RegistryEntryList
 import net.minecraft.state.property.Properties
@@ -38,7 +37,7 @@ class ConfiguredFeatureProvider(output: FabricDataOutput, registriesFuture: Comp
                         SimpleBlockFeatureConfig(
                             BlockStateProvider.of(HybridAquaticBlocks.ANEMONE.defaultState)
                         ),
-                        BlockPredicate.matchingFluids(Fluids.WATER)
+                        BlockPredicate.matchingBlocks(Blocks.WATER)
                     )
                 )
             )
@@ -54,7 +53,7 @@ class ConfiguredFeatureProvider(output: FabricDataOutput, registriesFuture: Comp
                         SimpleBlockFeatureConfig(
                             BlockStateProvider.of(HybridAquaticBlocks.BROWN_SEAWEED.defaultState)
                         ),
-                        BlockPredicate.matchingFluids(Fluids.WATER)
+                        BlockPredicate.matchingBlocks(Blocks.WATER)
                     )
                 )
             )
@@ -70,7 +69,7 @@ class ConfiguredFeatureProvider(output: FabricDataOutput, registriesFuture: Comp
                         SimpleBlockFeatureConfig(
                             BlockStateProvider.of(HybridAquaticBlocks.RED_SEAWEED.defaultState)
                         ),
-                        BlockPredicate.matchingFluids(Fluids.WATER)
+                        BlockPredicate.matchingBlocks(Blocks.WATER)
                     )
                 )
             )
@@ -86,7 +85,7 @@ class ConfiguredFeatureProvider(output: FabricDataOutput, registriesFuture: Comp
                         SimpleBlockFeatureConfig(
                             BlockStateProvider.of(HybridAquaticBlocks.GREEN_SEAWEED.defaultState)
                         ),
-                        BlockPredicate.matchingFluids(Fluids.WATER)
+                        BlockPredicate.matchingBlocks(Blocks.WATER)
                     )
                 )
             )
@@ -104,7 +103,7 @@ class ConfiguredFeatureProvider(output: FabricDataOutput, registriesFuture: Comp
                         SimpleBlockFeatureConfig(
                             BlockStateProvider.of(HybridAquaticBlocks.TUBE_SPONGE.defaultState.with(Properties.WATERLOGGED, true))
                         ),
-                        BlockPredicate.matchingFluids(Fluids.WATER)
+                        BlockPredicate.matchingBlocks(Blocks.WATER)
                     )
                 )
             )
@@ -126,7 +125,7 @@ class ConfiguredFeatureProvider(output: FabricDataOutput, registriesFuture: Comp
                                     .build()
                             )
                         ),
-                        BlockPredicate.matchingFluids(Fluids.WATER)
+                        BlockPredicate.matchingBlocks(Blocks.WATER)
                     )
                 )
             )