added clay soil, regenerated data

supermassimo · supermassimo · commit 57d587bde3ad · 2025-05-22T00:49:34.000-03:00
diff --git a/src/generated/resources/.cache/06c8634dbcb9eb0304a95e1ace9f06130b969502 b/src/generated/resources/.cache/06c8634dbcb9eb0304a95e1ace9f06130b969502
@@ -1,4 +1,4 @@
-// 1.20.1	2024-07-12T23:59:08.2438622	Block States: dynamictrees
+// 1.20.1	2025-05-22T00:45:53.7416775	Block States: dynamictrees
 ba3df68d28fba8cf21f652ea60b7575c7915d267 assets/dynamictrees/blockstates/acacia_branch.json
 2606791521eac27fa77ebbeeea442b8073802a51 assets/dynamictrees/blockstates/acacia_leaves.json
 28a0cd7b38e1a854acd4f0c477573a9460811d82 assets/dynamictrees/blockstates/acacia_sapling.json
@@ -34,6 +34,7 @@ ec8ab110c9a7deb973ad5c223fa05d2391f77c44 assets/dynamictrees/blockstates/mangrov
 1128f60fc8e5148d030661dbf3893731dd50f56d assets/dynamictrees/blockstates/oak_sapling.json
 9b73d2419e07259eb9681640ac018a6aeb7e7e93 assets/dynamictrees/blockstates/oak_undergrowth_leaves.json
 7b5a93d7d6c8cfb86a4412bcec6863be1f79237a assets/dynamictrees/blockstates/rooty_brown_terracotta.json
+8f50fddbdf92c5679a317fc2970f5423729dd017 assets/dynamictrees/blockstates/rooty_clay.json
 cd82dc2f30388797f1624419c6d711744d239c46 assets/dynamictrees/blockstates/rooty_coarse_dirt.json
 36b290f9517934141fd31eafe34c90b236d422ca assets/dynamictrees/blockstates/rooty_crimson_nylium.json
 3f1a2a51418086f3b07c7bf9c07c577b7686a7d3 assets/dynamictrees/blockstates/rooty_dirt.json
@@ -90,14 +91,14 @@ ef4b7408b4b4974a798c340818a91a4c8b1b4035 assets/dynamictrees/models/block/mangro
 714135ac04b9f4aa93a734605f64fedd2d8d9170 assets/dynamictrees/models/block/mangrove_roots.json
 4c832ea92b8398899623603db69a2babc020744f assets/dynamictrees/models/block/mangrove_roots_filled.json
 5e4f53ad61cabb371357397906ee7dc5d509966a assets/dynamictrees/models/block/oak_branch.json
-6553ecc912e1c9e94f830f407978a12070aa3c5e assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius1.json
-a50406e9a273e88502bfc8c4e5ab7dc74d65d246 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius2.json
-919fbba491e265702636b461b027e9a63a83b1d9 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius3.json
-9fd80a5971d7e8022ca49a6594d2d74285689588 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius4.json
-d65648547bbb20740572da96935f3934506379e2 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius5.json
-e5a5baf1543cc816d381d65dc95f290d6576eecc assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius6.json
-15d1da18826bfbc5536514a94fddf1e56284e246 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius7.json
-fcdb9bc5efbdbb4e4fafca3defa3324afb1ecbfc assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius8.json
+8ea08aa02e3251b15ceca12cbe53eb1073804837 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius1.json
+a0dafd5f979f73a239d327be5c8c824321ea612a assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius2.json
+86da2b98be24548bfc7ec9a6feeed2e23a4160cf assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius3.json
+e35f754a4f38f042d421911d2f455f2e495eba29 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius4.json
+2e1dee32bc222a441819acff4adfff8ba49ce187 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius5.json
+2b0dafdc970831e6918f86c91d35482dbfa505f0 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius6.json
+0a31bb83566268e327ffb80d3eb9aed3ddbf1e67 assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius7.json
+823d2c91308dc98192b4e111f566b907519430ca assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius8.json
 01b3a87546301bb658752a3d8e895a56c122edc0 assets/dynamictrees/models/block/saplings/acacia.json
 7a849487d3813ef0bcd33e55299ef4e396af2777 assets/dynamictrees/models/block/saplings/apple_oak.json
 b465c30f23ed200e7d6b139fa4ba3e6ce2e66ca6 assets/dynamictrees/models/block/saplings/azalea.json
diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,4 +1,4 @@
-// 1.20.1	2024-07-12T23:59:08.2512879	Loot Tables
+// 1.20.1	2025-05-22T00:45:53.7458363	Loot Tables
 93c6fd50af9d24b45db203fe16a3aa37d576caf8 data/dynamictrees/loot_tables/blocks/acacia_leaves.json
 2ac66fbd2e0b38eaabe31a9fac03c037bf9384b6 data/dynamictrees/loot_tables/blocks/apple.json
 1de7ef929cc5c2b2d483b3ed25ceaf424eee313e data/dynamictrees/loot_tables/blocks/azalea_leaves.json
@@ -7,7 +7,7 @@ eacb255ec5cb78ded08f2be7a6b59c6f9157c7e7 data/dynamictrees/loot_tables/blocks/bi
 ef1fa976875bf29597a90aaf803c09ff2f2ba1be data/dynamictrees/loot_tables/blocks/cocoa.json
 18f016216fefeff85a27e857b47e295c07b651cb data/dynamictrees/loot_tables/blocks/crimson_wart.json
 1ec312242a94eafcc4c39312c096f55ec82262b6 data/dynamictrees/loot_tables/blocks/dark_oak_leaves.json
-62ec36c9f19ab2588bf0fcb7627c2c5b1884ae9d data/dynamictrees/loot_tables/blocks/flowering_azalea_leaves.json
+88740a319761b6503c6ac23e90a2c296de1f6f06 data/dynamictrees/loot_tables/blocks/flowering_azalea_leaves.json
 5339bbabe643ce9bb6d5ec9277c416cd28c43682 data/dynamictrees/loot_tables/blocks/jungle_leaves.json
 5a92eeb178bb190a56ff30b35d8b4122193e0c14 data/dynamictrees/loot_tables/blocks/jungle_undergrowth_leaves.json
 8043f7b4b6f322831d4e25277e9fffd37a5d0f49 data/dynamictrees/loot_tables/blocks/mangrove_leaves.json
diff --git a/src/generated/resources/.cache/82dbd4df3226a8f2ebd864eec8c96cc5d0540266 b/src/generated/resources/.cache/82dbd4df3226a8f2ebd864eec8c96cc5d0540266
@@ -1,13 +1,13 @@
-// 1.20.1	2024-07-10T11:59:29.1213165	dynamictrees DT Block Tags
+// 1.20.1	2025-05-22T00:45:53.7448339	dynamictrees DT Block Tags
 89563876084509cc93d596004b67e412d78ebf3b data/dynamictrees/tags/blocks/aerial_roots_rooty_soil.json
 0852fd1f90777eeab7126995157c4b1242a44700 data/dynamictrees/tags/blocks/branches.json
 a2572689ed7e96c6b505b27867c5ef842778f52c data/dynamictrees/tags/blocks/branches_that_burn.json
-fb9592cb9de4bc25e833a8586daf2c3b6767aacb data/dynamictrees/tags/blocks/foliage.json
+1558ac65433baace270c8e51a699c1066b44ffed data/dynamictrees/tags/blocks/foliage.json
 265c9a52b7eb0cfd09154318ed7e17789980c9a6 data/dynamictrees/tags/blocks/fungus_branches.json
 a86aa6fa2f09d162f8300475ee0d944102f6334c data/dynamictrees/tags/blocks/fungus_caps.json
 d5e282c9638555a573bc736c203eaade162ca0ce data/dynamictrees/tags/blocks/leaves.json
 40de46457ac325dc281c1862bf4d99eb12daec0f data/dynamictrees/tags/blocks/roots.json
-52baa924e0817cb9cbaca436202fd66c846258b1 data/dynamictrees/tags/blocks/rooty_soil.json
+b9b20f9632fe9f3828dd8ab5805608e6f804f9b3 data/dynamictrees/tags/blocks/rooty_soil.json
 e2d1c787e1759b184c5cb639323da9972bd6a2c7 data/dynamictrees/tags/blocks/saplings.json
 ef507377a99fc5ec5cc3ca9cdd35486ea719a119 data/dynamictrees/tags/blocks/stripped_branches.json
 d6421789834ba436877531e157556da425ae369d data/dynamictrees/tags/blocks/stripped_branches_that_burn.json
diff --git a/src/generated/resources/assets/dynamictrees/blockstates/rooty_clay.json b/src/generated/resources/assets/dynamictrees/blockstates/rooty_clay.json
@@ -0,0 +1,14 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "minecraft:block/clay"
+      }
+    },
+    {
+      "apply": {
+        "model": "dynamictrees:block/roots"
+      }
+    }
+  ]
+}
diff --git a/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius1.json b/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius1.json
@@ -2,8 +2,8 @@
   "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius1",
   "textures": {
     "end": "minecraft:block/mangrove_log_top",
-    "side": "minecraft:block/mangrove_log",
-    "overlay": "block/mangrove_roots_side",
-    "overlay_end": "block/mangrove_roots_top"
+    "overlay": "minecraft:block/mangrove_roots_side",
+    "overlay_end": "minecraft:block/mangrove_roots_top",
+    "side": "minecraft:block/mangrove_log"
   }
 }
diff --git a/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius2.json b/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius2.json
@@ -2,8 +2,8 @@
   "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius2",
   "textures": {
     "end": "minecraft:block/mangrove_log_top",
-    "side": "minecraft:block/mangrove_log",
-    "overlay": "block/mangrove_roots_side",
-    "overlay_end": "block/mangrove_roots_top"
+    "overlay": "minecraft:block/mangrove_roots_side",
+    "overlay_end": "minecraft:block/mangrove_roots_top",
+    "side": "minecraft:block/mangrove_log"
   }
 }
diff --git a/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius3.json b/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius3.json
@@ -2,8 +2,8 @@
   "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius3",
   "textures": {
     "end": "minecraft:block/mangrove_log_top",
-    "side": "minecraft:block/mangrove_log",
-    "overlay": "block/mangrove_roots_side",
-    "overlay_end": "block/mangrove_roots_top"
+    "overlay": "minecraft:block/mangrove_roots_side",
+    "overlay_end": "minecraft:block/mangrove_roots_top",
+    "side": "minecraft:block/mangrove_log"
   }
 }
diff --git a/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius4.json b/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius4.json
@@ -2,8 +2,8 @@
   "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius4",
   "textures": {
     "end": "minecraft:block/mangrove_log_top",
-    "side": "minecraft:block/mangrove_log",
-    "overlay": "block/mangrove_roots_side",
-    "overlay_end": "block/mangrove_roots_top"
+    "overlay": "minecraft:block/mangrove_roots_side",
+    "overlay_end": "minecraft:block/mangrove_roots_top",
+    "side": "minecraft:block/mangrove_log"
   }
 }
diff --git a/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius5.json b/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius5.json
@@ -2,8 +2,8 @@
   "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius5",
   "textures": {
     "end": "minecraft:block/mangrove_log_top",
-    "side": "minecraft:block/mangrove_log",
-    "overlay": "block/mangrove_roots_side",
-    "overlay_end": "block/mangrove_roots_top"
+    "overlay": "minecraft:block/mangrove_roots_side",
+    "overlay_end": "minecraft:block/mangrove_roots_top",
+    "side": "minecraft:block/mangrove_log"
   }
 }
diff --git a/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius6.json b/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius6.json
@@ -2,8 +2,8 @@
   "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius6",
   "textures": {
     "end": "minecraft:block/mangrove_log_top",
-    "side": "minecraft:block/mangrove_log",
-    "overlay": "block/mangrove_roots_side",
-    "overlay_end": "block/mangrove_roots_top"
+    "overlay": "minecraft:block/mangrove_roots_side",
+    "overlay_end": "minecraft:block/mangrove_roots_top",
+    "side": "minecraft:block/mangrove_log"
   }
 }
diff --git a/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius7.json b/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius7.json
@@ -2,8 +2,8 @@
   "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius7",
   "textures": {
     "end": "minecraft:block/mangrove_log_top",
-    "side": "minecraft:block/mangrove_log",
-    "overlay": "block/mangrove_roots_side",
-    "overlay_end": "block/mangrove_roots_top"
+    "overlay": "minecraft:block/mangrove_roots_side",
+    "overlay_end": "minecraft:block/mangrove_roots_top",
+    "side": "minecraft:block/mangrove_log"
   }
 }
diff --git a/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius8.json b/src/generated/resources/assets/dynamictrees/models/block/rooty_mangrove_aerial_roots_radius8.json
@@ -2,8 +2,8 @@
   "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius8",
   "textures": {
     "end": "minecraft:block/mangrove_log_top",
-    "side": "minecraft:block/mangrove_log",
-    "overlay": "block/mangrove_roots_side",
-    "overlay_end": "block/mangrove_roots_top"
+    "overlay": "minecraft:block/mangrove_roots_side",
+    "overlay_end": "minecraft:block/mangrove_roots_top",
+    "side": "minecraft:block/mangrove_log"
   }
 }
diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/foliage.json b/src/generated/resources/data/dynamictrees/tags/blocks/foliage.json
@@ -8,6 +8,9 @@
     "minecraft:brown_mushroom",
     "minecraft:red_mushroom",
     "minecraft:lily_pad",
+    "minecraft:azalea",
+    "minecraft:flowering_azalea",
+    "minecraft:moss_carpet",
     "#minecraft:flowers",
     "#minecraft:replaceable_by_trees"
   ]
diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/rooty_soil.json b/src/generated/resources/data/dynamictrees/tags/blocks/rooty_soil.json
@@ -1,6 +1,7 @@
 {
   "values": [
     "dynamictrees:rooty_brown_terracotta",
+    "dynamictrees:rooty_clay",
     "dynamictrees:rooty_coarse_dirt",
     "dynamictrees:rooty_crimson_nylium",
     "dynamictrees:rooty_dirt",
diff --git a/src/main/resources/trees/dynamictrees/soil_properties/clay.json b/src/main/resources/trees/dynamictrees/soil_properties/clay.json
@@ -0,0 +1,4 @@
+{
+  "primitive_soil": "clay",
+  "acceptable_soils": [ "clay_like" ]
+}

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`"parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius1",`
`3`	`3`	`"textures": {`
`4`	`4`	`"end": "minecraft:block/mangrove_log_top",`
`5`		`- "side": "minecraft:block/mangrove_log",`
`6`		`- "overlay": "block/mangrove_roots_side",`
`7`		`- "overlay_end": "block/mangrove_roots_top"`
	`5`	`+ "overlay": "minecraft:block/mangrove_roots_side",`
	`6`	`+ "overlay_end": "minecraft:block/mangrove_roots_top",`
	`7`	`+ "side": "minecraft:block/mangrove_log"`
`8`	`8`	`}`
`9`	`9`	`}`