From 7008567c00d48b1466c211dfc7b0fd833d9d70d5 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:47:07 +0300 Subject: [PATCH] Add tags for painted furniture --- .../adorn/tags/block/painted_benches.json | 20 ++++++++++++++ .../data/adorn/tags/block/painted_chairs.json | 20 ++++++++++++++ .../tags/block/painted_coffee_tables.json | 20 ++++++++++++++ .../adorn/tags/block/painted_drawers.json | 20 ++++++++++++++ .../tags/block/painted_kitchen_counters.json | 20 ++++++++++++++ .../tags/block/painted_kitchen_cupboards.json | 20 ++++++++++++++ .../tags/block/painted_kitchen_sinks.json | 20 ++++++++++++++ .../data/adorn/tags/block/painted_tables.json | 20 ++++++++++++++ .../tags/block/painted_wood_platforms.json | 20 ++++++++++++++ .../adorn/tags/block/painted_wood_posts.json | 20 ++++++++++++++ .../tags/block/painted_wood_shelves.json | 20 ++++++++++++++ .../adorn/tags/block/painted_wood_steps.json | 20 ++++++++++++++ .../data/adorn/tags/item/painted_benches.json | 20 ++++++++++++++ .../data/adorn/tags/item/painted_chairs.json | 20 ++++++++++++++ .../tags/item/painted_coffee_tables.json | 20 ++++++++++++++ .../data/adorn/tags/item/painted_drawers.json | 20 ++++++++++++++ .../tags/item/painted_kitchen_counters.json | 20 ++++++++++++++ .../tags/item/painted_kitchen_cupboards.json | 20 ++++++++++++++ .../tags/item/painted_kitchen_sinks.json | 20 ++++++++++++++ .../data/adorn/tags/item/painted_tables.json | 20 ++++++++++++++ .../tags/item/painted_wood_platforms.json | 20 ++++++++++++++ .../adorn/tags/item/painted_wood_posts.json | 20 ++++++++++++++ .../adorn/tags/item/painted_wood_shelves.json | 20 ++++++++++++++ .../adorn/tags/item/painted_wood_steps.json | 20 ++++++++++++++ .../main/java/juuxel/adorn/lib/AdornTags.java | 12 +++++++++ .../resources/assets/adorn/lang/en_us.json | 24 +++++++++++++++++ .../adorn/data/AdornBlockTagGenerator.java | 27 +++++++++++++++++++ .../adorn/data/AdornItemTagGenerator.java | 12 +++++++++ 28 files changed, 555 insertions(+) create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_benches.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_chairs.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_coffee_tables.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_drawers.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_kitchen_counters.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_kitchen_cupboards.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_kitchen_sinks.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_tables.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_wood_platforms.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_wood_posts.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_wood_shelves.json create mode 100644 common/src/generated/resources/data/adorn/tags/block/painted_wood_steps.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_benches.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_chairs.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_coffee_tables.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_drawers.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_kitchen_counters.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_kitchen_cupboards.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_kitchen_sinks.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_tables.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_wood_platforms.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_wood_posts.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_wood_shelves.json create mode 100644 common/src/generated/resources/data/adorn/tags/item/painted_wood_steps.json diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_benches.json b/common/src/generated/resources/data/adorn/tags/block/painted_benches.json new file mode 100644 index 000000000..aa8c6922c --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_benches.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_chairs.json b/common/src/generated/resources/data/adorn/tags/block/painted_chairs.json new file mode 100644 index 000000000..1dbbc8e55 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_chairs.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_coffee_tables.json b/common/src/generated/resources/data/adorn/tags/block/painted_coffee_tables.json new file mode 100644 index 000000000..1429d4efd --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_coffee_tables.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_drawers.json b/common/src/generated/resources/data/adorn/tags/block/painted_drawers.json new file mode 100644 index 000000000..dc1c5dca4 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_drawers.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_kitchen_counters.json b/common/src/generated/resources/data/adorn/tags/block/painted_kitchen_counters.json new file mode 100644 index 000000000..b0eabc433 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_kitchen_counters.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_kitchen_cupboards.json b/common/src/generated/resources/data/adorn/tags/block/painted_kitchen_cupboards.json new file mode 100644 index 000000000..40bcae060 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_kitchen_cupboards.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_kitchen_sinks.json b/common/src/generated/resources/data/adorn/tags/block/painted_kitchen_sinks.json new file mode 100644 index 000000000..30789f3ad --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_kitchen_sinks.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_tables.json b/common/src/generated/resources/data/adorn/tags/block/painted_tables.json new file mode 100644 index 000000000..b70cb5b20 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_tables.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_wood_platforms.json b/common/src/generated/resources/data/adorn/tags/block/painted_wood_platforms.json new file mode 100644 index 000000000..297088249 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_wood_platforms.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_wood_posts.json b/common/src/generated/resources/data/adorn/tags/block/painted_wood_posts.json new file mode 100644 index 000000000..4b603f935 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_wood_posts.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_wood_shelves.json b/common/src/generated/resources/data/adorn/tags/block/painted_wood_shelves.json new file mode 100644 index 000000000..5bcd7959d --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_wood_shelves.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/block/painted_wood_steps.json b/common/src/generated/resources/data/adorn/tags/block/painted_wood_steps.json new file mode 100644 index 000000000..72c205d55 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/block/painted_wood_steps.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_benches.json b/common/src/generated/resources/data/adorn/tags/item/painted_benches.json new file mode 100644 index 000000000..aa8c6922c --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_benches.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_chairs.json b/common/src/generated/resources/data/adorn/tags/item/painted_chairs.json new file mode 100644 index 000000000..1dbbc8e55 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_chairs.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_coffee_tables.json b/common/src/generated/resources/data/adorn/tags/item/painted_coffee_tables.json new file mode 100644 index 000000000..1429d4efd --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_coffee_tables.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_drawers.json b/common/src/generated/resources/data/adorn/tags/item/painted_drawers.json new file mode 100644 index 000000000..dc1c5dca4 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_drawers.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_kitchen_counters.json b/common/src/generated/resources/data/adorn/tags/item/painted_kitchen_counters.json new file mode 100644 index 000000000..b0eabc433 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_kitchen_counters.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_kitchen_cupboards.json b/common/src/generated/resources/data/adorn/tags/item/painted_kitchen_cupboards.json new file mode 100644 index 000000000..40bcae060 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_kitchen_cupboards.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_kitchen_sinks.json b/common/src/generated/resources/data/adorn/tags/item/painted_kitchen_sinks.json new file mode 100644 index 000000000..30789f3ad --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_kitchen_sinks.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_tables.json b/common/src/generated/resources/data/adorn/tags/item/painted_tables.json new file mode 100644 index 000000000..b70cb5b20 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_tables.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_wood_platforms.json b/common/src/generated/resources/data/adorn/tags/item/painted_wood_platforms.json new file mode 100644 index 000000000..297088249 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_wood_platforms.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_wood_posts.json b/common/src/generated/resources/data/adorn/tags/item/painted_wood_posts.json new file mode 100644 index 000000000..4b603f935 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_wood_posts.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_wood_shelves.json b/common/src/generated/resources/data/adorn/tags/item/painted_wood_shelves.json new file mode 100644 index 000000000..5bcd7959d --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_wood_shelves.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/adorn/tags/item/painted_wood_steps.json b/common/src/generated/resources/data/adorn/tags/item/painted_wood_steps.json new file mode 100644 index 000000000..72c205d55 --- /dev/null +++ b/common/src/generated/resources/data/adorn/tags/item/painted_wood_steps.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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" + ] +} \ No newline at end of file diff --git a/common/src/main/java/juuxel/adorn/lib/AdornTags.java b/common/src/main/java/juuxel/adorn/lib/AdornTags.java index 78efd1695..d578191c8 100644 --- a/common/src/main/java/juuxel/adorn/lib/AdornTags.java +++ b/common/src/main/java/juuxel/adorn/lib/AdornTags.java @@ -40,6 +40,18 @@ public final class AdornTags { public static final TagPair PAINTED_WOOD_FENCE_GATES = blockAndItem("painted_wood_fence_gates"); public static final TagPair PAINTED_WOOD_PRESSURE_PLATES = blockAndItem("painted_wood_pressure_plates"); public static final TagPair PAINTED_WOOD_BUTTONS = blockAndItem("painted_wood_buttons"); + public static final TagPair PAINTED_CHAIRS = blockAndItem("painted_chairs"); + public static final TagPair PAINTED_TABLES = blockAndItem("painted_tables"); + public static final TagPair PAINTED_DRAWERS = blockAndItem("painted_drawers"); + public static final TagPair PAINTED_BENCHES = blockAndItem("painted_benches"); + public static final TagPair PAINTED_KITCHEN_COUNTERS = blockAndItem("painted_kitchen_counters"); + public static final TagPair PAINTED_KITCHEN_CUPBOARDS = blockAndItem("painted_kitchen_cupboards"); + public static final TagPair PAINTED_KITCHEN_SINKS = blockAndItem("painted_kitchen_sinks"); + public static final TagPair PAINTED_WOOD_POSTS = blockAndItem("painted_wood_posts"); + public static final TagPair PAINTED_WOOD_PLATFORMS = blockAndItem("painted_wood_platforms"); + public static final TagPair PAINTED_WOOD_STEPS = blockAndItem("painted_wood_steps"); + public static final TagPair PAINTED_WOOD_SHELVES = blockAndItem("painted_wood_shelves"); + public static final TagPair PAINTED_COFFEE_TABLES = blockAndItem("painted_coffee_tables"); public static final TagKey COPPER_PIPES_CONNECT_TO = block("copper_pipes_connect_to"); public static final TagKey WATERING_CAN_FERTILIZERS = item("watering_can_fertilizers"); diff --git a/common/src/main/resources/assets/adorn/lang/en_us.json b/common/src/main/resources/assets/adorn/lang/en_us.json index d2bce1b0e..c7dde1ae8 100644 --- a/common/src/main/resources/assets/adorn/lang/en_us.json +++ b/common/src/main/resources/assets/adorn/lang/en_us.json @@ -1789,13 +1789,25 @@ "tag.block.adorn.kitchen_counters": "Kitchen Counters", "tag.block.adorn.kitchen_cupboards": "Kitchen Cupboards", "tag.block.adorn.kitchen_sinks": "Kitchen Sinks", + "tag.block.adorn.painted_benches": "Painted Benches", + "tag.block.adorn.painted_chairs": "Painted Chairs", + "tag.block.adorn.painted_coffee_tables": "Painted Coffee Tables", + "tag.block.adorn.painted_drawers": "Painted Drawers", + "tag.block.adorn.painted_kitchen_counters": "Painted Kitchen Counters", + "tag.block.adorn.painted_kitchen_cupboards": "Painted Kitchen Cupboards", + "tag.block.adorn.painted_kitchen_sinks": "Painted Kitchen Sinks", "tag.block.adorn.painted_planks": "Painted Planks", + "tag.block.adorn.painted_tables": "Painted Tables", "tag.block.adorn.painted_wood_buttons": "Painted Wood Buttons", "tag.block.adorn.painted_wood_fences": "Painted Wood Fences", "tag.block.adorn.painted_wood_fence_gates": "Painted Wood Fence Gates", + "tag.block.adorn.painted_wood_platforms": "Painted Wood Platforms", + "tag.block.adorn.painted_wood_posts": "Painted Wood Posts", "tag.block.adorn.painted_wood_pressure_plates": "Painted Wood Pressure Plates", + "tag.block.adorn.painted_wood_shelves": "Painted Wood Shelves", "tag.block.adorn.painted_wood_slabs": "Painted Wood Slabs", "tag.block.adorn.painted_wood_stairs": "Painted Wood Stairs", + "tag.block.adorn.painted_wood_steps": "Painted Wood Steps", "tag.block.adorn.platforms": "Platforms", "tag.block.adorn.posts": "Posts", "tag.block.adorn.prismarine_chimneys": "Prismarine Chimneys", @@ -1827,13 +1839,25 @@ "tag.item.adorn.kitchen_counters": "Kitchen Counters", "tag.item.adorn.kitchen_cupboards": "Kitchen Cupboards", "tag.item.adorn.kitchen_sinks": "Kitchen Sinks", + "tag.item.adorn.painted_benches": "Painted Benches", + "tag.item.adorn.painted_chairs": "Painted Chairs", + "tag.item.adorn.painted_coffee_tables": "Painted Coffee Tables", + "tag.item.adorn.painted_drawers": "Painted Drawers", + "tag.item.adorn.painted_kitchen_counters": "Painted Kitchen Counters", + "tag.item.adorn.painted_kitchen_cupboards": "Painted Kitchen Cupboards", + "tag.item.adorn.painted_kitchen_sinks": "Painted Kitchen Sinks", "tag.item.adorn.painted_planks": "Painted Planks", + "tag.item.adorn.painted_tables": "Painted Tables", "tag.item.adorn.painted_wood_buttons": "Painted Wood Buttons", "tag.item.adorn.painted_wood_fences": "Painted Wood Fences", "tag.item.adorn.painted_wood_fence_gates": "Painted Wood Fence Gates", + "tag.item.adorn.painted_wood_platforms": "Painted Wood Platforms", + "tag.item.adorn.painted_wood_posts": "Painted Wood Posts", "tag.item.adorn.painted_wood_pressure_plates": "Painted Wood Pressure Plates", + "tag.item.adorn.painted_wood_shelves": "Painted Wood Shelves", "tag.item.adorn.painted_wood_slabs": "Painted Wood Slabs", "tag.item.adorn.painted_wood_stairs": "Painted Wood Stairs", + "tag.item.adorn.painted_wood_steps": "Painted Wood Steps", "tag.item.adorn.platforms": "Platforms", "tag.item.adorn.posts": "Posts", "tag.item.adorn.prismarine_chimneys": "Prismarine Chimneys", diff --git a/fabric/src/commonData/java/juuxel/adorn/data/AdornBlockTagGenerator.java b/fabric/src/commonData/java/juuxel/adorn/data/AdornBlockTagGenerator.java index 329a65621..295e961b7 100644 --- a/fabric/src/commonData/java/juuxel/adorn/data/AdornBlockTagGenerator.java +++ b/fabric/src/commonData/java/juuxel/adorn/data/AdornBlockTagGenerator.java @@ -1,12 +1,18 @@ package juuxel.adorn.data; import juuxel.adorn.block.AdornBlocks; +import juuxel.adorn.block.variant.BlockKind; +import juuxel.adorn.block.variant.BlockVariant; +import juuxel.adorn.block.variant.BlockVariantSets; import juuxel.adorn.lib.AdornTags; +import juuxel.adorn.lib.registry.Registered; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.minecraft.block.Block; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.DyeColor; import java.util.concurrent.CompletableFuture; @@ -31,6 +37,18 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { .add(AdornBlocks.PAINTED_WOOD_PRESSURE_PLATES.values().toArray(Block[]::new)); getOrCreateTagBuilder(AdornTags.PAINTED_WOOD_BUTTONS.block()) .add(AdornBlocks.PAINTED_WOOD_BUTTONS.values().toArray(Block[]::new)); + addPaintedVariants(AdornTags.PAINTED_CHAIRS.block(), BlockKind.CHAIR); + addPaintedVariants(AdornTags.PAINTED_TABLES.block(), BlockKind.TABLE); + addPaintedVariants(AdornTags.PAINTED_DRAWERS.block(), BlockKind.DRAWER); + addPaintedVariants(AdornTags.PAINTED_BENCHES.block(), BlockKind.BENCH); + addPaintedVariants(AdornTags.PAINTED_KITCHEN_COUNTERS.block(), BlockKind.KITCHEN_COUNTER); + addPaintedVariants(AdornTags.PAINTED_KITCHEN_CUPBOARDS.block(), BlockKind.KITCHEN_CUPBOARD); + addPaintedVariants(AdornTags.PAINTED_KITCHEN_SINKS.block(), BlockKind.KITCHEN_SINK); + addPaintedVariants(AdornTags.PAINTED_WOOD_POSTS.block(), BlockKind.POST); + addPaintedVariants(AdornTags.PAINTED_WOOD_PLATFORMS.block(), BlockKind.PLATFORM); + addPaintedVariants(AdornTags.PAINTED_WOOD_STEPS.block(), BlockKind.STEP); + addPaintedVariants(AdornTags.PAINTED_WOOD_SHELVES.block(), BlockKind.SHELF); + addPaintedVariants(AdornTags.PAINTED_COFFEE_TABLES.block(), BlockKind.COFFEE_TABLE); getOrCreateTagBuilder(BlockTags.PLANKS).addTag(AdornTags.PAINTED_PLANKS.block()); getOrCreateTagBuilder(BlockTags.WOODEN_SLABS).addTag(AdornTags.PAINTED_WOOD_SLABS.block()); getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS).addTag(AdornTags.PAINTED_WOOD_STAIRS.block()); @@ -39,4 +57,13 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { getOrCreateTagBuilder(BlockTags.WOODEN_PRESSURE_PLATES).addTag(AdornTags.PAINTED_WOOD_PRESSURE_PLATES.block()); getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).addTag(AdornTags.PAINTED_WOOD_BUTTONS.block()); } + + private void addPaintedVariants(TagKey tag, BlockKind kind) { + var builder = getOrCreateTagBuilder(tag); + + for (BlockVariant variant : BlockVariant.PAINTED_WOODS.values()) { + var block = BlockVariantSets.get(kind, variant); + if (block != null) builder.add(block.get()); + } + } } diff --git a/fabric/src/commonData/java/juuxel/adorn/data/AdornItemTagGenerator.java b/fabric/src/commonData/java/juuxel/adorn/data/AdornItemTagGenerator.java index 875d9516b..5356d135c 100644 --- a/fabric/src/commonData/java/juuxel/adorn/data/AdornItemTagGenerator.java +++ b/fabric/src/commonData/java/juuxel/adorn/data/AdornItemTagGenerator.java @@ -23,6 +23,18 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { copy(AdornTags.PAINTED_WOOD_FENCE_GATES); copy(AdornTags.PAINTED_WOOD_PRESSURE_PLATES); copy(AdornTags.PAINTED_WOOD_BUTTONS); + copy(AdornTags.PAINTED_CHAIRS); + copy(AdornTags.PAINTED_TABLES); + copy(AdornTags.PAINTED_DRAWERS); + copy(AdornTags.PAINTED_BENCHES); + copy(AdornTags.PAINTED_KITCHEN_COUNTERS); + copy(AdornTags.PAINTED_KITCHEN_CUPBOARDS); + copy(AdornTags.PAINTED_KITCHEN_SINKS); + copy(AdornTags.PAINTED_WOOD_POSTS); + copy(AdornTags.PAINTED_WOOD_PLATFORMS); + copy(AdornTags.PAINTED_WOOD_STEPS); + copy(AdornTags.PAINTED_WOOD_SHELVES); + copy(AdornTags.PAINTED_COFFEE_TABLES); copy(BlockTags.PLANKS, ItemTags.PLANKS); copy(BlockTags.WOODEN_SLABS, ItemTags.WOODEN_SLABS); copy(BlockTags.WOODEN_STAIRS, ItemTags.WOODEN_STAIRS);