From f373996e3640fea77e6b78bdcf7689efde1cb13d Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sun, 1 Sep 2024 09:29:36 +0200 Subject: [PATCH] Re-balanced recipes, update polymer --- gradle.properties | 4 +- .../05e548071acf141f8316a32dd9664b72bf08f473 | 126 +++++++++--------- .../767c31e3ff4fc47c158a5b9ee81cdc589b92f0cc | 2 +- .../994d817e0ea4d727e6c4fd01319484e3c3bc9550 | 2 +- .../f7d8407af9baaf5f0f162e0f8ab8027e321c0ef1 | 2 +- .../road_long_short_from_road.json | 32 +++++ .../road_white_short_from_road.json | 32 +++++ .../data/decorative/recipe/beach_ball.json | 2 +- .../decorative/recipe/black_bath_tire.json | 2 +- .../recipe/black_digital_clock.json | 2 +- .../data/decorative/recipe/black_lamp.json | 2 +- .../decorative/recipe/blue_bath_tire.json | 2 +- .../decorative/recipe/blue_digital_clock.json | 2 +- .../data/decorative/recipe/blue_lamp.json | 2 +- .../decorative/recipe/brown_bath_tire.json | 2 +- .../recipe/brown_digital_clock.json | 2 +- .../data/decorative/recipe/brown_lamp.json | 2 +- .../decorative/recipe/cyan_bath_tire.json | 2 +- .../decorative/recipe/cyan_digital_clock.json | 2 +- .../data/decorative/recipe/cyan_lamp.json | 2 +- .../data/decorative/recipe/fire_hydrant.json | 2 +- .../decorative/recipe/gray_bath_tire.json | 2 +- .../decorative/recipe/gray_digital_clock.json | 2 +- .../data/decorative/recipe/gray_lamp.json | 2 +- .../decorative/recipe/green_bath_tire.json | 2 +- .../recipe/green_digital_clock.json | 2 +- .../data/decorative/recipe/green_lamp.json | 2 +- .../data/decorative/recipe/guardrail.json | 2 +- .../data/decorative/recipe/kitchen_tiles.json | 2 +- .../recipe/kitchen_tiles_inverted.json | 2 +- .../recipe/light_blue_bath_tire.json | 2 +- .../recipe/light_blue_digital_clock.json | 2 +- .../decorative/recipe/light_blue_lamp.json | 2 +- .../recipe/light_gray_bath_tire.json | 2 +- .../recipe/light_gray_digital_clock.json | 2 +- .../decorative/recipe/light_gray_lamp.json | 2 +- .../decorative/recipe/lime_bath_tire.json | 2 +- .../decorative/recipe/lime_digital_clock.json | 2 +- .../data/decorative/recipe/lime_lamp.json | 2 +- .../decorative/recipe/magenta_bath_tire.json | 2 +- .../recipe/magenta_digital_clock.json | 2 +- .../data/decorative/recipe/magenta_lamp.json | 2 +- .../decorative/recipe/orange_bath_tire.json | 2 +- .../recipe/orange_digital_clock.json | 2 +- .../data/decorative/recipe/orange_lamp.json | 2 +- .../decorative/recipe/pink_bath_tire.json | 2 +- .../decorative/recipe/pink_digital_clock.json | 2 +- .../data/decorative/recipe/pink_lamp.json | 2 +- .../decorative/recipe/purple_bath_tire.json | 2 +- .../recipe/purple_digital_clock.json | 2 +- .../data/decorative/recipe/purple_lamp.json | 2 +- .../data/decorative/recipe/red_bath_tire.json | 2 +- .../decorative/recipe/red_digital_clock.json | 2 +- .../data/decorative/recipe/red_lamp.json | 2 +- .../data/decorative/recipe/road.json | 2 +- .../recipe/road_long_short_from_road.json | 10 ++ .../decorative/recipe/road_white_long.json | 13 +- .../decorative/recipe/road_white_short.json | 13 +- .../recipe/road_white_short_from_road.json | 10 ++ .../data/decorative/recipe/sign_post.json | 2 +- .../data/decorative/recipe/traffic_cone.json | 2 +- .../data/decorative/recipe/wall_clock.json | 2 +- .../data/decorative/recipe/water_pump.json | 2 +- .../decorative/recipe/white_bath_tire.json | 2 +- .../recipe/white_digital_clock.json | 2 +- .../data/decorative/recipe/white_lamp.json | 2 +- .../decorative/recipe/yellow_bath_tire.json | 2 +- .../recipe/yellow_digital_clock.json | 2 +- .../data/decorative/recipe/yellow_lamp.json | 2 +- .../motschen/decorative/datagen/Recipes.java | 32 ++--- .../motschen/decorative/init/BathTires.java | 2 +- .../motschen/decorative/init/Pool.java | 2 +- 72 files changed, 239 insertions(+), 159 deletions(-) create mode 100644 src/main/generated/data/decorative/advancement/recipes/transportation/road_long_short_from_road.json create mode 100644 src/main/generated/data/decorative/advancement/recipes/transportation/road_white_short_from_road.json create mode 100644 src/main/generated/data/decorative/recipe/road_long_short_from_road.json create mode 100644 src/main/generated/data/decorative/recipe/road_white_short_from_road.json diff --git a/gradle.properties b/gradle.properties index 7d6523d..6d27955 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx2G loader_version=0.15.11 # Mod Properties - mod_version = 5.0.0-pre.1 + mod_version = 5.0.0-pre.2 maven_group = eu.midnightdust.motschen archives_base_name = decorative @@ -17,5 +17,5 @@ org.gradle.jvmargs=-Xmx2G fabric_version=0.100.7+1.21 midnightlib_version=1.5.7-fabric patchouli_version=1.18.2-67-FABRIC - polymer_version=0.9.8+1.21 + polymer_version=0.9.12+1.21.1 factorytools_version=0.3.1+1.21 diff --git a/src/main/generated/.cache/05e548071acf141f8316a32dd9664b72bf08f473 b/src/main/generated/.cache/05e548071acf141f8316a32dd9664b72bf08f473 index ba2d0e9..cdc2c88 100644 --- a/src/main/generated/.cache/05e548071acf141f8316a32dd9664b72bf08f473 +++ b/src/main/generated/.cache/05e548071acf141f8316a32dd9664b72bf08f473 @@ -1,79 +1,82 @@ -// 1.21 2024-08-01T00:03:07.702740398 Decorative/Recipes -8840e1834a4e8b1459b63b4054e28fa51c26e72e data/decorative/recipe/wall_clock.json +// 1.21 2024-09-01T09:26:47.242811261 Decorative/Recipes +9e4053b040259b129aad5a249b7bb58f5555518f data/decorative/recipe/wall_clock.json c7ad4b64d576aee115925400b1fa6500d81d02c9 data/decorative/advancement/recipes/decorations/spruce_log_with_axe.json -cf0bf274ee073450f6c4fd3b5fd7b3d711bd2e60 data/decorative/recipe/gray_lamp.json +a784329131a6c3f7d820f7f3c9be61a4127f12b9 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 -14daf1e2c8be3d45afbf64db20f95a37df9eb7c6 data/decorative/recipe/light_blue_lamp.json +755511678af220d7cfe926ae70bea778def8f9cb 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 9262ec4f8c945c63a16c2ff6a536052f3b9e562c data/decorative/advancement/recipes/decorations/birch_log_with_axe.json 06529fe16fa6e7b6f2fd5bdd3cbe55c293fac647 data/decorative/advancement/recipes/transportation/road_white_short.json +8a2950ab2be80a9fa11272c672698f26deccdda5 data/decorative/recipe/road_long_short_from_road.json 75fc64574e313f6df1787448163eb4e070afed15 data/decorative/advancement/recipes/decorations/blue_digital_clock.json 543017e185506c0c16fef20d654d57cbe4fb2f73 data/decorative/advancement/recipes/decorations/mangrove_log_with_axe.json e65d15949122ad9190f0f785e00c1e2e2c069e55 data/decorative/recipe/warped_stem_with_axe.json 3a0072c8ac3e9488d3c3da850bb6ebffaea0aeba data/decorative/recipe/christmas_lights.json -a81a07ffa6a5844f8b6647da6bcaa850810be560 data/decorative/recipe/green_digital_clock.json +79937b0ec45e8623c122ffbe6a608028ae0d30df data/decorative/recipe/green_digital_clock.json +acb623f0528081f0d59a5722b98d027cffb16237 data/decorative/recipe/road_white_short_from_road.json b42d849311cc115a5c3bbd82c8ea17432602a460 data/decorative/advancement/recipes/decorations/shower_head.json b3fac2535a6f0056ff009157adaad92d7f6095d9 data/decorative/recipe/shower_head.json c38e2b97d02b24721f2fe2e0c18801f74189c3da data/decorative/advancement/recipes/decorations/green_digital_clock.json 1ed6928ef5a3b956b8acd113b8ff6eb014f0b67e data/decorative/advancement/recipes/decorations/pool_wall.json -720f99f9c64e5241228d8f6a2db0b82e4614092b data/decorative/recipe/beach_ball.json -ea55d14da020bf43b92247b0971bd0c5f9887a48 data/decorative/recipe/cyan_bath_tire.json +442eab2407f521035e6faa3b39b8d66c3e15e405 data/decorative/recipe/beach_ball.json +aa6c43501c66cdaa4e1bb9b14f4d5657503d831e data/decorative/recipe/cyan_bath_tire.json 7be358c8c0e1c696e2587a851d040d29d212e347 data/decorative/advancement/recipes/decorations/purple_double_lamp.json -3c7f4740fcd7da1c34145e3f5db2553c9b3234bb data/decorative/recipe/blue_bath_tire.json +a2e36434055716ff57bbbb8f93ce4d1a1c42d011 data/decorative/recipe/blue_bath_tire.json bfef7334fa9893eac82c8db7045ba69336d2ffa1 data/decorative/advancement/recipes/decorations/pink_double_lamp.json -b399653e925ac59319bcee0fa0e1e063edecbb4e data/decorative/recipe/light_blue_bath_tire.json +c1899be04cf38d2684209926ad40f46f528c61e2 data/decorative/recipe/light_blue_bath_tire.json 41cca238b5de1794bcf1e45f96685f879d908be5 data/decorative/advancement/recipes/transportation/onehundredten_sign.json -5b65423f65d9b127cb0f2ec6a7db56c3dc8de6b6 data/decorative/recipe/orange_digital_clock.json +3a1ba95d28edfefeb0558e12eae9f8e442725b5a data/decorative/advancement/recipes/transportation/road_white_short_from_road.json +fa5f4d1394384e1f716e8fad5240818736e9795e data/decorative/recipe/orange_digital_clock.json 202b648f3dc3a6c6b2fa667e8c6a72a7e238d355 data/decorative/advancement/recipes/decorations/black_double_lamp.json 3424e5e6940aa48b425444dbe700edb5afb5f73a data/decorative/advancement/recipes/decorations/pink_bath_tire.json 5df8364ef5b397553888ded16502724f817ab394 data/decorative/advancement/recipes/decorations/springboard_inverted.json a4d672b6cee5c2d2ebedd19c5393d8868280d8cd data/decorative/recipe/yellow_double_lamp.json cdf1d54c043a57cd870dc0a580eeb2bedefd3415 data/decorative/recipe/sixty_sign.json 1b5bb87f75a61d3a35bd3c320ad55fb97cb4e87b data/decorative/advancement/recipes/decorations/light_gray_double_lamp.json -6b6cb8bda3388e705bf0b23f54767cebc59ccb73 data/decorative/recipe/cyan_digital_clock.json +c228ccbef39fe2d9d22c387307c36945035f6d90 data/decorative/recipe/cyan_digital_clock.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 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 -8f1bb2c5fc296cbccee73962618dd12bdcac2f8c data/decorative/recipe/purple_digital_clock.json +598b66ec47ff17146e9f4a1f53560065cfda9bde data/decorative/recipe/lime_digital_clock.json +2d6e47b18bac7a05aa6799b0755316af0a2c50fa data/decorative/recipe/black_bath_tire.json +fdbd3df80516408bf4ce336b3b023e0448ae5d57 data/decorative/recipe/purple_digital_clock.json 436770fa4c85d57e5e5fb64f86762ee2c5c53c59 data/decorative/advancement/recipes/transportation/eighty_sign.json dd7c845f67b2dc144b315422d12edc0a45381260 data/decorative/advancement/recipes/decorations/light_blue_double_lamp.json 771dad46207ea9e1c6d6ccb2d328763ec30b5ef8 data/decorative/advancement/recipes/decorations/crimson_stem_with_axe.json 93baae858af9fe050211ebe71e5944467d9ed53f data/decorative/recipe/ceilingfan.json -03eb19b5311649a7ffe60feb56c4132b454ad376 data/decorative/recipe/red_bath_tire.json +ce93d6dae01eedf9c8b898cdda6621ed62d262e6 data/decorative/recipe/red_bath_tire.json 3b4465a4a33e8f1c9b48717ae29daaa07e9bb2b9 data/decorative/advancement/recipes/transportation/forty_sign.json eebc34041463a2cc5a99f09eeedbd44d48ed51b9 data/decorative/recipe/pool_sprinkler.json 32c4773eb843ec56a8352f21ea4078f2e5df6623 data/decorative/advancement/recipes/decorations/yellow_bath_tire.json 3f66d6d9253eab2f280295f5b6e06c2652755786 data/decorative/recipe/lime_double_lamp.json 42048d634891e821484ef3c982a586d80ce51786 data/decorative/advancement/recipes/decorations/brown_bath_tire.json bea5f6fa05b7fecc8e2162cefa5bedf0c5de6456 data/decorative/recipe/green_double_lamp.json -8bdd97ecdd8d7fad98c5e514e02d4a50b56b291d data/decorative/recipe/light_gray_digital_clock.json +a13eede6374708c5a6bc2620d00625575ec5e284 data/decorative/recipe/light_gray_digital_clock.json 38f7e9cccc3a49b0c49bcdc2d10d5095d7bec31a data/decorative/recipe/pink_double_lamp.json -5a813572b1217b3112dec0f2d777c649c04445cb data/decorative/recipe/kitchen_tiles.json +fdb5796fa843832f05b6f0c8b96980559333bf5d data/decorative/recipe/kitchen_tiles.json cac37fba15d98750e86f2765ff43746ef8f7a806 data/decorative/advancement/recipes/decorations/cyan_double_lamp.json -a68ac9eefd73de8758b911e53a1fe2d99c4aad1d data/decorative/recipe/blue_lamp.json +c7fb9c5727bd712ecbf50a8217b3f6284dd6a6da data/decorative/recipe/blue_lamp.json 891d74a5a69650582fd4314840b90bc49e9ee537 data/decorative/recipe/purple_double_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 +e1b3d34a5063f3fe8021ccb56e88eb7bab09f92a data/decorative/recipe/pink_lamp.json +c90f675aefa46f8a50d7c91320709018d885fc78 data/decorative/recipe/cyan_lamp.json +cc5a9bfdec5f1b2becd3ca82164ceba4f30734cd data/decorative/recipe/orange_lamp.json +287f15bc54602921758786f4ceded29b75ad223b 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 +001c939d69572d71d797f93669b66eb5a1e29bd7 data/decorative/recipe/green_bath_tire.json +936c62d9f00023ac359b864cb6f076d778143fad data/decorative/recipe/traffic_cone.json 936b059633cd8cc321e3ddd87bc00bcfe18472e4 data/decorative/advancement/recipes/transportation/guardrail.json fe5364c1285bcec7c81725016eb955cfbbc426ee data/decorative/advancement/recipes/transportation/empty_sign.json 4a83797ee3b3c2a993e6e547307f143e4bd8e116 data/decorative/recipe/onehundred_sign.json -c47311b9d630190475483504fdc794eda43c5bff data/decorative/recipe/yellow_digital_clock.json +8324fe311ed55b29d971905ce223b958e15ba0bf data/decorative/recipe/yellow_digital_clock.json 17615ad2622844eb75b208f7ffa3c0c1df76e466 data/decorative/recipe/white_double_lamp.json b5a960fa00a186665625f422387c892e30afaa07 data/decorative/recipe/eighty_sign.json -648ec9295eb63e1920b2f3062953468f2b0ae915 data/decorative/recipe/fire_hydrant.json +f4625a4199fc8eea58ffc468e155c3505e21e27f data/decorative/recipe/fire_hydrant.json e5480c0a04101a6f643e9901f95bd91502eda1ad data/decorative/advancement/recipes/transportation/five_sign.json 0d75a48f8cae9d1aa0ff0be7596b4e99c5cf153f data/decorative/advancement/recipes/transportation/ninety_sign.json fbaec7091d109b4246737dc863f1ac2bb2a941c8 data/decorative/advancement/recipes/decorations/black_bath_tire.json @@ -82,11 +85,11 @@ a31a0f68d05977c9475003dc56459c5966346900 data/decorative/recipe/bird_bath.json 2a1b898943b733a60d19da9787bab8f20aad138d data/decorative/recipe/light_blue_double_lamp.json c19b7a59fac568dcf30acc9348810be3163ad1dc data/decorative/advancement/recipes/decorations/kitchen_tiles_inverted.json 3e6a786261359f0c3e3217fd671f1e2a22ed8c2a data/decorative/advancement/recipes/transportation/seventy_sign.json -8c0c784e1387b2f2b8e4e09fd279c3cb29ac1680 data/decorative/recipe/road_white_long.json +a12371cfb294847fde2c5e689eeb23fe62d1f8f3 data/decorative/recipe/road_white_long.json 1cbe006c180599a63d173c09f7a47eec38fa3ed8 data/decorative/advancement/recipes/decorations/ceilingfan.json 0749023f62b9bc57dc92925b7a50c9565d183aa9 data/decorative/advancement/recipes/decorations/acacia_log_with_axe.json e026a94488c036ff18dd5f6fb38826c30b2ae8ed data/decorative/advancement/recipes/decorations/gray_digital_clock.json -2dc87490deecad1b15cca71d0c2520deb2083658 data/decorative/recipe/sign_post.json +7541115084824e7c07a3fe16f427a838ff05c635 data/decorative/recipe/sign_post.json 7f484e9c2d7ac35f1461c0af9157f19570c4d08a data/decorative/recipe/fifty_sign.json a95906844336037ba8b13f0046aa464166f980c9 data/decorative/recipe/empty_sign.json 124bc3456769224c38132f0a45575a29086443d6 data/decorative/advancement/recipes/decorations/pink_digital_clock.json @@ -95,7 +98,7 @@ a95906844336037ba8b13f0046aa464166f980c9 data/decorative/recipe/empty_sign.json cf6dd7aeb20678df2efabcb2a38e7fa595797369 data/decorative/advancement/recipes/decorations/black_lamp.json 3c9d54708db2bf836bbcd215a13197c5fca973be data/decorative/recipe/ninety_sign.json 28c511bb0c722d6c3699c29b42dfd58c4ef3660c data/decorative/advancement/recipes/decorations/light_blue_lamp.json -006a951d6072a9fe6769c79095fff21056041e8f data/decorative/recipe/white_bath_tire.json +fe8f7b29cba03feaa1036013fa06831a53664515 data/decorative/recipe/white_bath_tire.json 3cde566294cd2b55c27e8bfb623ea027405235bd data/decorative/advancement/recipes/transportation/sixty_sign.json 533603822eb60a487aa2fa9962209697b4054d95 data/decorative/recipe/twenty_sign.json 466f5eee3f13b9d06946a46030556034656e5e0b data/decorative/recipe/television.json @@ -105,7 +108,7 @@ a8e83c4467e4cc593c2358bd4f2220ea63db1fe0 data/decorative/recipe/dark_oak_log_wit 4903c4e44c3535782dd0c9fb2212c184f01fa07e data/decorative/advancement/recipes/decorations/wall_clock.json deca428b78a3de7da9a4b97f0fb745e737708830 data/decorative/advancement/recipes/decorations/kitchen_tiles.json a920e7191a3d17a0d7cdf90f85b60ab535f542c4 data/decorative/recipe/birch_log_with_axe.json -a236a997193043cda07f3160bfe95155e428ddb7 data/decorative/recipe/pink_bath_tire.json +553ac249ae76dbeef4de1d10ea8350ee329607e0 data/decorative/recipe/pink_bath_tire.json 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 @@ -113,60 +116,60 @@ eefda8442f5a3f95b6468c9e50edfe43fa586172 data/decorative/recipe/onehundredten_si 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 -913766f50f988c1ec817de1ddb4958c9fd160b46 data/decorative/recipe/gray_bath_tire.json +96f427373926977246a35e7c53068d0369ab021d data/decorative/recipe/gray_bath_tire.json f085e5ef996a54964332951507fdd307c1bf122f data/decorative/advancement/recipes/decorations/light_blue_bath_tire.json -fd018d11a2d9122060928a4cf9177c7470a3a54b data/decorative/recipe/black_digital_clock.json +a95186b170f1de926284b5a623681c13238fc1ca data/decorative/recipe/black_digital_clock.json f16305018efd7c2787f9475b23188ba258a76772 data/decorative/advancement/recipes/decorations/light_gray_digital_clock.json -eeffb17cbf0c8325b94c8dbba281437ee41dc48f data/decorative/recipe/light_blue_digital_clock.json +be30f00466ef01c05881e4cfcb4972576fd6567b data/decorative/recipe/light_blue_digital_clock.json 87bdbe860071142d6330f48f74ced7015b350b05 data/decorative/advancement/recipes/decorations/warped_stem_with_axe.json c240837233e9c4b2b1ae4bb144f87a2151b74865 data/decorative/recipe/acacia_log_with_axe.json 1f7eb14ae20e37347ceb4fdbbaefe700c1077a30 data/decorative/advancement/recipes/decorations/old_television.json 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 +d1e59505ddca87b9dce00eb3e99852754a66c383 data/decorative/recipe/blue_digital_clock.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 -fc44e4c02740835b6d9b7a8753e3b3bdafb9d8e9 data/decorative/recipe/black_lamp.json +51e95f05a256f4735c540fb1291ac28b1f4a4a02 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 +38b9642a5cbe86c4ff2d3353ab94d3947961c21b data/decorative/recipe/light_gray_bath_tire.json 8c0afa643841b405783435907dbe57c18e18f0f7 data/decorative/recipe/jungle_log_with_axe.json -1367d935d5b15b4bde1602c25edb49a43a54b83e data/decorative/recipe/magenta_lamp.json +0466f919c451a9798c1916793832d5eaec4010f8 data/decorative/recipe/magenta_lamp.json 3c94cdbcb7208959d69a378f08ae12ff04c3a0d7 data/decorative/advancement/recipes/decorations/red_bath_tire.json -fbd91aee85e1a4e33f500cd8b2e1ae801f5ebfbc data/decorative/recipe/magenta_bath_tire.json +5eea0a02ec6a43419b5dcc4a53cf50f8812a85f9 data/decorative/recipe/magenta_bath_tire.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 -6295e2c52101510600ae2321461b0003f98d7e58 data/decorative/recipe/water_pump.json +7eb061c33ee63bb46ae98770114f48692e6d0530 data/decorative/recipe/kitchen_tiles_inverted.json +4530cd8cf2a6274c338cb71d0ed346cc8324064d data/decorative/recipe/water_pump.json 3b46e6d6967427e9cc47bc8587f13070c889bbf2 data/decorative/recipe/black_double_lamp.json 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 -4f4d4834aafafdb0edd0718c4093f9973f2d3cda data/decorative/recipe/brown_lamp.json +0148615f4a2105c668a220fcd22c0e6b2b7027da data/decorative/recipe/white_digital_clock.json +28d5339ba86a1848f6572e2f149bb2771be067e8 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 4c636d686527f14b73c16725528807d4a48c9653 data/decorative/advancement/recipes/decorations/red_digital_clock.json 2ff78364ad21abebfa1c29069bc0a7fde4df3ed3 data/decorative/advancement/recipes/decorations/lime_bath_tire.json 16fb3c97a1eb4fb8e6463206f730c8b3f5d4f5b7 data/decorative/advancement/recipes/transportation/stop_sign.json -f14281ff91e51a1d4cc80624425d89d5a3426195 data/decorative/recipe/brown_digital_clock.json -ac59ed33258c2e587ac2cd5f25e7c439898ffba9 data/decorative/recipe/magenta_digital_clock.json -f8b162738014f04558fb92599406b335474c6164 data/decorative/recipe/gray_digital_clock.json +0a214e2501017cba64c5821876c96d9bb10ec4fe data/decorative/recipe/brown_digital_clock.json +9a5d2566c11684a8fa4204f8d4c2f511e9d0bdd2 data/decorative/recipe/magenta_digital_clock.json +b9e3e8143a0890359dfbad4b222aaa0138d7af9c data/decorative/recipe/gray_digital_clock.json a96b45f0c92082c5de774adfc8dcae6faa5863c4 data/decorative/advancement/recipes/transportation/onehundred_sign.json -09875ca4c71d906da6bcb9e4b74a6371c2babca2 data/decorative/recipe/purple_lamp.json -868b78cbe52501a0e21fc0ea813fc6b96c396177 data/decorative/recipe/red_digital_clock.json +e25a47b5f0efc7f810d696a50e16319e8ed03b51 data/decorative/recipe/purple_lamp.json +2e9ffeeff6600986effb9a1f3f22c27ebe025712 data/decorative/recipe/red_digital_clock.json 81469d13349fb8f0151a94b1e3667389a110c221 data/decorative/recipe/pool_wall.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 afcaf9508f1ab2313f5c2b63f2feaa7ce2cb1171 data/decorative/advancement/recipes/decorations/orange_double_lamp.json -8d18dbca7be947b724c4faf4148140af0276abc8 data/decorative/recipe/purple_bath_tire.json -3d6c43dda0e34db696cc9af981a50e0886d7d9d2 data/decorative/recipe/orange_bath_tire.json +85b52ffb0adb16cca16b1e831da2c901129c9169 data/decorative/recipe/purple_bath_tire.json +c135914d97b129d68e6d95c8699a7d49a0b68b26 data/decorative/recipe/orange_bath_tire.json 61891e6a7c958c7f380b036891e296cb2831078d data/decorative/advancement/recipes/decorations/brown_double_lamp.json a9c4f9523fc0fadf3a9580632b95c191d9b8efd2 data/decorative/recipe/springboard.json 6caa098708b8a8a935ddf98175b6afb0d104167b data/decorative/advancement/recipes/decorations/light_blue_digital_clock.json @@ -178,31 +181,31 @@ cf494e0e200ca17c0541b16dffb24fc11aff57da data/decorative/advancement/recipes/dec 3c8a135213f1fa9bcc52ddf73eb31b7d0945b548 data/decorative/advancement/recipes/transportation/road_white_long.json 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 +a05af42b4237f5d26358e98ea200f6e53337df5a data/decorative/recipe/pink_digital_clock.json d64b46a5af5f115feb11a2d575dd7ebec10bd95b data/decorative/advancement/recipes/decorations/purple_lamp.json a75e5488dd6e399b967c0ce6f19f556c968d0c03 data/decorative/advancement/recipes/decorations/cherry_log_with_axe.json 04bf6fbfe9cb9f18e8d5408ba4348fcd0251785b data/decorative/advancement/recipes/decorations/cyan_lamp.json 0049e0bca73b95810cb124c8f2f035613e42311f data/decorative/advancement/recipes/decorations/christmas_tree.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 +8ca3dbd27dab8cbed815fefe4a5b2a83eb3cd1dd data/decorative/recipe/guardrail.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 -408e2dd53b7e4dc6560f0a97de07ab7298d4cea3 data/decorative/recipe/light_gray_lamp.json +a6f8871db579db882e002b74e53c48df22cd61d0 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 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 +20a8ab51dfcf247162ee3c7e92ed660ece390bde data/decorative/recipe/brown_bath_tire.json +a747d1068c30ecc88a700537891a25b2667671d2 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 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 +313c7275e084dfad53baa2d8dbb27ecb78c65322 data/decorative/recipe/red_lamp.json 8b985258b4d6837eeac26fc9134495d9285e2a78 data/decorative/advancement/recipes/decorations/magenta_bath_tire.json -20e6d2724d050d92384a9a3ab32b29b76339abc3 data/decorative/recipe/lime_lamp.json +bc6cf923c683a1e0b3bc62a4f199881f850b6d46 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 @@ -210,20 +213,21 @@ a8117b67c3e1151fbda93894d23996fbca6b3738 data/decorative/advancement/recipes/dec 51330d9b4541579a6badf5b4a9e3452174a54031 data/decorative/recipe/spruce_log_with_axe.json 52b3c7aee833d88261c324de413144e48eb31d53 data/decorative/advancement/recipes/decorations/cyan_bath_tire.json 66158b652a48d577ee40f86ceb932b1651bac23a data/decorative/advancement/recipes/decorations/blue_bath_tire.json +bfa9536fd4cd346df0c4aa3159a5ad79665de010 data/decorative/advancement/recipes/transportation/road_long_short_from_road.json fbe7cc4f9a7a02e14324ecbf8b7561cc92ab28ec data/decorative/advancement/recipes/decorations/christmas_lights.json 6529dc93e8da7ef36df7e534b1a4fabe2258b0eb data/decorative/recipe/seventy_sign.json 445633f13bbe109bd5b15eef397761c96293e472 data/decorative/recipe/sliding_door.json 7c1de2d1a81ba13775d18cac0f59fa8fa6ecad91 data/decorative/recipe/red_double_lamp.json 0a4af6516c0e5cdba06f54232f23ab3235c7cdc6 data/decorative/advancement/recipes/decorations/white_double_lamp.json -96a08fce11810e95a0e5df9e2dc6a5ea4c6ffc9a data/decorative/recipe/yellow_bath_tire.json +ea029ebb55b76bd83cafd0ac84d350c528dccd60 data/decorative/recipe/yellow_bath_tire.json 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 -0a6474508344240cff0c305e49b2ad9c0588f8f5 data/decorative/recipe/green_lamp.json +55713b918b0d60d5bf4ab5cb1894969b159a6652 data/decorative/recipe/road.json +335006820913446378f7f62f7ad70d7cc6b02ed6 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 -8b5feef6998a5ba2f564d84e1a6e1f4e2447b524 data/decorative/recipe/white_lamp.json +b06b1920893e3cc4e98c2757a537a153bf551fa0 data/decorative/recipe/lime_bath_tire.json +cdbd80144d036f88ee6fa031f26d82e1a072dbb6 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 1da2ab1..10c3693 100644 --- a/src/main/generated/.cache/767c31e3ff4fc47c158a5b9ee81cdc589b92f0cc +++ b/src/main/generated/.cache/767c31e3ff4fc47c158a5b9ee81cdc589b92f0cc @@ -1,4 +1,4 @@ -// 1.21 2024-08-01T00:03:07.708091331 Decorative/Block Loot Tables +// 1.21 2024-09-01T09:26:47.246058135 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 ddb4c86..16a2eb8 100644 --- a/src/main/generated/.cache/994d817e0ea4d727e6c4fd01319484e3c3bc9550 +++ b/src/main/generated/.cache/994d817e0ea4d727e6c4fd01319484e3c3bc9550 @@ -1,3 +1,3 @@ -// 1.21 2024-08-01T00:03:07.707624524 Decorative/decorative +// 1.21 2024-09-01T09:26:47.245843628 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/.cache/f7d8407af9baaf5f0f162e0f8ab8027e321c0ef1 b/src/main/generated/.cache/f7d8407af9baaf5f0f162e0f8ab8027e321c0ef1 index a82713b..71ccc44 100644 --- a/src/main/generated/.cache/f7d8407af9baaf5f0f162e0f8ab8027e321c0ef1 +++ b/src/main/generated/.cache/f7d8407af9baaf5f0f162e0f8ab8027e321c0ef1 @@ -1,4 +1,4 @@ -// 1.21 2024-08-01T00:03:07.707245874 Decorative/Tags for minecraft:block +// 1.21 2024-09-01T09:26:47.245552629 Decorative/Tags for minecraft:block f2d5d3644e53c993deebe7b145b6da3246698fba data/minecraft/tags/block/mineable/pickaxe.json 943ffdbb1391ecf5d726ad5897b8e4b41366d8ce data/minecraft/tags/block/mineable/axe.json 8c82b629723744035dfdff5c75a81e15d1db82c1 data/minecraft/tags/block/needs_stone_tool.json diff --git a/src/main/generated/data/decorative/advancement/recipes/transportation/road_long_short_from_road.json b/src/main/generated/data/decorative/advancement/recipes/transportation/road_long_short_from_road.json new file mode 100644 index 0000000..1d263d4 --- /dev/null +++ b/src/main/generated/data/decorative/advancement/recipes/transportation/road_long_short_from_road.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_road": { + "conditions": { + "items": [ + { + "items": "decorative:road" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:road_long_short_from_road" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_road" + ] + ], + "rewards": { + "recipes": [ + "minecraft:road_long_short_from_road" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/decorative/advancement/recipes/transportation/road_white_short_from_road.json b/src/main/generated/data/decorative/advancement/recipes/transportation/road_white_short_from_road.json new file mode 100644 index 0000000..12cb73b --- /dev/null +++ b/src/main/generated/data/decorative/advancement/recipes/transportation/road_white_short_from_road.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_road": { + "conditions": { + "items": [ + { + "items": "decorative:road" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:road_white_short_from_road" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_road" + ] + ], + "rewards": { + "recipes": [ + "minecraft:road_white_short_from_road" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/beach_ball.json b/src/main/generated/data/decorative/recipe/beach_ball.json index 012494b..689fe9f 100644 --- a/src/main/generated/data/decorative/recipe/beach_ball.json +++ b/src/main/generated/data/decorative/recipe/beach_ball.json @@ -18,7 +18,7 @@ "RYB" ], "result": { - "count": 1, + "count": 3, "id": "decorative:beach_ball" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/black_bath_tire.json b/src/main/generated/data/decorative/recipe/black_bath_tire.json index 4f66bdb..51dbaae 100644 --- a/src/main/generated/data/decorative/recipe/black_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/black_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:black_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/black_digital_clock.json b/src/main/generated/data/decorative/recipe/black_digital_clock.json index daea80d..c874ca7 100644 --- a/src/main/generated/data/decorative/recipe/black_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/black_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:black_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/black_lamp.json b/src/main/generated/data/decorative/recipe/black_lamp.json index 1238b4e..df6bb77 100644 --- a/src/main/generated/data/decorative/recipe/black_lamp.json +++ b/src/main/generated/data/decorative/recipe/black_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:black_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/blue_bath_tire.json b/src/main/generated/data/decorative/recipe/blue_bath_tire.json index 4c5f225..2dad4f8 100644 --- a/src/main/generated/data/decorative/recipe/blue_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/blue_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:blue_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/blue_digital_clock.json b/src/main/generated/data/decorative/recipe/blue_digital_clock.json index 3d926ff..6a52e72 100644 --- a/src/main/generated/data/decorative/recipe/blue_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/blue_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:blue_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/blue_lamp.json b/src/main/generated/data/decorative/recipe/blue_lamp.json index 4a69730..6c3f7c4 100644 --- a/src/main/generated/data/decorative/recipe/blue_lamp.json +++ b/src/main/generated/data/decorative/recipe/blue_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:blue_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/brown_bath_tire.json b/src/main/generated/data/decorative/recipe/brown_bath_tire.json index e9d4090..1c1d836 100644 --- a/src/main/generated/data/decorative/recipe/brown_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/brown_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:brown_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/brown_digital_clock.json b/src/main/generated/data/decorative/recipe/brown_digital_clock.json index 73aacb2..16eeb74 100644 --- a/src/main/generated/data/decorative/recipe/brown_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/brown_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:brown_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/brown_lamp.json b/src/main/generated/data/decorative/recipe/brown_lamp.json index 2e76861..55b3a48 100644 --- a/src/main/generated/data/decorative/recipe/brown_lamp.json +++ b/src/main/generated/data/decorative/recipe/brown_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:brown_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/cyan_bath_tire.json b/src/main/generated/data/decorative/recipe/cyan_bath_tire.json index d3d5447..f572944 100644 --- a/src/main/generated/data/decorative/recipe/cyan_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/cyan_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:cyan_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/cyan_digital_clock.json b/src/main/generated/data/decorative/recipe/cyan_digital_clock.json index 0111c0d..7a64e1d 100644 --- a/src/main/generated/data/decorative/recipe/cyan_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/cyan_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:cyan_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/cyan_lamp.json b/src/main/generated/data/decorative/recipe/cyan_lamp.json index bc3fde9..06ef833 100644 --- a/src/main/generated/data/decorative/recipe/cyan_lamp.json +++ b/src/main/generated/data/decorative/recipe/cyan_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:cyan_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/fire_hydrant.json b/src/main/generated/data/decorative/recipe/fire_hydrant.json index 3aa1ef4..12e2a2c 100644 --- a/src/main/generated/data/decorative/recipe/fire_hydrant.json +++ b/src/main/generated/data/decorative/recipe/fire_hydrant.json @@ -11,7 +11,7 @@ "#" ], "result": { - "count": 1, + "count": 2, "id": "decorative:fire_hydrant" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/gray_bath_tire.json b/src/main/generated/data/decorative/recipe/gray_bath_tire.json index e7a1a82..f601247 100644 --- a/src/main/generated/data/decorative/recipe/gray_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/gray_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:gray_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/gray_digital_clock.json b/src/main/generated/data/decorative/recipe/gray_digital_clock.json index d18fbc4..f5e75b8 100644 --- a/src/main/generated/data/decorative/recipe/gray_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/gray_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:gray_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/gray_lamp.json b/src/main/generated/data/decorative/recipe/gray_lamp.json index fbb07d0..c460ff5 100644 --- a/src/main/generated/data/decorative/recipe/gray_lamp.json +++ b/src/main/generated/data/decorative/recipe/gray_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:gray_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/green_bath_tire.json b/src/main/generated/data/decorative/recipe/green_bath_tire.json index 58ed199..2bcbd2c 100644 --- a/src/main/generated/data/decorative/recipe/green_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/green_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:green_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/green_digital_clock.json b/src/main/generated/data/decorative/recipe/green_digital_clock.json index 8312665..14cded0 100644 --- a/src/main/generated/data/decorative/recipe/green_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/green_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:green_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/green_lamp.json b/src/main/generated/data/decorative/recipe/green_lamp.json index bf4cde0..f60415e 100644 --- a/src/main/generated/data/decorative/recipe/green_lamp.json +++ b/src/main/generated/data/decorative/recipe/green_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:green_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/guardrail.json b/src/main/generated/data/decorative/recipe/guardrail.json index 83520e5..127061e 100644 --- a/src/main/generated/data/decorative/recipe/guardrail.json +++ b/src/main/generated/data/decorative/recipe/guardrail.json @@ -13,7 +13,7 @@ "#I" ], "result": { - "count": 1, + "count": 2, "id": "decorative:guardrail" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/kitchen_tiles.json b/src/main/generated/data/decorative/recipe/kitchen_tiles.json index cc12e3d..0c8c0b6 100644 --- a/src/main/generated/data/decorative/recipe/kitchen_tiles.json +++ b/src/main/generated/data/decorative/recipe/kitchen_tiles.json @@ -14,7 +14,7 @@ "WB" ], "result": { - "count": 1, + "count": 4, "id": "decorative:kitchen_tiles" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/kitchen_tiles_inverted.json b/src/main/generated/data/decorative/recipe/kitchen_tiles_inverted.json index 49eac99..6e71e6c 100644 --- a/src/main/generated/data/decorative/recipe/kitchen_tiles_inverted.json +++ b/src/main/generated/data/decorative/recipe/kitchen_tiles_inverted.json @@ -14,7 +14,7 @@ "BW" ], "result": { - "count": 1, + "count": 4, "id": "decorative:kitchen_tiles" }, "show_notification": false diff --git a/src/main/generated/data/decorative/recipe/light_blue_bath_tire.json b/src/main/generated/data/decorative/recipe/light_blue_bath_tire.json index 308c6b0..6ee6bde 100644 --- a/src/main/generated/data/decorative/recipe/light_blue_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/light_blue_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:light_blue_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/light_blue_digital_clock.json b/src/main/generated/data/decorative/recipe/light_blue_digital_clock.json index b5258e4..6065c8c 100644 --- a/src/main/generated/data/decorative/recipe/light_blue_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/light_blue_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:light_blue_digital_clock" } } \ No newline at end of file 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 b49589c..0f565c4 100644 --- a/src/main/generated/data/decorative/recipe/light_blue_lamp.json +++ b/src/main/generated/data/decorative/recipe/light_blue_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:light_blue_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/light_gray_bath_tire.json b/src/main/generated/data/decorative/recipe/light_gray_bath_tire.json index 4a72e54..dfc9633 100644 --- a/src/main/generated/data/decorative/recipe/light_gray_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/light_gray_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:light_gray_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/light_gray_digital_clock.json b/src/main/generated/data/decorative/recipe/light_gray_digital_clock.json index 373068a..6bda5e6 100644 --- a/src/main/generated/data/decorative/recipe/light_gray_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/light_gray_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:light_gray_digital_clock" } } \ No newline at end of file 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 06e6b5a..09ffce9 100644 --- a/src/main/generated/data/decorative/recipe/light_gray_lamp.json +++ b/src/main/generated/data/decorative/recipe/light_gray_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:light_gray_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/lime_bath_tire.json b/src/main/generated/data/decorative/recipe/lime_bath_tire.json index ad45e29..69388d3 100644 --- a/src/main/generated/data/decorative/recipe/lime_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/lime_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:lime_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/lime_digital_clock.json b/src/main/generated/data/decorative/recipe/lime_digital_clock.json index 8e89cb4..8895200 100644 --- a/src/main/generated/data/decorative/recipe/lime_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/lime_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:lime_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/lime_lamp.json b/src/main/generated/data/decorative/recipe/lime_lamp.json index 4dec57c..026020b 100644 --- a/src/main/generated/data/decorative/recipe/lime_lamp.json +++ b/src/main/generated/data/decorative/recipe/lime_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:lime_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/magenta_bath_tire.json b/src/main/generated/data/decorative/recipe/magenta_bath_tire.json index c876414..7ec4592 100644 --- a/src/main/generated/data/decorative/recipe/magenta_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/magenta_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:magenta_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/magenta_digital_clock.json b/src/main/generated/data/decorative/recipe/magenta_digital_clock.json index 4f0a114..2d90f61 100644 --- a/src/main/generated/data/decorative/recipe/magenta_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/magenta_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:magenta_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/magenta_lamp.json b/src/main/generated/data/decorative/recipe/magenta_lamp.json index 37a941e..5e00ada 100644 --- a/src/main/generated/data/decorative/recipe/magenta_lamp.json +++ b/src/main/generated/data/decorative/recipe/magenta_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:magenta_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/orange_bath_tire.json b/src/main/generated/data/decorative/recipe/orange_bath_tire.json index af3df91..413e6eb 100644 --- a/src/main/generated/data/decorative/recipe/orange_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/orange_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:orange_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/orange_digital_clock.json b/src/main/generated/data/decorative/recipe/orange_digital_clock.json index 171ddc7..ed9d60e 100644 --- a/src/main/generated/data/decorative/recipe/orange_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/orange_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:orange_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/orange_lamp.json b/src/main/generated/data/decorative/recipe/orange_lamp.json index d6bace1..9b47c5e 100644 --- a/src/main/generated/data/decorative/recipe/orange_lamp.json +++ b/src/main/generated/data/decorative/recipe/orange_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:orange_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/pink_bath_tire.json b/src/main/generated/data/decorative/recipe/pink_bath_tire.json index fe06dae..d7e72d5 100644 --- a/src/main/generated/data/decorative/recipe/pink_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/pink_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:pink_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/pink_digital_clock.json b/src/main/generated/data/decorative/recipe/pink_digital_clock.json index da15eeb..0a860bc 100644 --- a/src/main/generated/data/decorative/recipe/pink_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/pink_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:pink_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/pink_lamp.json b/src/main/generated/data/decorative/recipe/pink_lamp.json index 373f467..ea5ae9b 100644 --- a/src/main/generated/data/decorative/recipe/pink_lamp.json +++ b/src/main/generated/data/decorative/recipe/pink_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:pink_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/purple_bath_tire.json b/src/main/generated/data/decorative/recipe/purple_bath_tire.json index daeb3e0..da147da 100644 --- a/src/main/generated/data/decorative/recipe/purple_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/purple_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:purple_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/purple_digital_clock.json b/src/main/generated/data/decorative/recipe/purple_digital_clock.json index 5d3f538..807a1b6 100644 --- a/src/main/generated/data/decorative/recipe/purple_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/purple_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:purple_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/purple_lamp.json b/src/main/generated/data/decorative/recipe/purple_lamp.json index aaea48c..6a20dbd 100644 --- a/src/main/generated/data/decorative/recipe/purple_lamp.json +++ b/src/main/generated/data/decorative/recipe/purple_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:purple_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/red_bath_tire.json b/src/main/generated/data/decorative/recipe/red_bath_tire.json index 2621546..158d83b 100644 --- a/src/main/generated/data/decorative/recipe/red_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/red_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:red_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/red_digital_clock.json b/src/main/generated/data/decorative/recipe/red_digital_clock.json index f73b606..1851106 100644 --- a/src/main/generated/data/decorative/recipe/red_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/red_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:red_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/red_lamp.json b/src/main/generated/data/decorative/recipe/red_lamp.json index 6c58aed..21ae475 100644 --- a/src/main/generated/data/decorative/recipe/red_lamp.json +++ b/src/main/generated/data/decorative/recipe/red_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:red_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/road.json b/src/main/generated/data/decorative/recipe/road.json index 16a4883..f453819 100644 --- a/src/main/generated/data/decorative/recipe/road.json +++ b/src/main/generated/data/decorative/recipe/road.json @@ -4,7 +4,7 @@ "item": "decorative:rocky_asphalt" }, "result": { - "count": 1, + "count": 4, "id": "decorative:road" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/road_long_short_from_road.json b/src/main/generated/data/decorative/recipe/road_long_short_from_road.json new file mode 100644 index 0000000..def5c1f --- /dev/null +++ b/src/main/generated/data/decorative/recipe/road_long_short_from_road.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "decorative:road" + }, + "result": { + "count": 1, + "id": "decorative:road_white_long" + } +} \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/road_white_long.json b/src/main/generated/data/decorative/recipe/road_white_long.json index d523afa..52fdba1 100644 --- a/src/main/generated/data/decorative/recipe/road_white_long.json +++ b/src/main/generated/data/decorative/recipe/road_white_long.json @@ -1,15 +1,10 @@ { "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "decorative:rocky_asphalt" - }, - { - "item": "decorative:road" - } - ], + "ingredient": { + "item": "decorative:rocky_asphalt" + }, "result": { - "count": 1, + "count": 4, "id": "decorative:road_white_long" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/road_white_short.json b/src/main/generated/data/decorative/recipe/road_white_short.json index 7757a89..0e37dce 100644 --- a/src/main/generated/data/decorative/recipe/road_white_short.json +++ b/src/main/generated/data/decorative/recipe/road_white_short.json @@ -1,15 +1,10 @@ { "type": "minecraft:stonecutting", - "ingredient": [ - { - "item": "decorative:rocky_asphalt" - }, - { - "item": "decorative:road" - } - ], + "ingredient": { + "item": "decorative:rocky_asphalt" + }, "result": { - "count": 1, + "count": 4, "id": "decorative:road_white_short" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/road_white_short_from_road.json b/src/main/generated/data/decorative/recipe/road_white_short_from_road.json new file mode 100644 index 0000000..26e9565 --- /dev/null +++ b/src/main/generated/data/decorative/recipe/road_white_short_from_road.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "decorative:road" + }, + "result": { + "count": 1, + "id": "decorative:road_white_short" + } +} \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/sign_post.json b/src/main/generated/data/decorative/recipe/sign_post.json index 7fa1d59..984636d 100644 --- a/src/main/generated/data/decorative/recipe/sign_post.json +++ b/src/main/generated/data/decorative/recipe/sign_post.json @@ -11,7 +11,7 @@ "#" ], "result": { - "count": 8, + "count": 6, "id": "decorative:sign_post" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/traffic_cone.json b/src/main/generated/data/decorative/recipe/traffic_cone.json index 4c667c1..cf19005 100644 --- a/src/main/generated/data/decorative/recipe/traffic_cone.json +++ b/src/main/generated/data/decorative/recipe/traffic_cone.json @@ -15,7 +15,7 @@ "OOO" ], "result": { - "count": 3, + "count": 6, "id": "decorative:traffic_cone" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/wall_clock.json b/src/main/generated/data/decorative/recipe/wall_clock.json index d74eae2..c3095dc 100644 --- a/src/main/generated/data/decorative/recipe/wall_clock.json +++ b/src/main/generated/data/decorative/recipe/wall_clock.json @@ -15,7 +15,7 @@ " # " ], "result": { - "count": 1, + "count": 2, "id": "decorative:wall_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/water_pump.json b/src/main/generated/data/decorative/recipe/water_pump.json index 65ea075..f67074e 100644 --- a/src/main/generated/data/decorative/recipe/water_pump.json +++ b/src/main/generated/data/decorative/recipe/water_pump.json @@ -11,7 +11,7 @@ "#" ], "result": { - "count": 1, + "count": 2, "id": "decorative:water_pump" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/white_bath_tire.json b/src/main/generated/data/decorative/recipe/white_bath_tire.json index 0faab8d..ee0c10d 100644 --- a/src/main/generated/data/decorative/recipe/white_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/white_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:white_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/white_digital_clock.json b/src/main/generated/data/decorative/recipe/white_digital_clock.json index 73c20a8..704f049 100644 --- a/src/main/generated/data/decorative/recipe/white_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/white_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:white_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/white_lamp.json b/src/main/generated/data/decorative/recipe/white_lamp.json index 670dc3d..29196bb 100644 --- a/src/main/generated/data/decorative/recipe/white_lamp.json +++ b/src/main/generated/data/decorative/recipe/white_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:white_lamp" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/yellow_bath_tire.json b/src/main/generated/data/decorative/recipe/yellow_bath_tire.json index d763da7..4c3f979 100644 --- a/src/main/generated/data/decorative/recipe/yellow_bath_tire.json +++ b/src/main/generated/data/decorative/recipe/yellow_bath_tire.json @@ -12,7 +12,7 @@ "###" ], "result": { - "count": 1, + "count": 3, "id": "decorative:yellow_bath_tire" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/yellow_digital_clock.json b/src/main/generated/data/decorative/recipe/yellow_digital_clock.json index 4adee0f..840b613 100644 --- a/src/main/generated/data/decorative/recipe/yellow_digital_clock.json +++ b/src/main/generated/data/decorative/recipe/yellow_digital_clock.json @@ -17,7 +17,7 @@ "#C#" ], "result": { - "count": 1, + "count": 3, "id": "decorative:yellow_digital_clock" } } \ No newline at end of file diff --git a/src/main/generated/data/decorative/recipe/yellow_lamp.json b/src/main/generated/data/decorative/recipe/yellow_lamp.json index b1c1d8c..4a904b0 100644 --- a/src/main/generated/data/decorative/recipe/yellow_lamp.json +++ b/src/main/generated/data/decorative/recipe/yellow_lamp.json @@ -18,7 +18,7 @@ " B " ], "result": { - "count": 1, + "count": 3, "id": "decorative:yellow_lamp" } } \ No newline at end of file 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 239c616..4919fd4 100644 --- a/src/main/java/eu/midnightdust/motschen/decorative/datagen/Recipes.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/datagen/Recipes.java @@ -42,7 +42,7 @@ public class Recipes extends FabricRecipeProvider { private void generateCrafting(RecipeExporter exporter) { LogsWithAxes.TYPES.forEach(log -> createLogWithAxeRecipe(log).offerTo(exporter)); - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, Pool.BEACH_BALL_ITEM) + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, Pool.BEACH_BALL_ITEM, 3) .input('R', Blocks.RED_CONCRETE) .input('Y', Blocks.YELLOW_CONCRETE) .input('B', Blocks.LIGHT_BLUE_CONCRETE) @@ -99,19 +99,19 @@ public class Recipes extends FabricRecipeProvider { .pattern("#I#") .criterion(FabricRecipeProvider.hasItem(DecorativeMain.SignPost), FabricRecipeProvider.conditionsFromItem(DecorativeMain.SignPost)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.TRANSPORTATION, DecorativeMain.FireHydrant) + ShapedRecipeJsonBuilder.create(RecipeCategory.TRANSPORTATION, DecorativeMain.FireHydrant, 2) .input('#', Blocks.RED_TERRACOTTA) .pattern("#") .pattern("#") .criterion(FabricRecipeProvider.hasItem(Blocks.RED_TERRACOTTA), FabricRecipeProvider.conditionsFromItem(Blocks.RED_TERRACOTTA)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.TRANSPORTATION, DecorativeMain.Guardrail) + ShapedRecipeJsonBuilder.create(RecipeCategory.TRANSPORTATION, DecorativeMain.Guardrail, 2) .input('#', Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE) .input('I', Blocks.IRON_BARS) .pattern("#I") .criterion(FabricRecipeProvider.hasItem(Blocks.IRON_BARS), FabricRecipeProvider.conditionsFromItem(Blocks.IRON_BARS)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.KitchenTiles) + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.KitchenTiles, 4) .input('B', Blocks.BLACK_CONCRETE) .input('W', Blocks.WHITE_CONCRETE) .pattern("BW") @@ -119,7 +119,7 @@ public class Recipes extends FabricRecipeProvider { .criterion(FabricRecipeProvider.hasItem(Blocks.BLACK_CONCRETE), FabricRecipeProvider.conditionsFromItem(Blocks.BLACK_CONCRETE)) .criterion(FabricRecipeProvider.hasItem(Blocks.WHITE_CONCRETE), FabricRecipeProvider.conditionsFromItem(Blocks.WHITE_CONCRETE)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.KitchenTiles) + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.KitchenTiles, 4) .input('W', Blocks.WHITE_CONCRETE) .input('B', Blocks.BLACK_CONCRETE) .pattern("WB") @@ -161,7 +161,7 @@ public class Recipes extends FabricRecipeProvider { .pattern("GGG") .criterion(FabricRecipeProvider.hasItem(Blocks.GRAY_CONCRETE), FabricRecipeProvider.conditionsFromItem(Blocks.GRAY_CONCRETE)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.SignPost, 8) + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.SignPost, 6) .input('#', Blocks.IRON_BLOCK) .pattern("#") .pattern("#") @@ -195,7 +195,7 @@ public class Recipes extends FabricRecipeProvider { .pattern("##") .criterion(FabricRecipeProvider.hasItem(Blocks.STONE_BUTTON), FabricRecipeProvider.conditionsFromItem(Blocks.STONE_BUTTON)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.TrafficCone, 3) + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.TrafficCone, 6) .input('W', Blocks.WHITE_CONCRETE) .input('O', Blocks.ORANGE_CONCRETE) .pattern(" O ") @@ -204,7 +204,7 @@ public class Recipes extends FabricRecipeProvider { .criterion(FabricRecipeProvider.hasItem(Blocks.WHITE_CONCRETE), FabricRecipeProvider.conditionsFromItem(Blocks.WHITE_CONCRETE)) .criterion(FabricRecipeProvider.hasItem(Blocks.ORANGE_CONCRETE), FabricRecipeProvider.conditionsFromItem(Blocks.ORANGE_CONCRETE)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.WallClock) + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.WallClock, 2) .input('#', Blocks.QUARTZ_BLOCK) .input('C', Items.CLOCK) .pattern(" # ") @@ -212,7 +212,7 @@ public class Recipes extends FabricRecipeProvider { .pattern(" # ") .criterion(FabricRecipeProvider.hasItem(Items.CLOCK), FabricRecipeProvider.conditionsFromItem(Items.CLOCK)) .offerTo(exporter); - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.WaterPump) + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, DecorativeMain.WaterPump, 2) .input('#', Blocks.GREEN_TERRACOTTA) .pattern("#") .pattern("#") @@ -231,7 +231,7 @@ public class Recipes extends FabricRecipeProvider { private ShapedRecipeJsonBuilder createBathTireRecipe(ColorUtil.VanillaColor color) { Item bathTire = Registries.ITEM.get(id(color.getName()+"_bath_tire")); Block concreteType = Registries.BLOCK.get(Identifier.ofVanilla(color.getName()+"_concrete")); - return ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, bathTire) + return ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, bathTire, 3) .input('#', concreteType) .pattern("###") .pattern("# #") @@ -241,7 +241,7 @@ public class Recipes extends FabricRecipeProvider { private ShapedRecipeJsonBuilder createDigitalClockRecipe(ColorUtil.VanillaColor color) { Block digitalClock = Registries.BLOCK.get(id(color.getName()+"_digital_clock")); Block concreteType = Registries.BLOCK.get(Identifier.ofVanilla(color.getName()+"_concrete")); - return ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, digitalClock) + return ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, digitalClock, 3) .input('#', concreteType) .input('B', Blocks.BLACK_CONCRETE) .input('C', Items.CLOCK) @@ -252,7 +252,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()+"_wool")); - return ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, lamp) + return ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, lamp, 3) .input('#', woolType) .input('R', Blocks.REDSTONE_LAMP) .input('B', Blocks.BLACK_CONCRETE) @@ -273,8 +273,10 @@ public class Recipes extends FabricRecipeProvider { private void generateStonecutting(RecipeExporter exporter) { Signs.SIGNS.forEach(sign -> StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.ofItems(Signs.EmptySign), RecipeCategory.TRANSPORTATION, sign).criterion(FabricRecipeProvider.hasItem(Signs.EmptySign), FabricRecipeProvider.conditionsFromItem(Signs.EmptySign)).offerTo(exporter)); - StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.ofItems(RockyAsphalt), RecipeCategory.TRANSPORTATION, DecorativeMain.Road).criterion(FabricRecipeProvider.hasItem(RockyAsphalt), FabricRecipeProvider.conditionsFromItem(RockyAsphalt)).offerTo(exporter); - StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.ofItems(RockyAsphalt, Road), RecipeCategory.TRANSPORTATION, DecorativeMain.RoadWhiteShort).criterion(FabricRecipeProvider.hasItem(RockyAsphalt), FabricRecipeProvider.conditionsFromItem(RockyAsphalt)).offerTo(exporter); - StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.ofItems(RockyAsphalt, Road), RecipeCategory.TRANSPORTATION, DecorativeMain.RoadWhiteLong).criterion(FabricRecipeProvider.hasItem(RockyAsphalt), FabricRecipeProvider.conditionsFromItem(RockyAsphalt)).offerTo(exporter); + StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.ofItems(RockyAsphalt), RecipeCategory.TRANSPORTATION, DecorativeMain.Road, 4).criterion(FabricRecipeProvider.hasItem(RockyAsphalt), FabricRecipeProvider.conditionsFromItem(RockyAsphalt)).offerTo(exporter); + StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.ofItems(RockyAsphalt), RecipeCategory.TRANSPORTATION, DecorativeMain.RoadWhiteShort, 4).criterion(FabricRecipeProvider.hasItem(RockyAsphalt), FabricRecipeProvider.conditionsFromItem(RockyAsphalt)).offerTo(exporter); + StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.ofItems(RockyAsphalt), RecipeCategory.TRANSPORTATION, DecorativeMain.RoadWhiteLong, 4).criterion(FabricRecipeProvider.hasItem(RockyAsphalt), FabricRecipeProvider.conditionsFromItem(RockyAsphalt)).offerTo(exporter); + StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.ofItems(Road), RecipeCategory.TRANSPORTATION, DecorativeMain.RoadWhiteShort).criterion(FabricRecipeProvider.hasItem(Road), FabricRecipeProvider.conditionsFromItem(Road)).offerTo(exporter, "road_white_short_from_road"); + StonecuttingRecipeJsonBuilder.createStonecutting(Ingredient.ofItems(Road), RecipeCategory.TRANSPORTATION, DecorativeMain.RoadWhiteLong).criterion(FabricRecipeProvider.hasItem(Road), FabricRecipeProvider.conditionsFromItem(Road)).offerTo(exporter, "road_long_short_from_road"); } } diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java b/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java index 3ec5590..8d100d4 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/BathTires.java @@ -62,7 +62,7 @@ public class BathTires { DUCK_BATH_TIRE = registerBathTire(id("duck_bath_tire")); } private static EntityType registerBathTire(Identifier id) { - EntityType entity = Registry.register(Registries.ENTITY_TYPE, id, EntityType.Builder.create(BathTireEntity::new, SpawnGroup.AMBIENT).dimensions(1.5f,1).maxTrackingRange(100).trackingTickInterval(4).build()); + EntityType entity = Registry.register(Registries.ENTITY_TYPE, id, EntityType.Builder.create(BathTireEntity::new, SpawnGroup.AMBIENT).dimensions(1.5f,1).maxTrackingRange(100).trackingTickInterval(4).build(id.toString())); FabricDefaultAttributeRegistry.register(entity, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 2.0D)); PolymerEntityUtils.registerType(entity); registerItem(id, new BathTireItem(entity, new Item.Settings()), PoolGroup); diff --git a/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java b/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java index 1060fb6..2b39aad 100755 --- a/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java +++ b/src/main/java/eu/midnightdust/motschen/decorative/init/Pool.java @@ -38,7 +38,7 @@ public class Pool { BathTires.init(); } private static EntityType registerBeachBall(Identifier id) { - EntityType entity = Registry.register(Registries.ENTITY_TYPE, id, EntityType.Builder.create(BeachBallEntity::new, SpawnGroup.AMBIENT).dimensions(0.9f,0.9f).maxTrackingRange(100).trackingTickInterval(4).build()); + EntityType entity = Registry.register(Registries.ENTITY_TYPE, id, EntityType.Builder.create(BeachBallEntity::new, SpawnGroup.AMBIENT).dimensions(0.9f,0.9f).maxTrackingRange(100).trackingTickInterval(4).build(id.toString())); FabricDefaultAttributeRegistry.register(entity, MobEntity.createMobAttributes().add(EntityAttributes.GENERIC_MAX_HEALTH, 100000.0D).add(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, -10D)); PolymerEntityUtils.registerType(entity); return entity;