dried forest world gen changes + dried grass block added

warior456 · Jan 14, 2025 · 2a90d16 · 2a90d16
1 parent 368f8a6
commit 2a90d16
Show file tree

Hide file tree

Showing 18 changed files with 138 additions and 21 deletions.
diff --git a/src/client/java/net/ugi/sculk_depths/SculkDepthsClient.java b/src/client/java/net/ugi/sculk_depths/SculkDepthsClient.java
@@ -113,6 +113,7 @@ public void onInitializeClient() {
 		BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.AURIC_VINES_END, RenderLayer.getCutout());
 
 		BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.QELDRY_BERRY_BUSH, RenderLayer.getCutout());
+		BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.DRIED_GRASS, RenderLayer.getCutout());
 
 
 		ParticleFactoryRegistry.getInstance().register(ModParticleTypes.PENEBRIUM_SPORES, PenebriumSporeParticle.Factory::new);

diff --git a/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java b/src/main/java/net/ugi/sculk_depths/block/ModBlocks.java
@@ -417,6 +417,10 @@ public class ModBlocks {
     public static final Block QELDRY_BERRY_BUSH = registerBlock("qeldry_berry_bush",
         new QeldryBerryBush(AbstractBlock.Settings.copy(Blocks.SWEET_BERRY_BUSH)), ModItemGroup.SCULK_DEPTHS_BLOCKS);
 
+    public static final Block DRIED_GRASS = registerBlock("dried_grass",
+            new ShortPlantBlock(AbstractBlock.Settings.copy(Blocks.SHORT_GRASS)), ModItemGroup.SCULK_DEPTHS_BLOCKS);
+
+
     //auric //TODO check blocksettings
 
 

diff --git a/src/main/resources/assets/sculk_depths/blockstates/dried_grass.json b/src/main/resources/assets/sculk_depths/blockstates/dried_grass.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "sculk_depths:block/dried_grass"
+    }
+  }
+}
diff --git a/src/main/resources/assets/sculk_depths/models/block/dried_grass.json b/src/main/resources/assets/sculk_depths/models/block/dried_grass.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "sculk_depths:block/dried_grass"
+  }
+}
diff --git a/src/main/resources/assets/sculk_depths/models/item/dried_grass.json b/src/main/resources/assets/sculk_depths/models/item/dried_grass.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "sculk_depths:block/dried_grass"
+  }
+}
diff --git a/src/main/resources/assets/sculk_depths/textures/block/dried_grass.png b/src/main/resources/assets/sculk_depths/textures/block/dried_grass.png
diff --git a/src/main/resources/data/sculk_depths/tags/block/dried_valtrox_forest_ground.json b/src/main/resources/data/sculk_depths/tags/block/dried_valtrox_forest_ground.json
@@ -1,5 +1,7 @@
 {
   "values": [
-    "sculk_depths:crumbling_dirt"
+    "sculk_depths:crumbling_dirt",
+    "minecraft:coarse_dirt",
+    "minecraft:packed_mud"
   ]
 }
diff --git a/src/main/resources/data/sculk_depths/worldgen/biome/dried_valtrox_forest.json b/src/main/resources/data/sculk_depths/worldgen/biome/dried_valtrox_forest.json
@@ -44,14 +44,15 @@
     ]
   },
   "features": [
+    [
+      "sculk_depths:dried_valtrox_forest/coarse_dirt_patch",
+      "sculk_depths:dried_valtrox_forest/mud_patch"
+    ],
+    [],
     [],
     [],
     [],
     [
-
-    ],
-    [
-      "sculk_depths:dried_valtrox_forest/coarse_dirt_patch",
       "sculk_depths:dried_valtrox_forest/grass",
       "sculk_depths:dried_valtrox_forest/berry_bush",
       "sculk_depths:dried_valtrox_forest/dead_bush",
@@ -61,8 +62,7 @@
       "sculk_depths:dried_valtrox_forest/stone_pile",
       "sculk_depths:dried_valtrox_forest/dried_valtrox",
       "sculk_depths:dried_valtrox_forest/small_dried_valtrox",
-      "sculk_depths:dried_valtrox_forest/fallen_dried_valtrox",
-      "sculk_depths:dried_valtrox_forest/mud_patch"
+      "sculk_depths:dried_valtrox_forest/fallen_dried_valtrox"
     ]
   ]
 }
diff --git a/.../resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/berry_bush.json b/.../resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/berry_bush.json
@@ -46,6 +46,18 @@
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:matching_blocks",
+        "offset": [
+          0,
+          -1,
+          0
+        ],
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
+      }
     }
   ]
 }
diff --git a/...ain/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/boulder.json b/...ain/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/boulder.json
@@ -31,6 +31,18 @@
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:matching_blocks",
+        "offset": [
+          0,
+          -1,
+          0
+        ],
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
+      }
     }
   ]
 }
diff --git a/...n/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/dead_bush.json b/...n/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/dead_bush.json
@@ -43,6 +43,18 @@
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:matching_blocks",
+        "offset": [
+          0,
+          -1,
+          0
+        ],
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
+      }
     }
   ]
 }
diff --git a/...sources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/dried_valtrox.json b/...sources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/dried_valtrox.json
@@ -136,10 +136,7 @@
           -1,
           0
         ],
-        "blocks": [
-          "sculk_depths:crumbling_dirt",
-          "minecraft:deepslate"
-        ]
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
       }
     },
     {

diff --git a/.../data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/fallen_dried_valtrox.json b/.../data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/fallen_dried_valtrox.json
@@ -150,10 +150,7 @@
           -1,
           0
         ],
-        "blocks": [
-          "sculk_depths:crumbling_dirt",
-          "minecraft:deepslate"
-        ]
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
       }
     },
     {

diff --git a/src/main/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/grass.json b/src/main/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/grass.json
@@ -9,7 +9,7 @@
                        "to_place": {
                          "type": "minecraft:simple_state_provider",
                          "state": {
-                           "Name": "minecraft:short_grass"
+                           "Name": "sculk_depths:dried_grass"
                          }
                        }
                      }
@@ -34,6 +34,7 @@
       "type": "minecraft:count",
       "count": 4
     },
+
     {
       "type": "minecraft:in_square"
     },
@@ -43,6 +44,18 @@
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:matching_blocks",
+        "offset": [
+          0,
+          -1,
+          0
+        ],
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
+      }
     }
   ]
 }
diff --git a/...sources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/large_boulder.json b/...sources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/large_boulder.json
@@ -35,6 +35,18 @@
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:matching_blocks",
+        "offset": [
+          0,
+          -1,
+          0
+        ],
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
+      }
     }
   ]
 }
diff --git a/...s/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/small_dried_valtrox.json b/...s/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/small_dried_valtrox.json
@@ -140,10 +140,7 @@
           -1,
           0
         ],
-        "blocks": [
-          "sculk_depths:crumbling_dirt",
-          "minecraft:deepslate"
-        ]
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
       }
     },
     {

diff --git a/src/main/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/stone.json b/src/main/resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/stone.json
@@ -29,6 +29,21 @@
           }
         },
         "placement": [
+          {
+            "type": "minecraft:block_predicate_filter",
+            "predicate": {
+              "type": "minecraft:matching_blocks",
+              "offset": [
+                0,
+                0,
+                0
+              ],
+              "blocks": [
+                "minecraft:air",
+                "sculk_depths:crumbling_dirt"
+              ]
+            }
+          },
           {
             "type": "minecraft:block_predicate_filter",
             "predicate": {
@@ -38,7 +53,7 @@
                 -1,
                 0
               ],
-              "blocks": "sculk_depths:crumbling_dirt"
+              "blocks": "#sculk_depths:dried_valtrox_forest_ground"
             }
           }
         ]
@@ -62,6 +77,18 @@
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:matching_blocks",
+        "offset": [
+          0,
+          -1,
+          0
+        ],
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
+      }
     }
   ]
 }
diff --git a/.../resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/stone_pile.json b/.../resources/data/sculk_depths/worldgen/placed_feature/dried_valtrox_forest/stone_pile.json
@@ -33,6 +33,18 @@
     },
     {
       "type": "minecraft:biome"
+    },
+    {
+      "type": "minecraft:block_predicate_filter",
+      "predicate": {
+        "type": "minecraft:matching_blocks",
+        "offset": [
+          0,
+          -1,
+          0
+        ],
+        "blocks": "#sculk_depths:dried_valtrox_forest_ground"
+      }
     }
   ]
 }