diff --git a/changelog.md b/changelog.md index 063e6ad5..6008558c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,2 +1,3 @@ - Fixed 1.21.1 crash when placing blocks with containers -- Fixed desk displaying the wrong tooltip (#112) \ No newline at end of file +- Fixed desk displaying the wrong tooltip (#112) +- Added colored items to dye tags \ No newline at end of file diff --git a/common/src/main/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/main/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 356d40f3..f2fa178f 100644 --- a/common/src/main/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/common/src/main/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,4 +1,4 @@ -// 1.21 2024-06-14T15:04:48.023748 Registries +// 1.21.1 2024-08-11T00:28:41.651882 Registries b05d705e7bfac46a6d93e9f2c3893faeb2c5aa53 data/handcrafted/painting_variant/ad_astra.json 3af0d7897f8ea92ea1721d255a279d5657c014d9 data/handcrafted/painting_variant/apple.json 1c90073436c9e019040377c7d314752705869473 data/handcrafted/painting_variant/beach_sunrise_left.json diff --git a/common/src/main/generated/resources/.cache/2857e23e27fe7a23fbd858a2f2d9cd46438d9fe5 b/common/src/main/generated/resources/.cache/2857e23e27fe7a23fbd858a2f2d9cd46438d9fe5 index 76233795..55da9d34 100644 --- a/common/src/main/generated/resources/.cache/2857e23e27fe7a23fbd858a2f2d9cd46438d9fe5 +++ b/common/src/main/generated/resources/.cache/2857e23e27fe7a23fbd858a2f2d9cd46438d9fe5 @@ -1,2 +1,2 @@ -// 1.21 2024-06-14T15:39:18.292406 Tags for minecraft:painting_variant mod id handcrafted +// 1.21.1 2024-08-11T00:28:41.650577 Tags for minecraft:painting_variant mod id handcrafted 254a729019ba5730471f7bcca1e333f1b34eb7b8 data/handcrafted/tags/painting_variant/paintings.json diff --git a/common/src/main/generated/resources/.cache/34e724f7bfdec2bf14377da0e28a0c3601a9c94f b/common/src/main/generated/resources/.cache/34e724f7bfdec2bf14377da0e28a0c3601a9c94f index 398132a4..66eaa411 100644 --- a/common/src/main/generated/resources/.cache/34e724f7bfdec2bf14377da0e28a0c3601a9c94f +++ b/common/src/main/generated/resources/.cache/34e724f7bfdec2bf14377da0e28a0c3601a9c94f @@ -1,4 +1,4 @@ -// 1.21 2024-06-14T15:04:47.968667 Block States: handcrafted +// 1.21.1 2024-08-11T00:28:41.590197 Block States: handcrafted 4556e77443b8e7f536dcacb6881a60d13de5d55a assets/handcrafted/blockstates/acacia_bench.json 32091dd9c08b0f170cebe2067e4d6ef0478ed3fe assets/handcrafted/blockstates/acacia_chair.json 999c6f1b88ed2de9733d7c7b8f9a08c55876183b assets/handcrafted/blockstates/acacia_corner_trim.json diff --git a/common/src/main/generated/resources/.cache/4f820cfde673b8b178d1e7534bbfbfc8c92e2fff b/common/src/main/generated/resources/.cache/4f820cfde673b8b178d1e7534bbfbfc8c92e2fff index 988500be..4a284357 100644 --- a/common/src/main/generated/resources/.cache/4f820cfde673b8b178d1e7534bbfbfc8c92e2fff +++ b/common/src/main/generated/resources/.cache/4f820cfde673b8b178d1e7534bbfbfc8c92e2fff @@ -1,4 +1,4 @@ -// 1.21 2024-06-14T15:04:48.026618 Item Models: handcrafted +// 1.21.1 2024-08-11T00:28:41.655587 Item Models: handcrafted e9d16e5f09deec53e52553e36264decb20a179cc assets/handcrafted/models/item/black_cushion.json becb4b2a271295008859164f3bcf70b01d5f5fb3 assets/handcrafted/models/item/black_sheet.json ca3214678d958a6a3b68a642a71d38dde6dcd5d2 assets/handcrafted/models/item/blue_bowl.json diff --git a/common/src/main/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/common/src/main/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 222f8bda..50f1f900 100644 --- a/common/src/main/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/common/src/main/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.21 2024-06-14T15:04:48.021972 Loot Tables +// 1.21.1 2024-08-11T00:28:41.649492 Loot Tables 7157ae2c0301789bf203e3e3977b19532045fcb5 data/handcrafted/loot_table/blocks/acacia_bench.json 85930fd231a79fede542ea32416b227dfd007fbc data/handcrafted/loot_table/blocks/acacia_chair.json 064777c5162406e4c752a94aae29bde36b1c2e2b data/handcrafted/loot_table/blocks/acacia_corner_trim.json diff --git a/common/src/main/generated/resources/.cache/6a0a31d3752318b8df579c723b3b100a327dc89b b/common/src/main/generated/resources/.cache/6a0a31d3752318b8df579c723b3b100a327dc89b index fa307085..421e7ff6 100644 --- a/common/src/main/generated/resources/.cache/6a0a31d3752318b8df579c723b3b100a327dc89b +++ b/common/src/main/generated/resources/.cache/6a0a31d3752318b8df579c723b3b100a327dc89b @@ -1,2 +1,2 @@ -// 1.21 2024-06-14T15:04:48.027355 Languages: en_us for mod: handcrafted +// 1.21.1 2024-08-11T00:28:41.65612 Languages: en_us for mod: handcrafted 40c2f03e3cc82e0105e51050a1d6fdd77cc72bd9 assets/handcrafted/lang/en_us.json diff --git a/common/src/main/generated/resources/.cache/9c93d98e764faf9e6b3a9f796e820b558c226b9f b/common/src/main/generated/resources/.cache/9c93d98e764faf9e6b3a9f796e820b558c226b9f index 8317131a..6a648f8c 100644 --- a/common/src/main/generated/resources/.cache/9c93d98e764faf9e6b3a9f796e820b558c226b9f +++ b/common/src/main/generated/resources/.cache/9c93d98e764faf9e6b3a9f796e820b558c226b9f @@ -1,4 +1,20 @@ -// 1.21 2024-06-14T15:04:48.021088 Tags for minecraft:block mod id handcrafted +// 1.21.1 2024-08-11T00:28:41.648676 Tags for minecraft:block mod id handcrafted +405166136525f6bddc8620260bb0e639e9e7ac1c data/c/tags/block/dyed/black.json +7ce3cdb9816bcc547ebb098775d35dd6422bb75e data/c/tags/block/dyed/blue.json +7bbbe3959ea94e64798348375e384a81979390e1 data/c/tags/block/dyed/brown.json +3721b4ad3f4cbe9471ebfa974c1e941f3630113c data/c/tags/block/dyed/cyan.json +49514d73a256713bab9574944788c0f89c721afd data/c/tags/block/dyed/gray.json +0b158561546d2a3101ee0fd01e687479327b2a5c data/c/tags/block/dyed/green.json +9212d9d7877ca767621d763de4509bf28773fcbf data/c/tags/block/dyed/light_blue.json +8a886c03947453f0a5c3b100832ae224078b131d data/c/tags/block/dyed/light_gray.json +579e7df72af5206ab7f4ade94bdf03f0d6798fb7 data/c/tags/block/dyed/lime.json +a9e666e6720a6ac78eadf17dc082d86ff11924e4 data/c/tags/block/dyed/magenta.json +9339147ae172855425ec9e8ad1af16e2f6bba6fe data/c/tags/block/dyed/orange.json +b11578b843a6a61f0ca938873f457a785d254f4b data/c/tags/block/dyed/pink.json +b96c13f9baf2201cbfd9cf7738266e4baa2679df data/c/tags/block/dyed/purple.json +d9a8259d3f31b0549714749d878b5f64168d375e data/c/tags/block/dyed/red.json +314f60ba0fcccfe3b6026be315573056cc109237 data/c/tags/block/dyed/white.json +9fe536553918ba267783727e1c51217e8173bf43 data/c/tags/block/dyed/yellow.json 148d9202ace672cfdf451a46397702b32fab9450 data/handcrafted/tags/block/benches.json 3662d7ac15380cec631c2eb872b6cbbb69072d62 data/handcrafted/tags/block/bowls.json d23ee811738879d0b22d489c76f6947f6b0ccf40 data/handcrafted/tags/block/chairs.json diff --git a/common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index bcaaa822..c21207b2 100644 --- a/common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21 2024-06-14T15:04:48.023958 Recipes +// 1.21.1 2024-08-11T00:28:41.652651 Recipes 48c72523ff0d53a1c95549726074ca4ef920c3ce data/handcrafted/advancement/recipes/misc/acacia_bench.json 8cc3e9de7479beb8d10f36ebe3375aa7f8d725dd data/handcrafted/advancement/recipes/misc/acacia_chair.json 2e1b9f190ac60d9bcd212342cb3c33b58aa7b3ae data/handcrafted/advancement/recipes/misc/acacia_corner_trim.json diff --git a/common/src/main/generated/resources/.cache/d60991a6fb71d37d1d9acc66e836564e99560c20 b/common/src/main/generated/resources/.cache/d60991a6fb71d37d1d9acc66e836564e99560c20 index d24cc419..8f707d31 100644 --- a/common/src/main/generated/resources/.cache/d60991a6fb71d37d1d9acc66e836564e99560c20 +++ b/common/src/main/generated/resources/.cache/d60991a6fb71d37d1d9acc66e836564e99560c20 @@ -1,4 +1,4 @@ -// 1.21 2024-06-14T15:04:48.019595 Handcrafted Highlight States +// 1.21.1 2024-08-11T00:28:41.647739 Handcrafted Highlight States 84684d75471e333594f581c3e1f93a676e1eb654 assets/handcrafted/resourcefullib/highlights/acacia_bench.json 4b76814a8aed1e8ffcfee74a219b34a7c3731e06 assets/handcrafted/resourcefullib/highlights/acacia_chair.json 7eab3e037da8ba9a4bf3f4027454e394a4931c1a assets/handcrafted/resourcefullib/highlights/acacia_couch.json diff --git a/common/src/main/generated/resources/.cache/d92fab55179a6614c04306098c1491a4f494f922 b/common/src/main/generated/resources/.cache/d92fab55179a6614c04306098c1491a4f494f922 index 1c954664..4f07b55c 100644 --- a/common/src/main/generated/resources/.cache/d92fab55179a6614c04306098c1491a4f494f922 +++ b/common/src/main/generated/resources/.cache/d92fab55179a6614c04306098c1491a4f494f922 @@ -1,4 +1,20 @@ -// 1.21 2024-06-15T11:08:37.057245 Tags for minecraft:item mod id handcrafted +// 1.21.1 2024-08-11T00:28:41.654963 Tags for minecraft:item mod id handcrafted +adfcb59c69179e0407575adf4cc7eea1b49c56c6 data/c/tags/item/dyed/black.json +f1f2096085191eb17a63d1449f2d252ceebba23a data/c/tags/item/dyed/blue.json +358cace5142b4823e2647df699279bc555b0bd3a data/c/tags/item/dyed/brown.json +07a89cfa2acf157f7246774ef4faf10c42630273 data/c/tags/item/dyed/cyan.json +05c83bd1ef86c0a2632cd259ecb969f0af5c0fbe data/c/tags/item/dyed/gray.json +81b3b63c6def4c08a8a6799bbce2e27185443346 data/c/tags/item/dyed/green.json +b665eee2fe2cb79ad9b7c3f923c20d201b155b1b data/c/tags/item/dyed/light_blue.json +afae63fcbb717824eedff37f837034b8326cc6d8 data/c/tags/item/dyed/light_gray.json +3fd0976e4fa16647a355af9e50c1c637e4bc5edc data/c/tags/item/dyed/lime.json +445fe8fe6f504c8a1165d6599d23560df5c0c7a7 data/c/tags/item/dyed/magenta.json +1dc3e05d03319c1f6746c6a2f2cc581dc777fec3 data/c/tags/item/dyed/orange.json +9892b9b38177df4ea2be632bdd8c050dd3524361 data/c/tags/item/dyed/pink.json +1de96aa9e8690147230746a518ec70b3bdc36430 data/c/tags/item/dyed/purple.json +5eba0293dbc9ec123de65f0d66f634230b85e893 data/c/tags/item/dyed/red.json +6d1c31aa9000d878bac62f3ddbfda9bc470d0a39 data/c/tags/item/dyed/white.json +a97bead8616b0d90c86bcea85ca66620edab07ba data/c/tags/item/dyed/yellow.json 148d9202ace672cfdf451a46397702b32fab9450 data/handcrafted/tags/item/benches.json 3662d7ac15380cec631c2eb872b6cbbb69072d62 data/handcrafted/tags/item/bowls.json d23ee811738879d0b22d489c76f6947f6b0ccf40 data/handcrafted/tags/item/chairs.json diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/black.json b/common/src/main/generated/resources/data/c/tags/block/dyed/black.json new file mode 100644 index 00000000..1efa0c3e --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/black.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:black_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/blue.json b/common/src/main/generated/resources/data/c/tags/block/dyed/blue.json new file mode 100644 index 00000000..87fa0e7b --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:blue_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/brown.json b/common/src/main/generated/resources/data/c/tags/block/dyed/brown.json new file mode 100644 index 00000000..0898eaa7 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/brown.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:brown_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/cyan.json b/common/src/main/generated/resources/data/c/tags/block/dyed/cyan.json new file mode 100644 index 00000000..3e847826 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/cyan.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:cyan_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/gray.json b/common/src/main/generated/resources/data/c/tags/block/dyed/gray.json new file mode 100644 index 00000000..99af0f6a --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:gray_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/green.json b/common/src/main/generated/resources/data/c/tags/block/dyed/green.json new file mode 100644 index 00000000..6d861657 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/green.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:green_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/light_blue.json b/common/src/main/generated/resources/data/c/tags/block/dyed/light_blue.json new file mode 100644 index 00000000..14cf8358 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/light_blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:light_blue_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/light_gray.json b/common/src/main/generated/resources/data/c/tags/block/dyed/light_gray.json new file mode 100644 index 00000000..c69b1b76 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/light_gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:light_gray_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/lime.json b/common/src/main/generated/resources/data/c/tags/block/dyed/lime.json new file mode 100644 index 00000000..53e413b0 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/lime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:lime_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/magenta.json b/common/src/main/generated/resources/data/c/tags/block/dyed/magenta.json new file mode 100644 index 00000000..d6d42d6f --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/magenta.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:magenta_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/orange.json b/common/src/main/generated/resources/data/c/tags/block/dyed/orange.json new file mode 100644 index 00000000..ac305e95 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/orange.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:orange_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/pink.json b/common/src/main/generated/resources/data/c/tags/block/dyed/pink.json new file mode 100644 index 00000000..697d70f1 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/pink.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:pink_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/purple.json b/common/src/main/generated/resources/data/c/tags/block/dyed/purple.json new file mode 100644 index 00000000..eda8d381 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/purple.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:purple_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/red.json b/common/src/main/generated/resources/data/c/tags/block/dyed/red.json new file mode 100644 index 00000000..1d5d675e --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:red_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/white.json b/common/src/main/generated/resources/data/c/tags/block/dyed/white.json new file mode 100644 index 00000000..bf1a95da --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/white.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:white_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/block/dyed/yellow.json b/common/src/main/generated/resources/data/c/tags/block/dyed/yellow.json new file mode 100644 index 00000000..4125dac8 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/block/dyed/yellow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "handcrafted:yellow_cushion" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/black.json b/common/src/main/generated/resources/data/c/tags/item/dyed/black.json new file mode 100644 index 00000000..ab4ac873 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/black.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:black_cushion", + "handcrafted:black_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/blue.json b/common/src/main/generated/resources/data/c/tags/item/dyed/blue.json new file mode 100644 index 00000000..5b1d91bf --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/blue.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:blue_cushion", + "handcrafted:blue_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/brown.json b/common/src/main/generated/resources/data/c/tags/item/dyed/brown.json new file mode 100644 index 00000000..e8f146a2 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/brown.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:brown_cushion", + "handcrafted:brown_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/cyan.json b/common/src/main/generated/resources/data/c/tags/item/dyed/cyan.json new file mode 100644 index 00000000..d06ddf17 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/cyan.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:cyan_cushion", + "handcrafted:cyan_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/gray.json b/common/src/main/generated/resources/data/c/tags/item/dyed/gray.json new file mode 100644 index 00000000..36e9a093 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/gray.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:gray_cushion", + "handcrafted:gray_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/green.json b/common/src/main/generated/resources/data/c/tags/item/dyed/green.json new file mode 100644 index 00000000..852f7001 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/green.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:green_cushion", + "handcrafted:green_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/light_blue.json b/common/src/main/generated/resources/data/c/tags/item/dyed/light_blue.json new file mode 100644 index 00000000..103a0462 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/light_blue.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:light_blue_cushion", + "handcrafted:light_blue_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/light_gray.json b/common/src/main/generated/resources/data/c/tags/item/dyed/light_gray.json new file mode 100644 index 00000000..eafb6375 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/light_gray.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:light_gray_cushion", + "handcrafted:light_gray_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/lime.json b/common/src/main/generated/resources/data/c/tags/item/dyed/lime.json new file mode 100644 index 00000000..df020341 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/lime.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:lime_cushion", + "handcrafted:lime_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/magenta.json b/common/src/main/generated/resources/data/c/tags/item/dyed/magenta.json new file mode 100644 index 00000000..e5d8c5e3 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/magenta.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:magenta_cushion", + "handcrafted:magenta_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/orange.json b/common/src/main/generated/resources/data/c/tags/item/dyed/orange.json new file mode 100644 index 00000000..89f3f97d --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/orange.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:orange_cushion", + "handcrafted:orange_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/pink.json b/common/src/main/generated/resources/data/c/tags/item/dyed/pink.json new file mode 100644 index 00000000..bf43b050 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/pink.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:pink_cushion", + "handcrafted:pink_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/purple.json b/common/src/main/generated/resources/data/c/tags/item/dyed/purple.json new file mode 100644 index 00000000..9ff2f6dd --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/purple.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:purple_cushion", + "handcrafted:purple_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/red.json b/common/src/main/generated/resources/data/c/tags/item/dyed/red.json new file mode 100644 index 00000000..6ec80285 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/red.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:red_cushion", + "handcrafted:red_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/white.json b/common/src/main/generated/resources/data/c/tags/item/dyed/white.json new file mode 100644 index 00000000..c5029f24 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/white.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:white_cushion", + "handcrafted:white_sheet" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/c/tags/item/dyed/yellow.json b/common/src/main/generated/resources/data/c/tags/item/dyed/yellow.json new file mode 100644 index 00000000..e7aff7a7 --- /dev/null +++ b/common/src/main/generated/resources/data/c/tags/item/dyed/yellow.json @@ -0,0 +1,6 @@ +{ + "values": [ + "handcrafted:yellow_cushion", + "handcrafted:yellow_sheet" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModBlockTagProvider.java b/neoforge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModBlockTagProvider.java index 58c51304..69df469d 100644 --- a/neoforge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModBlockTagProvider.java +++ b/neoforge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModBlockTagProvider.java @@ -16,6 +16,7 @@ import net.minecraft.tags.TagEntry; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; +import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.NotNull; @@ -65,6 +66,23 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { addSet(ModBlocks.PLATES, "plates"); addSet(ModBlocks.BOWLS, "bowls"); addSet(ModBlocks.CROCKERY_COMBOS, "crockery_combos"); + + tag(Tags.Blocks.DYED_BLACK).add(TagEntry.element(ModBlocks.BLACK_CUSHION.getId())); + tag(Tags.Blocks.DYED_BLUE).add(TagEntry.element(ModBlocks.BLUE_CUSHION.getId())); + tag(Tags.Blocks.DYED_BROWN).add(TagEntry.element(ModBlocks.BROWN_CUSHION.getId())); + tag(Tags.Blocks.DYED_CYAN).add(TagEntry.element(ModBlocks.CYAN_CUSHION.getId())); + tag(Tags.Blocks.DYED_GRAY).add(TagEntry.element(ModBlocks.GRAY_CUSHION.getId())); + tag(Tags.Blocks.DYED_GREEN).add(TagEntry.element(ModBlocks.GREEN_CUSHION.getId())); + tag(Tags.Blocks.DYED_LIGHT_BLUE).add(TagEntry.element(ModBlocks.LIGHT_BLUE_CUSHION.getId())); + tag(Tags.Blocks.DYED_LIGHT_GRAY).add(TagEntry.element(ModBlocks.LIGHT_GRAY_CUSHION.getId())); + tag(Tags.Blocks.DYED_LIME).add(TagEntry.element(ModBlocks.LIME_CUSHION.getId())); + tag(Tags.Blocks.DYED_MAGENTA).add(TagEntry.element(ModBlocks.MAGENTA_CUSHION.getId())); + tag(Tags.Blocks.DYED_ORANGE).add(TagEntry.element(ModBlocks.ORANGE_CUSHION.getId())); + tag(Tags.Blocks.DYED_PINK).add(TagEntry.element(ModBlocks.PINK_CUSHION.getId())); + tag(Tags.Blocks.DYED_PURPLE).add(TagEntry.element(ModBlocks.PURPLE_CUSHION.getId())); + tag(Tags.Blocks.DYED_RED).add(TagEntry.element(ModBlocks.RED_CUSHION.getId())); + tag(Tags.Blocks.DYED_WHITE).add(TagEntry.element(ModBlocks.WHITE_CUSHION.getId())); + tag(Tags.Blocks.DYED_YELLOW).add(TagEntry.element(ModBlocks.YELLOW_CUSHION.getId())); } private void addMineableTags() { diff --git a/neoforge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModItemTagProvider.java b/neoforge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModItemTagProvider.java index 8c0ba0bd..e7a3e9e2 100644 --- a/neoforge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModItemTagProvider.java +++ b/neoforge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModItemTagProvider.java @@ -16,6 +16,7 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; +import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.NotNull; @@ -111,6 +112,23 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { addSet(ModItems.PLATES, "plates"); addSet(ModItems.BOWLS, "bowls"); addSet(ModItems.CROCKERY_COMBOS, "crockery_combos"); + + tag(Tags.Items.DYED_BLACK).add(TagEntry.element(ModItems.BLACK_CUSHION.getId())).add(TagEntry.element(ModItems.BLACK_SHEET.getId())); + tag(Tags.Items.DYED_BLUE).add(TagEntry.element(ModItems.BLUE_CUSHION.getId())).add(TagEntry.element(ModItems.BLUE_SHEET.getId())); + tag(Tags.Items.DYED_BROWN).add(TagEntry.element(ModItems.BROWN_CUSHION.getId())).add(TagEntry.element(ModItems.BROWN_SHEET.getId())); + tag(Tags.Items.DYED_CYAN).add(TagEntry.element(ModItems.CYAN_CUSHION.getId())).add(TagEntry.element(ModItems.CYAN_SHEET.getId())); + tag(Tags.Items.DYED_GRAY).add(TagEntry.element(ModItems.GRAY_CUSHION.getId())).add(TagEntry.element(ModItems.GRAY_SHEET.getId())); + tag(Tags.Items.DYED_GREEN).add(TagEntry.element(ModItems.GREEN_CUSHION.getId())).add(TagEntry.element(ModItems.GREEN_SHEET.getId())); + tag(Tags.Items.DYED_LIGHT_BLUE).add(TagEntry.element(ModItems.LIGHT_BLUE_CUSHION.getId())).add(TagEntry.element(ModItems.LIGHT_BLUE_SHEET.getId())); + tag(Tags.Items.DYED_LIGHT_GRAY).add(TagEntry.element(ModItems.LIGHT_GRAY_CUSHION.getId())).add(TagEntry.element(ModItems.LIGHT_GRAY_SHEET.getId())); + tag(Tags.Items.DYED_LIME).add(TagEntry.element(ModItems.LIME_CUSHION.getId())).add(TagEntry.element(ModItems.LIME_SHEET.getId())); + tag(Tags.Items.DYED_MAGENTA).add(TagEntry.element(ModItems.MAGENTA_CUSHION.getId())).add(TagEntry.element(ModItems.MAGENTA_SHEET.getId())); + tag(Tags.Items.DYED_ORANGE).add(TagEntry.element(ModItems.ORANGE_CUSHION.getId())).add(TagEntry.element(ModItems.ORANGE_SHEET.getId())); + tag(Tags.Items.DYED_PINK).add(TagEntry.element(ModItems.PINK_CUSHION.getId())).add(TagEntry.element(ModItems.PINK_SHEET.getId())); + tag(Tags.Items.DYED_PURPLE).add(TagEntry.element(ModItems.PURPLE_CUSHION.getId())).add(TagEntry.element(ModItems.PURPLE_SHEET.getId())); + tag(Tags.Items.DYED_RED).add(TagEntry.element(ModItems.RED_CUSHION.getId())).add(TagEntry.element(ModItems.RED_SHEET.getId())); + tag(Tags.Items.DYED_WHITE).add(TagEntry.element(ModItems.WHITE_CUSHION.getId())).add(TagEntry.element(ModItems.WHITE_SHEET.getId())); + tag(Tags.Items.DYED_YELLOW).add(TagEntry.element(ModItems.YELLOW_CUSHION.getId())).add(TagEntry.element(ModItems.YELLOW_SHEET.getId())); } private void addSet(ResourcefulRegistry registry, String name) {