From c39bc6429e2ae63de69963fc3e6dff2bf89ec9af Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Wed, 31 Jul 2024 22:57:37 +0200 Subject: [PATCH] Fix lamp recipes --- .../05e548071acf141f8316a32dd9664b72bf08f473 | 66 +++++++++---------- .../767c31e3ff4fc47c158a5b9ee81cdc589b92f0cc | 2 +- .../994d817e0ea4d727e6c4fd01319484e3c3bc9550 | 2 +- .../recipes/decorations/black_lamp.json | 6 +- .../recipes/decorations/blue_lamp.json | 6 +- .../recipes/decorations/brown_lamp.json | 6 +- .../recipes/decorations/cyan_lamp.json | 6 +- .../recipes/decorations/gray_lamp.json | 6 +- .../recipes/decorations/green_lamp.json | 6 +- .../recipes/decorations/light_blue_lamp.json | 6 +- .../recipes/decorations/light_gray_lamp.json | 6 +- .../recipes/decorations/lime_lamp.json | 6 +- .../recipes/decorations/magenta_lamp.json | 6 +- .../recipes/decorations/orange_lamp.json | 6 +- .../recipes/decorations/pink_lamp.json | 6 +- .../recipes/decorations/purple_lamp.json | 6 +- .../recipes/decorations/red_lamp.json | 6 +- .../recipes/decorations/white_lamp.json | 6 +- .../recipes/decorations/yellow_lamp.json | 6 +- .../data/decorative/recipe/black_lamp.json | 2 +- .../data/decorative/recipe/blue_lamp.json | 2 +- .../data/decorative/recipe/brown_lamp.json | 2 +- .../data/decorative/recipe/cyan_lamp.json | 2 +- .../data/decorative/recipe/gray_lamp.json | 2 +- .../data/decorative/recipe/green_lamp.json | 2 +- .../decorative/recipe/light_blue_lamp.json | 2 +- .../decorative/recipe/light_gray_lamp.json | 2 +- .../data/decorative/recipe/lime_lamp.json | 2 +- .../data/decorative/recipe/magenta_lamp.json | 2 +- .../data/decorative/recipe/orange_lamp.json | 2 +- .../data/decorative/recipe/pink_lamp.json | 2 +- .../data/decorative/recipe/purple_lamp.json | 2 +- .../data/decorative/recipe/red_lamp.json | 2 +- .../data/decorative/recipe/white_lamp.json | 2 +- .../data/decorative/recipe/yellow_lamp.json | 2 +- .../motschen/decorative/datagen/Recipes.java | 2 +- 36 files changed, 100 insertions(+), 100 deletions(-) diff --git a/src/main/generated/.cache/05e548071acf141f8316a32dd9664b72bf08f473 b/src/main/generated/.cache/05e548071acf141f8316a32dd9664b72bf08f473 index 04b1bf8..87971d4 100644 --- a/src/main/generated/.cache/05e548071acf141f8316a32dd9664b72bf08f473 +++ b/src/main/generated/.cache/05e548071acf141f8316a32dd9664b72bf08f473 @@ -1,11 +1,11 @@ -// 1.21 2024-07-31T17:33:40.407744887 Decorative/Recipes +// 1.21 2024-07-31T22:56:58.458132274 Decorative/Recipes 8840e1834a4e8b1459b63b4054e28fa51c26e72e data/decorative/recipe/wall_clock.json c7ad4b64d576aee115925400b1fa6500d81d02c9 data/decorative/advancement/recipes/decorations/spruce_log_with_axe.json -333c78ff3f63b71e47bd5ac84e59a8ac8f8e9d79 data/decorative/recipe/gray_lamp.json +cf0bf274ee073450f6c4fd3b5fd7b3d711bd2e60 data/decorative/recipe/gray_lamp.json af28253dde9cc61cf2ddb1e2fae27b6e1a4e06b9 data/decorative/advancement/recipes/decorations/television.json 9d0cba2966aa6060d38965fdc6b4725e2dbb4570 data/decorative/advancement/recipes/decorations/light_gray_bath_tire.json d8af6ae40a5f699782989edff37b9c9417b6d5d9 data/decorative/advancement/recipes/transportation/thirty_sign.json -0c3775bf00a5b2b7cdf879fa4042540c87d9fbe0 data/decorative/recipe/light_blue_lamp.json +14daf1e2c8be3d45afbf64db20f95a37df9eb7c6 data/decorative/recipe/light_blue_lamp.json 92a2de5de20bab690ba3fac7a6092fe17ee5665c data/decorative/advancement/recipes/decorations/white_bath_tire.json 41500008ef363f3a2e26aea2f21c06daeee5b801 data/decorative/advancement/recipes/decorations/green_double_lamp.json e9576e6815c54d99c0c37d15eaa0ba682c3255d1 data/decorative/recipe/orange_double_lamp.json @@ -38,7 +38,7 @@ cdf1d54c043a57cd870dc0a580eeb2bedefd3415 data/decorative/recipe/sixty_sign.json bf89dbaabcc4a0f684e4f79c6e70340e56253192 data/decorative/advancement/recipes/transportation/fifty_sign.json 1ce540f6c22e95a7ec8cfd9ac48afdd9af0a0928 data/decorative/advancement/recipes/decorations/gray_bath_tire.json f7470ac621216657ab186616d0254a04743ef583 data/decorative/advancement/recipes/decorations/beach_ball.json -df6c477a5570c4292f8c964af03415bbb6217605 data/decorative/advancement/recipes/decorations/yellow_lamp.json +7677de7550d55fc58da0554f1e3af48e93ab257c data/decorative/advancement/recipes/decorations/yellow_lamp.json 8b6134bc286c60ce10cad9eaadedb6542423af4d data/decorative/advancement/recipes/transportation/road.json 5f3f39a647a3de9a33424bd0e764c6505ac05ef6 data/decorative/recipe/lime_digital_clock.json 06accd88bd43a6ea204b3c87e0e651a73fa976e0 data/decorative/recipe/black_bath_tire.json @@ -58,12 +58,12 @@ bea5f6fa05b7fecc8e2162cefa5bedf0c5de6456 data/decorative/recipe/green_double_lam 38f7e9cccc3a49b0c49bcdc2d10d5095d7bec31a data/decorative/recipe/pink_double_lamp.json 5a813572b1217b3112dec0f2d777c649c04445cb data/decorative/recipe/kitchen_tiles.json cac37fba15d98750e86f2765ff43746ef8f7a806 data/decorative/advancement/recipes/decorations/cyan_double_lamp.json -05d5f489d872bc17ef3facf1c1f4a64c08e6b134 data/decorative/recipe/blue_lamp.json +a68ac9eefd73de8758b911e53a1fe2d99c4aad1d data/decorative/recipe/blue_lamp.json 891d74a5a69650582fd4314840b90bc49e9ee537 data/decorative/recipe/purple_double_lamp.json -83a93017cdf337715f4f07812f1f8923930973e8 data/decorative/recipe/pink_lamp.json -8f159248058c31e07a111f959c276d713d1a2bd6 data/decorative/recipe/cyan_lamp.json -95749fae7efb7d4ef2a3b800d96ad2b3dd77e9e2 data/decorative/recipe/orange_lamp.json -392f0ac2a8f8f9f7f9b0272638f55da593511902 data/decorative/recipe/yellow_lamp.json +3725abff63e7542d6392796e8f173e6d4208c478 data/decorative/recipe/pink_lamp.json +2c6500effb270006ad95b5f51e8a18867a66fa89 data/decorative/recipe/cyan_lamp.json +1b4c1df98cdb752ca95546e41662d7fcb0115d5d data/decorative/recipe/orange_lamp.json +8c0d3ce8f178c8fac36df4fe73061f8c6e10c4ae data/decorative/recipe/yellow_lamp.json bf19fcc4ac7b454d9f9faeba9ac412374cb0a5f9 data/decorative/advancement/recipes/decorations/magenta_digital_clock.json f1578d34afdf428e95abb5e221b14a60b37cbd39 data/decorative/recipe/green_bath_tire.json 4fc6dcde997b2aacddfef33ba83562a19688167e data/decorative/recipe/traffic_cone.json @@ -91,10 +91,10 @@ e026a94488c036ff18dd5f6fb38826c30b2ae8ed data/decorative/advancement/recipes/dec a95906844336037ba8b13f0046aa464166f980c9 data/decorative/recipe/empty_sign.json 124bc3456769224c38132f0a45575a29086443d6 data/decorative/advancement/recipes/decorations/pink_digital_clock.json 747803c678142b0acd37fef32493af40b24bdfdd data/decorative/advancement/recipes/decorations/blue_double_lamp.json -e1ca8f20f11312c23a24f59083d79952d50c4579 data/decorative/advancement/recipes/decorations/orange_lamp.json -0c5217740011c9e81ae34f4371bb2cb572e7259f data/decorative/advancement/recipes/decorations/black_lamp.json +142d1aeee6b499ce9a7894e94d889411328e2454 data/decorative/advancement/recipes/decorations/orange_lamp.json +cf6dd7aeb20678df2efabcb2a38e7fa595797369 data/decorative/advancement/recipes/decorations/black_lamp.json 3c9d54708db2bf836bbcd215a13197c5fca973be data/decorative/recipe/ninety_sign.json -23c6300eac3424b66ce9c3ed39b0959374d74663 data/decorative/advancement/recipes/decorations/light_blue_lamp.json +28c511bb0c722d6c3699c29b42dfd58c4ef3660c data/decorative/advancement/recipes/decorations/light_blue_lamp.json 006a951d6072a9fe6769c79095fff21056041e8f data/decorative/recipe/white_bath_tire.json 3cde566294cd2b55c27e8bfb623ea027405235bd data/decorative/advancement/recipes/transportation/sixty_sign.json 533603822eb60a487aa2fa9962209697b4054d95 data/decorative/recipe/twenty_sign.json @@ -109,7 +109,7 @@ a236a997193043cda07f3160bfe95155e428ddb7 data/decorative/recipe/pink_bath_tire.j b21b84b2c06c76253eafe123af2ed563351efbdd data/decorative/advancement/recipes/decorations/cyan_digital_clock.json 4290eafe32c114f3390e27231c6f9ba02cf97cb3 data/decorative/recipe/brown_double_lamp.json eefda8442f5a3f95b6468c9e50edfe43fa586172 data/decorative/recipe/onehundredten_sign.json -43c56aa3817d956b4bd373f9c25bdb9ce2f531a8 data/decorative/advancement/recipes/decorations/gray_lamp.json +35bdf3faadd6222eeaa97a86ef4aec9bedfe7479 data/decorative/advancement/recipes/decorations/gray_lamp.json 7e67a7b4d0775be58984c13c6d695c5afa580bfc data/decorative/advancement/recipes/decorations/jungle_log_with_axe.json fd91e99529471b42616f8e55d724b6b2326da995 data/decorative/advancement/recipes/decorations/orange_bath_tire.json 739e56a47b963b7268c31d78740beb998446c071 data/decorative/advancement/recipes/decorations/gray_double_lamp.json @@ -124,20 +124,20 @@ c240837233e9c4b2b1ae4bb144f87a2151b74865 data/decorative/recipe/acacia_log_with_ d42e86185410e284ee79fc0309330ab0e9686d06 data/decorative/recipe/springboard_inverted.json af939d2b444087daa9f829ae23950bd355fd8822 data/decorative/advancement/recipes/decorations/lime_double_lamp.json aaa1472f05ed6d6df13a626851ab9f0cb2f3ea54 data/decorative/recipe/blue_digital_clock.json -504e65955ffc469a97c08e2e6a5f8fda2b687c8d data/decorative/advancement/recipes/decorations/magenta_lamp.json +4f716998f9cec9d976a7590da24c8d1b3130a718 data/decorative/advancement/recipes/decorations/magenta_lamp.json d66674d7211ba6dc4af44e92b9b7c66011d7d959 data/decorative/advancement/recipes/decorations/orange_digital_clock.json 969f6d07fee55e1ad1da025f2d19539acadba552 data/decorative/recipe/thirty_sign.json -0b2fde63dd1385b17a1fd52dc7109c46e6f027e3 data/decorative/recipe/black_lamp.json +fc44e4c02740835b6d9b7a8753e3b3bdafb9d8e9 data/decorative/recipe/black_lamp.json 54ff432b25f0c3d26141f2c624a51bd66c1c69e0 data/decorative/recipe/light_gray_double_lamp.json 0cacc40f6d36cd9df9b34fd2f920da6c04a11d64 data/decorative/recipe/cyan_double_lamp.json 7c403f49b9ba7a752c396375a69c79a06135a16f data/decorative/advancement/recipes/transportation/twenty_sign.json 51eb2ee81af387e58052a87c1834c95c8c746efa data/decorative/recipe/ten_sign.json fa37a32206ad915ff884aec42e5997a0136fab86 data/decorative/recipe/light_gray_bath_tire.json 8c0afa643841b405783435907dbe57c18e18f0f7 data/decorative/recipe/jungle_log_with_axe.json -79a7f2c243038c58dafaa90831679314bd597cf1 data/decorative/recipe/magenta_lamp.json +1367d935d5b15b4bde1602c25edb49a43a54b83e data/decorative/recipe/magenta_lamp.json 3c94cdbcb7208959d69a378f08ae12ff04c3a0d7 data/decorative/advancement/recipes/decorations/red_bath_tire.json fbd91aee85e1a4e33f500cd8b2e1ae801f5ebfbc data/decorative/recipe/magenta_bath_tire.json -9e9abe414e4cf6068ceda049ef7eaf22c980842d data/decorative/advancement/recipes/decorations/lime_lamp.json +a4fb6170418fb54b2edf6732176cfedd1e473c2f data/decorative/advancement/recipes/decorations/lime_lamp.json b3887cbe53253d0c7bbea00292d19285e800e93a data/decorative/recipe/crimson_stem_with_axe.json 25ad2d08fb005a906cbeb12fd6c170fd25f27373 data/decorative/recipe/bamboo_block_with_axe.json 16767feb48a4462116de5a1f3964198c72c4f6ca data/decorative/recipe/kitchen_tiles_inverted.json @@ -146,7 +146,7 @@ b3887cbe53253d0c7bbea00292d19285e800e93a data/decorative/recipe/crimson_stem_wit cbe251cdb2301152ecd042db19170a49dac97914 data/decorative/recipe/mangrove_log_with_axe.json 7c52494466db67b5505c654fcc3410e89b1a34a9 data/decorative/advancement/recipes/decorations/stone_path.json 662c36e941200ed9ff5752a9b6de4ccf7ed6e3d8 data/decorative/recipe/white_digital_clock.json -984e248a99c43e9563304cb87e5f33fec593b5ef data/decorative/recipe/brown_lamp.json +4f4d4834aafafdb0edd0718c4093f9973f2d3cda data/decorative/recipe/brown_lamp.json cdfba7a11369ecbdaf362f3a06c98fb0b2250255 data/decorative/recipe/stone_path.json 4526746ce747877e747d8c4bf58e7613d73c00ac data/decorative/advancement/recipes/decorations/black_digital_clock.json 120b58f44452675436c582a14aff3a94498577b2 data/decorative/recipe/stop_sign.json @@ -157,10 +157,10 @@ f14281ff91e51a1d4cc80624425d89d5a3426195 data/decorative/recipe/brown_digital_cl ac59ed33258c2e587ac2cd5f25e7c439898ffba9 data/decorative/recipe/magenta_digital_clock.json f8b162738014f04558fb92599406b335474c6164 data/decorative/recipe/gray_digital_clock.json a96b45f0c92082c5de774adfc8dcae6faa5863c4 data/decorative/advancement/recipes/transportation/onehundred_sign.json -5d639a3a34fb2ae69c12501aba61c4b25d68f68c data/decorative/recipe/purple_lamp.json +09875ca4c71d906da6bcb9e4b74a6371c2babca2 data/decorative/recipe/purple_lamp.json 868b78cbe52501a0e21fc0ea813fc6b96c396177 data/decorative/recipe/red_digital_clock.json 81469d13349fb8f0151a94b1e3667389a110c221 data/decorative/recipe/pool_wall.json -3383342333458307ab36a484edb91ec02c19f427 data/decorative/advancement/recipes/decorations/brown_lamp.json +255265b4d2706e90a30cf0bda93bbd016747f4ff data/decorative/advancement/recipes/decorations/brown_lamp.json 65541a7d826f010da7aac3b7b5fcb9974d68eb34 data/decorative/recipe/magenta_double_lamp.json e47d93b927582ed10c721e25c51d9a94d2f4064d data/decorative/recipe/cherry_log_with_axe.json 5f0c0f395e24fb107ce3d85e12c67ff059dbf2de data/decorative/advancement/recipes/decorations/red_double_lamp.json @@ -179,30 +179,30 @@ cf494e0e200ca17c0541b16dffb24fc11aff57da data/decorative/advancement/recipes/dec 01189dc0263b15ff6e40e27012aa99dd0b54f302 data/decorative/advancement/recipes/decorations/white_digital_clock.json 62430ac79b707e84af35a8f6e0a9ea916fb2c5df data/decorative/advancement/recipes/decorations/dark_oak_log_with_axe.json 0fc26bebd413acdab07bcdd70c6b376363ba342a data/decorative/recipe/pink_digital_clock.json -09beb8dc478393213ec19a79a907bb92fb923a47 data/decorative/advancement/recipes/decorations/purple_lamp.json +d64b46a5af5f115feb11a2d575dd7ebec10bd95b data/decorative/advancement/recipes/decorations/purple_lamp.json a75e5488dd6e399b967c0ce6f19f556c968d0c03 data/decorative/advancement/recipes/decorations/cherry_log_with_axe.json -d638f96754f4497453480c3ef06392c1c35f1563 data/decorative/advancement/recipes/decorations/cyan_lamp.json +04bf6fbfe9cb9f18e8d5408ba4348fcd0251785b data/decorative/advancement/recipes/decorations/cyan_lamp.json 0049e0bca73b95810cb124c8f2f035613e42311f data/decorative/advancement/recipes/decorations/christmas_tree.json -1c86881d4bbda18892b7381e9392443528b31e8d data/decorative/advancement/recipes/decorations/green_lamp.json -bc272d98521c6aaead3893545881e9b6ca77e4c1 data/decorative/advancement/recipes/decorations/pink_lamp.json +2849d3f15a34c065c523d4cd6e42ac98c98b7200 data/decorative/advancement/recipes/decorations/green_lamp.json +7067079e2d2e5af9ac35454af2352ff9189824e0 data/decorative/advancement/recipes/decorations/pink_lamp.json eaf1ca2d94be776d0b143603824017f8b09abd91 data/decorative/recipe/guardrail.json -c3162af4c855e5dffc33767ccbc60d7bdbf918e4 data/decorative/advancement/recipes/decorations/blue_lamp.json +d08707bb988b203b21144f3db4bb9576875ee813 data/decorative/advancement/recipes/decorations/blue_lamp.json 270843afa8c887fe668f9cfa58c131a226776d3c data/decorative/recipe/blue_double_lamp.json c0b9442b873af752eaf1b97fa49472d06698367a data/decorative/recipe/five_sign.json -a4485c7c217049456bda50caa23b89862b14f1a9 data/decorative/recipe/light_gray_lamp.json +408e2dd53b7e4dc6560f0a97de07ab7298d4cea3 data/decorative/recipe/light_gray_lamp.json ca61f1d618b5ffda9a3c317c7eb604159a3ff514 data/decorative/advancement/recipes/decorations/green_bath_tire.json 16cb2c3b23ab75834a13a2f2c4cae499690cf97e data/decorative/advancement/recipes/decorations/purple_bath_tire.json -409a81102cd9c128929a00d3d7fbeacf35dd1ee8 data/decorative/advancement/recipes/decorations/red_lamp.json +499be4d9c6b647bce9d2855324b09165b2e97b35 data/decorative/advancement/recipes/decorations/red_lamp.json 13965d313531df211d139951b01e1ee54ad879fd data/decorative/recipe/brown_bath_tire.json 165e29ed1e0218a6eb8185f182e9e87a420b769f data/decorative/recipe/road_white_short.json fd3513bff41a5d2a2bec4c03eaa2098a3be59d8e data/decorative/advancement/recipes/decorations/traffic_cone.json 45112e5234e9bd4a7f1b4790dae3ccce695b200b data/decorative/recipe/gray_double_lamp.json b859258b4ea7e5fbcf36555252204e9243dc1dbb data/decorative/advancement/recipes/decorations/bamboo_block_with_axe.json -b210e2c0a0bb4b711c23e902d32350bb4befea9b data/decorative/advancement/recipes/decorations/light_gray_lamp.json -0f9f59de6f5bbe81db0bd416a48bc129486dbfa3 data/decorative/advancement/recipes/decorations/white_lamp.json -c769ffcf0cbaee958b4862baa8990468d5f6c0ae data/decorative/recipe/red_lamp.json +b8e28bd6ef09d49046de330046f47798cd7170b0 data/decorative/advancement/recipes/decorations/light_gray_lamp.json +9d92567656fab5363fdc4eacca4db086e9e0d4fb data/decorative/advancement/recipes/decorations/white_lamp.json +14a4122fbfc22b64145b2913436f16b2b8cc0049 data/decorative/recipe/red_lamp.json 8b985258b4d6837eeac26fc9134495d9285e2a78 data/decorative/advancement/recipes/decorations/magenta_bath_tire.json -7f17cbc550a2ec0b3d690fed4610c53e883f0e39 data/decorative/recipe/lime_lamp.json +20e6d2724d050d92384a9a3ab32b29b76339abc3 data/decorative/recipe/lime_lamp.json baac344bda7473ab704eaeff2b4c338eb44d7032 data/decorative/recipe/old_television.json e6183d511bde67905df3c9a47067de58c7d0fc11 data/decorative/advancement/recipes/decorations/sign_post.json a8117b67c3e1151fbda93894d23996fbca6b3738 data/decorative/advancement/recipes/decorations/yellow_digital_clock.json @@ -219,11 +219,11 @@ fbe7cc4f9a7a02e14324ecbf8b7561cc92ab28ec data/decorative/advancement/recipes/dec 7cb5cd7d76b7660c9fce6d49537efc7ca8d66310 data/decorative/advancement/recipes/decorations/magenta_double_lamp.json cd402919e7cdebe888d56c3ea8a6e532f7af57cd data/decorative/advancement/recipes/transportation/ten_sign.json fa9a0738193a00b43689f0ab41e44b6d78510dd1 data/decorative/recipe/road.json -aa3c098e0a4094371e6759f6693ca56ec19d2aae data/decorative/recipe/green_lamp.json +0a6474508344240cff0c305e49b2ad9c0588f8f5 data/decorative/recipe/green_lamp.json 34fb31b7da90cda67b3e9fbbaca61d542939ef22 data/decorative/advancement/recipes/decorations/oak_log_with_axe.json e9d23c0151351de34a3464e7e5b54b67c986ab4c data/decorative/advancement/recipes/decorations/yellow_double_lamp.json 29cc708af165248ec26a9bb0a06302ee38c6909c data/decorative/advancement/recipes/decorations/water_pump.json 675542429c74bc8b964c619f51cd4bf92dfa37ce data/decorative/recipe/lime_bath_tire.json -82672b3cd478148e3f243b9c317e57cc61afc3c7 data/decorative/recipe/white_lamp.json +8b5feef6998a5ba2f564d84e1a6e1f4e2447b524 data/decorative/recipe/white_lamp.json b19f703dba308a2f616e1af299d262221ba15f90 data/decorative/advancement/recipes/decorations/purple_digital_clock.json b0b5791ec8119aa38168f16d6ffa45d1a2730df1 data/decorative/recipe/forty_sign.json diff --git a/src/main/generated/.cache/767c31e3ff4fc47c158a5b9ee81cdc589b92f0cc b/src/main/generated/.cache/767c31e3ff4fc47c158a5b9ee81cdc589b92f0cc index 8da3ee2..27ded98 100644 --- a/src/main/generated/.cache/767c31e3ff4fc47c158a5b9ee81cdc589b92f0cc +++ b/src/main/generated/.cache/767c31e3ff4fc47c158a5b9ee81cdc589b92f0cc @@ -1,4 +1,4 @@ -// 1.21 2024-07-31T17:33:40.411273783 Decorative/Block Loot Tables +// 1.21 2024-07-31T22:56:58.464282543 Decorative/Block Loot Tables 89cdb12dd315c74b635244350ea725b1cc5cff53 data/decorative/loot_table/blocks/orange_lamp.json db0783aa5f2aebcde11576ff95da049cf278b336 data/decorative/loot_table/blocks/mangrove_log_with_axe.json e13c9b7a44df3ef0e24e4878355b435a7c9b596e data/decorative/loot_table/blocks/yellow_digital_clock.json diff --git a/src/main/generated/.cache/994d817e0ea4d727e6c4fd01319484e3c3bc9550 b/src/main/generated/.cache/994d817e0ea4d727e6c4fd01319484e3c3bc9550 index 94169d7..0972c6c 100644 --- a/src/main/generated/.cache/994d817e0ea4d727e6c4fd01319484e3c3bc9550 +++ b/src/main/generated/.cache/994d817e0ea4d727e6c4fd01319484e3c3bc9550 @@ -1,3 +1,3 @@ -// 1.21 2024-07-31T17:33:40.411002232 Decorative/decorative +// 1.21 2024-07-31T22:56:58.463872214 Decorative/decorative 0f026ea055880052079f9153d9bb8c0b76de000e data/decorative/worldgen/placed_feature/rocky_asphalt.json 8dfd1b980dfd7aba3fa12e1ea506a3c9fc463929 data/decorative/worldgen/configured_feature/rocky_asphalt.json diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/black_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/black_lamp.json index 7dcb5c0..6bbb58a 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/black_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/black_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_black_concrete": { + "has_black_wool": { "conditions": { "items": [ { - "items": "minecraft:black_concrete" + "items": "minecraft:black_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_black_concrete" + "has_black_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/blue_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/blue_lamp.json index 2f9310b..14c0150 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/blue_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/blue_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_blue_concrete": { + "has_blue_wool": { "conditions": { "items": [ { - "items": "minecraft:blue_concrete" + "items": "minecraft:blue_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_blue_concrete" + "has_blue_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/brown_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/brown_lamp.json index 3bf0858..6adaa42 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/brown_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/brown_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_brown_concrete": { + "has_brown_wool": { "conditions": { "items": [ { - "items": "minecraft:brown_concrete" + "items": "minecraft:brown_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_brown_concrete" + "has_brown_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/cyan_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/cyan_lamp.json index 0c3f0cc..a192977 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/cyan_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/cyan_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_cyan_concrete": { + "has_cyan_wool": { "conditions": { "items": [ { - "items": "minecraft:cyan_concrete" + "items": "minecraft:cyan_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_cyan_concrete" + "has_cyan_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/gray_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/gray_lamp.json index 0a48f06..89f1f6e 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/gray_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/gray_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_gray_concrete": { + "has_gray_wool": { "conditions": { "items": [ { - "items": "minecraft:gray_concrete" + "items": "minecraft:gray_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_gray_concrete" + "has_gray_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/green_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/green_lamp.json index b108753..34c0b26 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/green_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/green_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_green_concrete": { + "has_green_wool": { "conditions": { "items": [ { - "items": "minecraft:green_concrete" + "items": "minecraft:green_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_green_concrete" + "has_green_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/light_blue_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/light_blue_lamp.json index bff2d68..bd70875 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/light_blue_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/light_blue_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_light_blue_concrete": { + "has_light_blue_wool": { "conditions": { "items": [ { - "items": "minecraft:light_blue_concrete" + "items": "minecraft:light_blue_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_light_blue_concrete" + "has_light_blue_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/light_gray_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/light_gray_lamp.json index 47b9e5f..89f8cab 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/light_gray_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/light_gray_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_light_gray_concrete": { + "has_light_gray_wool": { "conditions": { "items": [ { - "items": "minecraft:light_gray_concrete" + "items": "minecraft:light_gray_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_light_gray_concrete" + "has_light_gray_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/lime_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/lime_lamp.json index c33707e..cc24c64 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/lime_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/lime_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lime_concrete": { + "has_lime_wool": { "conditions": { "items": [ { - "items": "minecraft:lime_concrete" + "items": "minecraft:lime_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_lime_concrete" + "has_lime_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/magenta_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/magenta_lamp.json index e964d7c..d35a78f 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/magenta_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/magenta_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_magenta_concrete": { + "has_magenta_wool": { "conditions": { "items": [ { - "items": "minecraft:magenta_concrete" + "items": "minecraft:magenta_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_magenta_concrete" + "has_magenta_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/orange_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/orange_lamp.json index a143b9e..96bd847 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/orange_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/orange_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_orange_concrete": { + "has_orange_wool": { "conditions": { "items": [ { - "items": "minecraft:orange_concrete" + "items": "minecraft:orange_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_orange_concrete" + "has_orange_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/pink_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/pink_lamp.json index cf8b074..9be05ee 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/pink_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/pink_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_pink_concrete": { + "has_pink_wool": { "conditions": { "items": [ { - "items": "minecraft:pink_concrete" + "items": "minecraft:pink_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_pink_concrete" + "has_pink_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/purple_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/purple_lamp.json index d127e18..0b9b500 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/purple_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/purple_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_purple_concrete": { + "has_purple_wool": { "conditions": { "items": [ { - "items": "minecraft:purple_concrete" + "items": "minecraft:purple_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_purple_concrete" + "has_purple_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/red_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/red_lamp.json index 85535d0..38063dc 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/red_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/red_lamp.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_red_concrete": { + "has_red_wool": { "conditions": { "items": [ { - "items": "minecraft:red_concrete" + "items": "minecraft:red_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_red_concrete" + "has_red_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/white_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/white_lamp.json index dbeeb69..44c48a1 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/white_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/white_lamp.json @@ -7,11 +7,11 @@ }, "trigger": "minecraft:recipe_unlocked" }, - "has_white_concrete": { + "has_white_wool": { "conditions": { "items": [ { - "items": "minecraft:white_concrete" + "items": "minecraft:white_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_white_concrete" + "has_white_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/advancement/recipes/decorations/yellow_lamp.json b/src/main/generated/data/decorative/advancement/recipes/decorations/yellow_lamp.json index 368496e..c665b19 100644 --- a/src/main/generated/data/decorative/advancement/recipes/decorations/yellow_lamp.json +++ b/src/main/generated/data/decorative/advancement/recipes/decorations/yellow_lamp.json @@ -7,11 +7,11 @@ }, "trigger": "minecraft:recipe_unlocked" }, - "has_yellow_concrete": { + "has_yellow_wool": { "conditions": { "items": [ { - "items": "minecraft:yellow_concrete" + "items": "minecraft:yellow_wool" } ] }, @@ -21,7 +21,7 @@ "requirements": [ [ "has_the_recipe", - "has_yellow_concrete" + "has_yellow_wool" ] ], "rewards": { diff --git a/src/main/generated/data/decorative/recipe/black_lamp.json b/src/main/generated/data/decorative/recipe/black_lamp.json index cf69151..1238b4e 100644 --- a/src/main/generated/data/decorative/recipe/black_lamp.json +++ b/src/main/generated/data/decorative/recipe/black_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:black_concrete" + "item": "minecraft:black_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/blue_lamp.json b/src/main/generated/data/decorative/recipe/blue_lamp.json index 5e9877d..4a69730 100644 --- a/src/main/generated/data/decorative/recipe/blue_lamp.json +++ b/src/main/generated/data/decorative/recipe/blue_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:blue_concrete" + "item": "minecraft:blue_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/brown_lamp.json b/src/main/generated/data/decorative/recipe/brown_lamp.json index 4afbea9..2e76861 100644 --- a/src/main/generated/data/decorative/recipe/brown_lamp.json +++ b/src/main/generated/data/decorative/recipe/brown_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:brown_concrete" + "item": "minecraft:brown_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/cyan_lamp.json b/src/main/generated/data/decorative/recipe/cyan_lamp.json index 21134ef..bc3fde9 100644 --- a/src/main/generated/data/decorative/recipe/cyan_lamp.json +++ b/src/main/generated/data/decorative/recipe/cyan_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:cyan_concrete" + "item": "minecraft:cyan_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/gray_lamp.json b/src/main/generated/data/decorative/recipe/gray_lamp.json index eab154a..fbb07d0 100644 --- a/src/main/generated/data/decorative/recipe/gray_lamp.json +++ b/src/main/generated/data/decorative/recipe/gray_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:gray_concrete" + "item": "minecraft:gray_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/green_lamp.json b/src/main/generated/data/decorative/recipe/green_lamp.json index 7785f3d..bf4cde0 100644 --- a/src/main/generated/data/decorative/recipe/green_lamp.json +++ b/src/main/generated/data/decorative/recipe/green_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:green_concrete" + "item": "minecraft:green_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/light_blue_lamp.json b/src/main/generated/data/decorative/recipe/light_blue_lamp.json index 9623eda..b49589c 100644 --- a/src/main/generated/data/decorative/recipe/light_blue_lamp.json +++ b/src/main/generated/data/decorative/recipe/light_blue_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:light_blue_concrete" + "item": "minecraft:light_blue_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/light_gray_lamp.json b/src/main/generated/data/decorative/recipe/light_gray_lamp.json index dd57445..06e6b5a 100644 --- a/src/main/generated/data/decorative/recipe/light_gray_lamp.json +++ b/src/main/generated/data/decorative/recipe/light_gray_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:light_gray_concrete" + "item": "minecraft:light_gray_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/lime_lamp.json b/src/main/generated/data/decorative/recipe/lime_lamp.json index d019f84..4dec57c 100644 --- a/src/main/generated/data/decorative/recipe/lime_lamp.json +++ b/src/main/generated/data/decorative/recipe/lime_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:lime_concrete" + "item": "minecraft:lime_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/magenta_lamp.json b/src/main/generated/data/decorative/recipe/magenta_lamp.json index 27d4ad9..37a941e 100644 --- a/src/main/generated/data/decorative/recipe/magenta_lamp.json +++ b/src/main/generated/data/decorative/recipe/magenta_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:magenta_concrete" + "item": "minecraft:magenta_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/orange_lamp.json b/src/main/generated/data/decorative/recipe/orange_lamp.json index 68a09e2..d6bace1 100644 --- a/src/main/generated/data/decorative/recipe/orange_lamp.json +++ b/src/main/generated/data/decorative/recipe/orange_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:orange_concrete" + "item": "minecraft:orange_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/pink_lamp.json b/src/main/generated/data/decorative/recipe/pink_lamp.json index 0eb6875..373f467 100644 --- a/src/main/generated/data/decorative/recipe/pink_lamp.json +++ b/src/main/generated/data/decorative/recipe/pink_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:pink_concrete" + "item": "minecraft:pink_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/purple_lamp.json b/src/main/generated/data/decorative/recipe/purple_lamp.json index a512987..aaea48c 100644 --- a/src/main/generated/data/decorative/recipe/purple_lamp.json +++ b/src/main/generated/data/decorative/recipe/purple_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:purple_concrete" + "item": "minecraft:purple_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/red_lamp.json b/src/main/generated/data/decorative/recipe/red_lamp.json index 0a77657..6c58aed 100644 --- a/src/main/generated/data/decorative/recipe/red_lamp.json +++ b/src/main/generated/data/decorative/recipe/red_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:red_concrete" + "item": "minecraft:red_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/white_lamp.json b/src/main/generated/data/decorative/recipe/white_lamp.json index 697a6b0..670dc3d 100644 --- a/src/main/generated/data/decorative/recipe/white_lamp.json +++ b/src/main/generated/data/decorative/recipe/white_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:white_concrete" + "item": "minecraft:white_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/generated/data/decorative/recipe/yellow_lamp.json b/src/main/generated/data/decorative/recipe/yellow_lamp.json index 6d46f43..b1c1d8c 100644 --- a/src/main/generated/data/decorative/recipe/yellow_lamp.json +++ b/src/main/generated/data/decorative/recipe/yellow_lamp.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "minecraft:yellow_concrete" + "item": "minecraft:yellow_wool" }, "B": { "item": "minecraft:black_concrete" diff --git a/src/main/java/eu/midnightdust/motschen/decorative/datagen/Recipes.java b/src/main/java/eu/midnightdust/motschen/decorative/datagen/Recipes.java index 3f7ad82..239c616 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/datagen/Recipes.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/datagen/Recipes.java @@ -251,7 +251,7 @@ public class Recipes extends FabricRecipeProvider { } private ShapedRecipeJsonBuilder createLampRecipe(ColorUtil.VanillaColor color) { Block lamp = Registries.BLOCK.get(id(color.getName()+"_lamp")); - Block woolType = Registries.BLOCK.get(Identifier.ofVanilla(color.getName()+"_concrete")); + Block woolType = Registries.BLOCK.get(Identifier.ofVanilla(color.getName()+"_wool")); return ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, lamp) .input('#', woolType) .input('R', Blocks.REDSTONE_LAMP)