Use painted furniture tags in general furniture tags

Juuxel · Aug 19, 2024 · 5cf2876 · 5cf2876
1 parent 7008567
commit 5cf2876
Show file tree

Hide file tree

Showing 26 changed files with 78 additions and 408 deletions.
diff --git a/common/src/generated/resources/data/adorn/tags/block/benches.json b/common/src/generated/resources/data/adorn/tags/block/benches.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_bench",
     "adorn:crimson_bench",
     "adorn:warped_bench",
-    "adorn:white_bench",
-    "adorn:orange_bench",
-    "adorn:magenta_bench",
-    "adorn:light_blue_bench",
-    "adorn:yellow_bench",
-    "adorn:lime_bench",
-    "adorn:pink_bench",
-    "adorn:gray_bench",
-    "adorn:light_gray_bench",
-    "adorn:cyan_bench",
-    "adorn:purple_bench",
-    "adorn:blue_bench",
-    "adorn:brown_bench",
-    "adorn:green_bench",
-    "adorn:red_bench",
-    "adorn:black_bench",
+    "#adorn:painted_benches",
     { "id": "adorn:biomemakeover/ancient_oak_bench", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_bench", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_bench", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/chairs.json b/common/src/generated/resources/data/adorn/tags/block/chairs.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_chair",
     "adorn:crimson_chair",
     "adorn:warped_chair",
-    "adorn:white_chair",
-    "adorn:orange_chair",
-    "adorn:magenta_chair",
-    "adorn:light_blue_chair",
-    "adorn:yellow_chair",
-    "adorn:lime_chair",
-    "adorn:pink_chair",
-    "adorn:gray_chair",
-    "adorn:light_gray_chair",
-    "adorn:cyan_chair",
-    "adorn:purple_chair",
-    "adorn:blue_chair",
-    "adorn:brown_chair",
-    "adorn:green_chair",
-    "adorn:red_chair",
-    "adorn:black_chair",
+    "#adorn:painted_chairs",
     { "id": "adorn:biomemakeover/ancient_oak_chair", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_chair", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_chair", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/coffee_tables.json b/common/src/generated/resources/data/adorn/tags/block/coffee_tables.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_coffee_table",
     "adorn:crimson_coffee_table",
     "adorn:warped_coffee_table",
-    "adorn:white_coffee_table",
-    "adorn:orange_coffee_table",
-    "adorn:magenta_coffee_table",
-    "adorn:light_blue_coffee_table",
-    "adorn:yellow_coffee_table",
-    "adorn:lime_coffee_table",
-    "adorn:pink_coffee_table",
-    "adorn:gray_coffee_table",
-    "adorn:light_gray_coffee_table",
-    "adorn:cyan_coffee_table",
-    "adorn:purple_coffee_table",
-    "adorn:blue_coffee_table",
-    "adorn:brown_coffee_table",
-    "adorn:green_coffee_table",
-    "adorn:red_coffee_table",
-    "adorn:black_coffee_table",
+    "#adorn:painted_coffee_tables",
     { "id": "adorn:biomemakeover/ancient_oak_coffee_table", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_coffee_table", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_coffee_table", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/drawers.json b/common/src/generated/resources/data/adorn/tags/block/drawers.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_drawer",
     "adorn:crimson_drawer",
     "adorn:warped_drawer",
-    "adorn:white_drawer",
-    "adorn:orange_drawer",
-    "adorn:magenta_drawer",
-    "adorn:light_blue_drawer",
-    "adorn:yellow_drawer",
-    "adorn:lime_drawer",
-    "adorn:pink_drawer",
-    "adorn:gray_drawer",
-    "adorn:light_gray_drawer",
-    "adorn:cyan_drawer",
-    "adorn:purple_drawer",
-    "adorn:blue_drawer",
-    "adorn:brown_drawer",
-    "adorn:green_drawer",
-    "adorn:red_drawer",
-    "adorn:black_drawer",
+    "#adorn:painted_drawers",
     { "id": "adorn:biomemakeover/ancient_oak_drawer", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_drawer", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_drawer", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/kitchen_counters.json b/common/src/generated/resources/data/adorn/tags/block/kitchen_counters.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_kitchen_counter",
     "adorn:crimson_kitchen_counter",
     "adorn:warped_kitchen_counter",
-    "adorn:white_kitchen_counter",
-    "adorn:orange_kitchen_counter",
-    "adorn:magenta_kitchen_counter",
-    "adorn:light_blue_kitchen_counter",
-    "adorn:yellow_kitchen_counter",
-    "adorn:lime_kitchen_counter",
-    "adorn:pink_kitchen_counter",
-    "adorn:gray_kitchen_counter",
-    "adorn:light_gray_kitchen_counter",
-    "adorn:cyan_kitchen_counter",
-    "adorn:purple_kitchen_counter",
-    "adorn:blue_kitchen_counter",
-    "adorn:brown_kitchen_counter",
-    "adorn:green_kitchen_counter",
-    "adorn:red_kitchen_counter",
-    "adorn:black_kitchen_counter",
+    "#adorn:painted_kitchen_counters",
     { "id": "adorn:biomemakeover/ancient_oak_kitchen_counter", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_kitchen_counter", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_kitchen_counter", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/kitchen_cupboards.json b/common/src/generated/resources/data/adorn/tags/block/kitchen_cupboards.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_kitchen_cupboard",
     "adorn:crimson_kitchen_cupboard",
     "adorn:warped_kitchen_cupboard",
-    "adorn:white_kitchen_cupboard",
-    "adorn:orange_kitchen_cupboard",
-    "adorn:magenta_kitchen_cupboard",
-    "adorn:light_blue_kitchen_cupboard",
-    "adorn:yellow_kitchen_cupboard",
-    "adorn:lime_kitchen_cupboard",
-    "adorn:pink_kitchen_cupboard",
-    "adorn:gray_kitchen_cupboard",
-    "adorn:light_gray_kitchen_cupboard",
-    "adorn:cyan_kitchen_cupboard",
-    "adorn:purple_kitchen_cupboard",
-    "adorn:blue_kitchen_cupboard",
-    "adorn:brown_kitchen_cupboard",
-    "adorn:green_kitchen_cupboard",
-    "adorn:red_kitchen_cupboard",
-    "adorn:black_kitchen_cupboard",
+    "#adorn:painted_kitchen_cupboards",
     { "id": "adorn:biomemakeover/ancient_oak_kitchen_cupboard", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_kitchen_cupboard", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_kitchen_cupboard", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/kitchen_sinks.json b/common/src/generated/resources/data/adorn/tags/block/kitchen_sinks.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_kitchen_sink",
     "adorn:crimson_kitchen_sink",
     "adorn:warped_kitchen_sink",
-    "adorn:white_kitchen_sink",
-    "adorn:orange_kitchen_sink",
-    "adorn:magenta_kitchen_sink",
-    "adorn:light_blue_kitchen_sink",
-    "adorn:yellow_kitchen_sink",
-    "adorn:lime_kitchen_sink",
-    "adorn:pink_kitchen_sink",
-    "adorn:gray_kitchen_sink",
-    "adorn:light_gray_kitchen_sink",
-    "adorn:cyan_kitchen_sink",
-    "adorn:purple_kitchen_sink",
-    "adorn:blue_kitchen_sink",
-    "adorn:brown_kitchen_sink",
-    "adorn:green_kitchen_sink",
-    "adorn:red_kitchen_sink",
-    "adorn:black_kitchen_sink",
+    "#adorn:painted_kitchen_sinks",
     { "id": "adorn:biomemakeover/ancient_oak_kitchen_sink", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_kitchen_sink", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_kitchen_sink", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/tables.json b/common/src/generated/resources/data/adorn/tags/block/tables.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_table",
     "adorn:crimson_table",
     "adorn:warped_table",
-    "adorn:white_table",
-    "adorn:orange_table",
-    "adorn:magenta_table",
-    "adorn:light_blue_table",
-    "adorn:yellow_table",
-    "adorn:lime_table",
-    "adorn:pink_table",
-    "adorn:gray_table",
-    "adorn:light_gray_table",
-    "adorn:cyan_table",
-    "adorn:purple_table",
-    "adorn:blue_table",
-    "adorn:brown_table",
-    "adorn:green_table",
-    "adorn:red_table",
-    "adorn:black_table",
+    "#adorn:painted_tables",
     { "id": "adorn:biomemakeover/ancient_oak_table", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_table", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_table", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/wooden_platforms.json b/common/src/generated/resources/data/adorn/tags/block/wooden_platforms.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_platform",
     "adorn:crimson_platform",
     "adorn:warped_platform",
-    "adorn:white_platform",
-    "adorn:orange_platform",
-    "adorn:magenta_platform",
-    "adorn:light_blue_platform",
-    "adorn:yellow_platform",
-    "adorn:lime_platform",
-    "adorn:pink_platform",
-    "adorn:gray_platform",
-    "adorn:light_gray_platform",
-    "adorn:cyan_platform",
-    "adorn:purple_platform",
-    "adorn:blue_platform",
-    "adorn:brown_platform",
-    "adorn:green_platform",
-    "adorn:red_platform",
-    "adorn:black_platform",
+    "#adorn:painted_wood_platforms",
     { "id": "adorn:biomemakeover/ancient_oak_platform", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_platform", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_platform", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/wooden_posts.json b/common/src/generated/resources/data/adorn/tags/block/wooden_posts.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_post",
     "adorn:crimson_post",
     "adorn:warped_post",
-    "adorn:white_post",
-    "adorn:orange_post",
-    "adorn:magenta_post",
-    "adorn:light_blue_post",
-    "adorn:yellow_post",
-    "adorn:lime_post",
-    "adorn:pink_post",
-    "adorn:gray_post",
-    "adorn:light_gray_post",
-    "adorn:cyan_post",
-    "adorn:purple_post",
-    "adorn:blue_post",
-    "adorn:brown_post",
-    "adorn:green_post",
-    "adorn:red_post",
-    "adorn:black_post",
+    "#adorn:painted_wood_posts",
     { "id": "adorn:biomemakeover/ancient_oak_post", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_post", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_post", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/wooden_shelves.json b/common/src/generated/resources/data/adorn/tags/block/wooden_shelves.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_shelf",
     "adorn:crimson_shelf",
     "adorn:warped_shelf",
-    "adorn:white_shelf",
-    "adorn:orange_shelf",
-    "adorn:magenta_shelf",
-    "adorn:light_blue_shelf",
-    "adorn:yellow_shelf",
-    "adorn:lime_shelf",
-    "adorn:pink_shelf",
-    "adorn:gray_shelf",
-    "adorn:light_gray_shelf",
-    "adorn:cyan_shelf",
-    "adorn:purple_shelf",
-    "adorn:blue_shelf",
-    "adorn:brown_shelf",
-    "adorn:green_shelf",
-    "adorn:red_shelf",
-    "adorn:black_shelf",
+    "#adorn:painted_wood_shelves",
     { "id": "adorn:biomemakeover/ancient_oak_shelf", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_shelf", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_shelf", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/block/wooden_steps.json b/common/src/generated/resources/data/adorn/tags/block/wooden_steps.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_step",
     "adorn:crimson_step",
     "adorn:warped_step",
-    "adorn:white_step",
-    "adorn:orange_step",
-    "adorn:magenta_step",
-    "adorn:light_blue_step",
-    "adorn:yellow_step",
-    "adorn:lime_step",
-    "adorn:pink_step",
-    "adorn:gray_step",
-    "adorn:light_gray_step",
-    "adorn:cyan_step",
-    "adorn:purple_step",
-    "adorn:blue_step",
-    "adorn:brown_step",
-    "adorn:green_step",
-    "adorn:red_step",
-    "adorn:black_step",
+    "#adorn:painted_wood_steps",
     { "id": "adorn:biomemakeover/ancient_oak_step", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_step", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_step", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/item/benches.json b/common/src/generated/resources/data/adorn/tags/item/benches.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_bench",
     "adorn:crimson_bench",
     "adorn:warped_bench",
-    "adorn:white_bench",
-    "adorn:orange_bench",
-    "adorn:magenta_bench",
-    "adorn:light_blue_bench",
-    "adorn:yellow_bench",
-    "adorn:lime_bench",
-    "adorn:pink_bench",
-    "adorn:gray_bench",
-    "adorn:light_gray_bench",
-    "adorn:cyan_bench",
-    "adorn:purple_bench",
-    "adorn:blue_bench",
-    "adorn:brown_bench",
-    "adorn:green_bench",
-    "adorn:red_bench",
-    "adorn:black_bench",
+    "#adorn:painted_benches",
     { "id": "adorn:biomemakeover/ancient_oak_bench", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_bench", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_bench", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/item/chairs.json b/common/src/generated/resources/data/adorn/tags/item/chairs.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_chair",
     "adorn:crimson_chair",
     "adorn:warped_chair",
-    "adorn:white_chair",
-    "adorn:orange_chair",
-    "adorn:magenta_chair",
-    "adorn:light_blue_chair",
-    "adorn:yellow_chair",
-    "adorn:lime_chair",
-    "adorn:pink_chair",
-    "adorn:gray_chair",
-    "adorn:light_gray_chair",
-    "adorn:cyan_chair",
-    "adorn:purple_chair",
-    "adorn:blue_chair",
-    "adorn:brown_chair",
-    "adorn:green_chair",
-    "adorn:red_chair",
-    "adorn:black_chair",
+    "#adorn:painted_chairs",
     { "id": "adorn:biomemakeover/ancient_oak_chair", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_chair", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_chair", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/item/coffee_tables.json b/common/src/generated/resources/data/adorn/tags/item/coffee_tables.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_coffee_table",
     "adorn:crimson_coffee_table",
     "adorn:warped_coffee_table",
-    "adorn:white_coffee_table",
-    "adorn:orange_coffee_table",
-    "adorn:magenta_coffee_table",
-    "adorn:light_blue_coffee_table",
-    "adorn:yellow_coffee_table",
-    "adorn:lime_coffee_table",
-    "adorn:pink_coffee_table",
-    "adorn:gray_coffee_table",
-    "adorn:light_gray_coffee_table",
-    "adorn:cyan_coffee_table",
-    "adorn:purple_coffee_table",
-    "adorn:blue_coffee_table",
-    "adorn:brown_coffee_table",
-    "adorn:green_coffee_table",
-    "adorn:red_coffee_table",
-    "adorn:black_coffee_table",
+    "#adorn:painted_coffee_tables",
     { "id": "adorn:biomemakeover/ancient_oak_coffee_table", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_coffee_table", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_coffee_table", "required": false },

diff --git a/common/src/generated/resources/data/adorn/tags/item/drawers.json b/common/src/generated/resources/data/adorn/tags/item/drawers.json
@@ -12,22 +12,7 @@
     "adorn:bamboo_drawer",
     "adorn:crimson_drawer",
     "adorn:warped_drawer",
-    "adorn:white_drawer",
-    "adorn:orange_drawer",
-    "adorn:magenta_drawer",
-    "adorn:light_blue_drawer",
-    "adorn:yellow_drawer",
-    "adorn:lime_drawer",
-    "adorn:pink_drawer",
-    "adorn:gray_drawer",
-    "adorn:light_gray_drawer",
-    "adorn:cyan_drawer",
-    "adorn:purple_drawer",
-    "adorn:blue_drawer",
-    "adorn:brown_drawer",
-    "adorn:green_drawer",
-    "adorn:red_drawer",
-    "adorn:black_drawer",
+    "#adorn:painted_drawers",
     { "id": "adorn:biomemakeover/ancient_oak_drawer", "required": false },
     { "id": "adorn:biomemakeover/blighted_balsa_drawer", "required": false },
     { "id": "adorn:biomemakeover/swamp_cypress_drawer", "required": false },