Fix Leaves Crash. Closes #56

Potion-Studios · Aug 6, 2024 · 223d6f9 · 223d6f9
1 parent f8c5fac
commit 223d6f9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
   - Prevent Bonemealing when leaves are placed by players/decayable/Persistence Value
     - Reason for this is fruit should only really be growing when the leaves are attached to a tree
 - Fix Fruit Leaves Crash
+- Fix Yucca Trees not being growable on sand tagged blocks
+- Add Cracked Sand and Sandy Dirt to Sand Block and item tags
 
 # 1.0.5-Beta
 - Workaround for a crash involving fruit leaves decay (No Drops)

diff --git a/...main/generated/resources/data/biomeswevegone/worldgen/configured_feature/yucca_tree1.json b/...main/generated/resources/data/biomeswevegone/worldgen/configured_feature/yucca_tree1.json
@@ -4,7 +4,7 @@
     "base_location": "biomeswevegone:features/trees/yucca/yucca_trunk1",
     "can_grow_on_filter": {
       "type": "minecraft:matching_block_tag",
-      "tag": "minecraft:dirt"
+      "tag": "minecraft:sand"
     },
     "can_leaves_place_filter": {
       "type": "minecraft:replaceable"

diff --git a/...main/generated/resources/data/biomeswevegone/worldgen/configured_feature/yucca_tree2.json b/...main/generated/resources/data/biomeswevegone/worldgen/configured_feature/yucca_tree2.json
@@ -4,7 +4,7 @@
     "base_location": "biomeswevegone:features/trees/yucca/yucca_trunk2",
     "can_grow_on_filter": {
       "type": "minecraft:matching_block_tag",
-      "tag": "minecraft:dirt"
+      "tag": "minecraft:sand"
     },
     "can_leaves_place_filter": {
       "type": "minecraft:replaceable"

diff --git a/Common/src/main/generated/resources/data/minecraft/tags/blocks/sand.json b/Common/src/main/generated/resources/data/minecraft/tags/blocks/sand.json
@@ -4,11 +4,13 @@
     "biomeswevegone:blue_sand",
     "biomeswevegone:cracked_red_sand",
     "biomeswevegone:cracked_sand",
+    "biomeswevegone:cracked_sand",
     "biomeswevegone:end_sand",
     "biomeswevegone:pink_sand",
     "biomeswevegone:purple_sand",
     "biomeswevegone:quicksand",
     "biomeswevegone:red_quicksand",
+    "biomeswevegone:sandy_dirt",
     "biomeswevegone:white_sand",
     "biomeswevegone:windswept_sand"
   ]

diff --git a/Common/src/main/generated/resources/data/minecraft/tags/items/sand.json b/Common/src/main/generated/resources/data/minecraft/tags/items/sand.json
@@ -4,11 +4,13 @@
     "biomeswevegone:blue_sand",
     "biomeswevegone:cracked_red_sand",
     "biomeswevegone:cracked_sand",
+    "biomeswevegone:cracked_sand",
     "biomeswevegone:end_sand",
     "biomeswevegone:pink_sand",
     "biomeswevegone:purple_sand",
     "biomeswevegone:quicksand",
     "biomeswevegone:red_quicksand",
+    "biomeswevegone:sandy_dirt",
     "biomeswevegone:white_sand",
     "biomeswevegone:windswept_sand"
   ]

diff --git a/...swevegone/world/level/levelgen/feature/configured/BWGOverworldTreeConfiguredFeatures.java b/...swevegone/world/level/levelgen/feature/configured/BWGOverworldTreeConfiguredFeatures.java
@@ -1587,7 +1587,7 @@ public class BWGOverworldTreeConfiguredFeatures {
                     ),
                     Blocks.OAK_LOG,
                     Blocks.OAK_LEAVES,
-                    BlockTags.DIRT, 4, ImmutableList.of(YUCCA_FRUIT.get())
+                    BlockTags.SAND, 4, ImmutableList.of(YUCCA_FRUIT.get())
             )
     );
 
@@ -1605,7 +1605,7 @@ public class BWGOverworldTreeConfiguredFeatures {
                     ),
                     Blocks.OAK_LOG,
                     Blocks.OAK_LEAVES,
-                    BlockTags.DIRT, 6, ImmutableList.of(YUCCA_FRUIT.get())
+                    BlockTags.SAND, 6, ImmutableList.of(YUCCA_FRUIT.get())
             )
     );
 

diff --git a/...rc/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/TagsGenerator.java b/...rc/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/TagsGenerator.java
@@ -141,6 +141,7 @@ else if (blocks.get() instanceof LeavesBlock)
             tag(BlockTags.MAINTAINS_FARMLAND).add(BWGBlocks.ODDION_CROP.get());
             tag(BlockTags.MINEABLE_WITH_HOE).add(BWGBlocks.ALLIUM_PETAL_BLOCK.get(), BWGBlocks.PINK_ALLIUM_PETAL_BLOCK.get(), BWGBlocks.WHITE_ALLIUM_PETAL_BLOCK.get(), BWGBlocks.ROSE_PETAL_BLOCK.get());
             tag(BlockTags.REPLACEABLE).add(BWGBlocks.PRAIRIE_GRASS.get(), BWGBlocks.TALL_PRAIRIE_GRASS.get(), BWGBlocks.BEACH_GRASS.get(), BWGBlocks.TALL_BEACH_GRASS.get(), BWGBlocks.SKYRIS_VINE.get());
+            tag(BlockTags.SAND).add(BWGBlocks.SANDY_DIRT.get(), BWGBlocks.CRACKED_SAND.get());
             sortTagsAlphabeticallyAndRemoveDuplicateTagEntries(this.builders);
         }