diff --git a/common/src/generated/resources/.cache/e2778987850117b7cc788cc2ae98d0c4537669cf b/common/src/generated/resources/.cache/e2778987850117b7cc788cc2ae98d0c4537669cf index 1bad5682..c47c25a3 100644 --- a/common/src/generated/resources/.cache/e2778987850117b7cc788cc2ae98d0c4537669cf +++ b/common/src/generated/resources/.cache/e2778987850117b7cc788cc2ae98d0c4537669cf @@ -1,10 +1,10 @@ -// 1.20.1 2024-02-26T19:05:03.247923 Create: Interiors/Registrate Provider for interiors [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.20.1 2024-09-01T23:34:34.484888 Create: Interiors/Registrate Provider for interiors [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 14aff3c9d61a7542b08a2b7a37385a5aaca94952 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/black_floor_chair.json 4f547294cbced34ab6930f8c959efde9183a97ac data/interiors/advancements/recipes/building_blocks/crafting/chair/magenta_chair_from_floor_chair.json f1c40fb2d701527a66f4e026c7f95239681e2352 data/interiors/advancements/recipes/building_blocks/crafting/chair/yellow_chair.json e6be31072b5af08a78994380b69ca3b753805fd3 data/interiors/advancements/recipes/building_blocks/crafting/chair/blue_chair_from_floor_chair.json -c019ad63d14d017d5226a88cfbf6124c8b1d99c1 assets/interiors/models/block/floor_chair/green_floor_chair_right.json d4f0830fbe4e1027517569b504d8281ed9e4be11 assets/interiors/models/block/floor_chair/purple_floor_chair_left_cropped.json +c019ad63d14d017d5226a88cfbf6124c8b1d99c1 assets/interiors/models/block/floor_chair/green_floor_chair_right.json 3924688b68ba8bb5e9b8cb7ed18e2ad9e5c9a16f assets/interiors/models/item/brown_floor_chair.json b02ce47e2dd2a387f9e37f15f893708fed843045 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/lime_floor_chair_from_seat.json 81c74611f9421259786f3adffa0a2c52ce1b8068 assets/interiors/models/block/chair/magenta_chair_none_cropped.json @@ -12,7 +12,7 @@ b02ce47e2dd2a387f9e37f15f893708fed843045 data/interiors/advancements/recipes/bui 366d11baa681bacd806be95be64d7db812d074cf assets/interiors/blockstates/orange_floor_chair.json 98bd7a7b5afb0cb5fc6a448969819b0bd66c6093 data/interiors/advancements/recipes/building_blocks/crafting/chair/red_chair.json 442080fb327b03811f87ac8e9667249bdd17828c assets/interiors/models/block/chair/light_blue_chair_none_cropped.json -d4ff3c28902fdc27848baab2fb3f9fdb38af5aa5 data/interiors/recipes/crafting/floor_chair/red_floor_chair_from_other_floor_chair.json +4cf7109e6889901ed357ff6bedd743eaf04e6f16 data/interiors/recipes/crafting/floor_chair/red_floor_chair_from_other_floor_chair.json dea42a9e5831f84b5021e2aac639d9a62da58c06 assets/interiors/models/block/chair/red_chair_right_cropped.json 105111ba1f491411c6547855dcdb8f4ca02f85ff assets/interiors/models/block/floor_chair/red_floor_chair_none.json 9b1ba2aebafcee275555667a3bc5c5cd061189e4 assets/interiors/models/block/chair/light_gray_chair_both.json @@ -20,12 +20,12 @@ f77ac104d52173fc8ba260f5ee7719138c249894 data/interiors/recipes/crafting/floor_c e5e13b678a049b3455cacf9013177a347fbd920f data/interiors/advancements/recipes/building_blocks/crafting/chair/light_blue_chair_from_other_chair.json a6b1b8d4416aba2a8b1bbbb285ed1663e8b1cbd3 assets/interiors/models/block/chair/light_blue_chair_none.json c07c54cc70db571d50cae6e804c00e840d7edc9f data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair_from_floor_chair.json -48ee2073a9c3f5066b9336f2285992af50e7b5a2 data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json 44b6d1ce8c68f8ee7a3cca7668551d4a93e95f1f data/interiors/advancements/recipes/building_blocks/crafting/chair/purple_chair.json +8f827d2b2f8904010aef4fa146b8a8d1693d8376 data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json a584c10d9c0ec40fe6bfd818fa44a7e04932f94e assets/interiors/models/block/chair/green_chair_right_cropped.json 1fe8148160ae6a9a7ef19eb31682a69959a313f2 assets/interiors/models/block/chair/gray_chair_none.json 64e8f84ca1926e140d74e22eb4f33b76309328ca data/interiors/recipes/crafting/floor_chair/yellow_floor_chair.json -8cea06c92a450af6d22fb46a9c6114bb14508c33 data/interiors/recipes/crafting/chair/white_chair_from_other_chair.json +c6e86492f5ed9adb3a3a34be8f2b864c07b1d236 data/interiors/recipes/crafting/chair/white_chair_from_other_chair.json 9e85faaba443d73ab94a0363ace19167d8623493 data/interiors/loot_tables/blocks/black_chair.json 6c86d06604b53323148df73b7b109e1c3703edbd assets/interiors/models/block/floor_chair/white_floor_chair_right_cropped.json bbfe46a3862e213eda375fd90c45fdb8fecb2966 assets/interiors/models/block/floor_chair/red_floor_chair_right_cropped.json @@ -45,9 +45,9 @@ ffaa9019b65e3859db897f69ca70fcaf4dd88c34 assets/interiors/models/block/chair/kel 8f7684c731d9c20686210efaf1b7e6eb7ed5b7d4 assets/interiors/models/block/floor_chair/yellow_floor_chair_both.json 8ab8207c90bd46e58a09ab1b6caf2eab17b22cc8 data/interiors/recipes/crafting/floor_chair/magenta_floor_chair.json d48676500292eca76bae23290ce7639428249b2f assets/interiors/models/item/blue_chair.json -1e2084707aee2f68ae0f3dd4d14c680c97b24b55 data/interiors/recipes/crafting/chair/red_chair_from_other_chair.json +546d6fb2c156427c2c1be0c1813f3e006031acf9 data/interiors/recipes/crafting/chair/red_chair_from_other_chair.json df10d3029cc453befd81a98f1ae5b1f41b6a7bd1 data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair_from_other_chair.json -33cb13fc4ccb6d05a4d90ed3d76bd27f964d6a07 data/interiors/recipes/crafting/chair/black_chair_from_other_chair.json +7143a98f9d2e257bc51737b640942a1c9468a81c data/interiors/recipes/crafting/chair/black_chair_from_other_chair.json ccf6a528c6bf22fdfceaa853341e95e1159bdf8d data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/brown_floor_chair_from_seat.json 911370bbc50592c0f3f35d97fdb1942637fc7e68 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/light_gray_floor_chair_from_other_floor_chair.json abb1c8012e075cf370833100aaf819fedba3bb9a data/interiors/advancements/recipes/building_blocks/crafting/chair/black_chair.json @@ -58,7 +58,7 @@ b01af3b56b5675c2bf63ddb86eee6be02570eede data/interiors/recipes/crafting/floor_c 3022c64e58da951adbf3e1ba23fbfe05aa6df45c data/interiors/recipes/crafting/chair/red_chair.json fd2786239e1fe187988662642f1fe59009bcd8dc assets/interiors/models/block/chair/cyan_chair_left_cropped.json b49e56c3e39d355901d4252ea5d97db4e18a99d4 assets/interiors/models/block/chair/green_chair_left_cropped.json -aec4bde61a4b812e290aeb83ccb149cd43812077 data/interiors/recipes/crafting/floor_chair/white_floor_chair_from_other_floor_chair.json +4e61e89f1ce525e1807087a26397fa9884341c20 data/interiors/recipes/crafting/floor_chair/white_floor_chair_from_other_floor_chair.json 6f169b08e61940af66799f0a7d17bcab52c3ac89 data/interiors/loot_tables/blocks/green_chair.json 1d593b33b68d224e3baef0538c4633f7273a4e12 assets/interiors/blockstates/white_floor_chair.json 4ce6255bafe1e69930d7e4dc74744c4edfda5a82 assets/interiors/models/block/chair/kelp_chair_right_cropped.json @@ -89,6 +89,7 @@ ca6fdc4ee6ca7f9cacdd159c25130107017067b3 assets/interiors/models/block/floor_cha aca9d67c4cd107248024656ee4c15aa951229339 assets/interiors/models/block/floor_chair/purple_floor_chair_both.json 42e86c17eeeb5a103aae6933ca7769d200dd2e27 assets/interiors/models/block/floor_chair/orange_floor_chair_left_cropped.json 6a6c2a1e08c28507b0c43e149b7927a7b9dbadde data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/red_floor_chair_from_seat.json +790ff3c5da6a67a5de1ceb7138fa3e1c0fe97f80 data/interiors/tags/items/internal/dyes/lime_dyes.json b327c2d93f1ee4845d21bf04db492345d7810f90 data/interiors/advancements/recipes/building_blocks/crafting/chair/gray_chair_from_seat.json 1a256ea134dafc1b13980af5471c0685c6202756 assets/interiors/models/block/floor_chair/lime_floor_chair_none.json d0829a63f3d040308aced5c65d57161b09a2c618 assets/interiors/models/block/chair/orange_chair_right.json @@ -98,11 +99,12 @@ d98ff59cc85da2c53ca0d225e07b771599cc04a0 assets/interiors/models/item/green_floo 773d03444b7f37386b09836d57c35f66e7f45da8 data/interiors/tags/blocks/chairs.json 79edbf1056c3b969e4d34e76fb6935e8147691ac data/interiors/loot_tables/blocks/orange_floor_chair.json 2d593b8894b4370c39c17a76bc7f7a2465bd3594 assets/interiors/models/block/chair/brown_chair_both.json +7e50900990bbf31a02fe968dbb463930332ede3b data/interiors/recipes/crafting/chair/purple_chair_from_other_chair.json ac19c2dbf73f5b6835529a70e8bbb033f5c5bb35 data/interiors/advancements/recipes/building_blocks/crafting/chair/purple_chair_from_seat.json -b9b24a01861c65d4365c4e82b1ff8a6b96a232aa data/interiors/recipes/crafting/chair/purple_chair_from_other_chair.json c9fee6f087e7dc8dbd390562d6b9b1a63f7a8197 assets/interiors/models/block/floor_chair/green_floor_chair_left.json 8a4b18e26e615bb3b635f2e35cbaf0715c4216f5 assets/interiors/models/block/floor_chair/purple_floor_chair_none_cropped.json 2a352db3525767361b2644778063239e934e915a assets/interiors/models/item/kelp_floor_chair.json +2a6aaab63efb82be5fee5de0f9d96824d520b25e data/interiors/tags/items/internal/dyes/blue_dyes.json d428eab6a600008691b704ffa1e4fc35adb5ac1a data/interiors/recipes/crafting/chair/red_chair_from_seat.json 4ad3be20fdd5df230f63dde392fea1b719e5599c assets/interiors/models/block/chair/pink_chair_none_cropped.json 55cd95c88fb26323c21cdc35383acf1b2c611846 assets/interiors/models/block/chair/purple_chair_both_cropped.json @@ -111,8 +113,8 @@ bbe13c2a55081ab78d4b207fc4fe3695bf4db99c assets/interiors/models/block/floor_cha c74a64580f5c109cc6a422100d63da50f90f8acf data/interiors/loot_tables/blocks/lime_chair.json 2b4d2506d7e2a312a1a2f402f283f4aea5844bfb assets/interiors/models/item/pink_chair.json acc640bf6ff9fda1747f2f8bec7174c3dfa62288 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/cyan_floor_chair.json -179818eda3d71c744231a07b4972a7290df2ecc5 data/interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json 7951e098c2509c5e5aa3dd76bf99b1093f630cef data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_seat.json +fe151ff7f72d46d74e99703baebb6f26adc67185 data/interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json 5d8a5fb0b5104c895fa897ce3e05bf050baf742e data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair_from_seat.json 14ee62e5724f489ccf2e95154d882a388d30c334 data/interiors/recipes/crafting/floor_chair/green_floor_chair.json fa5768ba206c65705888460414ff379347998aa4 assets/interiors/models/block/floor_chair/light_gray_floor_chair_right.json @@ -148,6 +150,7 @@ bde81b367c4973e5c07a3c664fabc511c7461c44 assets/interiors/models/block/chair/red 821ed5027056f1391fceec5a6f374061127d363c data/interiors/recipes/crafting/chair/orange_chair.json 34f4e13b84a87cff27d0fc5fc3828fd80714ecba assets/interiors/models/block/chair/pink_chair_right.json 79b9ed55ed0744a5d0e8ce40f41e1d577e8aba65 assets/interiors/models/block/floor_chair/magenta_floor_chair_both.json +182450e6ad4229f2959e6c50e38ef6e2ff5259d0 data/interiors/tags/items/internal/dyes/orange_dyes.json db6e42c21752b1b06fc8402a57e75f4605d9ac95 assets/interiors/models/block/floor_chair/white_floor_chair_both_cropped.json 6b49c8d8add4ee0ec3f2d9dd7fd60e168c5ec837 data/interiors/advancements/recipes/building_blocks/crafting/chair/white_chair_from_seat.json cd340d288c650341bfbc28b8cb17a78ef5201bcc data/interiors/advancements/recipes/building_blocks/crafting/chair/light_gray_chair_from_seat.json @@ -155,12 +158,12 @@ cd340d288c650341bfbc28b8cb17a78ef5201bcc data/interiors/advancements/recipes/bui 4ff0fdd19d9d0c11b7a6c7fb343853d1194e9ac1 assets/interiors/models/block/chair/black_chair_right.json 28b13ad338ac6af0b87086fcdafdbad6b26c1ff7 data/interiors/advancements/recipes/building_blocks/crafting/chair/gray_chair_from_other_chair.json 9e5f370bede7a20f74d7d717a9562a362b5a3690 assets/interiors/models/block/chair/kelp_chair_left.json -cd3226b3c18c3a1a094d59558a733f2176056c37 data/interiors/recipes/crafting/chair/magenta_chair_from_other_chair.json +1a9911bf5a44b289cfd71a90ba8abd87c68492ef data/interiors/recipes/crafting/chair/magenta_chair_from_other_chair.json 0e18213b078c87aa0ca70b743f5c7bf1b8b42353 assets/interiors/models/block/chair/cyan_chair_none_cropped.json c69cf28dd39f0f30fe06997edd1167cc042af4de assets/interiors/models/block/floor_chair/orange_floor_chair_none_cropped.json 2966e177deca7304dd2bd61f2359abd5eaf66931 assets/interiors/models/block/floor_chair/pink_floor_chair_left_cropped.json 1b2822bcde27188e7a44f40a042466cddb75fe3b data/interiors/recipes/crafting/chair/light_blue_chair_from_floor_chair.json -7fad5e9ed530cd31ada2bd998e53b461735dd353 data/interiors/recipes/crafting/floor_chair/yellow_floor_chair_from_other_floor_chair.json +ce09133eb397e2acf7aaea958bdf8c56a447ec4c data/interiors/recipes/crafting/floor_chair/yellow_floor_chair_from_other_floor_chair.json 3dd041097760f815f54705691e954d7e7b03e65e assets/interiors/models/block/chair/pink_chair_left_cropped.json 95518f532eb58c4577f883faa708e0ca1b4fc306 assets/interiors/models/block/floor_chair/pink_floor_chair_both.json 7d94960d34f247a448afea16fc42499cb5a28f1f assets/interiors/blockstates/kelp_seat.json @@ -181,7 +184,7 @@ d4803a01357638590f0c37ee24b4bd40af48ae3a data/interiors/advancements/recipes/bui b418dc24e62ddc2c6a7e42737c050aed4f9ec314 data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_seat.json 035144829140c8702d00daa38b22ac538d6282ae assets/interiors/models/block/chair/kelp_chair_both.json 2903c90a98c83d3373d1dc9bec0abd136490d228 data/interiors/recipes/crafting/floor_chair/white_floor_chair_from_seat.json -2e06883d74857eea4c306d64c6858cf362ad4dd7 data/interiors/recipes/crafting/floor_chair/brown_floor_chair_from_other_floor_chair.json +45a33f004d7213d7873ac42edeee21600c889cfd data/interiors/recipes/crafting/floor_chair/brown_floor_chair_from_other_floor_chair.json 564619a18472bd5c930b3e96287c9396231d9b55 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/red_floor_chair_from_other_floor_chair.json f1b83198c7929a2ef5c84d817ea3c67d51acf1a2 data/interiors/recipes/crafting/chair/yellow_chair_from_floor_chair.json 7cf377a3313848525cbe59a384d5fc93ba980263 data/interiors/loot_tables/blocks/red_floor_chair.json @@ -199,8 +202,8 @@ cbe648951eff6770fd529ed2affa0f638314e95b data/interiors/advancements/recipes/bui b2988d2492306495e9966503e51b37a4ce7dda7e data/interiors/recipes/crafting/floor_chair/white_floor_chair.json 33ca50a314a7e994abc35bf1b06e4dbc731788de assets/interiors/models/block/chair/black_chair_both.json 047916f611e089555cc6bd7883a05ae2df32581a assets/interiors/models/block/chair/kelp_chair_none.json +bc6287cfc798ca9e177fe7761f8626d0e775ab62 data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json 12f2bcf648860f442b279d82455ec94f717be978 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/magenta_floor_chair_from_seat.json -af555b90cd40ad5b4cde65190a6e7eea52c2d400 data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json 14b167a8a1a2c9575ba3a84353566ddd2867c0f3 data/interiors/loot_tables/blocks/gray_chair.json 8e938ad151ff4c0f4c5d3524923c4d28d198ed88 assets/interiors/models/block/floor_chair/gray_floor_chair_none_cropped.json ac105974315090e84a43f5384179f791ae37a655 assets/interiors/models/block/chair/kelp_chair_both_cropped.json @@ -218,13 +221,14 @@ eaafe928b599aa54390766636d4a42a674b945c5 assets/interiors/models/block/floor_cha f05de134b0952eb75709bdc3cfd14e0c6fcaa699 assets/interiors/models/block/chair/lime_chair_right_cropped.json 4e612b58397ff2864a5729e4baedd993f1019260 assets/interiors/blockstates/light_gray_chair.json 40c3f38836b7809a41110c3aa7bf3f5f30c20e6c assets/interiors/models/block/floor_chair/cyan_floor_chair_both.json -4cea2f25a5944e0ed1f85061884da965905a2dba data/interiors/recipes/crafting/chair/pink_chair_from_other_chair.json +87961240a1d380ab03d8b97e35cda6c9c63fec66 data/interiors/recipes/crafting/chair/pink_chair_from_other_chair.json 09e38a650f201ae746510fc878a0281a19e35a37 data/interiors/recipes/crafting/chair/light_gray_chair_from_floor_chair.json 3254002a8683242bedc3f90acf2182bd75d52426 assets/interiors/models/block/chair/magenta_chair_both.json c999a7d117c02e0e1fe82382bd10340f39e959b3 assets/interiors/models/block/chair/orange_chair_both_cropped.json 191ea771098df55b34371c47e24752b7a869ad37 assets/interiors/models/block/chair/lime_chair_none.json 0b78056c62c9f30a04eaa0380619d38988246fb4 assets/interiors/models/block/floor_chair/black_floor_chair_none_cropped.json 3890941ae826db88dc81c6833205daa6923a92ba assets/interiors/models/block/floor_chair/blue_floor_chair_right.json +4458283178334ae169a7cbbd1aa09067cbb99ee7 data/interiors/tags/items/internal/dyes/green_dyes.json 7428c5109eccd2a0060cc4b65f562f47a9079585 assets/interiors/models/block/chair/red_chair_both.json 07af06a34172e91a206f9cf7929c848c28d8e70a assets/interiors/models/block/chair/green_chair_none.json 5b7fea49155b907c1955ee65c2d1c1e3d2e6575d assets/interiors/models/block/floor_chair/cyan_floor_chair_none_cropped.json @@ -235,17 +239,22 @@ e586866c354cb783c7e9809f91a811bcb961996a assets/interiors/models/block/chair/lig 9136b6983cf74b9e0378a5cd31cba4e9b9cf51b4 assets/interiors/models/block/floor_chair/brown_floor_chair_left.json a315574a24870aeca3594f9613ca1ddbe4bf1c05 assets/interiors/models/block/floor_chair/light_blue_floor_chair_left_cropped.json 8eccc7f071b0d98f79e0df3eb07ef03e4d29fb3e assets/interiors/models/item/gray_floor_chair.json +82bc77ac080aa62bc6cdf0a932f4e80de50412dc data/interiors/tags/items/internal/dyes/pink_dyes.json b291d27cef477f862762d7473c20498c72961385 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/light_blue_floor_chair.json 2c38a437151f6b22e0421a82e764c0038c5bc9d2 data/interiors/loot_tables/blocks/magenta_chair.json +3f0d912779200aaaf55bef102d9b96acead1a636 data/interiors/tags/items/internal/dyes/purple_dyes.json 1a880dcd511e3c552a90fdd21b8d92c94e5f5ec0 assets/interiors/models/block/floor_chair/blue_floor_chair_left_cropped.json fa8cc3d5196f949f912e568974a3acdb30998160 assets/interiors/models/block/chair/blue_chair_none_cropped.json 248f97aabc09afb88b726b638ce69327a2a98af7 data/interiors/loot_tables/blocks/cyan_chair.json 22f2f6cf60685d2dbeb5b16496d896ca6a180a8e assets/interiors/models/block/floor_chair/green_floor_chair_none.json +62ab2750314492e8da73768bd891faee34cfdcd6 data/interiors/tags/items/internal/dyes/red_dyes.json 8082f18e03bab13d7b54551e2a641a490ee4e1e6 assets/interiors/models/block/floor_chair/red_floor_chair_none_cropped.json +9fdcd12c871f136e66973a8c02be94a675a4b727 data/interiors/tags/items/internal/dyes/yellow_dyes.json 19745e1d7cbbcb83647d0134944d0bcfb4bd5804 data/interiors/recipes/crafting/floor_chair/yellow_floor_chair_from_seat.json 76ab61848fd72adfcd86c95bf2b52622bc8cd499 data/interiors/recipes/crafting/chair/brown_chair_from_seat.json f45faa60a5c3c99488ff029161552a41c1c46e7d data/interiors/tags/blocks/floor_chairs.json e2aa698c6f90f90cc2aef89df00deb50cdb9550d assets/interiors/models/block/chair/yellow_chair_both.json +e62db1a880d468865769307ad19f16d9b7dac7c1 data/interiors/tags/items/internal/dyes/light_gray_dyes.json 4564041dcc85088f3d1359ba9aede7f27d7e560e data/interiors/recipes/crafting/chair/black_chair_from_seat.json df46d841e2fc2c10ebc12768775d84f1a462bad6 data/interiors/recipes/crafting/floor_chair/light_gray_floor_chair_from_seat.json 4ea04a7e4a63d4eaf1bdea1315857ab2cf7a7829 data/interiors/recipes/crafting/chair/brown_chair_from_floor_chair.json @@ -262,9 +271,9 @@ f63310a5080444ce2cb59d80c28acb0fd117f78d data/interiors/loot_tables/blocks/green ced4d028c66986eb56807c9bca830f0484046e71 assets/interiors/models/block/chair/orange_chair_none_cropped.json c3f84103fed4bbfb59894a94c818d75041e847c3 assets/interiors/models/block/chair/blue_chair_left.json 6fdce01d7c381119470ff23f69ab96d3efe93c2e assets/interiors/models/block/chair/blue_chair_left_cropped.json -e8269ce1e808f392ae0359694eed4e6243324b89 data/interiors/recipes/crafting/floor_chair/pink_floor_chair_from_other_floor_chair.json +41a02d5c21aa4c8dc4e49fd693236285602f85c0 data/interiors/recipes/crafting/floor_chair/pink_floor_chair_from_other_floor_chair.json 4005c031b1a8d82f761236c4807cda619eea740c assets/interiors/models/block/chair/pink_chair_both.json -6cdeacd67beb885fe97a85ac5d2ba1238bfc56b4 data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_other_floor_chair.json +3ddd09c10e724b6d00efcf403eb69e08bca70fa5 data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_other_floor_chair.json 5989fd046f9deb0456e74fa6fff136d03a0da2d3 data/interiors/recipes/crafting/chair/lime_chair.json 4f1a709b15562e027947014c9af1f15fcb6c1012 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json 7f364d19e0c3591c6c92fe0f5ef1053e77da0101 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/gray_floor_chair_from_seat.json @@ -273,15 +282,16 @@ a32ac5b823db5a8d65d6f7468081c121352b7bfa data/interiors/recipes/crafting/chair/b 566d84903e4acb98dbc7b8b4f88349b76a2a7284 assets/interiors/models/block/chair/green_chair_left.json 7caf1fae7a918672789cade2c940ac013b7190ea assets/interiors/models/block/chair/kelp_floor_chair_left.json 9bfeb1188d095bf5d9910af233b0c8f4ed2d295f data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/yellow_floor_chair.json -2ecec8b7a575e7b4203915f3c98ae82c2a4484a2 data/interiors/recipes/crafting/chair/lime_chair_from_other_chair.json +e231b2049e65116458444b710cc61f8114062695 data/interiors/recipes/crafting/chair/lime_chair_from_other_chair.json 2ba222ffb61a6f7eb22126776c850d63150a5998 data/interiors/advancements/recipes/building_blocks/crafting/chair/lime_chair_from_seat.json 65d355619358d6fa8da0301c1b8f48bdf7e76437 data/interiors/advancements/recipes/building_blocks/crafting/chair/black_chair_from_floor_chair.json 0b53e2b489cf1d60d55f9d9556be87ac5f3b2e6c assets/interiors/models/block/floor_chair/lime_floor_chair_right_cropped.json -a4b026151c48f0e34068fbe160d5dce805401f19 data/interiors/recipes/crafting/chair/light_blue_chair_from_other_chair.json +64c77aa6b0cbe094e3e23e7479d5a192b772c486 data/interiors/recipes/crafting/chair/light_blue_chair_from_other_chair.json +ac8c537dfc0e6704a0abe4f47130c41b19cde231 data/interiors/tags/items/internal/dyes/magenta_dyes.json 960c95efd447456651f2c555b2959154e58bd8b5 data/interiors/advancements/recipes/building_blocks/crafting/chair/green_chair_from_floor_chair.json 48e4d9271b889ff9496d5b4f5e475c313db61f63 assets/interiors/models/block/floor_chair/cyan_floor_chair_none.json 38cef4a6179301887375b85e5b5c0e7452260223 assets/interiors/models/block/floor_chair/gray_floor_chair_left_cropped.json -6e0807c01dc31057f6559a59489d6127aa011091 data/interiors/recipes/crafting/floor_chair/green_floor_chair_from_other_floor_chair.json +421d421ba5577ffc5c06e2c8e30c898dca428cfa data/interiors/recipes/crafting/floor_chair/green_floor_chair_from_other_floor_chair.json 77bf644f23aa3d1151bace1030d4e203b0a9a366 assets/interiors/blockstates/lime_chair.json 74d189d72e06cc0aa375d4039e43af4a0185b1fd data/interiors/advancements/recipes/building_blocks/crafting/chair/light_gray_chair_from_other_chair.json 2d0ef6a1e55fb1b176117f96a8737597bfcf810e assets/interiors/models/item/yellow_floor_chair.json @@ -325,7 +335,7 @@ e15f1b59f4f7e3fe5c5f07ae3d217e05921b2e6c assets/interiors/models/block/chair/lig 5a9de2f8dc83a8d57668c4834c5b73d69434780c data/interiors/loot_tables/blocks/light_blue_floor_chair.json 53263af91d14731e9670846aa121beeb1c8b5b8f data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json dc5bf260b0d850e976af18b80542a9e6c707c9a0 assets/interiors/models/block/floor_chair/white_floor_chair_right.json -37532c4c4e7b76eb90a7f12b58431e60ea0a9e74 data/interiors/recipes/crafting/chair/orange_chair_from_other_chair.json +7e46e8e604560d442a289874238d73bc9c68ba8e data/interiors/recipes/crafting/chair/orange_chair_from_other_chair.json 6df02ac5f9ddb7f630d53696728dc02924645568 data/interiors/recipes/crafting/chair/magenta_chair.json 246b38676700833b85bc6d49cb68a1cf634f2173 assets/interiors/models/block/chair/green_chair_both_cropped.json 07973c3143269db242be91193ad054a10f21f0aa assets/interiors/models/block/floor_chair/brown_floor_chair_left_cropped.json @@ -341,11 +351,12 @@ dac4dc6c457ea01bd692bf04a477e10b86e9d1fd assets/interiors/blockstates/black_chai 59daf1b84c55f35fb4548af06d37318af63e9183 assets/interiors/models/block/chair/light_gray_chair_right_cropped.json 9e05272acf05d08cf53594a30c103d86f6f2e85c assets/interiors/models/block/chair/lime_chair_right.json d5805f3656a060b6366999e4bde885fd27959b9d data/interiors/advancements/recipes/building_blocks/crafting/chair/yellow_chair_from_floor_chair.json +d1629b144f7bb21fdac6d84982720c8195f77b8e data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json a3d1e4c30bf30d1f9c7b26c6c043efe5a05502b1 data/interiors/advancements/recipes/building_blocks/crafting/chair/pink_chair.json -72da9e1ab98e9f10c0db1a5eced3385985a1a36a data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json fa0fa535b7190d9963a822cf79e3fe5086ed7cff data/interiors/recipes/crafting/floor_chair/blue_floor_chair.json 4a34c30999dd6653e1081c30fa7fdbba1dfbe6a6 assets/interiors/models/block/chair/gray_chair_both.json 54524072bcc8a277a004147eee971c0ee06c3bad data/interiors/recipes/crafting/chair/green_chair_from_floor_chair.json +4d944b6e0e93a3444591a2e540530da0b2a0ff08 data/interiors/tags/items/internal/dyes/light_blue_dyes.json 083caf165cf17c19817d166317e60b8eac3914a1 data/interiors/advancements/recipes/building_blocks/crafting/chair/cyan_chair.json 5168492c551875243a3ef66f6d86bacd14e9ad2c assets/interiors/models/block/floor_chair/light_gray_floor_chair_right_cropped.json a7563d91705114d819af1dca5f0cd8d6acfce5bf data/minecraft/tags/blocks/planks.json @@ -355,15 +366,18 @@ a7563d91705114d819af1dca5f0cd8d6acfce5bf data/minecraft/tags/blocks/planks.json 7f40e57da59053375c666e0645b37d3a9ad1c7b1 assets/interiors/blockstates/cyan_floor_chair.json 82032590206bd8f686b99d5214193f9359df4b81 data/interiors/advancements/recipes/building_blocks/crafting/chair/white_chair_from_floor_chair.json 9bb6fbe23b5eb248bbb9418cc4c843691d0e7a00 assets/interiors/models/block/floor_chair/purple_floor_chair_both_cropped.json +27788e1854c12b323c1fe5945858fce4d1544e3c data/interiors/tags/items/internal/dyes/white_dyes.json ceb92b73ef2085dd95f76e81463ebeaaca22f3c5 assets/interiors/models/block/floor_chair/red_floor_chair_both.json 4eff133eaa2f2b3c9da0e81aaa995080cac1184c assets/interiors/models/block/chair/light_gray_chair_both_cropped.json c0551368e06223f8b31ce4b5253c054ead76d87e assets/interiors/models/block/chair/yellow_chair_right_cropped.json 6983f4bc045e04d20f75f045115c3c0ffc8681fd assets/interiors/models/block/chair/red_chair_left.json +b1f339ffecbae2c812e18a1286162d31429ce356 data/interiors/tags/items/internal/dyes/gray_dyes.json 7139b18095e841d52e3a5b544f7a5fd5a1e38ea4 assets/interiors/models/block/floor_chair/black_floor_chair_right_cropped.json 261f9b753c8886e4e3c2026c6ca052e3aab88ffc assets/interiors/models/block/chair/orange_chair_none.json 221c5647c64d557006e282eb285371a2ead3184b assets/interiors/models/block/chair/black_chair_left.json 281a42a53004016826a59f57be7ea091cd22429c data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/cyan_floor_chair_from_other_floor_chair.json -bdb09a20170b20999fb942d309453cf0bbe02d00 data/interiors/recipes/crafting/floor_chair/magenta_floor_chair_from_other_floor_chair.json +ad712dd2a2a7268dfa773f38a50d526952758d5c data/interiors/tags/items/internal/dyes/cyan_dyes.json +ddb74079f798e4435d304217783b1ff538cff02b data/interiors/recipes/crafting/floor_chair/magenta_floor_chair_from_other_floor_chair.json 1cc58f2144f466408686904905f6fcefedb36ed9 assets/interiors/models/block/chair/pink_chair_both_cropped.json 0950c8f5638e35e7535a54d0d7ee4731df2336c8 data/interiors/loot_tables/blocks/magenta_floor_chair.json b033642edb0c1606343eb19b0ba7404ac899e7fa data/interiors/recipes/crafting/floor_chair/orange_floor_chair.json @@ -401,7 +415,7 @@ cdd1b2b648a1c3701f777aa19ef27b64ed2e1b5b assets/interiors/models/block/floor_cha 4ca8f4f1524ccc6754f5862d878d69b01213b59c assets/interiors/models/block/chair/orange_chair_right_cropped.json d435e2557857b449d6726c9a84c1cf85f00a69b0 data/interiors/loot_tables/blocks/white_floor_chair.json c0af6428b82833d65c540170c7a37f3783490300 assets/interiors/blockstates/pink_floor_chair.json -a5e835f773a272a31a86864f9d81b5bc9d1386e2 data/interiors/recipes/crafting/chair/gray_chair_from_other_chair.json +d66649a49ae66c91fe6ea973a78cc5f9005ac181 data/interiors/recipes/crafting/chair/gray_chair_from_other_chair.json 1a19bca73222fc12dd4adc6ffbd53d3eb5700ef8 assets/interiors/models/block/floor_chair/white_floor_chair_left.json 7ab334acfd566d52ca9872e2be5f6b1e21b1e5c6 assets/interiors/models/block/chair/yellow_chair_none.json f297cb92ddec77e27b2f30650efdc8ffee2ea503 assets/interiors/models/item/gray_chair.json @@ -422,14 +436,14 @@ b64e4cad15673ccd05f5a121ca5d96cee88d5687 assets/interiors/blockstates/blue_floor 0db7796977effa4001e80e826633ed21d899d485 assets/interiors/models/block/floor_chair/lime_floor_chair_none_cropped.json bad25992fd11eb84f69ac2b2bd0baa1bb27f803e data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_seat.json ccb649ba8bd0834645a54fd8d0047feb3b2aeeea data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/pink_floor_chair_from_other_floor_chair.json -30ced7db5fe40b64e1e9619bb5c13e83423fd30c data/interiors/recipes/crafting/floor_chair/black_floor_chair_from_other_floor_chair.json +7c166a57c5f3b8bc4bd610b77b48f7232dcbe838 data/interiors/recipes/crafting/floor_chair/black_floor_chair_from_other_floor_chair.json 51ab4c1d1b07dcbe6fdf2e82a39b7f86b71af9d4 assets/interiors/models/block/chair/kelp_floor_chair_both_cropped.json 4fe6b59c5bc07491ef483cb1ea680211dd1a74b8 assets/interiors/models/block/floor_chair/red_floor_chair_left.json 71cbc9332c2c9d628fd577f8da6f5da472d35877 data/interiors/recipes/crafting/chair/blue_chair.json 65d0a0af60ddd772249a19ec15ccd988d18036f7 assets/interiors/models/block/chair/magenta_chair_right_cropped.json a1e6ed72f5beca1248299c60d6ef4e8081eb271d assets/interiors/models/block/chair/gray_chair_right_cropped.json 367b25446164e6b044044337bcbbbfc175406c3f data/interiors/loot_tables/blocks/blue_chair.json -8aa4e5f2be8d3d2acc8ac797439d14cbe17eb3d2 data/interiors/recipes/crafting/chair/yellow_chair_from_other_chair.json +6767e93f12b3aa59261a5a84eaf2389e7e68bab6 data/interiors/recipes/crafting/chair/yellow_chair_from_other_chair.json 9b575c3091b916f4b04f4f5d6a76bbb0de6a20d6 data/interiors/recipes/crafting/chair/black_chair.json fb337dddae5f33076d887dd710f29e3a25c8e8ab data/interiors/loot_tables/blocks/gray_floor_chair.json 8b89b263a6d2e4edef24dc923a3eaca5366c4c4f assets/interiors/models/block/floor_chair/cyan_floor_chair_right_cropped.json @@ -459,13 +473,13 @@ ca1a4d054d3ef7b5ed031ced166dfd0e7f82e469 assets/interiors/models/block/chair/pin 9c6949cd8db915cfe5b3af5452a4a8a760e30188 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/white_floor_chair_from_seat.json d46ab950fde944fd2f489714551276347bcb22cd assets/interiors/models/block/chair/black_chair_none_cropped.json 0afe061890ac247aa6048e6c9b6737e23aa1df1c assets/interiors/models/block/chair/lime_chair_both.json -265970a97b4f76b179c30fcd21c4aaac77cf8cc9 data/interiors/recipes/crafting/floor_chair/light_gray_floor_chair_from_other_floor_chair.json +5875795dc38ce4af841bb68f34161e0da0782e4b data/interiors/recipes/crafting/floor_chair/light_gray_floor_chair_from_other_floor_chair.json 15c7b99dab3feec0baaa75bea6c72efc98917ae6 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/red_floor_chair.json b1733881e5911dc993fdf6789cc66e68ca5a5679 assets/interiors/blockstates/green_chair.json 93876c38c7f5b055238f0a7f3e9a93722a2d369c data/interiors/advancements/recipes/building_blocks/crafting/chair/black_chair_from_other_chair.json 36036cc417a244351392176cf790093540174336 assets/interiors/models/block/chair/light_gray_chair_none.json -99d8bbaf79f0715dc7f8c628cc02543c766a2e87 data/interiors/advancements/recipes/building_blocks/crafting/chair/brown_chair_from_other_chair.json 79c08dbe0887d06f0b7f7d776acc61ca6491b8db data/interiors/recipes/crafting/chair/pink_chair_from_seat.json +99d8bbaf79f0715dc7f8c628cc02543c766a2e87 data/interiors/advancements/recipes/building_blocks/crafting/chair/brown_chair_from_other_chair.json 78ae55ad019ce944ffa0de3adadc90d75bf59131 data/interiors/advancements/recipes/building_blocks/crafting/chair/purple_chair_from_floor_chair.json 7ea96efd7e5f03fcaef59bc8cdcb0f7e265ff0aa data/interiors/loot_tables/blocks/kelp_seat.json efcc4d2783a66fcba9ec3b0e80fe15ffd07c1016 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/blue_floor_chair_from_other_floor_chair.json @@ -488,7 +502,7 @@ b37abbf5f8896410c8ff7ee9ef404f0f00899994 assets/interiors/blockstates/kelp_floor f351f109b9359d250a8c697f7ab6f05d3345fa4b data/interiors/loot_tables/blocks/yellow_floor_chair.json a27ec5954c89706cf24cb8adc169a92678c15783 assets/interiors/models/block/chair/light_blue_chair_right.json 1245903220505c83614feb5ece177a8dcb09321e assets/interiors/models/block/floor_chair/magenta_floor_chair_left.json -8ea350a249c119d86f5a0d81011ef8e52672f243 data/interiors/recipes/crafting/floor_chair/orange_floor_chair_from_other_floor_chair.json +1632b614a66e8b95633dcec202ca36e19c0b5560 data/interiors/recipes/crafting/floor_chair/orange_floor_chair_from_other_floor_chair.json e0d973321adfbf0ce5e9782937e911097b4585c4 assets/interiors/models/block/chair/cyan_chair_both.json 92bf940c8202a1fcbe0d3009d9a313b12482e866 data/interiors/recipes/crafting/chair/yellow_chair_from_seat.json 18cf265082eca0bd630917cb71bae9ad68f47d19 assets/interiors/models/block/chair/pink_chair_left.json @@ -504,7 +518,7 @@ a9dc283fa682fe05b5962762aba30afb212de1e0 data/minecraft/tags/blocks/mineable/axe 0afa981ee9af7078349d2f2192d175505815a218 data/interiors/loot_tables/blocks/light_gray_chair.json f80052194bb5fdea3c5f878f65b731362d0af202 assets/interiors/models/block/chair/brown_chair_left_cropped.json 6934841b527e6f48c54d119681b398a99e47f5b7 assets/interiors/models/block/floor_chair/magenta_floor_chair_none_cropped.json -2b473338b91d454163dea2a5f72139d15427e28e data/interiors/recipes/crafting/floor_chair/gray_floor_chair_from_other_floor_chair.json +2876d358a038f185694468e498cb0aa219eb0d39 data/interiors/recipes/crafting/floor_chair/gray_floor_chair_from_other_floor_chair.json 1702e13cd7eee98b25d492c7384a378275dc8fdd data/interiors/advancements/recipes/building_blocks/crafting/chair/orange_chair_from_other_chair.json a0231f8e29d8ae12f0152ee9bff19dd870d88af5 data/interiors/advancements/recipes/building_blocks/crafting/floor_chair/orange_floor_chair.json 4d399955b93d26635e956647d6485e5724507212 assets/interiors/blockstates/black_floor_chair.json @@ -518,13 +532,14 @@ f8f92bb5b86550d6cfebba6af4e4b99751a6776d assets/interiors/models/block/chair/red 9a260af6dd60de755f37541a0356121c6619d45b assets/interiors/models/block/chair/magenta_chair_right.json 73c297867e1805906231a6354d05c29ccfefcb43 assets/interiors/models/block/chair/white_chair_right.json efa056c773d8e45d483f76c9c958a2563057c9af assets/interiors/models/item/orange_floor_chair.json -3237ca961f9f155a9602cc32193c509ffe4890c8 data/interiors/recipes/crafting/chair/brown_chair_from_other_chair.json +ad515036b01753b26a46fb04a2d7abfef6838251 data/interiors/recipes/crafting/chair/brown_chair_from_other_chair.json fac94e0e252e10fdf638aebe0105fd03bd7559aa assets/interiors/blockstates/orange_chair.json e9e8d09c6c366c4a6c41f024699559e63ccd5d2e data/interiors/advancements/recipes/building_blocks/crafting/chair/lime_chair_from_floor_chair.json 819cd305b6ce432c83588ee1c8ef7da11c6f6cbe data/interiors/recipes/crafting/chair/magenta_chair_from_floor_chair.json 462b176288f610248e628168f5fdab89ac86c9f0 assets/interiors/models/block/floor_chair/light_blue_floor_chair_none.json bbd1b62664bddcae11dd7f5b1ad7d3a9cf93ef22 assets/interiors/models/item/yellow_chair.json df9f9bfe5e0cd30654d2b3b1db1a25e350029485 data/interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_seat.json +ce821bcccb920fd51237904e253fb29100882648 data/interiors/tags/items/internal/dyes/brown_dyes.json 8ce4bc17c83933754a7cb3fff425c6eee64a517e assets/interiors/models/block/floor_chair/lime_floor_chair_both_cropped.json 760556cf409e487bdde0d0a25f6dae24fd4ed7ee data/interiors/loot_tables/blocks/yellow_chair.json 30fbf54b9b6311754140cb022cf9b98fe1cd41a0 assets/interiors/models/block/floor_chair/magenta_floor_chair_both_cropped.json @@ -537,13 +552,13 @@ df9f9bfe5e0cd30654d2b3b1db1a25e350029485 data/interiors/recipes/crafting/floor_c 619ff3d06d46d5f61c1637d07ac3aa5b1d1d6078 assets/interiors/models/block/chair/yellow_chair_left_cropped.json 9b7e09e7d8512c40ef04ef2998df53bc9c182bab assets/interiors/models/item/magenta_floor_chair.json 11c7ceb38387d574a42089265049a1485b0518d5 assets/interiors/models/block/chair/light_gray_chair_left.json -5445577bd207baa79fedd2a84ac8e9de10a07e19 data/interiors/recipes/crafting/floor_chair/blue_floor_chair_from_other_floor_chair.json +be2bb89d8f3d36954d0a90b6e43854d4cd94ce62 data/interiors/recipes/crafting/floor_chair/blue_floor_chair_from_other_floor_chair.json 574fcdf54ff4326d8e60c4041801e2c67e652db4 assets/interiors/models/block/chair/cyan_chair_right.json 2b26a3afdf36aeb3f42ea2b9585d7325515c757c assets/interiors/models/block/floor_chair/green_floor_chair_left_cropped.json 6d1277542e3a919268272d2218f6b2661b4a314e assets/interiors/models/block/floor_chair/blue_floor_chair_both.json 0b5a902571f1af9f4030a5b21f1cddc420d3198f data/interiors/recipes/crafting/floor_chair/brown_floor_chair_from_seat.json 340e8b40f13a263196b7139b23a1e6d819635d37 data/interiors/advancements/recipes/building_blocks/crafting/chair/orange_chair_from_floor_chair.json -de5e1aa5374561ab5e22e3a5e59f0c2cfa82a553 data/interiors/recipes/crafting/chair/blue_chair_from_other_chair.json +92486bc41ccac94235da4908b5fc99d34817c7b8 data/interiors/recipes/crafting/chair/blue_chair_from_other_chair.json 5e362f4bc7875b58352a5e83e107c676cc04995f assets/interiors/models/block/floor_chair/yellow_floor_chair_left_cropped.json 4861ada3f4ee09ea1d984d340df8b4c33722bfce assets/interiors/models/block/floor_chair/cyan_floor_chair_both_cropped.json c406ab4b9ee9a98e93c4ec75b761cde27b753042 data/interiors/recipes/crafting/floor_chair/pink_floor_chair_from_seat.json @@ -583,6 +598,7 @@ a45035a779800799984ea23d83d6a54c1d1d0e49 assets/interiors/models/block/floor_cha 76b475fab697342989f885ac42a0809fa417c573 assets/interiors/models/block/floor_chair/light_gray_floor_chair_none.json 8f61168cf16012d38bd5257d987edd87889eb403 assets/interiors/models/block/floor_chair/orange_floor_chair_left.json 990d861273ccc8f620246ea3721ddca4b2000932 assets/interiors/models/block/chair/yellow_chair_both_cropped.json +a7e754dd80af7eff6447f4376b98ebe4eb54e7d6 data/interiors/tags/items/internal/dyes/black_dyes.json 36d52ab277e4c2cf46253972e0818ec245e7e4c9 assets/interiors/models/block/floor_chair/black_floor_chair_right.json 91c806a356c0fc3be084e90b7a32ff4b72a09304 assets/interiors/blockstates/yellow_chair.json db5247e39a6378fb6ef871e5dfe5733ff0f993f9 assets/interiors/models/block/chair/orange_chair_left.json @@ -609,10 +625,10 @@ cdd60ef3f901911482595447212cb186b49aa932 assets/interiors/models/item/orange_cha a34dfcb9905eb10f317989f8fcaea71506aab599 assets/interiors/models/block/floor_chair/black_floor_chair_left.json dae54bc64e2c0bb0ef2e975c5e0f7ace6fa58981 assets/interiors/blockstates/red_chair.json c435ade062f043d88d3d1c7e50cb33c4c35c363d data/interiors/recipes/crafting/floor_chair/black_floor_chair.json -e7047960d2d4bc795a03c8909b377f723b4cb636 data/interiors/recipes/crafting/chair/light_gray_chair_from_other_chair.json +56e67b275154b19c9f8a0b539a7fee832f9cc539 data/interiors/recipes/crafting/chair/light_gray_chair_from_other_chair.json 3422ac8cae48276683c75014e2e49f4cacf8b1d1 data/interiors/recipes/crafting/chair/white_chair_from_seat.json 7b018ab3a9cedd72001ea5323381f284136d8b92 assets/interiors/models/block/floor_chair/light_blue_floor_chair_left.json 01a6423954c83271e48832881604d546b95a76c0 data/interiors/advancements/recipes/building_blocks/crafting/chair/yellow_chair_from_seat.json 749bb4cd9f56f98c1e6cff3b644e04b96e609f88 assets/interiors/models/block/chair/gray_chair_left_cropped.json -ac4783100a864bf884da1c86112cb267c47559f0 data/interiors/recipes/crafting/chair/green_chair_from_other_chair.json +305bdddf97f4bee23f92fb04c27b50ee3559c8cc data/interiors/recipes/crafting/chair/green_chair_from_other_chair.json ba9b1ee930d7dfd5c03831a4cd355a8da289b77a data/interiors/recipes/crafting/chair/orange_chair_from_floor_chair.json diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/black_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/black_chair_from_other_chair.json index e338d502..3184e1c0 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/black_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/black_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:black_dyes" + "tag": "interiors:internal/dyes/black_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/blue_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/blue_chair_from_other_chair.json index 4c5210c7..f0fcbb19 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/blue_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/blue_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:blue_dyes" + "tag": "interiors:internal/dyes/blue_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/brown_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/brown_chair_from_other_chair.json index 30613021..378cb12e 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/brown_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/brown_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:brown_dyes" + "tag": "interiors:internal/dyes/brown_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json index d99ebe5f..40f8c47d 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:cyan_dyes" + "tag": "interiors:internal/dyes/cyan_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/gray_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/gray_chair_from_other_chair.json index 8709c9b3..0b7546a5 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/gray_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/gray_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:gray_dyes" + "tag": "interiors:internal/dyes/gray_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/green_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/green_chair_from_other_chair.json index 3927c43a..7572901d 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/green_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/green_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:green_dyes" + "tag": "interiors:internal/dyes/green_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/light_blue_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/light_blue_chair_from_other_chair.json index 294b4a00..b56c6def 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/light_blue_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/light_blue_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:light_blue_dyes" + "tag": "interiors:internal/dyes/light_blue_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/light_gray_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/light_gray_chair_from_other_chair.json index 2139fa1e..6a9dc0b0 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/light_gray_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/light_gray_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:light_gray_dyes" + "tag": "interiors:internal/dyes/light_gray_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/lime_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/lime_chair_from_other_chair.json index 2e5fc434..8f5ce5de 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/lime_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/lime_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:lime_dyes" + "tag": "interiors:internal/dyes/lime_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/magenta_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/magenta_chair_from_other_chair.json index c8f6b248..b75f327c 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/magenta_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/magenta_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:magenta_dyes" + "tag": "interiors:internal/dyes/magenta_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/orange_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/orange_chair_from_other_chair.json index 9f8439a7..06671430 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/orange_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/orange_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:orange_dyes" + "tag": "interiors:internal/dyes/orange_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/pink_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/pink_chair_from_other_chair.json index b87d45ae..0063bf5b 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/pink_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/pink_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:pink_dyes" + "tag": "interiors:internal/dyes/pink_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/purple_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/purple_chair_from_other_chair.json index 4c08f67c..f1fcd9ec 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/purple_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/purple_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:purple_dyes" + "tag": "interiors:internal/dyes/purple_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/red_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/red_chair_from_other_chair.json index 54280834..7daae15e 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/red_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/red_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:red_dyes" + "tag": "interiors:internal/dyes/red_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/white_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/white_chair_from_other_chair.json index 3d24def7..b1236e87 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/white_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/white_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:white_dyes" + "tag": "interiors:internal/dyes/white_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/chair/yellow_chair_from_other_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/chair/yellow_chair_from_other_chair.json index d4b275e0..23c5feed 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/chair/yellow_chair_from_other_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/chair/yellow_chair_from_other_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:chairs" }, { - "tag": "c:yellow_dyes" + "tag": "interiors:internal/dyes/yellow_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/black_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/black_floor_chair_from_other_floor_chair.json index 026458b7..fe69456d 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/black_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/black_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:black_dyes" + "tag": "interiors:internal/dyes/black_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/blue_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/blue_floor_chair_from_other_floor_chair.json index 41f8a925..8204a637 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/blue_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/blue_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:blue_dyes" + "tag": "interiors:internal/dyes/blue_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/brown_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/brown_floor_chair_from_other_floor_chair.json index 7dfb18fe..614c0784 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/brown_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/brown_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:brown_dyes" + "tag": "interiors:internal/dyes/brown_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_other_floor_chair.json index 6d07816a..0e0af7c5 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:cyan_dyes" + "tag": "interiors:internal/dyes/cyan_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/gray_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/gray_floor_chair_from_other_floor_chair.json index b130128b..db217ecd 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/gray_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/gray_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:gray_dyes" + "tag": "interiors:internal/dyes/gray_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/green_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/green_floor_chair_from_other_floor_chair.json index fe344f32..ef173e99 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/green_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/green_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:green_dyes" + "tag": "interiors:internal/dyes/green_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json index a7c24da8..3dc4d98e 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:light_blue_dyes" + "tag": "interiors:internal/dyes/light_blue_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/light_gray_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/light_gray_floor_chair_from_other_floor_chair.json index d61965ae..85c623a9 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/light_gray_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/light_gray_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:light_gray_dyes" + "tag": "interiors:internal/dyes/light_gray_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json index aa2eea70..4f9de491 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:lime_dyes" + "tag": "interiors:internal/dyes/lime_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/magenta_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/magenta_floor_chair_from_other_floor_chair.json index 3d8b450a..505f32ad 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/magenta_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/magenta_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:magenta_dyes" + "tag": "interiors:internal/dyes/magenta_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/orange_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/orange_floor_chair_from_other_floor_chair.json index 926c17dc..cb3f1172 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/orange_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/orange_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:orange_dyes" + "tag": "interiors:internal/dyes/orange_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/pink_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/pink_floor_chair_from_other_floor_chair.json index c1ca65ee..0e300e88 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/pink_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/pink_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:pink_dyes" + "tag": "interiors:internal/dyes/pink_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json index 5ea63f8e..82fec5a3 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:purple_dyes" + "tag": "interiors:internal/dyes/purple_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/red_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/red_floor_chair_from_other_floor_chair.json index 4d9f8f2e..37985113 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/red_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/red_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:red_dyes" + "tag": "interiors:internal/dyes/red_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/white_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/white_floor_chair_from_other_floor_chair.json index 31476f15..283a8515 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/white_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/white_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:white_dyes" + "tag": "interiors:internal/dyes/white_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/yellow_floor_chair_from_other_floor_chair.json b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/yellow_floor_chair_from_other_floor_chair.json index 7c26441f..ee4b6704 100644 --- a/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/yellow_floor_chair_from_other_floor_chair.json +++ b/common/src/generated/resources/data/interiors/recipes/crafting/floor_chair/yellow_floor_chair_from_other_floor_chair.json @@ -6,7 +6,7 @@ "tag": "interiors:floor_chairs" }, { - "tag": "c:yellow_dyes" + "tag": "interiors:internal/dyes/yellow_dyes" } ], "result": { diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/black_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/black_dyes.json new file mode 100644 index 00000000..25eb49c7 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/black_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:black_dyes", + "required": false + }, + { + "id": "#forge:dyes/black", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/blue_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/blue_dyes.json new file mode 100644 index 00000000..a7a0fbf4 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/blue_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:blue_dyes", + "required": false + }, + { + "id": "#forge:dyes/blue", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/brown_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/brown_dyes.json new file mode 100644 index 00000000..577337e0 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/brown_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:brown_dyes", + "required": false + }, + { + "id": "#forge:dyes/brown", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/cyan_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/cyan_dyes.json new file mode 100644 index 00000000..ddf9ef3e --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/cyan_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:cyan_dyes", + "required": false + }, + { + "id": "#forge:dyes/cyan", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/gray_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/gray_dyes.json new file mode 100644 index 00000000..84b0dfe0 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/gray_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:gray_dyes", + "required": false + }, + { + "id": "#forge:dyes/gray", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/green_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/green_dyes.json new file mode 100644 index 00000000..fd0e1cae --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/green_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:green_dyes", + "required": false + }, + { + "id": "#forge:dyes/green", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/light_blue_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/light_blue_dyes.json new file mode 100644 index 00000000..41ebc483 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/light_blue_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:light_blue_dyes", + "required": false + }, + { + "id": "#forge:dyes/light_blue", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/light_gray_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/light_gray_dyes.json new file mode 100644 index 00000000..28b2c5fd --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/light_gray_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:light_gray_dyes", + "required": false + }, + { + "id": "#forge:dyes/light_gray", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/lime_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/lime_dyes.json new file mode 100644 index 00000000..dbab61e4 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/lime_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:lime_dyes", + "required": false + }, + { + "id": "#forge:dyes/lime", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/magenta_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/magenta_dyes.json new file mode 100644 index 00000000..2d3ad5e2 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/magenta_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:magenta_dyes", + "required": false + }, + { + "id": "#forge:dyes/magenta", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/orange_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/orange_dyes.json new file mode 100644 index 00000000..927d06a7 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/orange_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:orange_dyes", + "required": false + }, + { + "id": "#forge:dyes/orange", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/pink_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/pink_dyes.json new file mode 100644 index 00000000..31d96e06 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/pink_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:pink_dyes", + "required": false + }, + { + "id": "#forge:dyes/pink", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/purple_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/purple_dyes.json new file mode 100644 index 00000000..07a2dc8b --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/purple_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:purple_dyes", + "required": false + }, + { + "id": "#forge:dyes/purple", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/red_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/red_dyes.json new file mode 100644 index 00000000..08a98511 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/red_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:red_dyes", + "required": false + }, + { + "id": "#forge:dyes/red", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/white_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/white_dyes.json new file mode 100644 index 00000000..3f7c618f --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/white_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:white_dyes", + "required": false + }, + { + "id": "#forge:dyes/white", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/yellow_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/yellow_dyes.json new file mode 100644 index 00000000..80036299 --- /dev/null +++ b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/yellow_dyes.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + { + "id": "#c:yellow_dyes", + "required": false + }, + { + "id": "#forge:dyes/yellow", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/java/com/sudolev/interiors/Utils.java b/common/src/main/java/com/sudolev/interiors/Utils.java index cf112707..99e010cb 100644 --- a/common/src/main/java/com/sudolev/interiors/Utils.java +++ b/common/src/main/java/com/sudolev/interiors/Utils.java @@ -1,8 +1,11 @@ package com.sudolev.interiors; +import com.sudolev.interiors.content.registry.CITags; +import com.tterrag.registrate.providers.RegistrateTagsProvider; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.core.Direction; +import net.minecraft.data.tags.TagsProvider.TagAppender; import net.minecraft.nbt.CompoundTag; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.Entity; @@ -35,7 +38,7 @@ public static CompoundTag getCustomData(Entity entity) { } @ExpectPlatform - public static TagKey tagFromColor(DyeColor color) { + public static TagAppender tagAppender(RegistrateTagsProvider prov, TagKey tag) { throw new AssertionError(); } @@ -45,7 +48,7 @@ public static DyeColor colorFromItem(ItemStack stack) { } else { for (int x = 0; x < DyeColor.BLACK.getId(); ++x) { DyeColor color = DyeColor.byId(x); - if (stack.is(tagFromColor(color))) { + if (stack.is(CITags.DYES.get(color).tag)) { return color; } } diff --git a/common/src/main/java/com/sudolev/interiors/content/registry/CIBlocks.java b/common/src/main/java/com/sudolev/interiors/content/registry/CIBlocks.java index 42b69572..5c2bfd01 100644 --- a/common/src/main/java/com/sudolev/interiors/content/registry/CIBlocks.java +++ b/common/src/main/java/com/sudolev/interiors/content/registry/CIBlocks.java @@ -114,7 +114,7 @@ public final class CIBlocks { ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, c.get()) .requires(CITags.Items.FLOOR_CHAIRS) - .requires(Utils.tagFromColor(color)) + .requires(CITags.DYES.get(color).tag) .unlockedBy("has_floor_chair", RegistrateRecipeProvider.has(CITags.Items.FLOOR_CHAIRS)) .save(p, CreateInteriors.asResource("crafting/floor_chair/" + c.getName() + "_from_other_floor_chair")); }) @@ -173,7 +173,7 @@ public final class CIBlocks { ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, c.get()) .requires(CITags.Items.CHAIRS) - .requires(Utils.tagFromColor(color)) + .requires(CITags.DYES.get(color).tag) .unlockedBy("has_chair", RegistrateRecipeProvider.has(CITags.Items.CHAIRS)) .save(p, CreateInteriors.asResource("crafting/chair/" + c.getName() + "_from_other_chair")); }) diff --git a/common/src/main/java/com/sudolev/interiors/content/registry/CITags.java b/common/src/main/java/com/sudolev/interiors/content/registry/CITags.java index 01752868..631d2cd8 100644 --- a/common/src/main/java/com/sudolev/interiors/content/registry/CITags.java +++ b/common/src/main/java/com/sudolev/interiors/content/registry/CITags.java @@ -1,11 +1,17 @@ package com.sudolev.interiors.content.registry; +import net.minecraft.Util; import net.minecraft.core.registries.Registries; import net.minecraft.tags.TagKey; +import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.block.Block; import net.minecraft.world.item.Item; import com.sudolev.interiors.CreateInteriors; +import com.sudolev.interiors.foundation.data.CommonTag; + +import java.util.EnumMap; +import java.util.Map; public final class CITags { public static final class Blocks { @@ -18,5 +24,15 @@ public static final class Items { public static final TagKey FLOOR_CHAIRS = TagKey.create(Registries.ITEM, CreateInteriors.asResource("floor_chairs")); } + public static final Map> DYES = Util.make(new EnumMap<>(DyeColor.class), dyes -> { + for (DyeColor color : DyeColor.values()) { + String name = color.getName(); + String common = "dyes/" + name + "_dyes"; + String fabric = name + "_dyes"; + String forge = "dyes/" + name; + dyes.put(color, CommonTag.conventional(Registries.ITEM, common, fabric, forge)); + } + }); + public static void register() {} } diff --git a/common/src/main/java/com/sudolev/interiors/foundation/data/CommonTag.java b/common/src/main/java/com/sudolev/interiors/foundation/data/CommonTag.java new file mode 100644 index 00000000..3f5aec6f --- /dev/null +++ b/common/src/main/java/com/sudolev/interiors/foundation/data/CommonTag.java @@ -0,0 +1,55 @@ +package com.sudolev.interiors.foundation.data; + +import com.sudolev.interiors.CreateInteriors; +import com.tterrag.registrate.providers.RegistrateTagsProvider; + +import net.minecraft.core.Registry; +import net.minecraft.data.tags.TagsProvider.TagAppender; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; + +import java.util.function.Consumer; + +import static com.sudolev.interiors.Utils.tagAppender; + +/** + * A common tag is a trio of tags: one for common, one for fabric, and one for forge. + * The common tag contains both loader tags and should only be used for querying. + * Content is added to both loader tags separately. + */ +public class CommonTag { + public final TagKey tag, fabric, forge; + + public CommonTag(TagKey common, TagKey fabric, TagKey forge) { + this.tag = common; + this.fabric = fabric; + this.forge = forge; + } + + public CommonTag(ResourceKey> registry, ResourceLocation common, ResourceLocation fabric, ResourceLocation forge) { + this(TagKey.create(registry, common), TagKey.create(registry, fabric), TagKey.create(registry, forge)); + } + + public static CommonTag conventional(ResourceKey> registry, String common, String fabric, String forge) { + return new CommonTag<>( + registry, + CreateInteriors.asResource("internal/" + common), + new ResourceLocation("c", fabric), + new ResourceLocation("forge", forge) + ); + } + + public CommonTag generateBoth(RegistrateTagsProvider tags, Consumer> consumer) { + consumer.accept(tagAppender(tags, fabric)); + consumer.accept(tagAppender(tags, forge)); + return this; + } + + public CommonTag generateCommon(RegistrateTagsProvider tags) { + tagAppender(tags, tag) + .addOptionalTag(fabric.location()) + .addOptionalTag(forge.location()); + return this; + } +} diff --git a/fabric/src/main/java/com/sudolev/interiors/fabric/CIDatagen.java b/fabric/src/main/java/com/sudolev/interiors/fabric/CIDatagen.java index 4128d74f..19f2b483 100644 --- a/fabric/src/main/java/com/sudolev/interiors/fabric/CIDatagen.java +++ b/fabric/src/main/java/com/sudolev/interiors/fabric/CIDatagen.java @@ -1,5 +1,7 @@ package com.sudolev.interiors.fabric; +import com.sudolev.interiors.content.registry.CITags; +import com.tterrag.registrate.providers.ProviderType; import io.github.fabricators_of_create.porting_lib.data.ExistingFileHelper; import java.nio.file.Path; @@ -27,6 +29,9 @@ public void onInitializeDataGenerator(FabricDataGenerator gen) { Set.of(resources), Set.of("create"), false, null, null ); + CreateInteriors.REGISTRATE.addDataGenerator(ProviderType.ITEM_TAGS, prov -> + CITags.DYES.values().forEach(tag -> tag.generateCommon(prov))); + CreateInteriors.REGISTRATE.setupDatagen(gen.createPack(), helper); provideDefaultLang("tooltips"); diff --git a/fabric/src/main/java/com/sudolev/interiors/fabric/UtilsImpl.java b/fabric/src/main/java/com/sudolev/interiors/fabric/UtilsImpl.java index a672fbd8..b5bba4ac 100644 --- a/fabric/src/main/java/com/sudolev/interiors/fabric/UtilsImpl.java +++ b/fabric/src/main/java/com/sudolev/interiors/fabric/UtilsImpl.java @@ -1,12 +1,12 @@ package com.sudolev.interiors.fabric; +import com.tterrag.registrate.providers.RegistrateTagsProvider; import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.data.tags.TagsProvider.TagAppender; import net.minecraft.nbt.CompoundTag; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.Item; public abstract class UtilsImpl { public static String getVersion(String modid) { @@ -30,7 +30,7 @@ public static CompoundTag getCustomData(Entity entity) { return entity.getCustomData(); } - public static TagKey tagFromColor(DyeColor color) { - return color.getTag(); + public static TagAppender tagAppender(RegistrateTagsProvider prov, TagKey tag) { + return prov.addTag(tag); } } diff --git a/forge/src/main/java/com/sudolev/interiors/forge/UtilsImpl.java b/forge/src/main/java/com/sudolev/interiors/forge/UtilsImpl.java index 1658f195..bcddd385 100644 --- a/forge/src/main/java/com/sudolev/interiors/forge/UtilsImpl.java +++ b/forge/src/main/java/com/sudolev/interiors/forge/UtilsImpl.java @@ -2,17 +2,17 @@ import java.util.List; +import net.minecraft.data.tags.TagsProvider.TagAppender; import net.minecraft.nbt.CompoundTag; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.Item; import net.minecraftforge.common.util.MavenVersionStringHelper; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.forgespi.language.IModInfo; import com.sudolev.interiors.CreateInteriors; +import com.tterrag.registrate.providers.RegistrateTagsProvider; public abstract class UtilsImpl { public static String getVersion(String modid) { @@ -43,7 +43,7 @@ public static CompoundTag getCustomData(Entity entity) { return entity.getPersistentData(); } - public static TagKey tagFromColor(DyeColor color) { - return color.getTag(); + public static TagAppender tagAppender(RegistrateTagsProvider prov, TagKey tag) { + return prov.addTag(tag); } }