feat(worldgen): move more to datagen

SpiritGameStudios · Nov 24, 2024 · fccdd97 · fccdd97
1 parent 4bb2295
commit fccdd97
Show file tree

Hide file tree

Showing 21 changed files with 464 additions and 115 deletions.
diff --git a/...n/configured_feature/birch_bees_0002.json → ...n/configured_feature/birch_bees_0002.json b/...n/configured_feature/birch_bees_0002.json → ...n/configured_feature/birch_bees_0002.json
@@ -3,22 +3,29 @@
   "config": {
     "decorators": [
       {
-        "type": "hollow:branch_tree_decorator",
+        "type": "hollow:polypore_tree_decorator",
         "provider": {
           "type": "minecraft:simple_state_provider",
           "state": {
-            "Name": "minecraft:birch_log"
+            "Name": "hollow:polypore",
+            "Properties": {
+              "amount": "1",
+              "facing": "north"
+            }
           }
-        },
-        "max_amount": 2,
-        "probability": 0.5
+        }
       },
       {
-        "type": "hollow:polypore_tree_decorator",
+        "type": "hollow:branch_tree_decorator",
+        "max_amount": 2,
+        "probability": 0.5,
         "provider": {
           "type": "minecraft:simple_state_provider",
           "state": {
-            "Name": "hollow:polypore"
+            "Name": "minecraft:birch_log",
+            "Properties": {
+              "axis": "y"
+            }
           }
         }
       }
@@ -31,11 +38,11 @@
     },
     "foliage_placer": {
       "type": "hollow:blob_with_hanging",
+      "hanging_leaves_chance": 0.25,
+      "hanging_leaves_extension_chance": 0.4,
       "height": 3,
       "offset": 0,
-      "radius": 2,
-      "hanging_leaves_chance": 0.25,
-      "hanging_leaves_extension_chance": 0.4
+      "radius": 2
     },
     "foliage_provider": {
       "type": "minecraft:simple_state_provider",

diff --git a/...rldgen/configured_feature/birch_tall.json → ...rldgen/configured_feature/birch_tall.json b/...rldgen/configured_feature/birch_tall.json → ...rldgen/configured_feature/birch_tall.json
diff --git a/...worldgen/configured_feature/cattails.json → ...worldgen/configured_feature/cattails.json b/...worldgen/configured_feature/cattails.json → ...worldgen/configured_feature/cattails.json
diff --git a/...n/configured_feature/patch_waterlily.json → ...n/configured_feature/patch_waterlily.json b/...n/configured_feature/patch_waterlily.json → ...n/configured_feature/patch_waterlily.json
@@ -1,9 +1,6 @@
 {
   "type": "minecraft:random_patch",
   "config": {
-    "tries": 10,
-    "xz_spread": 7,
-    "y_spread": 3,
     "feature": {
       "feature": {
         "type": "minecraft:simple_block",
@@ -12,16 +9,16 @@
             "type": "minecraft:weighted_state_provider",
             "entries": [
               {
-                "weight": 4,
                 "data": {
                   "Name": "minecraft:lily_pad"
-                }
+                },
+                "weight": 4
               },
               {
-                "weight": 1,
                 "data": {
                   "Name": "hollow:lotus_lilypad"
-                }
+                },
+                "weight": 1
               }
             ]
           }
@@ -36,6 +33,9 @@
           }
         }
       ]
-    }
+    },
+    "tries": 10,
+    "xz_spread": 7,
+    "y_spread": 3
   }
-}
+}
diff --git a/...igured_feature/super_birch_bees_0002.json → ...igured_feature/super_birch_bees_0002.json b/...igured_feature/super_birch_bees_0002.json → ...igured_feature/super_birch_bees_0002.json
@@ -3,22 +3,29 @@
   "config": {
     "decorators": [
       {
-        "type": "hollow:branch_tree_decorator",
+        "type": "hollow:polypore_tree_decorator",
         "provider": {
           "type": "minecraft:simple_state_provider",
           "state": {
-            "Name": "minecraft:birch_log"
+            "Name": "hollow:polypore",
+            "Properties": {
+              "amount": "1",
+              "facing": "north"
+            }
           }
-        },
-        "max_amount": 5,
-        "probability": 0.5
+        }
       },
       {
-        "type": "hollow:polypore_tree_decorator",
+        "type": "hollow:branch_tree_decorator",
+        "max_amount": 5,
+        "probability": 0.5,
         "provider": {
           "type": "minecraft:simple_state_provider",
           "state": {
-            "Name": "hollow:polypore"
+            "Name": "minecraft:birch_log",
+            "Properties": {
+              "axis": "y"
+            }
           }
         }
       }
@@ -31,11 +38,11 @@
     },
     "foliage_placer": {
       "type": "hollow:blob_with_hanging",
+      "hanging_leaves_chance": 0.25,
+      "hanging_leaves_extension_chance": 0.4,
       "height": 3,
       "offset": 0,
-      "radius": 2,
-      "hanging_leaves_chance": 0.25,
-      "hanging_leaves_extension_chance": 0.4
+      "radius": 2
     },
     "foliage_provider": {
       "type": "minecraft:simple_state_provider",

diff --git a/...orldgen/configured_feature/swamp_oak.json → ...orldgen/configured_feature/swamp_oak.json b/...orldgen/configured_feature/swamp_oak.json → ...orldgen/configured_feature/swamp_oak.json
@@ -8,13 +8,16 @@
       },
       {
         "type": "hollow:big_branch_tree_decorator",
+        "probability": 0.5,
         "provider": {
           "type": "minecraft:simple_state_provider",
           "state": {
-            "Name": "minecraft:oak_log"
+            "Name": "minecraft:oak_log",
+            "Properties": {
+              "axis": "y"
+            }
           }
-        },
-        "probability": 0.5
+        }
       }
     ],
     "dirt_provider": {
@@ -25,11 +28,11 @@
     },
     "foliage_placer": {
       "type": "hollow:blob_with_hanging",
+      "hanging_leaves_chance": 1.0,
+      "hanging_leaves_extension_chance": 0.5,
       "height": 3,
       "offset": 0,
-      "radius": 3,
-      "hanging_leaves_chance": 1.0,
-      "hanging_leaves_extension_chance": 0.5
+      "radius": 3
     },
     "foliage_provider": {
       "type": "minecraft:simple_state_provider",

diff --git a/...ldgen/placed_feature/birch_bees_0002.json → ...ldgen/placed_feature/birch_bees_0002.json b/...ldgen/placed_feature/birch_bees_0002.json → ...ldgen/placed_feature/birch_bees_0002.json
diff --git a/...w/worldgen/placed_feature/birch_tall.json → ...w/worldgen/placed_feature/birch_tall.json b/...w/worldgen/placed_feature/birch_tall.json → ...w/worldgen/placed_feature/birch_tall.json
@@ -1,17 +1,21 @@
 {
   "feature": "hollow:birch_tall",
   "placement": [
+    {
+      "type": "minecraft:heightmap",
+      "heightmap": "OCEAN_FLOOR"
+    },
     {
       "type": "minecraft:count",
       "count": {
         "type": "minecraft:weighted_list",
         "distribution": [
           {
-            "data": 3,
+            "data": 10,
             "weight": 9
           },
           {
-            "data": 4,
+            "data": 11,
             "weight": 1
           }
         ]
@@ -25,11 +29,19 @@
       "max_water_depth": 0
     },
     {
-      "type": "minecraft:heightmap",
-      "heightmap": "OCEAN_FLOOR"
+      "type": "minecraft:biome"
     },
     {
-      "type": "minecraft:biome"
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:would_survive",
+        "state": {
+          "Name": "minecraft:birch_sapling",
+          "Properties": {
+            "stage": "0"
+          }
+        }
+      }
     }
   ]
 }
diff --git a/...low/worldgen/placed_feature/cattails.json → ...low/worldgen/placed_feature/cattails.json b/...low/worldgen/placed_feature/cattails.json → ...low/worldgen/placed_feature/cattails.json
@@ -2,18 +2,22 @@
   "feature": "hollow:cattails",
   "placement": [
     {
-      "type": "minecraft:in_square"
+      "type": "minecraft:count",
+      "count": 2
+    },
+    {
+      "type": "minecraft:rarity_filter",
+      "chance": 2
     },
     {
       "type": "minecraft:heightmap",
       "heightmap": "OCEAN_FLOOR_WG"
     },
     {
-      "type": "minecraft:count",
-      "count": 32
+      "type": "minecraft:biome"
     },
     {
-      "type": "minecraft:biome"
+      "type": "minecraft:in_square"
     }
   ]
 }
diff --git a/...orldgen/placed_feature/patch_campion.json → ...orldgen/placed_feature/patch_campion.json b/...orldgen/placed_feature/patch_campion.json → ...orldgen/placed_feature/patch_campion.json
@@ -3,21 +3,21 @@
   "placement": [
     {
       "type": "minecraft:count",
-      "count": 4
+      "count": 1
     },
     {
       "type": "minecraft:rarity_filter",
       "chance": 2
     },
-    {
-      "type": "minecraft:in_square"
-    },
     {
       "type": "minecraft:heightmap",
       "heightmap": "MOTION_BLOCKING"
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:in_square"
     }
   ]
 }
diff --git a/...w/worldgen/placed_feature/patch_twig.json → ...w/worldgen/placed_feature/patch_twig.json b/...w/worldgen/placed_feature/patch_twig.json → ...w/worldgen/placed_feature/patch_twig.json
@@ -9,15 +9,15 @@
       "type": "minecraft:rarity_filter",
       "chance": 2
     },
-    {
-      "type": "minecraft:in_square"
-    },
     {
       "type": "minecraft:heightmap",
       "heightmap": "MOTION_BLOCKING"
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:in_square"
     }
   ]
 }
diff --git a/...ldgen/placed_feature/patch_waterlily.json → ...ldgen/placed_feature/patch_waterlily.json b/...ldgen/placed_feature/patch_waterlily.json → ...ldgen/placed_feature/patch_waterlily.json
@@ -5,15 +5,15 @@
       "type": "minecraft:count",
       "count": 4
     },
-    {
-      "type": "minecraft:in_square"
-    },
     {
       "type": "minecraft:heightmap",
       "heightmap": "WORLD_SURFACE_WG"
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:in_square"
     }
   ]
 }
diff --git a/...placed_feature/super_birch_bees_0002.json → ...placed_feature/super_birch_bees_0002.json b/...placed_feature/super_birch_bees_0002.json → ...placed_feature/super_birch_bees_0002.json
diff --git a/src/main/java/dev/spiritstudios/hollow/block/CattailBlock.java b/src/main/java/dev/spiritstudios/hollow/block/CattailBlock.java
@@ -77,6 +77,17 @@ public BlockState getPlacementState(ItemPlacementContext ctx) {
         return null;
     }
 
+    @Override
+    protected boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
+        boolean canPlace = true;
+        if (state.get(PIECE) == Piece.BASE) {
+            FluidState fluidState = world.getFluidState(pos);
+            if (!fluidState.isIn(FluidTags.WATER) || fluidState.getLevel() != 8) canPlace = false;
+
+        }
+        return super.canPlaceAt(state, world, pos) && canPlace;
+    }
+
     @Override
     protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
         return SHAPE;