diff --git a/gradle.properties b/gradle.properties index c2851307..b971bb3a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G +org.gradle.jvmargs=-Xmx3G org.gradle.parallel=true # Fabric Properties diff --git a/src/main/generated/.cache/2d9e9705c09fddda27f0fab2a98c15a5511271f4 b/src/main/generated/.cache/2d9e9705c09fddda27f0fab2a98c15a5511271f4 index f8bf7fa6..83017468 100644 --- a/src/main/generated/.cache/2d9e9705c09fddda27f0fab2a98c15a5511271f4 +++ b/src/main/generated/.cache/2d9e9705c09fddda27f0fab2a98c15a5511271f4 @@ -1,162 +1,85 @@ -// 1.20.1 2024-01-29T18:25:38.1412969 tead/Recipes -6f18d2136e9b4c5871b93ee83bf36e8091f05638 data\tead\advancements\recipes\combat\fabric_4.json -9ca942f591b1c39328dd7b377fb2623bbd80eef6 data\tead\advancements\recipes\combat\jerky_12.json -410de2b77025aba48844f2d86d3a6107967933fb data\tead\recipes\gold_sickle.json -e643ea303a967f455226e15cd82d12bcbd5022b1 data\tead\recipes\fabric_4.json -7018305af08e1cdf4f8016dd65c6e0e78e236289 data\tead\recipes\boring_arrow_1.json -2a69fe4d3177b43aaefb2c24b03b07f5ceaee69e data\tead\advancements\recipes\tools\lead_shovel.json +// 1.20.1 2024-02-03T14:49:48.49488 tead/Recipes 555829edf7cee50c5f88a368ac6947aa182e8911 data\tead\recipes\amethyst_arrow_1.json 6e4a96ac6f1875ca5ae1c6f813a41fce84f19e41 data\tead\advancements\recipes\tools\bone_club.json 4f7a395665128b7c13c78d56cfc8f804afc8686a data\tead\recipes\obsidian_claymore.json -accb6925a1ef6c1d3d43120571ed51f606c64ff3 data\tead\advancements\recipes\tools\obsidian_sword.json 2ca40c954f4e3131f227875b3ff587e569f87928 data\tead\recipes\iron_plate_helmet.json -9a2a4e16c0d9bbb70ac5e0062fa7892ab1b94c46 data\tead\recipes\jerky_5.json a630b0a1c58e26b41f0bdeb1b82cefe2c8dd537f data\tead\recipes\lead_dagger.json -f59b500b212d3d0346ed8f23223d4958e3dfdce3 data\tead\recipes\lead_ingot.json e736deba72ca8cf3634976f577c1b403f55d2906 data\tead\recipes\diamond_plate_chestplate.json -6424d81948217d3c590d115ab415102ee6185b31 data\tead\recipes\quarterstaff.json a5f5b5a92533a742fceb2058818faba8fec1981b data\tead\recipes\dark_brick.json fedb3ca6807ab64eb0805186e523a0f49b17cf24 data\tead\advancements\recipes\tools\iron_plate_helmet.json 4841c8a6d8c5aab0657a90c537d2bc262a22a6d7 data\tead\advancements\recipes\tools\obsidian_claymore.json -fe0818b618c676d607e693c4f5ace6b9797a3ab2 data\tead\advancements\recipes\tools\gold_stalwart_helmet.json -ff455102ccae589e390418c8130f487f34a2630d data\tead\advancements\recipes\tools\firebolt_thrower.json +77667fc63f08d7ddc761d07a2592da6b3edb5793 data\tead\advancements\recipes\combat\torch_arrow_4.json b31c3e48a575c804456bb864c9168c1946a87a52 data\tead\recipes\wood_dagger.json d266fb20d5cb2c3d1fbb7ee232c7759e742a5ca8 data\tead\advancements\recipes\tools\gold_plate_helmet.json -1fb72f4921cbfbefc15ffc228b1d7e6313c38474 data\tead\advancements\recipes\combat\jerky_1.json -70805dbab36d0af12100da94df06343109fc35ce data\tead\recipes\jerky_12.json -386987e5e519e986977337fab476910f3876940d data\tead\advancements\recipes\tools\chainmail_boots.json 882b49cedb07225fcb5c6aaa098a32a90d4ff36d data\tead\advancements\recipes\combat\lead_bullet.json 10d2fa5308753cc78a7169b23c9c62f84734cfb0 data\tead\recipes\lead_ingot_from_blasting_lead_ore.json 12058ffd3c148c350f1cfab48c7d183dd15463ab data\tead\recipes\jerky_3.json -09f4a2d5f3f3acb1bbd3bd3b27fcc5e30736552f data\tead\recipes\wood_sickle.json -e0254cfa603d96ce15a79bfe1b3c76338bac2809 data\tead\recipes\diamond_royal_helmet.json -12bd033c75ebe8d0327281e8a2186c7a850af8c1 data\tead\recipes\handle_1.json 1c096ba71e826c5146551793ef771ee86a57f5c2 data\tead\advancements\recipes\combat\fabric_6.json -2b305998d4be196b07074cecb672aee59770d599 data\tead\advancements\recipes\building_blocks\ruby.json -dc234b3411b6cf30c381684aa65400cdeebf6772 data\tead\recipes\lead_ingot_from_blasting_galena.json bf21e5848e1b5976a765b5ad357e84553556b312 data\tead\recipes\lead_double_axe.json -087c27594e2e9bc756b4c92566e00fb199f7582d data\tead\recipes\robe_helmet.json +dc234b3411b6cf30c381684aa65400cdeebf6772 data\tead\recipes\lead_ingot_from_blasting_galena.json +2b305998d4be196b07074cecb672aee59770d599 data\tead\advancements\recipes\building_blocks\ruby.json 78a679439b495da11904c61afcbdc5ec4d8467ad data\tead\advancements\recipes\tools\diamond_stalwart_chestplate.json b1b487d7e85f1a98d3e62b5a26bffcaa712164eb data\tead\recipes\lead_hoe.json -ac6885529b6489a404e6a5655c3dee8084b394e5 data\tead\recipes\dirty_cobblestone.json -f6333292b92548140f93cdc153654b6860a45516 data\tead\recipes\empty_bookshelf.json f3761e1c26cc5845d5747f2db6a3ef11629c226a data\tead\recipes\jerky_10.json -211ca03ca62aa1ef3566ffc53cdc091ddcebb379 data\tead\advancements\recipes\tools\diamond_dagger.json -9b2745cd7a3ef566370056dce2aaf6916787895c data\tead\recipes\gold_chainmail_helmet.json -521408a6747f811c71b5bf098d7fbaf87742c97e data\tead\advancements\recipes\tools\bone_bow.json b67d702792eaba45a87378c442082024dc7a9fcf data\tead\recipes\gold_plate_helmet.json e20c735898d0d0f815daf24dfcf089a97209e14a data\tead\recipes\ruby_from_blasting_ruby_ore.json -3b01a888ae46a24c0a09f94fd4d5bd4ba94cb4cc data\tead\recipes\iron_royal_helmet.json fa76eaec7314cdc8a4ab9679c1b98cf6a73d22c0 data\tead\advancements\recipes\misc\dark_brick_from_smelting_clayish_mud.json 930610b5ca766338a09df63c458402b151745557 data\tead\recipes\fabric_2.json -ae60344237b9f3748d290c72dcac6e216e2f0a6a data\tead\recipes\lead_sickle.json aae5f5f95ced96566d76a7692e3c00def8ecd433 data\tead\advancements\recipes\tools\netherite_stalwart_helmet.json -01d4f18ac6c2b779c6b2f6b5a2636825d6cbcd2f data\tead\advancements\recipes\tools\gold_royal_helmet.json 9784c91c33d9eeabb853bbc0473ccb486150f95f data\tead\advancements\recipes\tools\stone_double_axe.json -0a8d82011b1e68f13c789916411b1308a62c6a7c data\tead\advancements\recipes\combat\ender_pearl_arrow_1.json -aab6bd570b252ed9592c02285cc4a8050a88650e data\tead\advancements\recipes\combat\cooper_arrow_2.json a78d99be54d0891347ea880d9f98a2d69371b3a7 data\tead\recipes\jerky_7.json -294cddcfb87a4173d58df606fec0bd204dba9b78 data\tead\advancements\recipes\building_blocks\old_bookshelf.json 02506bba90482f643ca975bb1bc35fa4c7f8b4d7 data\tead\recipes\ender_pearl_arrow_2.json -900b4faf412bc568c36cc037bd0235d061490007 data\tead\recipes\wood_hammer.json -0608b4efec39c7afc92e3b733f69e6765426068f data\tead\recipes\item_frame.json cbd97fb9d0207c7fe848f11e743b5e5addcc960c data\tead\recipes\shotgun.json -c7cd6d2f75ac24d498ce5175ef1f5cc6bbdd217f data\tead\advancements\recipes\tools\quarterstaff.json -ed7e22dc2a94227da2f3f57631e3b621c647d6df data\tead\advancements\recipes\combat\tnt_arrow_1.json +db982a4e1a3d9c4401edaec9654984b6f1909b65 data\tead\advancements\recipes\combat\tnt_arrow_1.json 2b8ce35f19173ca858b82c3fe688653ae41e94c9 data\tead\recipes\netherite_claymore_smithing.json eef3fb6d85b494529dcea8f8b7d10fe8afb3ef55 data\tead\advancements\recipes\misc\saddle.json fd1c648e05db2b61f09a52ff2865ff4b913c9a52 data\tead\advancements\recipes\combat\jerky_10.json 8858a0ba6cd770f0b7ed4a90c8a09ee55416d86e data\tead\advancements\recipes\food\lead_apple.json -4f9104aa424992039d3aa3fe599902c3a68000d7 data\tead\recipes\firebolt_thrower.json -248ff690f2ad73f6a1c8629721962b641bbb5075 data\tead\recipes\diamond_stalwart_helmet.json -7ba40fdb9b45227bcda636a3f333d64e325f24f3 data\tead\advancements\recipes\tools\iron_dagger.json -be58017bff06cc01b49e9b8e0912cfdbf5f68101 data\tead\advancements\recipes\misc\block_of_galena.json -d03babd085bf57aa2c01cd033e28c3001c30b3a1 data\tead\advancements\recipes\tools\grenade_0.json -10bc45af63f07ff117de0a29d79228d1b227c27a data\tead\advancements\recipes\building_blocks\dry_grass.json 7a7341b07756414011f456e447ea25b17deb5275 data\tead\advancements\recipes\misc\lead_ingot_from_blasting_lead_ore.json bf4ebacdb8415605191f58a1f36355036702803f data\tead\recipes\sandy_cobblestone.json 8e92b3fb04c5ef42503e05020a3506e64063300f data\tead\recipes\iron_claymore.json 76b19ffafec288cf676211cccb582461e62f65bb data\tead\recipes\old_bookshelf.json -c2346ba129edbf195124d3c6d222ff29f3b78835 data\tead\advancements\recipes\tools\gold_stalwart_chestplate.json -74a02873660af06195a6326ee785dea0ccac818f data\tead\advancements\recipes\tools\gold_chainmail_leggings.json ba5b1d8be95c4c8608235fe464ca46993c429d3b data\tead\advancements\recipes\tools\gold_plate_boots.json f69a766831e91efd87351add18061c503b6ed062 data\tead\advancements\recipes\tools\diamond_plate_helmet.json -be2cd72df13bc50807cdddefd199169c69e2a663 data\tead\recipes\tnt_arrow_1.json 10a241ba9623c3ddc9f5eedf44b99d19ea8fb671 data\tead\recipes\diamond_plate_helmet.json -c26a06ef11ae0990cec46c6982686138dd9c9fee data\tead\advancements\recipes\tools\diamond_royal_helmet.json d11813077f6bdfbf065e4d7d171c53e166e44a6d data\tead\recipes\netherite_double_axe_smithing.json 5440cba4dd28f7b7343c6a67b796ccf0a15a3eef data\tead\advancements\recipes\tools\diamond_highland_helmet.json -95332216b9342ab50388ef7f65e1d617a75ae254 data\tead\recipes\lead_hammer.json -9414393dac07c440d2fbc3e02fc8fb266c82eb7f data\tead\recipes\fabric_0.json -691dabb404e535cce7f5f60dcc0193b6f4dec738 data\tead\recipes\shuriken_1.json -7720dafa1935d6a3c4343b565e1128c847bb0b75 data\tead\recipes\long_bow.json -453ca508a651e2af4792948d12c8af6ddbb599c6 data\tead\recipes\ruby_from_smelting_deepslate_ruby_ore.json -c0b12c372ea28b52c7a1def1f29edb6e8313ebbb data\tead\advancements\recipes\combat\amethyst_arrow_1.json 5eb37151ea9e26b98853f4a6545691941a67ccfb data\tead\advancements\recipes\tools\gold_plate_chestplate.json -a51cc2df0b9d97998cb736818eebf72ed8511a9d data\tead\advancements\recipes\tools\short_bow.json 2a3e375412fad0ffb5f9aeeef560903f3c1a32ae data\tead\recipes\gold_stalwart_chestplate.json -01469f3d67824e559055633a6983afbee655f3ac data\tead\advancements\recipes\building_blocks\obsidian_shard.json -41856b334f590ecfb530050f1cb14729b0993e5d data\tead\recipes\fabric_6.json 1b066bed40364ba04de5697d7ab5a59403ee30bd data\tead\advancements\recipes\tools\lead_claymore.json -37463668c6a5f2c172b98c7da719f87949c05c18 data\tead\advancements\recipes\tools\gold_chainmail_boots.json -3c012bf3b66f15d029ff2ccd012a86e8a000f01a data\tead\recipes\cooper_arrow_1.json -439faaea4a5eda5c131c58c008a5ed4d2c913c98 data\tead\advancements\recipes\tools\shuriken_0.json +41856b334f590ecfb530050f1cb14729b0993e5d data\tead\recipes\fabric_6.json +01469f3d67824e559055633a6983afbee655f3ac data\tead\advancements\recipes\building_blocks\obsidian_shard.json e3b7499cd2943589dea97a0f92f55b74b63f0bf0 data\tead\recipes\sparse_grass.json ddd10288b78292a61b79b900069a52fcb5c1d9b8 data\tead\recipes\gold_chainmail_chestplate.json -068f1f78e7d07a690eef9cd7a94cb4ff3124dc04 data\tead\recipes\jerky_1.json 42b0e39501b39a449ab7d1c580f81d0d7729f140 data\tead\recipes\diamond_plate_boots.json 2e0c4a088a3979aa2bea7e1460d4a2b6497a453a data\tead\advancements\recipes\tools\diamond_sickle.json 625b2a86067f8750c2dfca8b1054017a8b4f38f5 data\tead\advancements\recipes\tools\diamond_hammer.json -d476142f1f60408529a5330af28379f0b2761fac data\tead\recipes\diamond_dagger.json 761bd6ddde02b7f7252e8422f17a0e1089bde7ce data\tead\advancements\recipes\building_blocks\dark_cobblestone.json -4b23f35107ad89157a156bd922529b0065e03382 data\tead\advancements\recipes\combat\amethyst_arrow_2.json -105aa8bc90f116e19aa37bbe4211cd77d43cea09 data\tead\recipes\gold_chain.json +26dad3676f052cc00944fc58728dc9ef525139cb data\tead\advancements\recipes\combat\amethyst_arrow_2.json 5ce55bf80a2829c2eb9655ad7d4425f8f4eb836c data\tead\advancements\recipes\misc\ruby_from_blasting_deepslate_ruby_ore.json b404ab23cdf36c0d9c6bb515e1975eefa94dea6c data\tead\recipes\book.json -330b447e2948ea48e958046fc890d55745c56279 data\tead\recipes\bone_club.json -bed9049f34f5a7e2430674876e48f33fc506b176 data\tead\advancements\recipes\building_blocks\sandy_cobblestone.json 9ca11f92ee25a9211bbe01caa29738add110c9d0 data\tead\advancements\recipes\combat\jerky_7.json +4ca45d04a93be6fcbac2d38de683eda384f78bdb data\tead\recipes\soul_torch_arrow_4.json 4400fadc9dadb99d131008c10a5f6a8ebbd8f30c data\tead\recipes\grenade_1.json deff3653345dca3765cd95feb4feb85d3904a8dc data\tead\recipes\jerky_0.json 01db668b70ebbf3183f37e947fd608156dcc4c23 data\tead\recipes\netherite_highland_chestplate.json -4a058754d2abf8c50d2a39fcd1e4bc609cf7e18a data\tead\recipes\iron_plate_boots.json 338580627f8cf62f2ea66279bc1e3f21920cebab data\tead\recipes\netherite_royal_helmet.json -fb2adfe1c8aeb41b31f0726bde8eaa7fe2e2865b data\tead\advancements\recipes\tools\iron_stalwart_helmet.json -5c6b0150e9f7d713279fc8e23465440bbf5650c9 data\tead\advancements\recipes\tools\stone_hammer.json -556df44a517afbbca6504c0df5bab929202628a9 data\tead\advancements\recipes\tools\shuriken_1.json -594772e2776b60bf3eb3e9cfd790fcb7e48cc8be data\tead\recipes\iron_stalwart_helmet.json +7edf17ae1286bd1b544841c8d9c3fb215edd69b3 data\tead\recipes\redstone_torch_arrow_2.json d3f23b29a76c2df00a092e10d1498ed16981c0ef data\tead\recipes\lead_sword.json -e753e0acc3d983578cc5d69d8c4f52035607747d data\tead\advancements\recipes\combat\jerky_5.json -b0d6a1b7c17ce73a53d884a0dc5faa7d2e24426b data\tead\advancements\recipes\combat\cooper_arrow_1.json -b5f56324e94cf0ecfbc077a3ab3fcb266c98cc68 data\tead\recipes\stone_hammer.json -94ef674614759c2d7a4b28ae02cad8ee9b3f11a4 data\tead\recipes\netherite_hammer_smithing.json +07644251204627982410e320f7926b7ac78f02fe data\tead\advancements\recipes\combat\cooper_arrow_1.json d71b2bd5e54331b3f8578f90a224e752d0901a3e data\tead\recipes\dark_brick_from_smelting_muddy_clay_ball.json 1f6fb3e9a9adfed44bffa4555d880c86e168ecb6 data\tead\advancements\recipes\misc\ruby_from_blasting_ruby_ore.json -735f9dbd66649383b8507a37c3871e102f145f59 data\tead\recipes\fabric_8.json -847cb64aa3ccabc519b2907b329c2e52c416266f data\tead\advancements\recipes\combat\boring_arrow_2.json -d57ed935b3f88ee48266a23f867e43e82d22083f data\tead\advancements\recipes\combat\fabric_0.json -46077ef2dabc0759f46fd94f96d755a4538dede7 data\tead\advancements\recipes\tools\iron_plate_boots.json 9c4262c6e0e1f8baba17c8492b2a2982d2a394ab data\tead\recipes\arrow_2.json -065ec0a5ab8c048e2c1b1785af442501fe5f74c4 data\tead\advancements\recipes\tools\robe_helmet.json c919f10b59f59eb65462704b309a083e9825ea64 data\tead\advancements\recipes\misc\dark_brick_from_blasting_muddy_clay_ball.json -77f1d88a0bf0ceee16fcfc4a68544e9e6a463642 data\tead\advancements\recipes\combat\ruby_arrow_1.json -0d4dcf69ad12044b34d0c1a30bf249afecf7b21b data\tead\recipes\block_of_ruby.json e1e3163ce4e454eadc23a41079e8ed708de0cdcb data\tead\recipes\netherite_plate_chestplate.json 16c82c4c501404e0f1fe4eb98336c3c8dbbf771c data\tead\advancements\recipes\tools\iron_highland_chestplate.json 74dbbe46428a949ca32c0000dcdf05a2cc7eee04 data\tead\recipes\very_sparse_grass.json -1622ff05704927819a4a1957188412fcbe72466a data\tead\recipes\fabric_1.json -4a6ebebce1adb57f8d793168bdc60532a929835b data\tead\recipes\obsidian_arrow_2.json 80a77ee698ee5984dfd0976a65f1d7f2359b473f data\tead\recipes\gold_claymore.json -6ce3485d92ca517097c37558e017422e3fdded11 data\tead\recipes\stone_sickle.json 18560bbd2f9927f655e2e01e65d646b519b3b31b data\tead\recipes\gold_dagger.json -8769de86a617ac06929b4cb2b59d1e52d54c7c73 data\tead\advancements\recipes\misc\lead_ingot_from_blasting_galena.json 139f95626e644a959334bf990c6e91435d0c5c57 data\tead\recipes\iron_dagger.json 8a99242995b8c7e359f18aad9cffc9681230a56d data\tead\recipes\iron_highland_chestplate.json -2f922d013c569730b01af4b14315fa9a7d0e4caa data\tead\recipes\cooper_arrow_2.json -bfd1b2b6f09b9f5b1d6dfc368d8db37183c3aabd data\tead\advancements\recipes\combat\ender_pearl_arrow_2.json -fe3985a825b07ac55b975c90583d2b31446fa05f data\tead\recipes\chainmail_helmet.json -9e92e07fbf927134403f1c8889a94e75d999251f data\tead\recipes\fabric_7.json -3f3c5d3745437e10ac3f73dc8d264dbf1afd27a7 data\tead\advancements\recipes\combat\book.json +f25be496977172a622379ed858d8d0bed2fdf357 data\tead\advancements\recipes\combat\soul_torch_arrow_2.json +82f0bbc7b2398e9db37fa458a45596333e4e3965 data\tead\recipes\cooper_arrow_2.json 3551b2a49f8b442c6e4d7f53bd9210e8fa7cb96b data\tead\recipes\stone_double_axe.json c19d2653890e3037d77d339bd792c0098499247e data\tead\recipes\dark_cobblestone.json 0d2db4093c299a5f187bb118d792aa71c7ea6280 data\tead\advancements\recipes\tools\netherite_stalwart_chestplate.json @@ -171,195 +94,296 @@ d2519129dc37a892cb16e2b00b579d795a427913 data\tead\advancements\recipes\tools\wo d91b8f34fb1693d65f8bc54cf0aaba84a16d7408 data\tead\advancements\recipes\building_blocks\dirty_stone_plaque.json 334874449e1d4f7a7b5f4430f1e5b1d048e9f5e3 data\tead\advancements\recipes\tools\gold_highland_chestplate.json 80cefc4fa2f4be55afd87b53cf9c0bc8206acb00 data\tead\recipes\lightning_staff.json -05ed81ede8524a93d3f0f43e19a98d1f6b2cc587 data\tead\advancements\recipes\combat\handle_1.json -0138fb45b4262af110408614d4b29c0b1f767d3e data\tead\recipes\very_sandy_cobblestone.json -be3308f861b3f65a6666507d0dded4db4c676c52 data\tead\recipes\gold_highland_chestplate.json -3b931942a2b48ffba5ea5f5148b05bcfe9cff3dd data\tead\recipes\netherite_sickle_smithing.json -b1abcc63ca490344299ae2b49b9f1e09505d374d data\tead\advancements\recipes\tools\gold_chain.json d1dd911478d0b90435fef2893c80a10a8a960120 data\tead\advancements\recipes\tools\robe_chestplate.json c6d468e3536ba04e77718f5421a3021c6c676cd7 data\tead\recipes\ruby_arrow_1.json -cb478e8a6e99790606b0011255dc674ca866debe data\tead\advancements\recipes\tools\iron_double_axe.json +337604371bf55dfd09e3d5022264824ed3cda8ea data\tead\recipes\torch_arrow_1.json +a56e7a75a3abda852a2de164c3620caf805fe2e4 data\tead\advancements\recipes\combat\redstone_torch_arrow_1.json 351b093f2f81fc165b33de0c89410a1c05c2adf4 data\tead\advancements\recipes\combat\handle_2.json -6724a3f5f4ac2c4efc906ff32767302061f04174 data\tead\advancements\recipes\combat\arrow_2.json 279d8f659b3b2c6539574ffdb534341d337ff749 data\tead\recipes\netherite_dagger_smithing.json -471a08310bd0f16ad56585d15803336e11cd8dd6 data\tead\advancements\recipes\tools\wood_sickle.json 05116427afc7b30dbb02709c1b83c17f547e5ed9 data\tead\advancements\recipes\tools\iron_highland_helmet.json -81cf1bd7f1cce257412d9e2b01764ddd2c7de63b data\tead\recipes\handle_2.json -e9a075e943a13174d782e17ea150d29cdfda926f data\tead\recipes\dark_brick_from_blasting_clayish_mud.json -e31650ffb7bec488cc4a85db0189451587c079ea data\tead\advancements\recipes\tools\stone_sickle.json 04c36d142fab97be06f01818df8b28c81381a9af data\tead\recipes\saddle.json 17a3349947c9062f0351c2d43d07fb6d0605e90e data\tead\advancements\recipes\combat\jerky_13.json -367651f5f05eb87a9a9f9be3770231ecbda2813a data\tead\recipes\lead_shovel.json -e8d747dbecd5a5d24c2195f2578f812607f6438e data\tead\advancements\recipes\tools\chainmail_leggings.json f12fa05883f7fb0be91611f99f04af4e09332e72 data\tead\advancements\recipes\combat\fabric_5.json -b0009200079eb18e4a5134b7098996e4ebae62fc data\tead\recipes\iron_sickle.json 26332265e69e0381f6497cc32731a779bdb2932a data\tead\recipes\netherite_highland_helmet.json -275a84d2ce2750a2246c4df50df224a5a844924c data\tead\recipes\robe_chestplate.json +b0009200079eb18e4a5134b7098996e4ebae62fc data\tead\recipes\iron_sickle.json 8dbe2321c715807e954063ab47ab122ddbc9b2b9 data\tead\recipes\ruby_from_smelting_ruby_ore.json c6be2d01c4953f8012800455df26ac93b200804e data\tead\advancements\recipes\misc\lead_ingot.json +06e9a8120d49e3a2f416e9b4da790cd4b9676d37 data\tead\advancements\recipes\combat\torch_arrow_3.json f09db7c1f80126ad8c2ced87b8eb3c6cccd7b835 data\tead\advancements\recipes\tools\iron_claymore.json -9e280366874037d07b9a9bc3275e5ba600b14d26 data\tead\recipes\jerky_6.json -f37fb0a9c6219e9b17a79fcf25392201a86c1490 data\tead\recipes\wood_double_axe.json 7e2d35d8e8ae2db5eaf6bee5c10fe09eeea85606 data\tead\recipes\dark_bricks.json aa69c9fa6455d48f67b18f79c9ad488035eebe6b data\tead\advancements\recipes\combat\fabric_3.json -754115facd342dd39bb276f6fca8d52032619a78 data\tead\recipes\iron_stalwart_chestplate.json -2e0e2a133474507b136c86c15ef86a2bfe5fa627 data\tead\recipes\brown_dry_grass_from_smelting_brown_dry_grass.json -1e02c35ead104a2a814f99362231dea5b16b9236 data\tead\recipes\ruby_arrow_2.json -cb50834d6af3242d7eb648335a07ef522d01755d data\tead\recipes\dark_brick_from_blasting_muddy_clay_ball.json 7727ade417d1b51e208822586316c7802d0bb4c1 data\tead\recipes\dry_dirt.json -4262673092f64274b8499042bc19dde2003c9527 data\tead\recipes\gold_highland_helmet.json -63277e8e847824da6680ec3226103edbe7126256 data\tead\advancements\recipes\combat\jerky_11.json e67c4ab3e1ac409411fda0f2ec896ae53c1e5ae8 data\tead\advancements\recipes\tools\grenade_1.json 53e4329fece153fe936f10087288c7bb3b5e46c1 data\tead\advancements\recipes\misc\ruby_from_smelting_deepslate_ruby_ore.json 071ac3c2590254779a4ba3aa928c910b9e78f5b8 data\tead\advancements\recipes\combat\jerky_2.json d212c43deea1c049015358076b240f51959f264d data\tead\recipes\fabric_5.json b8e1a9d5be0276a84e3918fb4501b36c2fbcdb2b data\tead\advancements\recipes\tools\gold_sickle.json -015ef98237ab2035c97bdeefe265a01a504e368d data\tead\recipes\chainmail_leggings.json -b09edf5e72d1ecdb31e9e20375fa3bd0d952d3c3 data\tead\recipes\jerky_13.json 7e471c0100b03454b381f4dd43cdfaf5eeea28e4 data\tead\advancements\recipes\combat\netherite_sickle_smithing.json 5f677c6bb499fa3a5a829216e67564d7bcbb9d63 data\tead\recipes\tnt_arrow_2.json -078cb23d8e788ea5e9275e20bb9c3d8d07fd6797 data\tead\recipes\lead_apple.json 8b935a804eb0b304d443a6942cfd5993a77eb36d data\tead\recipes\lead_ingot_from_smelting_lead_ore.json -e36f11346139f2a627ba5613f9dc013712662028 data\tead\recipes\sludge.json 3bac2850c4298488920add5ba73df8f0f177dff9 data\tead\advancements\recipes\tools\shotgun.json 56b2bb7113048e7b55ddce80bd6b99ce9cc23757 data\tead\advancements\recipes\combat\netherite_dagger_smithing.json 54a17b316949c2e15c9ab681d273584a8343a5f3 data\tead\advancements\recipes\tools\lead_dagger.json -c7a4fb13cdcfe5a3d9515ba8680c93608053317f data\tead\advancements\recipes\combat\fabric_7.json -ec405d2d141e6875ecc1beeb8bbf99cee4910d8c data\tead\advancements\recipes\tools\iron_stalwart_chestplate.json -5f47e12803bcfe623cce05fdecfd0934703b5479 data\tead\recipes\obsidian_shard.json -ded959476dd28b8242432e8dfae79af73b80944d data\tead\advancements\recipes\combat\netherite_claymore_smithing.json -404aa2f6328080c1ff4c1b02d2d0a6bc2b1516e4 data\tead\recipes\battle_staff.json 0817a523638adc9489d8bd7c26317bb07be8dde4 data\tead\advancements\recipes\combat\netherite_hammer_smithing.json ee126b18340f6ec78123dcbbbcb28d9a1e4de1ce data\tead\advancements\recipes\tools\diamond_claymore.json +5d162b1014007186835de1ed150f4f069fa75f8d data\tead\recipes\torch_arrow_2.json 512fe5acdc00191ed8995dad29bd49511e52089a data\tead\advancements\recipes\combat\fabric_1.json ee048d3da6db6bb933f70d699b83fe77b4c2a631 data\tead\recipes\dark_brick_from_smelting_clayish_mud.json -3e07086c062f60350c980d5d8b3601bd9b13aefe data\tead\recipes\ender_pearl_arrow_1.json -0f36ed6f068671b8a03b8d7059b878d7f835916c data\tead\recipes\short_bow.json a065091038c41a12250677875f9d7a606c3d7046 data\tead\advancements\recipes\misc\lead_ingot_from_smelting_galena.json 94685d66070b8ce250d7e95aa41c29d926bd9b71 data\tead\advancements\recipes\building_blocks\muddy_clay_ball.json -570243b6fbaddbf5b504f174a86ddf5249cf797a data\tead\advancements\recipes\building_blocks\clayish_mud.json -deaf190e96906bcf5464b727c52306037d898d2d data\tead\advancements\recipes\building_blocks\empty_bookshelf.json -5c71615de6c10e03986cbc6efecc5b0359321bc3 data\tead\recipes\iron_highland_helmet.json -dfe290337adde236848d1de50ff776fc562be9d9 data\tead\advancements\recipes\tools\netherite_royal_helmet.json 37a5ec932527bd62f6b463c915387557b68dda81 data\tead\recipes\obsidian_arrow_1.json +d26c896a9872416b99cd98e297b7c018b1eb8d3f data\tead\recipes\soul_torch_arrow_1.json a51c9b5ba8e387b5caa783a3ef04073a1306d007 data\tead\advancements\recipes\combat\jerky_4.json -a6652dc1435cca834591b17b1578e8077f92cd44 data\tead\recipes\stone_dagger.json +5b141988dbe41c0cf1c65844e80d6f5078f4876b data\tead\advancements\recipes\combat\soul_torch_arrow_1.json ae0770fd84f0afaff9c251a1e43a04aaa7d9012b data\tead\advancements\recipes\tools\netherite_plate_chestplate.json 6df20d8beb0a049eb86d59b25b1689d8112271ae data\tead\advancements\recipes\misc\dark_brick_from_smelting_muddy_clay_ball.json -62a6af3c7a7833abc1d1adc13a2d001d408bff16 data\tead\recipes\fabric_9.json -82064fb1d046aabce60d6255fd5be85903237077 data\tead\advancements\recipes\combat\ruby_arrow_2.json f496d92c003cb8a9f1dade4f35e64d2675537f59 data\tead\recipes\fabric_3.json -3839b1470756a65f5d8556dbd0b72e89ea5a52fe data\tead\recipes\gold_chainmail_boots.json -99d90f4307476e4ea1faae0eb50dccc34bd90f25 data\tead\advancements\recipes\tools\robe_boots.json 265c737ededa8796f18f024be9e91a10a0f47bde data\tead\recipes\bone_bow.json 2b0b8c4bc56f129ed8e352386b77d6dfb81527dd data\tead\advancements\recipes\tools\netherite_plate_helmet.json 4388931c00af447c7b20bc13855720141f2b96f8 data\tead\recipes\lead_pickaxe.json 246856a09f5de60f78a4028cac71ed43d83de82c data\tead\recipes\grenade_0.json -0f127213ddcc72941707fb804d6b1258579f4bb5 data\tead\advancements\recipes\tools\gold_chainmail_chestplate.json 16e387c1316874e586bfb0621e6529db8ee06448 data\tead\recipes\jerky_4.json +e1046232699dad66039c6b238978c6917fe91f87 data\tead\advancements\recipes\tools\gold_claymore.json +f336766f867ca0c90864e91b92b729e61dd728e9 data\tead\advancements\recipes\tools\chainmail_helmet.json +e24c77ca5f4c40cbf0f2bcea0642c99e03d2d0c3 data\tead\recipes\soul_torch_arrow_3.json +c0bde0debf5d05594f8cd6bba60a19abd3bf1e22 data\tead\advancements\recipes\tools\iron_hammer.json +5543c8a4942b72aed36935e9dcc8f011724e5f63 data\tead\recipes\lead_bullet.json +a31ff1c81cca82e17de93ded8d830d9e4942e192 data\tead\recipes\ruby_from_blasting_deepslate_ruby_ore.json +7b9f710a765c7877c40894fd401ecd97b3e22303 data\tead\advancements\recipes\building_blocks\brown_dry_grass_from_smelting_brown_dry_grass.json +b100536cfbd542e811920e1749fc2f8e2d0c2a14 data\tead\recipes\iron_hammer.json +2e5855fcc4536df9cc6a037fc47d1107f5db3122 data\tead\advancements\recipes\building_blocks\stone_plaque_from_chiseled_stone_bricks_stonecutting.json +06ed8eeed0b99bf31ed2547834107bdf80dba7cb data\tead\recipes\jerky_9.json +36dfe9673c0bd7aeabc04664ac4a9e18b798db48 data\tead\advancements\recipes\tools\lead_sword.json +fab36557316662f875621f2bef561963bff00354 data\tead\recipes\gold_hammer.json +16584296094736e66990b2f8e7848fbf1ac53221 data\tead\recipes\netherite_stalwart_chestplate.json +63ea69d02f4791055a2987fec9b5a9d79ab34fb9 data\tead\advancements\recipes\misc\ruby_from_smelting_ruby_ore.json +d6a08dc6019485fbb39c858c88e4d24c70309216 data\tead\advancements\recipes\tools\battle_staff.json +729025d3a563d06b5d565e0a566ddab52c5acc3a data\tead\advancements\recipes\tools\lightning_staff.json +1cfffb13b3c433e41129fa173209decbaa55ebdd data\tead\advancements\recipes\combat\netherite_double_axe_smithing.json +802e265bfad1f0c2df9206eed6e6402deeb8a15b data\tead\recipes\dirty_stone_plaque.json +1ab54c027b30c54daa1d21cdba3bc2655294715b data\tead\advancements\recipes\tools\gold_highland_helmet.json +d7efec2703bd2fb2bc03a802eb4d4eaf34356b96 data\tead\advancements\recipes\building_blocks\galena.json +b6b8236562f64925ee09bf1f09c4d89847622f33 data\tead\recipes\chainmail_boots.json +d5e56c4ecb8e046d2b8abd18df2b81a92eea53c5 data\tead\recipes\dry_grass.json +bd4b99a45293b0b552ac1583098ac8328f8978b0 data\tead\recipes\diamond_stalwart_chestplate.json +8866d2a181e6a4f6fb7a9faae7fb1ebf14a112e2 data\tead\advancements\recipes\tools\gold_hammer.json +8aed82af904b2602c4c5429d0c47f36b2890d278 data\tead\advancements\recipes\building_blocks\dirty_cobblestone.json +b0dcf4c2c7c7ddba97cea28b695c318a3f9cd99f data\tead\recipes\gold_royal_helmet.json +446a924cd64276612cf01ded3c2526c8da471b5d data\tead\advancements\recipes\tools\iron_royal_helmet.json +7a02ae758540b9d2f0d62d221ce1ea8670f56531 data\tead\advancements\recipes\building_blocks\sludge.json +36fb0077d679f6fdca0748f41317fc81342a1200 data\tead\advancements\recipes\building_blocks\very_sparse_grass.json +234d6dccfdbefe7c3580114466fabd9704c8a1f9 data\tead\recipes\diamond_hammer.json +88700ec6ba9e6ebf5e7b0468e88f32706477023a data\tead\advancements\recipes\tools\diamond_plate_boots.json +282dbfa304aa2636b1a6213046d2a98981279832 data\tead\advancements\recipes\combat\torch_arrow_1.json +7d7818bd22077ec5a01ae8d66b82a65ccbddf008 data\tead\recipes\diamond_sickle.json +32dac3d323122d6077c495373706d64e1186828c data\tead\advancements\recipes\tools\wood_double_axe.json +c850cd11e861e5b6c16f1d273d127b74dbc5ddc6 data\tead\recipes\jerky_2.json +67ed8ef41b18c343efe23f6a265cfc8fcc043804 data\tead\recipes\lead_nugget.json +23337b52417b514b28a92c2e3bab547116a0e04c data\tead\advancements\recipes\tools\diamond_highland_chestplate.json +0ce431ee0d4fcfb234c2d7880b38abf6d2a4d873 data\tead\advancements\recipes\tools\chainmail_chestplate.json +8e274f1da35dd202c0892bef6d672c849bf3a482 data\tead\advancements\recipes\combat\fabric_8.json +a1730f98aeaa3027a016210a3e5141596fceb84e data\tead\advancements\recipes\tools\netherite_plate_boots.json +0da6385eeb6056ae6507a6ecb220c6ed77df93b7 data\tead\advancements\recipes\combat\obsidian_arrow_2.json +e3d0c2cb20d36e32ff5ef86fd2c9bdde3f6e13b1 data\tead\recipes\gold_chainmail_leggings.json +909ee974266bdbd1a4e5c9a0c010d57c5ca8baf7 data\tead\advancements\recipes\tools\iron_plate_chestplate.json +52bb3e10d062e4cadd696bf9bdf3e0bd7350cb59 data\tead\advancements\recipes\tools\iron_sickle.json +2b156ad6d5f80c5b799a42d20cf420fb9f99cb72 data\tead\recipes\netherite_plate_helmet.json +30c86158b0c7da40a8879a36e0cdb31a3bcacfef data\tead\recipes\boring_arrow_2.json +01426dcc6b41e0d10fa1abd627c20145a003bd19 data\tead\recipes\clayish_mud.json +7b46d62b27e36215335644122fd8819ff6d25a1b data\tead\recipes\gold_stalwart_helmet.json +42a405deae699f9946422f95f58495022172d92c data\tead\advancements\recipes\combat\tnt_arrow_2.json +634e843659daca94cb14dc5024ad7b4eaf1f0baa data\tead\advancements\recipes\combat\jerky_9.json +9ab51ca6eefca8887046961484f7c7468930d4bc data\tead\recipes\torch_arrow_4.json +76d967f30b22c714b4f5248e8e5f5fab630166a6 data\tead\recipes\ruby.json +0461aace2dfce17a4d0d59bead29bbd9f1190e31 data\tead\advancements\recipes\tools\stone_dagger.json +1b792c5003ecf42a968b3b83f0cd424a87825a38 data\tead\advancements\recipes\tools\gold_double_axe.json +87eb0835861c21b42e2e5dba4f274234f1237331 data\tead\advancements\recipes\misc\obsidian.json +6f18d2136e9b4c5871b93ee83bf36e8091f05638 data\tead\advancements\recipes\combat\fabric_4.json +9ca942f591b1c39328dd7b377fb2623bbd80eef6 data\tead\advancements\recipes\combat\jerky_12.json +410de2b77025aba48844f2d86d3a6107967933fb data\tead\recipes\gold_sickle.json +e643ea303a967f455226e15cd82d12bcbd5022b1 data\tead\recipes\fabric_4.json +7018305af08e1cdf4f8016dd65c6e0e78e236289 data\tead\recipes\boring_arrow_1.json +2a69fe4d3177b43aaefb2c24b03b07f5ceaee69e data\tead\advancements\recipes\tools\lead_shovel.json +accb6925a1ef6c1d3d43120571ed51f606c64ff3 data\tead\advancements\recipes\tools\obsidian_sword.json +9a2a4e16c0d9bbb70ac5e0062fa7892ab1b94c46 data\tead\recipes\jerky_5.json +f59b500b212d3d0346ed8f23223d4958e3dfdce3 data\tead\recipes\lead_ingot.json +2a6888e42a039ed68f1594244af055f10f5d9cd6 data\tead\advancements\recipes\combat\redstone_torch_arrow_2.json +6424d81948217d3c590d115ab415102ee6185b31 data\tead\recipes\quarterstaff.json +ff455102ccae589e390418c8130f487f34a2630d data\tead\advancements\recipes\tools\firebolt_thrower.json +fe0818b618c676d607e693c4f5ace6b9797a3ab2 data\tead\advancements\recipes\tools\gold_stalwart_helmet.json +1fb72f4921cbfbefc15ffc228b1d7e6313c38474 data\tead\advancements\recipes\combat\jerky_1.json +70805dbab36d0af12100da94df06343109fc35ce data\tead\recipes\jerky_12.json +386987e5e519e986977337fab476910f3876940d data\tead\advancements\recipes\tools\chainmail_boots.json +531807df71a3b4a8d04eae822436e8551cbf089b data\tead\recipes\torch_arrow_3.json +09f4a2d5f3f3acb1bbd3bd3b27fcc5e30736552f data\tead\recipes\wood_sickle.json +e0254cfa603d96ce15a79bfe1b3c76338bac2809 data\tead\recipes\diamond_royal_helmet.json +12bd033c75ebe8d0327281e8a2186c7a850af8c1 data\tead\recipes\handle_1.json +087c27594e2e9bc756b4c92566e00fb199f7582d data\tead\recipes\robe_helmet.json +ac6885529b6489a404e6a5655c3dee8084b394e5 data\tead\recipes\dirty_cobblestone.json +f6333292b92548140f93cdc153654b6860a45516 data\tead\recipes\empty_bookshelf.json +211ca03ca62aa1ef3566ffc53cdc091ddcebb379 data\tead\advancements\recipes\tools\diamond_dagger.json +9b2745cd7a3ef566370056dce2aaf6916787895c data\tead\recipes\gold_chainmail_helmet.json +521408a6747f811c71b5bf098d7fbaf87742c97e data\tead\advancements\recipes\tools\bone_bow.json +3b01a888ae46a24c0a09f94fd4d5bd4ba94cb4cc data\tead\recipes\iron_royal_helmet.json +ae60344237b9f3748d290c72dcac6e216e2f0a6a data\tead\recipes\lead_sickle.json +01d4f18ac6c2b779c6b2f6b5a2636825d6cbcd2f data\tead\advancements\recipes\tools\gold_royal_helmet.json +0a8d82011b1e68f13c789916411b1308a62c6a7c data\tead\advancements\recipes\combat\ender_pearl_arrow_1.json +64648ed8ea87dff2f508f73d103dfbed99116641 data\tead\advancements\recipes\combat\cooper_arrow_2.json +294cddcfb87a4173d58df606fec0bd204dba9b78 data\tead\advancements\recipes\building_blocks\old_bookshelf.json +0dd4121d4a732ea3c24471f87d76beded52811f5 data\tead\advancements\recipes\combat\torch_arrow_2.json +900b4faf412bc568c36cc037bd0235d061490007 data\tead\recipes\wood_hammer.json +0608b4efec39c7afc92e3b733f69e6765426068f data\tead\recipes\item_frame.json +c7cd6d2f75ac24d498ce5175ef1f5cc6bbdd217f data\tead\advancements\recipes\tools\quarterstaff.json +4f9104aa424992039d3aa3fe599902c3a68000d7 data\tead\recipes\firebolt_thrower.json +248ff690f2ad73f6a1c8629721962b641bbb5075 data\tead\recipes\diamond_stalwart_helmet.json +7ba40fdb9b45227bcda636a3f333d64e325f24f3 data\tead\advancements\recipes\tools\iron_dagger.json +be58017bff06cc01b49e9b8e0912cfdbf5f68101 data\tead\advancements\recipes\misc\block_of_galena.json +d03babd085bf57aa2c01cd033e28c3001c30b3a1 data\tead\advancements\recipes\tools\grenade_0.json +10bc45af63f07ff117de0a29d79228d1b227c27a data\tead\advancements\recipes\building_blocks\dry_grass.json +057dbae64914b7c6da1b42a7fa676a5cf5f024dd data\tead\recipes\redstone_torch_arrow_1.json +c2346ba129edbf195124d3c6d222ff29f3b78835 data\tead\advancements\recipes\tools\gold_stalwart_chestplate.json +74a02873660af06195a6326ee785dea0ccac818f data\tead\advancements\recipes\tools\gold_chainmail_leggings.json +be2cd72df13bc50807cdddefd199169c69e2a663 data\tead\recipes\tnt_arrow_1.json +c26a06ef11ae0990cec46c6982686138dd9c9fee data\tead\advancements\recipes\tools\diamond_royal_helmet.json +95332216b9342ab50388ef7f65e1d617a75ae254 data\tead\recipes\lead_hammer.json +9414393dac07c440d2fbc3e02fc8fb266c82eb7f data\tead\recipes\fabric_0.json +691dabb404e535cce7f5f60dcc0193b6f4dec738 data\tead\recipes\shuriken_1.json +7720dafa1935d6a3c4343b565e1128c847bb0b75 data\tead\recipes\long_bow.json +3944992464665f97f5a1d962688518abfd8983e5 data\tead\advancements\recipes\combat\amethyst_arrow_1.json +453ca508a651e2af4792948d12c8af6ddbb599c6 data\tead\recipes\ruby_from_smelting_deepslate_ruby_ore.json +f76cbcb45db8597a8b7a6b6bba24de6fcb8936ea data\tead\recipes\arrow_3.json +a51cc2df0b9d97998cb736818eebf72ed8511a9d data\tead\advancements\recipes\tools\short_bow.json +37463668c6a5f2c172b98c7da719f87949c05c18 data\tead\advancements\recipes\tools\gold_chainmail_boots.json +be92e5846cb2379efda7663e5ced7451bc38c0e2 data\tead\recipes\cooper_arrow_1.json +439faaea4a5eda5c131c58c008a5ed4d2c913c98 data\tead\advancements\recipes\tools\shuriken_0.json +0d327322f05543dd0c9726c5e4b4151a60b8abbd data\tead\advancements\recipes\combat\arrow_3.json +068f1f78e7d07a690eef9cd7a94cb4ff3124dc04 data\tead\recipes\jerky_1.json +fcc86e036e6ddeb1158d04c94cc53687f78b6ccd data\tead\advancements\recipes\combat\soul_torch_arrow_4.json +d476142f1f60408529a5330af28379f0b2761fac data\tead\recipes\diamond_dagger.json +105aa8bc90f116e19aa37bbe4211cd77d43cea09 data\tead\recipes\gold_chain.json +330b447e2948ea48e958046fc890d55745c56279 data\tead\recipes\bone_club.json +bed9049f34f5a7e2430674876e48f33fc506b176 data\tead\advancements\recipes\building_blocks\sandy_cobblestone.json +4a058754d2abf8c50d2a39fcd1e4bc609cf7e18a data\tead\recipes\iron_plate_boots.json +fb2adfe1c8aeb41b31f0726bde8eaa7fe2e2865b data\tead\advancements\recipes\tools\iron_stalwart_helmet.json +5c6b0150e9f7d713279fc8e23465440bbf5650c9 data\tead\advancements\recipes\tools\stone_hammer.json +556df44a517afbbca6504c0df5bab929202628a9 data\tead\advancements\recipes\tools\shuriken_1.json +594772e2776b60bf3eb3e9cfd790fcb7e48cc8be data\tead\recipes\iron_stalwart_helmet.json +e753e0acc3d983578cc5d69d8c4f52035607747d data\tead\advancements\recipes\combat\jerky_5.json +b5f56324e94cf0ecfbc077a3ab3fcb266c98cc68 data\tead\recipes\stone_hammer.json +94ef674614759c2d7a4b28ae02cad8ee9b3f11a4 data\tead\recipes\netherite_hammer_smithing.json +735f9dbd66649383b8507a37c3871e102f145f59 data\tead\recipes\fabric_8.json +847cb64aa3ccabc519b2907b329c2e52c416266f data\tead\advancements\recipes\combat\boring_arrow_2.json +d57ed935b3f88ee48266a23f867e43e82d22083f data\tead\advancements\recipes\combat\fabric_0.json +46077ef2dabc0759f46fd94f96d755a4538dede7 data\tead\advancements\recipes\tools\iron_plate_boots.json +065ec0a5ab8c048e2c1b1785af442501fe5f74c4 data\tead\advancements\recipes\tools\robe_helmet.json +0a6f22337d17ca04172b59803c49a89ec0c791db data\tead\advancements\recipes\combat\ruby_arrow_1.json +0d4dcf69ad12044b34d0c1a30bf249afecf7b21b data\tead\recipes\block_of_ruby.json +1622ff05704927819a4a1957188412fcbe72466a data\tead\recipes\fabric_1.json +f1cfb0d5175548208f2af951d835329c05de41aa data\tead\advancements\recipes\combat\soul_torch_arrow_3.json +4a6ebebce1adb57f8d793168bdc60532a929835b data\tead\recipes\obsidian_arrow_2.json +6ce3485d92ca517097c37558e017422e3fdded11 data\tead\recipes\stone_sickle.json +8769de86a617ac06929b4cb2b59d1e52d54c7c73 data\tead\advancements\recipes\misc\lead_ingot_from_blasting_galena.json +bfd1b2b6f09b9f5b1d6dfc368d8db37183c3aabd data\tead\advancements\recipes\combat\ender_pearl_arrow_2.json +fe3985a825b07ac55b975c90583d2b31446fa05f data\tead\recipes\chainmail_helmet.json +9e92e07fbf927134403f1c8889a94e75d999251f data\tead\recipes\fabric_7.json +3f3c5d3745437e10ac3f73dc8d264dbf1afd27a7 data\tead\advancements\recipes\combat\book.json +05ed81ede8524a93d3f0f43e19a98d1f6b2cc587 data\tead\advancements\recipes\combat\handle_1.json +0138fb45b4262af110408614d4b29c0b1f767d3e data\tead\recipes\very_sandy_cobblestone.json +be3308f861b3f65a6666507d0dded4db4c676c52 data\tead\recipes\gold_highland_chestplate.json +b1abcc63ca490344299ae2b49b9f1e09505d374d data\tead\advancements\recipes\tools\gold_chain.json +3b931942a2b48ffba5ea5f5148b05bcfe9cff3dd data\tead\recipes\netherite_sickle_smithing.json +cb478e8a6e99790606b0011255dc674ca866debe data\tead\advancements\recipes\tools\iron_double_axe.json +6724a3f5f4ac2c4efc906ff32767302061f04174 data\tead\advancements\recipes\combat\arrow_2.json +471a08310bd0f16ad56585d15803336e11cd8dd6 data\tead\advancements\recipes\tools\wood_sickle.json +81cf1bd7f1cce257412d9e2b01764ddd2c7de63b data\tead\recipes\handle_2.json +e9a075e943a13174d782e17ea150d29cdfda926f data\tead\recipes\dark_brick_from_blasting_clayish_mud.json +e31650ffb7bec488cc4a85db0189451587c079ea data\tead\advancements\recipes\tools\stone_sickle.json +bbf2217c459ced3dc26b57397956d5b01b1e146a data\tead\recipes\arrow_4.json +367651f5f05eb87a9a9f9be3770231ecbda2813a data\tead\recipes\lead_shovel.json +e8d747dbecd5a5d24c2195f2578f812607f6438e data\tead\advancements\recipes\tools\chainmail_leggings.json +275a84d2ce2750a2246c4df50df224a5a844924c data\tead\recipes\robe_chestplate.json +9e280366874037d07b9a9bc3275e5ba600b14d26 data\tead\recipes\jerky_6.json +f37fb0a9c6219e9b17a79fcf25392201a86c1490 data\tead\recipes\wood_double_axe.json +754115facd342dd39bb276f6fca8d52032619a78 data\tead\recipes\iron_stalwart_chestplate.json +2e0e2a133474507b136c86c15ef86a2bfe5fa627 data\tead\recipes\brown_dry_grass_from_smelting_brown_dry_grass.json +1e02c35ead104a2a814f99362231dea5b16b9236 data\tead\recipes\ruby_arrow_2.json +cb50834d6af3242d7eb648335a07ef522d01755d data\tead\recipes\dark_brick_from_blasting_muddy_clay_ball.json +4262673092f64274b8499042bc19dde2003c9527 data\tead\recipes\gold_highland_helmet.json +63277e8e847824da6680ec3226103edbe7126256 data\tead\advancements\recipes\combat\jerky_11.json +48eba66d68629831cafed720d850eaf364c4c449 data\tead\advancements\recipes\combat\arrow_4.json +015ef98237ab2035c97bdeefe265a01a504e368d data\tead\recipes\chainmail_leggings.json +b09edf5e72d1ecdb31e9e20375fa3bd0d952d3c3 data\tead\recipes\jerky_13.json +078cb23d8e788ea5e9275e20bb9c3d8d07fd6797 data\tead\recipes\lead_apple.json +e36f11346139f2a627ba5613f9dc013712662028 data\tead\recipes\sludge.json +c7a4fb13cdcfe5a3d9515ba8680c93608053317f data\tead\advancements\recipes\combat\fabric_7.json +ec405d2d141e6875ecc1beeb8bbf99cee4910d8c data\tead\advancements\recipes\tools\iron_stalwart_chestplate.json +5f47e12803bcfe623cce05fdecfd0934703b5479 data\tead\recipes\obsidian_shard.json +ded959476dd28b8242432e8dfae79af73b80944d data\tead\advancements\recipes\combat\netherite_claymore_smithing.json +404aa2f6328080c1ff4c1b02d2d0a6bc2b1516e4 data\tead\recipes\battle_staff.json +3e07086c062f60350c980d5d8b3601bd9b13aefe data\tead\recipes\ender_pearl_arrow_1.json +0f36ed6f068671b8a03b8d7059b878d7f835916c data\tead\recipes\short_bow.json +570243b6fbaddbf5b504f174a86ddf5249cf797a data\tead\advancements\recipes\building_blocks\clayish_mud.json +deaf190e96906bcf5464b727c52306037d898d2d data\tead\advancements\recipes\building_blocks\empty_bookshelf.json +5c71615de6c10e03986cbc6efecc5b0359321bc3 data\tead\recipes\iron_highland_helmet.json +dfe290337adde236848d1de50ff776fc562be9d9 data\tead\advancements\recipes\tools\netherite_royal_helmet.json +a6652dc1435cca834591b17b1578e8077f92cd44 data\tead\recipes\stone_dagger.json +62a6af3c7a7833abc1d1adc13a2d001d408bff16 data\tead\recipes\fabric_9.json +cfbcd926dc940cce8024e781471b13804df4b638 data\tead\advancements\recipes\combat\ruby_arrow_2.json +3839b1470756a65f5d8556dbd0b72e89ea5a52fe data\tead\recipes\gold_chainmail_boots.json +99d90f4307476e4ea1faae0eb50dccc34bd90f25 data\tead\advancements\recipes\tools\robe_boots.json +0f127213ddcc72941707fb804d6b1258579f4bb5 data\tead\advancements\recipes\tools\gold_chainmail_chestplate.json 5d3533481af4953fe5006bbb6879ed9bca36339f data\tead\recipes\obsidian.json 2e57d8a40163b74592b4dc8795d0d3c1edf37415 data\tead\advancements\recipes\tools\gold_dagger.json -e1046232699dad66039c6b238978c6917fe91f87 data\tead\advancements\recipes\tools\gold_claymore.json 365d8c5c631c4e9c48c11b7134273d608500d977 data\tead\advancements\recipes\tools\long_bow.json 4ec9abe86555d851798899f808aabf838575a92e data\tead\advancements\recipes\combat\obsidian_arrow_1.json -f336766f867ca0c90864e91b92b729e61dd728e9 data\tead\advancements\recipes\tools\chainmail_helmet.json 644ca606087b10bb914e52f9abd4a7120ec76ec7 data\tead\advancements\recipes\building_blocks\very_sandy_cobblestone.json 41bc2f686851b13a12b866ee605ca4c980ac5783 data\tead\advancements\recipes\tools\diamond_plate_chestplate.json f88a9cf43694cc5cbdcee0a57d67fe64052aa4d7 data\tead\recipes\galena.json -c0bde0debf5d05594f8cd6bba60a19abd3bf1e22 data\tead\advancements\recipes\tools\iron_hammer.json -a31ff1c81cca82e17de93ded8d830d9e4942e192 data\tead\recipes\ruby_from_blasting_deepslate_ruby_ore.json -5543c8a4942b72aed36935e9dcc8f011724e5f63 data\tead\recipes\lead_bullet.json 5b09f90bb64f5c20b6ec5e1efc9aaddbc7df8d49 data\tead\advancements\recipes\tools\lead_hoe.json 77854c61875f3a174f9ff140342a7936c5a6de9d data\tead\recipes\lead_axe.json -7b9f710a765c7877c40894fd401ecd97b3e22303 data\tead\advancements\recipes\building_blocks\brown_dry_grass_from_smelting_brown_dry_grass.json bcd1959549011c12aef2e247dd1d705e37b1839f data\tead\recipes\gold_plate_boots.json f848b3554d4285fd9d3ea5e9491ec3346fbabd67 data\tead\recipes\netherite_stalwart_helmet.json e1b9128fbc37362f1ff107fac26064a12e5817e4 data\tead\recipes\diamond_highland_helmet.json b1b13ac6f14d2560d6a9edd377b8a35adf1c236f data\tead\advancements\recipes\combat\boring_arrow_1.json -b100536cfbd542e811920e1749fc2f8e2d0c2a14 data\tead\recipes\iron_hammer.json 679cb62d1dc6c05ea3b563445ffa8078b7c6a508 data\tead\recipes\diamond_double_axe.json -2e5855fcc4536df9cc6a037fc47d1107f5db3122 data\tead\advancements\recipes\building_blocks\stone_plaque_from_chiseled_stone_bricks_stonecutting.json -06ed8eeed0b99bf31ed2547834107bdf80dba7cb data\tead\recipes\jerky_9.json 9e1929e085a293eb89f1b3655a05845246bc480f data\tead\advancements\recipes\tools\wood_hammer.json -36dfe9673c0bd7aeabc04664ac4a9e18b798db48 data\tead\advancements\recipes\tools\lead_sword.json -fab36557316662f875621f2bef561963bff00354 data\tead\recipes\gold_hammer.json 071ad6e007834e9b9bf54413c8e1b13ffb9994c6 data\tead\advancements\recipes\tools\netherite_highland_chestplate.json -16584296094736e66990b2f8e7848fbf1ac53221 data\tead\recipes\netherite_stalwart_chestplate.json 2a0727e09b9d1f79b66b2454e10a6d5be0fa2734 data\tead\advancements\recipes\tools\netherite_highland_helmet.json d6a25a25d6898aad5d0c6d7f9b8f8c980f0b6489 data\tead\recipes\diamond_highland_chestplate.json -63ea69d02f4791055a2987fec9b5a9d79ab34fb9 data\tead\advancements\recipes\misc\ruby_from_smelting_ruby_ore.json -d6a08dc6019485fbb39c858c88e4d24c70309216 data\tead\advancements\recipes\tools\battle_staff.json -729025d3a563d06b5d565e0a566ddab52c5acc3a data\tead\advancements\recipes\tools\lightning_staff.json -1cfffb13b3c433e41129fa173209decbaa55ebdd data\tead\advancements\recipes\combat\netherite_double_axe_smithing.json 207b39cb580314f9373b98843f5744b9eaabbd8b data\tead\advancements\recipes\building_blocks\stone_plaque.json 10dd03f2ba7d25c26b2d38e2e58c4b38858093d5 data\tead\recipes\stone_plaque.json -802e265bfad1f0c2df9206eed6e6402deeb8a15b data\tead\recipes\dirty_stone_plaque.json 1129c2af1ca845d4037efa2b1851e2c37cb35651 data\tead\advancements\recipes\tools\lead_double_axe.json 0a9f332dab6ddc1f3778ff9ce9a0d2b4933dce42 data\tead\advancements\recipes\combat\fabric_9.json 72ed1d3e0fbea3e1ae0b9e5bfa11ab9467118fb0 data\tead\advancements\recipes\combat\jerky_8.json -1ab54c027b30c54daa1d21cdba3bc2655294715b data\tead\advancements\recipes\tools\gold_highland_helmet.json 966207d96c145774126154701447ea0b7c493f83 data\tead\advancements\recipes\misc\block_of_ruby.json b34a50f9e27a7f3c63b4f694b0ad79f8af4663c9 data\tead\recipes\jerky_8.json 4bf5d749aa5a9bf6cb85194727c5f99442e8ec60 data\tead\recipes\block_of_galena.json 5da1459d06015c05cae787d48902dbd7e7e08b74 data\tead\recipes\iron_plate_chestplate.json a21740698cbe4a453dbb0a777e5260d51c56cd75 data\tead\advancements\recipes\tools\item_frame.json 0a1b18b4536990fc219aaa8688bebf9d15df8256 data\tead\recipes\chainmail_chestplate.json -d7efec2703bd2fb2bc03a802eb4d4eaf34356b96 data\tead\advancements\recipes\building_blocks\galena.json -b6b8236562f64925ee09bf1f09c4d89847622f33 data\tead\recipes\chainmail_boots.json -d5e56c4ecb8e046d2b8abd18df2b81a92eea53c5 data\tead\recipes\dry_grass.json -bd4b99a45293b0b552ac1583098ac8328f8978b0 data\tead\recipes\diamond_stalwart_chestplate.json -8866d2a181e6a4f6fb7a9faae7fb1ebf14a112e2 data\tead\advancements\recipes\tools\gold_hammer.json -8aed82af904b2602c4c5429d0c47f36b2890d278 data\tead\advancements\recipes\building_blocks\dirty_cobblestone.json f4a7a084c76b02d9439cebd8d16f474f2d3d7249 data\tead\recipes\lead_claymore.json 989e831c410ad37866e479197aee3a4850024dd4 data\tead\recipes\obsidian_sword.json c92e501d88f00d321570f1cbc08e6792f03f26c3 data\tead\advancements\recipes\tools\diamond_stalwart_helmet.json -b0dcf4c2c7c7ddba97cea28b695c318a3f9cd99f data\tead\recipes\gold_royal_helmet.json -446a924cd64276612cf01ded3c2526c8da471b5d data\tead\advancements\recipes\tools\iron_royal_helmet.json 5a679474acdfd68cba5ac69bfb969e0acc9eec28 data\tead\advancements\recipes\tools\lead_hammer.json -7a02ae758540b9d2f0d62d221ce1ea8670f56531 data\tead\advancements\recipes\building_blocks\sludge.json 9a9a30e01c9ff5ff042c87ffb8536b133dea137c data\tead\advancements\recipes\misc\dark_brick_from_blasting_clayish_mud.json ecf2df23fb2756f1ea4a8336653170c99c7bee24 data\tead\advancements\recipes\tools\lead_axe.json -36fb0077d679f6fdca0748f41317fc81342a1200 data\tead\advancements\recipes\building_blocks\very_sparse_grass.json 8c205b4ff20983e66aaa44e592e5d4b37effd271 data\tead\advancements\recipes\misc\lead_nugget.json ddd74ce8a565f85b0e571b3f39a5fb90c73d5dfb data\tead\advancements\recipes\tools\diamond_double_axe.json -234d6dccfdbefe7c3580114466fabd9704c8a1f9 data\tead\recipes\diamond_hammer.json -88700ec6ba9e6ebf5e7b0468e88f32706477023a data\tead\advancements\recipes\tools\diamond_plate_boots.json -7d7818bd22077ec5a01ae8d66b82a65ccbddf008 data\tead\recipes\diamond_sickle.json -32dac3d323122d6077c495373706d64e1186828c data\tead\advancements\recipes\tools\wood_double_axe.json 07f0d7eeebb67cb65dd152dbd4171ffc31e04b32 data\tead\recipes\iron_double_axe.json d67169e341089725de36eedf6c25f1cde8c94cf9 data\tead\recipes\shuriken_0.json 3cb34f0790021b3b033fa8fd60b2d353ccc896e3 data\tead\recipes\netherite_plate_boots.json -c850cd11e861e5b6c16f1d273d127b74dbc5ddc6 data\tead\recipes\jerky_2.json -67ed8ef41b18c343efe23f6a265cfc8fcc043804 data\tead\recipes\lead_nugget.json 2d11de204e46e6d3149336dc92b6f398ef00dc02 data\tead\advancements\recipes\building_blocks\dark_bricks.json -23337b52417b514b28a92c2e3bab547116a0e04c data\tead\advancements\recipes\tools\diamond_highland_chestplate.json -0ce431ee0d4fcfb234c2d7880b38abf6d2a4d873 data\tead\advancements\recipes\tools\chainmail_chestplate.json -8e274f1da35dd202c0892bef6d672c849bf3a482 data\tead\advancements\recipes\combat\fabric_8.json 743812ea5f1b092a304956efd4d8db5855c3a90e data\tead\advancements\recipes\combat\fabric_2.json -a1730f98aeaa3027a016210a3e5141596fceb84e data\tead\advancements\recipes\tools\netherite_plate_boots.json 84e0abd50f1f54e25d49fa7e1b1db6a95c45d752 data\tead\recipes\jerky_11.json a2d6a88416acea8f27660317707c7ef81493fe35 data\tead\recipes\amethyst_arrow_2.json eccbbeaedc52640a72c6ea2cfca36f8e477f1c00 data\tead\recipes\stone_plaque_from_chiseled_stone_bricks_stonecutting.json -0da6385eeb6056ae6507a6ecb220c6ed77df93b7 data\tead\advancements\recipes\combat\obsidian_arrow_2.json abbbc8c0b0450247db9b13fd269b97f7f3fdd366 data\tead\advancements\recipes\tools\lead_sickle.json e50c9423261060094e4e0abb8d0eb2b3ef87550d data\tead\advancements\recipes\tools\gold_chainmail_helmet.json -e3d0c2cb20d36e32ff5ef86fd2c9bdde3f6e13b1 data\tead\recipes\gold_chainmail_leggings.json -909ee974266bdbd1a4e5c9a0c010d57c5ca8baf7 data\tead\advancements\recipes\tools\iron_plate_chestplate.json 342a9c824ef6ab524176582602d2bc901d95bc44 data\tead\advancements\recipes\combat\jerky_3.json -52bb3e10d062e4cadd696bf9bdf3e0bd7350cb59 data\tead\advancements\recipes\tools\iron_sickle.json -2b156ad6d5f80c5b799a42d20cf420fb9f99cb72 data\tead\recipes\netherite_plate_helmet.json -30c86158b0c7da40a8879a36e0cdb31a3bcacfef data\tead\recipes\boring_arrow_2.json c12ab9f4d8d27a5b87784e6510f287ab960e890a data\tead\recipes\robe_boots.json -01426dcc6b41e0d10fa1abd627c20145a003bd19 data\tead\recipes\clayish_mud.json -7b46d62b27e36215335644122fd8819ff6d25a1b data\tead\recipes\gold_stalwart_helmet.json -634e843659daca94cb14dc5024ad7b4eaf1f0baa data\tead\advancements\recipes\combat\jerky_9.json -1e43d1f6ea0c83a70f8939f75d08258b3b040023 data\tead\advancements\recipes\combat\tnt_arrow_2.json +54958399621bfa8a66a4a4bf98e5418a402dab5a data\tead\recipes\soul_torch_arrow_2.json cee7a5a2c53001d8a7b293042fb3bff43b7a2145 data\tead\advancements\recipes\tools\lead_pickaxe.json f5c2e5fe794e0804e2d2c7ccc42229e3687fbf10 data\tead\recipes\muddy_clay_ball.json f8d6126022d7551e62b8cf3d755e9a69dbe98628 data\tead\recipes\diamond_claymore.json -76d967f30b22c714b4f5248e8e5f5fab630166a6 data\tead\recipes\ruby.json aaddaa96f1469919c17096640a17a2a506838f53 data\tead\advancements\recipes\misc\lead_ingot_from_smelting_lead_ore.json -0461aace2dfce17a4d0d59bead29bbd9f1190e31 data\tead\advancements\recipes\tools\stone_dagger.json -1b792c5003ecf42a968b3b83f0cd424a87825a38 data\tead\advancements\recipes\tools\gold_double_axe.json 2a42ece4350e92d93aee6b288d11fbc773434961 data\tead\advancements\recipes\building_blocks\dry_dirt.json -87eb0835861c21b42e2e5dba4f274234f1237331 data\tead\advancements\recipes\misc\obsidian.json diff --git a/src/main/generated/.cache/7062bde979b90da93bb37d6f9bc733e954909cbd b/src/main/generated/.cache/7062bde979b90da93bb37d6f9bc733e954909cbd index eeeb7b55..76d4e4ce 100644 --- a/src/main/generated/.cache/7062bde979b90da93bb37d6f9bc733e954909cbd +++ b/src/main/generated/.cache/7062bde979b90da93bb37d6f9bc733e954909cbd @@ -1,4 +1,4 @@ -// 1.20.1 2024-01-29T18:25:38.1536393 tead/Block Loot Tables +// 1.20.1 2024-02-03T14:49:48.5089007 tead/Block Loot Tables 58a52e751a1a99f81be70af5c1035edcfa01bd89 data\tead\loot_tables\blocks\clayish_mud.json 921ac0bd13ba01497f064a862b7d0d7e921dd6ad data\tead\loot_tables\blocks\sick_pumpkin.json af455ebaddb213c26102a3ddb413b5865ab94560 data\tead\loot_tables\blocks\ruby_ore.json @@ -7,11 +7,11 @@ e7d4eb4ff8c2213eefb66e481f35cb334381a0e0 data\tead\loot_tables\blocks\stone_plaq 555ee1782d3e1868042e2af860b5e34c595a978e data\tead\loot_tables\blocks\dirty_cobblestone.json 17a91c1c75fd00de73f28a65724670f7db7b3b2e data\tead\loot_tables\blocks\lead_ore.json a554d110681080ba8938e6070e2f79b67f144db8 data\tead\loot_tables\blocks\sandy_cobblestone.json -1d6382ff683993db839e2b230bc268542efb115c data\tead\loot_tables\blocks\block_of_ruby.json 3e1a08bda0fb83234114f78658a50d0e9a8edd9a data\tead\loot_tables\blocks\brown_dry_grass.json +1d6382ff683993db839e2b230bc268542efb115c data\tead\loot_tables\blocks\block_of_ruby.json 4d29ce526cb5fc23958ace9f6ba0f9eb7150b717 data\tead\loot_tables\blocks\sparse_grass.json -15b069c8bcca778679e2f999985565e5eb24c8a6 data\tead\loot_tables\blocks\block_of_galena.json aa4459890e8211d32c443514972b07c7ad02708e data\tead\loot_tables\blocks\dirty_stone_plaque.json +15b069c8bcca778679e2f999985565e5eb24c8a6 data\tead\loot_tables\blocks\block_of_galena.json 579db7732e8913f3b95d54fe74ae29e2eb3f630d data\tead\loot_tables\blocks\sludge.json b7bdf6c99e5ba47adfe7a6c8e2437f007303879a data\tead\loot_tables\blocks\very_sparse_grass.json cfa3cc8c0d19d2a51aa9946c206f55b437d8bfe6 data\tead\loot_tables\blocks\dark_bricks.json diff --git a/src/main/generated/.cache/995f6549a623150a79e600170b60abb50bce24e1 b/src/main/generated/.cache/995f6549a623150a79e600170b60abb50bce24e1 index d279d514..415ee813 100644 --- a/src/main/generated/.cache/995f6549a623150a79e600170b60abb50bce24e1 +++ b/src/main/generated/.cache/995f6549a623150a79e600170b60abb50bce24e1 @@ -1,4 +1,4 @@ -// 1.20.1 2024-01-29T18:25:38.1486283 tead/Model Definitions +// 1.20.1 2024-02-03T14:49:48.5029042 tead/Model Definitions 3c50dd955f99ca46d6a9f6a101ea3c1bd92a7c2b assets\tead\models\item\lead_pickaxe.json 9ce48b5cf00c0c19f7b7ba625ecde5fd23af242d assets\tead\models\item\grenade.json 88d7d9edfbc905db45cc776a0773f5f1477b721c assets\tead\models\item\netherite_royal_helmet_amethyst_trim.json @@ -20,6 +20,7 @@ eba6ba78305eb26c436463ac762c774c811f40bd assets\tead\models\item\wood_double_axe eeb801d66ec65c243807d6b4f22849b2536240d6 assets\tead\blockstates\dry_dirt.json d0ea1efcb8b84e3b7ca522ab701cbf64095c7c0a assets\tead\models\item\diamond_highland_helmet_emerald_trim.json c12b80d6b72aa801724bb936ec917d71854d98a0 assets\tead\models\item\gold_chainmail_boots_iron_trim.json +2e882b16e2281dfe5c848f4d2aedfa8f6abde700 assets\tead\models\item\torch_arrow.json 4ccb37eb5a87903a16f021a6069b6afd846bbe39 assets\tead\models\item\iron_stalwart_helmet_iron_trim.json 6af590556e00cfd7b9cb92ba9aa04c555c0463d9 assets\tead\blockstates\dirty_stone_plaque.json 7a75cf49ce17129b951cc31bfff3f8bca35ceddf assets\tead\models\item\gold_stalwart_helmet_redstone_trim.json @@ -47,8 +48,8 @@ a1399170c06397c31727f020a43aebc3d9d84d02 assets\tead\models\item\gold_highland_h eb49985fc4f43bcf3a7da9019ffbfeab87f09313 assets\tead\blockstates\deepslate_ruby_ore.json 92192a47bc55e7599adbe22d3d02adac3b28d5a9 assets\tead\models\item\gold_chainmail_chestplate.json 23d9c7e8c82341cfa0e21e4ef7bac3273d70ea2c assets\tead\models\item\diamond_highland_helmet_diamond_trim.json -b991d80e1011954db64fae86b98e62ba196e77cb assets\tead\models\item\music_disc_hail_and_kill.json 70e0c359fb85682759bee590633c4ec3ed3b2346 assets\tead\models\item\netherite_dagger.json +b991d80e1011954db64fae86b98e62ba196e77cb assets\tead\models\item\music_disc_hail_and_kill.json 9e365bc883ff676454e94188fb3836f23c5b190e assets\tead\models\item\diamond_royal_helmet_copper_trim.json 46b6fe25e330cae8e798483ae419dc779852714a assets\tead\models\item\netherite_stalwart_helmet_quartz_trim.json ba47d5e31c355a1c4785d90ddc716d2ca97ab917 assets\tead\models\item\gold_stalwart_chestplate_emerald_trim.json @@ -64,6 +65,7 @@ de098bc78312cf23f1de401e14b46aaaa950e074 assets\tead\models\item\gold_highland_h bd65261164da3294b75f6871dc14b14217475445 assets\tead\models\item\gold_stalwart_helmet.json e4e393006f6251a448d14eca09bbe48a9051fecc assets\tead\models\item\diamond_highland_helmet_iron_trim.json 4b9d1588417d47139b343e9d15ce98ee7a76314a assets\tead\models\block\dirty_cobblestone.json +6093e59e04de889e0332e352b19df587e0fdba41 assets\tead\models\item\soul_torch_arrow.json df403cfdcae8520e563d61d3874019d8ebaf1353 assets\tead\models\item\iron_highland_helmet_netherite_trim.json 544fae509e1529ac672239b179e59a2c8b6be593 assets\tead\models\block\ruby_ore.json 0161514d3c88da65225b6a1c29973df8bfd8de32 assets\tead\models\item\iron_tempest_knife.json @@ -103,8 +105,8 @@ abaa14c11ef102de667e10f7562830fb5e61fe3b assets\tead\models\item\gold_royal_helm d9012edb32d53a41e513867a89fb06864f5c0137 assets\tead\models\item\iron_royal_helmet_amethyst_trim.json 69f4d306c797c5bb38d9b0641157101afe30b54a assets\tead\models\item\diamond_highland_helmet_quartz_trim.json 4168f0d71aab47178e392503253b19a099f31d5e assets\tead\models\block\block_of_ruby.json -cef38c64291ada5b94ba6dd7cd583249e788c5fa assets\tead\models\item\music_disc_day_one.json b652b55e8fe7737c61e067d4abc72535cd40b821 assets\tead\models\item\swiftness_boots_copper_trim.json +cef38c64291ada5b94ba6dd7cd583249e788c5fa assets\tead\models\item\music_disc_day_one.json 9180e1a07898031322bc350c9dd4602cc261b9e8 assets\tead\models\block\dark_cobblestone.json 668790842952bd2cb0e4e4c4b8fa84409ee27ee3 assets\tead\models\item\iron_stalwart_chestplate_iron_trim.json be035de9630702f153bdcf601d2039fafe73fc3b assets\tead\models\item\iron_highland_helmet_gold_trim.json @@ -133,8 +135,8 @@ f6be128e0d0a59b8dfad0007396225e6bc4fd243 assets\tead\models\item\netherite_highl ae37702090220ed7b6c6f1093da61e29596065c9 assets\tead\models\item\diamond_stalwart_chestplate.json 48375906c8e45c2dfea02c16d164fcfaea8b3c7a assets\tead\models\item\netherite_stalwart_helmet_iron_trim.json d0834bd3cb01b31dd934fa666f93307909f6f68b assets\tead\models\item\very_sparse_grass.json -d401026e71b53825c45f0eae3c1a9cd8527ac7d6 assets\tead\models\item\gold_stalwart_chestplate_lapis_trim.json 03390ef15f0141b0d9e939fb884af26e5d6abb8e assets\tead\models\item\swiftness_boots_gold_trim.json +d401026e71b53825c45f0eae3c1a9cd8527ac7d6 assets\tead\models\item\gold_stalwart_chestplate_lapis_trim.json ca093851665d8aaf5b34d65d480051f42648fae5 assets\tead\models\item\iron_highland_helmet_diamond_trim.json c5771d3aa8485302f2f75f826431f36fde7f91f2 assets\tead\models\item\gold_chainmail_chestplate_emerald_trim.json 164e57d1f6e059ed8043883dd85a504bf7a33c79 assets\tead\models\item\gold_chainmail_boots_emerald_trim.json @@ -211,8 +213,8 @@ e96d569a129c6c945075becd2ef0c146a707ac8b assets\tead\models\item\iron_stalwart_h 0411d850f72f34c06d61e6710d4be27ff728c16b assets\tead\models\item\gold_chainmail_leggings_netherite_trim.json 9fe5b647de0bde7a64f5ce9756d6077e14e6ac5b assets\tead\models\item\swiftness_boots_netherite_trim.json 67d4273a6cc89155cb8a032f8a04f01f4d17a5df assets\tead\models\item\iron_double_axe.json -152be24982529fbab86cb7fdf604557b3e9c313f assets\tead\models\item\diamond_stalwart_helmet_lapis_trim.json fa858d405cec4b005a342a192f1b21e711ad3647 assets\tead\models\item\netherite_stalwart_chestplate_emerald_trim.json +152be24982529fbab86cb7fdf604557b3e9c313f assets\tead\models\item\diamond_stalwart_helmet_lapis_trim.json f95d03a65cc5660eff34c4147327418bd8c5409e assets\tead\models\item\netherite_highland_helmet_emerald_trim.json e69cea046a6481f946cf77e6f7bd357ed1da06ba assets\tead\models\item\gold_chainmail_leggings_iron_trim.json acb6a32cd7619cb910268e048a27526c8fce629a assets\tead\models\item\netherite_highland_helmet_redstone_trim.json @@ -257,8 +259,8 @@ f6867a83c299a4eab7ae2f27432df6655be519e1 assets\tead\models\item\gold_chainmail_ ab17c73d6eeb10781efca46f2dbcd7371e76b731 assets\tead\models\item\gold_chainmail_helmet_redstone_trim.json 3943aa89a8ba402bef372cd8af8eef0e56923a48 assets\tead\models\item\diamond_highland_helmet_netherite_trim.json d31ee17474d4db40128e3495538aaf9a0f96e8d1 assets\tead\models\item\lead_double_axe.json -d75e70365ae7feebd149f4efbbb275780dca5528 assets\tead\models\item\netherite_stalwart_chestplate_iron_trim.json 5e0d887b30158525b6cd9856e83bdea8847188bb assets\tead\models\item\diamond_royal_helmet_amethyst_trim.json +d75e70365ae7feebd149f4efbbb275780dca5528 assets\tead\models\item\netherite_stalwart_chestplate_iron_trim.json dcbc09a25d4307fb3d99d9220e8cd1978e7dfde6 assets\tead\models\item\iron_royal_helmet_lapis_trim.json aff39e96712698c8761e6daab1664d5d601ab224 assets\tead\models\item\iron_royal_helmet.json 8dc5745d9c235cca2256df49b46d300be0c44a88 assets\tead\models\item\gold_chainmail_chestplate_redstone_trim.json @@ -314,6 +316,7 @@ a0f2c7a5f286f7542909624acfa39a670c42dd1f assets\tead\models\item\iron_royal_helm 7eabed1c2f21dcdbb7df8164c42c3bcb8ddbc833 assets\tead\models\item\swiftness_boots_amethyst_trim.json 8764750eb6ab777c7e3406a590888f948a34ee5e assets\tead\models\item\music_disc_lose_yourself.json 8c561d1114c2474c4f360a34b6fde7d3ccac8899 assets\tead\models\block\dark_bricks.json +20723b4a7fb314d4077b2dc1fa9573d8160776df assets\tead\models\item\redstone_torch_arrow.json 0e600f052a4ab797636f5b94c12bab31e494ebe3 assets\tead\models\block\deepslate_ruby_ore.json 8d3bba068594f98dc0b4eb87ad40d0a748a70d73 assets\tead\models\item\diamond_royal_helmet_diamond_trim.json d427c607661b73a6b9b25ac742bae41efa764362 assets\tead\models\item\shotgun_projectile.json @@ -321,8 +324,8 @@ e2c07333f978935dda670919f51afc1ab0566c7f assets\tead\models\item\diamond_royal_h 3b9cec2dd155bd39acd4236e9abf348814795a29 assets\tead\models\item\gold_highland_helmet_gold_trim.json 94be0d0439105f698cd9c0674a7ba82844e61649 assets\tead\models\item\dark_cobblestone.json d59472b4099c798fb614b349a87804ed62d7c659 assets\tead\models\item\gold_chainmail_helmet_netherite_trim.json -02d21d7298dc98a66b4592ffd41a9a0eaed558b7 assets\tead\models\item\iron_stalwart_helmet_quartz_trim.json 20390bf97fe8a8eec9e5bc73517c0814ae9ec19d assets\tead\models\item\lead_ore.json +02d21d7298dc98a66b4592ffd41a9a0eaed558b7 assets\tead\models\item\iron_stalwart_helmet_quartz_trim.json 2c98800f3fa466378aa7582ec93d0c16de69f02a assets\tead\blockstates\sick_pumpkin.json efedb419dd1a5e67d4e87d6b2d2c20e2638f2836 assets\tead\models\item\gold_chainmail_boots.json 778d9f0a3001155971af52c3693e8522f821af7a assets\tead\models\item\gold_chainmail_leggings_gold_trim.json @@ -345,9 +348,9 @@ bb7326361d25aeac967bbc5574ed6cd5e5dee3f4 assets\tead\models\item\block_of_ruby.j 58c4d0754909c535307f7b27ff7e887cfc3ae599 assets\tead\models\item\gold_highland_helmet_diamond_trim.json df38f90b1ba47d7804910c317fd9497c82c7f125 assets\tead\blockstates\ruby_ore.json 46bb9e099a6e39be261e6cc213aebfd8567595ae assets\tead\models\item\gold_chainmail_boots_redstone_trim.json -dad6aa545b142df4c18ee7fbe5905310c82304ed assets\tead\models\item\netherite_royal_helmet_diamond_trim.json -9f70e8969029c61e7ab094ea97a361b91c9f5c43 assets\tead\models\item\swiftness_boots_emerald_trim.json d57cb769fd7869ef8d17827782ab72814b77096f assets\tead\blockstates\sandy_cobblestone.json +9f70e8969029c61e7ab094ea97a361b91c9f5c43 assets\tead\models\item\swiftness_boots_emerald_trim.json +dad6aa545b142df4c18ee7fbe5905310c82304ed assets\tead\models\item\netherite_royal_helmet_diamond_trim.json e68562d44c0763dae98d91523e43170e792ffeb1 assets\tead\models\item\gold_stalwart_helmet_gold_trim.json 8d460e8791cdf6330a59365886efa6c0316f34a7 assets\tead\models\item\sandy_cobblestone.json 088f9130b090f76dee2311b5bb1fb0cc719c5531 assets\tead\models\item\lead_dagger.json diff --git a/src/main/generated/.cache/c7f9aaa26ace8792d7e820fbd1f5df7211c704c1 b/src/main/generated/.cache/c7f9aaa26ace8792d7e820fbd1f5df7211c704c1 index 3c02a478..42688836 100644 --- a/src/main/generated/.cache/c7f9aaa26ace8792d7e820fbd1f5df7211c704c1 +++ b/src/main/generated/.cache/c7f9aaa26ace8792d7e820fbd1f5df7211c704c1 @@ -1,7 +1,7 @@ -// 1.20.1 2024-01-29T18:25:38.1540488 tead/World Gen -d7f4bb28cf229769332d150ff934c91638a2054b data\tead\worldgen\placed_feature\lead_ore_placed.json +// 1.20.1 2024-02-03T14:49:48.5109911 tead/World Gen +0a3d8090864dfb97a05d630c53f6ffc07c9ad0cb data\tead\worldgen\placed_feature\lead_ore_placed.json 2352a497ac661c664d2b39567cc1e326ef934970 data\tead\worldgen\placed_feature\ruby_ore_placed.json -2b11d6f824f2ef76f64daf15d6300c3f746dd3b6 data\tead\worldgen\configured_feature\deepslate_ruby_ore.json -8c44bb0b20982964985000004b4528ca75ecf35c data\tead\worldgen\configured_feature\ruby_ore.json +5daae181466ff06e914b54530b2de325b9181f35 data\tead\worldgen\configured_feature\deepslate_ruby_ore.json +0f4e1286cee7972dee44ec24cbca50797011b404 data\tead\worldgen\configured_feature\ruby_ore.json 91eb6fd37f1063abfdbaa3227383cd9ca0f97540 data\tead\worldgen\placed_feature\deepslate_ruby_ore_placed.json -1478ae860538f7c25c70429ac03d541134c96880 data\tead\worldgen\configured_feature\lead_ore.json +d2ee5e3af93fe00a3f08ad76bb9a97f56729171a data\tead\worldgen\configured_feature\lead_ore.json diff --git a/src/main/generated/.cache/d20327c3cda4a54c28dc505c0327f6f3fc0bd834 b/src/main/generated/.cache/d20327c3cda4a54c28dc505c0327f6f3fc0bd834 index 1b18377e..a49d9b71 100644 --- a/src/main/generated/.cache/d20327c3cda4a54c28dc505c0327f6f3fc0bd834 +++ b/src/main/generated/.cache/d20327c3cda4a54c28dc505c0327f6f3fc0bd834 @@ -1,4 +1,4 @@ -// 1.20.1 2024-01-29T18:25:38.1395895 tead/Tags for minecraft:item +// 1.20.1 2024-02-03T14:49:48.4938829 tead/Tags for minecraft:item 9a8b88cdbfd6ad375dbea98c45eb304315449842 data\minecraft\tags\items\trimmable_armor.json 870daac12e447cf4e4d8be5e8ac2bbfca009c33f data\minecraft\tags\items\creeper_drop_music_discs.json 870daac12e447cf4e4d8be5e8ac2bbfca009c33f data\minecraft\tags\items\music_discs.json diff --git a/src/main/generated/.cache/d4d9ab23629b20d3a51133d72646fff930d8a919 b/src/main/generated/.cache/d4d9ab23629b20d3a51133d72646fff930d8a919 index de72e53b..1070097f 100644 --- a/src/main/generated/.cache/d4d9ab23629b20d3a51133d72646fff930d8a919 +++ b/src/main/generated/.cache/d4d9ab23629b20d3a51133d72646fff930d8a919 @@ -1,4 +1,4 @@ -// 1.20.1 2024-01-29T18:25:38.137587 tead/Tags for minecraft:block +// 1.20.1 2024-02-03T14:49:48.4894007 tead/Tags for minecraft:block a7bed1c69a0776fb68eb189877fde38060a9bac4 data\minecraft\tags\blocks\needs_diamond_tool.json a29a401919d5905bd706e6010cbf590fd32c34e7 data\minecraft\tags\blocks\mineable\pickaxe.json 06a698369cbe90b291874c870defaeadb1cfd018 data\minecraft\tags\blocks\mineable\shovel.json diff --git a/src/main/generated/assets/tead/models/item/battle_staff.json b/src/main/generated/assets/tead/models/item/battle_staff.json deleted file mode 100644 index 14df3dbb..00000000 --- a/src/main/generated/assets/tead/models/item/battle_staff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "tead:item/battle_staff" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/tead/models/item/lightning_staff.json b/src/main/generated/assets/tead/models/item/lightning_staff.json deleted file mode 100644 index 5a5e7722..00000000 --- a/src/main/generated/assets/tead/models/item/lightning_staff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "tead:item/lightning_staff" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/tead/models/item/quarterstaff.json b/src/main/generated/assets/tead/models/item/quarterstaff.json deleted file mode 100644 index ca48b66d..00000000 --- a/src/main/generated/assets/tead/models/item/quarterstaff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "tead:item/quarterstaff" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/tead/models/item/redstone_torch_arrow.json b/src/main/generated/assets/tead/models/item/redstone_torch_arrow.json new file mode 100644 index 00000000..8b0ff366 --- /dev/null +++ b/src/main/generated/assets/tead/models/item/redstone_torch_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tead:item/redstone_torch_arrow" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/tead/models/item/soul_torch_arrow.json b/src/main/generated/assets/tead/models/item/soul_torch_arrow.json new file mode 100644 index 00000000..cfc635a1 --- /dev/null +++ b/src/main/generated/assets/tead/models/item/soul_torch_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tead:item/soul_torch_arrow" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/tead/models/item/torch_arrow.json b/src/main/generated/assets/tead/models/item/torch_arrow.json new file mode 100644 index 00000000..acd0433b --- /dev/null +++ b/src/main/generated/assets/tead/models/item/torch_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tead:item/torch_arrow" + } +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/amethyst_arrow_1.json b/src/main/generated/data/tead/advancements/recipes/combat/amethyst_arrow_1.json index 6a0f7299..addbb0c6 100644 --- a/src/main/generated/data/tead/advancements/recipes/combat/amethyst_arrow_1.json +++ b/src/main/generated/data/tead/advancements/recipes/combat/amethyst_arrow_1.json @@ -13,18 +13,6 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_feather": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:feather" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_the_recipe": { "conditions": { "recipe": "tead:amethyst_arrow_1" @@ -34,7 +22,6 @@ }, "requirements": [ [ - "has_feather", "has_amethyst_shard", "has_the_recipe" ] diff --git a/src/main/generated/data/tead/advancements/recipes/combat/amethyst_arrow_2.json b/src/main/generated/data/tead/advancements/recipes/combat/amethyst_arrow_2.json index bb08fbc9..d8d814cf 100644 --- a/src/main/generated/data/tead/advancements/recipes/combat/amethyst_arrow_2.json +++ b/src/main/generated/data/tead/advancements/recipes/combat/amethyst_arrow_2.json @@ -13,18 +13,6 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_feather": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:feather" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_the_recipe": { "conditions": { "recipe": "tead:amethyst_arrow_2" @@ -34,7 +22,6 @@ }, "requirements": [ [ - "has_feather", "has_amethyst_shard", "has_the_recipe" ] diff --git a/src/main/generated/data/tead/advancements/recipes/combat/arrow_3.json b/src/main/generated/data/tead/advancements/recipes/combat/arrow_3.json new file mode 100644 index 00000000..252e3e27 --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/arrow_3.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_feather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:feather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:arrow_3" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_feather", + "has_iron_ingot", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:arrow_3" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/arrow_4.json b/src/main/generated/data/tead/advancements/recipes/combat/arrow_4.json new file mode 100644 index 00000000..d2518efa --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/arrow_4.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_feather": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:feather" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:arrow_4" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_feather", + "has_iron_ingot", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:arrow_4" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/cooper_arrow_1.json b/src/main/generated/data/tead/advancements/recipes/combat/cooper_arrow_1.json index 52994571..e0738d0a 100644 --- a/src/main/generated/data/tead/advancements/recipes/combat/cooper_arrow_1.json +++ b/src/main/generated/data/tead/advancements/recipes/combat/cooper_arrow_1.json @@ -1,18 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_feather": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:feather" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_lightning_rod": { "conditions": { "items": [ @@ -34,7 +22,6 @@ }, "requirements": [ [ - "has_feather", "has_lightning_rod", "has_the_recipe" ] diff --git a/src/main/generated/data/tead/advancements/recipes/combat/cooper_arrow_2.json b/src/main/generated/data/tead/advancements/recipes/combat/cooper_arrow_2.json index 8769f656..5a627180 100644 --- a/src/main/generated/data/tead/advancements/recipes/combat/cooper_arrow_2.json +++ b/src/main/generated/data/tead/advancements/recipes/combat/cooper_arrow_2.json @@ -1,18 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_feather": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:feather" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_lightning_rod": { "conditions": { "items": [ @@ -34,7 +22,6 @@ }, "requirements": [ [ - "has_feather", "has_lightning_rod", "has_the_recipe" ] diff --git a/src/main/generated/data/tead/advancements/recipes/combat/redstone_torch_arrow_1.json b/src/main/generated/data/tead/advancements/recipes/combat/redstone_torch_arrow_1.json new file mode 100644 index 00000000..90be73f5 --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/redstone_torch_arrow_1.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_redstone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:redstone_torch_arrow_1" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:redstone_torch_arrow_1" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/redstone_torch_arrow_2.json b/src/main/generated/data/tead/advancements/recipes/combat/redstone_torch_arrow_2.json new file mode 100644 index 00000000..0f992205 --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/redstone_torch_arrow_2.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_redstone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:redstone_torch_arrow_2" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_redstone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:redstone_torch_arrow_2" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/ruby_arrow_1.json b/src/main/generated/data/tead/advancements/recipes/combat/ruby_arrow_1.json index 079f431c..fb053f38 100644 --- a/src/main/generated/data/tead/advancements/recipes/combat/ruby_arrow_1.json +++ b/src/main/generated/data/tead/advancements/recipes/combat/ruby_arrow_1.json @@ -1,18 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_feather": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:feather" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_ruby": { "conditions": { "items": [ @@ -34,7 +22,6 @@ }, "requirements": [ [ - "has_feather", "has_ruby", "has_the_recipe" ] diff --git a/src/main/generated/data/tead/advancements/recipes/combat/ruby_arrow_2.json b/src/main/generated/data/tead/advancements/recipes/combat/ruby_arrow_2.json index adc74823..28841743 100644 --- a/src/main/generated/data/tead/advancements/recipes/combat/ruby_arrow_2.json +++ b/src/main/generated/data/tead/advancements/recipes/combat/ruby_arrow_2.json @@ -1,18 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_feather": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:feather" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_ruby": { "conditions": { "items": [ @@ -34,7 +22,6 @@ }, "requirements": [ [ - "has_feather", "has_ruby", "has_the_recipe" ] diff --git a/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_1.json b/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_1.json new file mode 100644 index 00000000..d97897ca --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_1.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_soul_sand": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:soul_sand" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:soul_torch_arrow_1" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_soul_sand", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:soul_torch_arrow_1" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_2.json b/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_2.json new file mode 100644 index 00000000..0c77cce4 --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_2.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_soul_sand": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:soul_sand" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:soul_torch_arrow_2" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_soul_sand", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:soul_torch_arrow_2" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_3.json b/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_3.json new file mode 100644 index 00000000..4cc452ca --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_3.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_soul_soil": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:soul_soil" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:soul_torch_arrow_3" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_soul_soil", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:soul_torch_arrow_3" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_4.json b/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_4.json new file mode 100644 index 00000000..5ef773b3 --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/soul_torch_arrow_4.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_soul_soil": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:soul_soil" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:soul_torch_arrow_4" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_soul_soil", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:soul_torch_arrow_4" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/tnt_arrow_1.json b/src/main/generated/data/tead/advancements/recipes/combat/tnt_arrow_1.json index 2116416d..7689c5e6 100644 --- a/src/main/generated/data/tead/advancements/recipes/combat/tnt_arrow_1.json +++ b/src/main/generated/data/tead/advancements/recipes/combat/tnt_arrow_1.json @@ -1,18 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_feather": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:feather" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_the_recipe": { "conditions": { "recipe": "tead:tnt_arrow_1" @@ -34,7 +22,6 @@ }, "requirements": [ [ - "has_feather", "has_tnt", "has_the_recipe" ] diff --git a/src/main/generated/data/tead/advancements/recipes/combat/tnt_arrow_2.json b/src/main/generated/data/tead/advancements/recipes/combat/tnt_arrow_2.json index cc3a736e..ccba9938 100644 --- a/src/main/generated/data/tead/advancements/recipes/combat/tnt_arrow_2.json +++ b/src/main/generated/data/tead/advancements/recipes/combat/tnt_arrow_2.json @@ -1,18 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_feather": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:feather" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_the_recipe": { "conditions": { "recipe": "tead:tnt_arrow_2" @@ -34,7 +22,6 @@ }, "requirements": [ [ - "has_feather", "has_tnt", "has_the_recipe" ] diff --git a/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_1.json b/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_1.json new file mode 100644 index 00000000..be558b00 --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_1.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_coal": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:coal" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:torch_arrow_1" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_coal", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:torch_arrow_1" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_2.json b/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_2.json new file mode 100644 index 00000000..16df036d --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_2.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_coal": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:coal" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:torch_arrow_2" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_coal", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:torch_arrow_2" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_3.json b/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_3.json new file mode 100644 index 00000000..0c8c07f5 --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_3.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_charcoal": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:charcoal" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:torch_arrow_3" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_charcoal", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:torch_arrow_3" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_4.json b/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_4.json new file mode 100644 index 00000000..fd6dda1f --- /dev/null +++ b/src/main/generated/data/tead/advancements/recipes/combat/torch_arrow_4.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_charcoal": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:charcoal" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tead:torch_arrow_4" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_charcoal", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tead:torch_arrow_4" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/arrow_3.json b/src/main/generated/data/tead/recipes/arrow_3.json new file mode 100644 index 00000000..2bbac543 --- /dev/null +++ b/src/main/generated/data/tead/recipes/arrow_3.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:iron_ingot" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + " $", + " # ", + "% " + ], + "result": { + "count": 4, + "item": "minecraft:arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/arrow_4.json b/src/main/generated/data/tead/recipes/arrow_4.json new file mode 100644 index 00000000..8f81d3c7 --- /dev/null +++ b/src/main/generated/data/tead/recipes/arrow_4.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:iron_ingot" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + "$", + "#", + "%" + ], + "result": { + "count": 4, + "item": "minecraft:arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/cooper_arrow_1.json b/src/main/generated/data/tead/recipes/cooper_arrow_1.json index 9e6f85e1..038fe468 100644 --- a/src/main/generated/data/tead/recipes/cooper_arrow_1.json +++ b/src/main/generated/data/tead/recipes/cooper_arrow_1.json @@ -19,7 +19,7 @@ "% " ], "result": { - "count": 2, + "count": 3, "item": "tead:copper_arrow" }, "show_notification": true diff --git a/src/main/generated/data/tead/recipes/cooper_arrow_2.json b/src/main/generated/data/tead/recipes/cooper_arrow_2.json index b14d59bf..c3415674 100644 --- a/src/main/generated/data/tead/recipes/cooper_arrow_2.json +++ b/src/main/generated/data/tead/recipes/cooper_arrow_2.json @@ -19,7 +19,7 @@ "%" ], "result": { - "count": 2, + "count": 3, "item": "tead:copper_arrow" }, "show_notification": true diff --git a/src/main/generated/data/tead/recipes/redstone_torch_arrow_1.json b/src/main/generated/data/tead/recipes/redstone_torch_arrow_1.json new file mode 100644 index 00000000..22dfdb32 --- /dev/null +++ b/src/main/generated/data/tead/recipes/redstone_torch_arrow_1.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "redstone_torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:redstone" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + " $", + " # ", + "% " + ], + "result": { + "count": 4, + "item": "tead:redstone_torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/redstone_torch_arrow_2.json b/src/main/generated/data/tead/recipes/redstone_torch_arrow_2.json new file mode 100644 index 00000000..7170a919 --- /dev/null +++ b/src/main/generated/data/tead/recipes/redstone_torch_arrow_2.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "redstone_torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:redstone" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + "$", + "#", + "%" + ], + "result": { + "count": 4, + "item": "tead:redstone_torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/soul_torch_arrow_1.json b/src/main/generated/data/tead/recipes/soul_torch_arrow_1.json new file mode 100644 index 00000000..d030c8eb --- /dev/null +++ b/src/main/generated/data/tead/recipes/soul_torch_arrow_1.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "soul_torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:soul_sand" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + " $", + " # ", + "% " + ], + "result": { + "count": 4, + "item": "tead:soul_torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/soul_torch_arrow_2.json b/src/main/generated/data/tead/recipes/soul_torch_arrow_2.json new file mode 100644 index 00000000..1c34c04a --- /dev/null +++ b/src/main/generated/data/tead/recipes/soul_torch_arrow_2.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "soul_torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:soul_sand" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + "$", + "#", + "%" + ], + "result": { + "count": 4, + "item": "tead:soul_torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/soul_torch_arrow_3.json b/src/main/generated/data/tead/recipes/soul_torch_arrow_3.json new file mode 100644 index 00000000..3db30f1f --- /dev/null +++ b/src/main/generated/data/tead/recipes/soul_torch_arrow_3.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "soul_torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:soul_soil" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + " $", + " # ", + "% " + ], + "result": { + "count": 4, + "item": "tead:soul_torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/soul_torch_arrow_4.json b/src/main/generated/data/tead/recipes/soul_torch_arrow_4.json new file mode 100644 index 00000000..a997c735 --- /dev/null +++ b/src/main/generated/data/tead/recipes/soul_torch_arrow_4.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "soul_torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:soul_soil" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + "$", + "#", + "%" + ], + "result": { + "count": 4, + "item": "tead:soul_torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/torch_arrow_1.json b/src/main/generated/data/tead/recipes/torch_arrow_1.json new file mode 100644 index 00000000..cac62ec8 --- /dev/null +++ b/src/main/generated/data/tead/recipes/torch_arrow_1.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:coal" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + " $", + " # ", + "% " + ], + "result": { + "count": 4, + "item": "tead:torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/torch_arrow_2.json b/src/main/generated/data/tead/recipes/torch_arrow_2.json new file mode 100644 index 00000000..9d125717 --- /dev/null +++ b/src/main/generated/data/tead/recipes/torch_arrow_2.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:coal" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + "$", + "#", + "%" + ], + "result": { + "count": 4, + "item": "tead:torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/torch_arrow_3.json b/src/main/generated/data/tead/recipes/torch_arrow_3.json new file mode 100644 index 00000000..7e945340 --- /dev/null +++ b/src/main/generated/data/tead/recipes/torch_arrow_3.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:charcoal" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + " $", + " # ", + "% " + ], + "result": { + "count": 4, + "item": "tead:torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/recipes/torch_arrow_4.json b/src/main/generated/data/tead/recipes/torch_arrow_4.json new file mode 100644 index 00000000..81eb2035 --- /dev/null +++ b/src/main/generated/data/tead/recipes/torch_arrow_4.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "group": "torch_arrow", + "key": { + "#": { + "item": "minecraft:stick" + }, + "$": { + "item": "minecraft:charcoal" + }, + "%": { + "item": "minecraft:feather" + } + }, + "pattern": [ + "$", + "#", + "%" + ], + "result": { + "count": 4, + "item": "tead:torch_arrow" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/tead/worldgen/configured_feature/deepslate_ruby_ore.json b/src/main/generated/data/tead/worldgen/configured_feature/deepslate_ruby_ore.json index 240c1a5d..3cb44f34 100644 --- a/src/main/generated/data/tead/worldgen/configured_feature/deepslate_ruby_ore.json +++ b/src/main/generated/data/tead/worldgen/configured_feature/deepslate_ruby_ore.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 6, + "size": 5, "targets": [ { "state": { diff --git a/src/main/generated/data/tead/worldgen/configured_feature/lead_ore.json b/src/main/generated/data/tead/worldgen/configured_feature/lead_ore.json index 2c7a7f03..540ace6f 100644 --- a/src/main/generated/data/tead/worldgen/configured_feature/lead_ore.json +++ b/src/main/generated/data/tead/worldgen/configured_feature/lead_ore.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 20, + "size": 10, "targets": [ { "state": { diff --git a/src/main/generated/data/tead/worldgen/configured_feature/ruby_ore.json b/src/main/generated/data/tead/worldgen/configured_feature/ruby_ore.json index 20700183..7020177d 100644 --- a/src/main/generated/data/tead/worldgen/configured_feature/ruby_ore.json +++ b/src/main/generated/data/tead/worldgen/configured_feature/ruby_ore.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 5, + "size": 4, "targets": [ { "state": { diff --git a/src/main/generated/data/tead/worldgen/placed_feature/lead_ore_placed.json b/src/main/generated/data/tead/worldgen/placed_feature/lead_ore_placed.json index 2ca440b1..884321bf 100644 --- a/src/main/generated/data/tead/worldgen/placed_feature/lead_ore_placed.json +++ b/src/main/generated/data/tead/worldgen/placed_feature/lead_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 8 + "count": 6 }, { "type": "minecraft:in_square" diff --git a/src/main/java/net/pythonbear/tead/datagen/TeadModelProvider.java b/src/main/java/net/pythonbear/tead/datagen/TeadModelProvider.java index 463cebfb..16226e20 100644 --- a/src/main/java/net/pythonbear/tead/datagen/TeadModelProvider.java +++ b/src/main/java/net/pythonbear/tead/datagen/TeadModelProvider.java @@ -158,6 +158,9 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) { itemModelGenerator.register(TeadItems.JERKY, Models.GENERATED); itemModelGenerator.register(TeadItems.HANDLE, Models.GENERATED); itemModelGenerator.register(TeadItems.TNT_ARROW, Models.GENERATED); + itemModelGenerator.register(TeadItems.TORCH_ARROW, Models.GENERATED); + itemModelGenerator.register(TeadItems.REDSTONE_TORCH_ARROW, Models.GENERATED); + itemModelGenerator.register(TeadItems.SOUL_TORCH_ARROW, Models.GENERATED); itemModelGenerator.register(TeadItems.BORING_ARROW, Models.GENERATED); itemModelGenerator.register(TeadItems.COPPER_ARROW, Models.GENERATED); itemModelGenerator.register(TeadItems.OBSIDIAN_ARROW, Models.GENERATED); @@ -172,7 +175,7 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) { itemModelGenerator.register(TeadItems.GRENADE, Models.GENERATED); itemModelGenerator.register(TeadItems.SHURIKEN, Models.GENERATED); - itemModelGenerator.register(TeadItems.LIGHTNING_STAFF, Models.HANDHELD); +// itemModelGenerator.register(TeadItems.LIGHTNING_STAFF, Models.HANDHELD); itemModelGenerator.register(TeadItems.LEAD_AXE, Models.HANDHELD); itemModelGenerator.register(TeadItems.LEAD_HOE, Models.HANDHELD); itemModelGenerator.register(TeadItems.LEAD_PICKAXE, Models.HANDHELD); @@ -215,8 +218,8 @@ public void generateItemModels(ItemModelGenerator itemModelGenerator) { // itemModelGenerator.register(TeadItems.NETHERITE_CLAYMORE, Models.HANDHELD); // itemModelGenerator.register(TeadItems.OBSIDIAN_CLAYMORE, Models.HANDHELD); itemModelGenerator.register(TeadItems.OBSIDIAN_SWORD, Models.HANDHELD); - itemModelGenerator.register(TeadItems.BATTLE_STAFF, Models.HANDHELD); - itemModelGenerator.register(TeadItems.QUARTERSTAFF, Models.HANDHELD); +// itemModelGenerator.register(TeadItems.BATTLE_STAFF, Models.HANDHELD); +// itemModelGenerator.register(TeadItems.QUARTERSTAFF, Models.HANDHELD); itemModelGenerator.register(TeadItems.BONE_CLUB, Models.HANDHELD); itemModelGenerator.register(TeadItems.SHOTGUN, Models.HANDHELD); itemModelGenerator.registerArmor(((ArmorItem) TeadItems.SWIFTNESS_BOOTS)); diff --git a/src/main/java/net/pythonbear/tead/datagen/TeadRecipeProvider.java b/src/main/java/net/pythonbear/tead/datagen/TeadRecipeProvider.java index c3f8aab5..ec57970b 100644 --- a/src/main/java/net/pythonbear/tead/datagen/TeadRecipeProvider.java +++ b/src/main/java/net/pythonbear/tead/datagen/TeadRecipeProvider.java @@ -328,7 +328,6 @@ public void generate(Consumer exporter) { .input('%', Items.FEATHER) .input('#', Items.STICK) .input('$', Items.AMETHYST_SHARD) - .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) .criterion(hasItem(Items.AMETHYST_SHARD), conditionsFromItem(Items.AMETHYST_SHARD)) .group("amethyst_arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "amethyst_arrow_1")); @@ -339,7 +338,6 @@ public void generate(Consumer exporter) { .input('%', Items.FEATHER) .input('#', Items.STICK) .input('$', Items.AMETHYST_SHARD) - .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) .criterion(hasItem(Items.AMETHYST_SHARD), conditionsFromItem(Items.AMETHYST_SHARD)) .group("amethyst_arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "amethyst_arrow_2")); @@ -350,7 +348,6 @@ public void generate(Consumer exporter) { .input('%', Items.FEATHER) .input('#', Items.STICK) .input('$', Items.TNT) - .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) .criterion(hasItem(Items.TNT), conditionsFromItem(Items.TNT)) .group("tnt_arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "tnt_arrow_1")); @@ -361,10 +358,109 @@ public void generate(Consumer exporter) { .input('%', Items.FEATHER) .input('#', Items.STICK) .input('$', Items.TNT) - .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) .criterion(hasItem(Items.TNT), conditionsFromItem(Items.TNT)) .group("tnt_arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "tnt_arrow_2")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.TORCH_ARROW, 4) + .pattern(" $") + .pattern(" # ") + .pattern("% ") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.COAL) + .criterion(hasItem(Items.COAL), conditionsFromItem(Items.COAL)) + .group("torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "torch_arrow_1")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.TORCH_ARROW, 4) + .pattern("$") + .pattern("#") + .pattern("%") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.COAL) + .criterion(hasItem(Items.COAL), conditionsFromItem(Items.COAL)) + .group("torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "torch_arrow_2")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.TORCH_ARROW, 4) + .pattern(" $") + .pattern(" # ") + .pattern("% ") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.CHARCOAL) + .criterion(hasItem(Items.CHARCOAL), conditionsFromItem(Items.CHARCOAL)) + .group("torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "torch_arrow_3")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.TORCH_ARROW, 4) + .pattern("$") + .pattern("#") + .pattern("%") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.CHARCOAL) + .criterion(hasItem(Items.CHARCOAL), conditionsFromItem(Items.CHARCOAL)) + .group("torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "torch_arrow_4")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.SOUL_TORCH_ARROW, 4) + .pattern(" $") + .pattern(" # ") + .pattern("% ") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.SOUL_SAND) + .criterion(hasItem(Items.SOUL_SAND), conditionsFromItem(Items.SOUL_SAND)) + .group("soul_torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "soul_torch_arrow_1")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.SOUL_TORCH_ARROW, 4) + .pattern("$") + .pattern("#") + .pattern("%") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.SOUL_SAND) + .criterion(hasItem(Items.SOUL_SAND), conditionsFromItem(Items.SOUL_SAND)) + .group("soul_torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "soul_torch_arrow_2")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.SOUL_TORCH_ARROW, 4) + .pattern(" $") + .pattern(" # ") + .pattern("% ") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.SOUL_SOIL) + .criterion(hasItem(Items.SOUL_SOIL), conditionsFromItem(Items.SOUL_SOIL)) + .group("soul_torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "soul_torch_arrow_3")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.SOUL_TORCH_ARROW, 4) + .pattern("$") + .pattern("#") + .pattern("%") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.SOUL_SOIL) + .criterion(hasItem(Items.SOUL_SOIL), conditionsFromItem(Items.SOUL_SOIL)) + .group("soul_torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "soul_torch_arrow_4")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.REDSTONE_TORCH_ARROW, 4) + .pattern(" $") + .pattern(" # ") + .pattern("% ") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.REDSTONE) + .criterion(hasItem(Items.REDSTONE), conditionsFromItem(Items.REDSTONE)) + .group("redstone_torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "redstone_torch_arrow_1")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.REDSTONE_TORCH_ARROW, 4) + .pattern("$") + .pattern("#") + .pattern("%") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.REDSTONE) + .criterion(hasItem(Items.REDSTONE), conditionsFromItem(Items.REDSTONE)) + .group("redstone_torch_arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "redstone_torch_arrow_2")); ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.BORING_ARROW, 1) .pattern("%%$") .pattern("%#%") @@ -385,25 +481,23 @@ public void generate(Consumer exporter) { .criterion(hasItem(TeadItems.TNT_ARROW), conditionsFromItem(TeadItems.TNT_ARROW)) .group("boring_arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "boring_arrow_2")); - ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.COPPER_ARROW, 2) + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.COPPER_ARROW, 3) .pattern(" $") .pattern(" # ") .pattern("% ") .input('%', Items.FEATHER) .input('#', Items.STICK) .input('$', Items.LIGHTNING_ROD) - .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) .criterion(hasItem(Items.LIGHTNING_ROD), conditionsFromItem(Items.LIGHTNING_ROD)) .group("copper_arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "cooper_arrow_1")); - ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.COPPER_ARROW, 2) + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, TeadItems.COPPER_ARROW, 3) .pattern("$") .pattern("#") .pattern("%") .input('%', Items.FEATHER) .input('#', Items.STICK) .input('$', Items.LIGHTNING_ROD) - .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) .criterion(hasItem(Items.LIGHTNING_ROD), conditionsFromItem(Items.LIGHTNING_ROD)) .group("copper_arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "cooper_arrow_2")); @@ -456,7 +550,6 @@ public void generate(Consumer exporter) { .input('%', Items.FEATHER) .input('#', Items.STICK) .input('$', TeadItems.RUBY) - .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) .criterion(hasItem(TeadItems.RUBY), conditionsFromItem(TeadItems.RUBY)) .group("ruby_arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "ruby_arrow_1")); @@ -467,7 +560,6 @@ public void generate(Consumer exporter) { .input('%', Items.FEATHER) .input('#', Items.STICK) .input('$', TeadItems.RUBY) - .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) .criterion(hasItem(TeadItems.RUBY), conditionsFromItem(TeadItems.RUBY)) .group("ruby_arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "ruby_arrow_2")); @@ -482,6 +574,28 @@ public void generate(Consumer exporter) { .criterion(hasItem(Items.FLINT), conditionsFromItem(Items.FLINT)) .group("arrow") .offerTo(exporter, new Identifier(Tead.MOD_ID, "arrow_2")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, Items.ARROW, 4) + .pattern(" $") + .pattern(" # ") + .pattern("% ") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.IRON_INGOT) + .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) + .criterion(hasItem(Items.IRON_INGOT), conditionsFromItem(Items.IRON_INGOT)) + .group("arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "arrow_3")); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, Items.ARROW, 4) + .pattern("$") + .pattern("#") + .pattern("%") + .input('%', Items.FEATHER) + .input('#', Items.STICK) + .input('$', Items.IRON_INGOT) + .criterion(hasItem(Items.FEATHER), conditionsFromItem(Items.FEATHER)) + .criterion(hasItem(Items.IRON_INGOT), conditionsFromItem(Items.IRON_INGOT)) + .group("arrow") + .offerTo(exporter, new Identifier(Tead.MOD_ID, "arrow_4")); ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, TeadItems.LIGHTNING_STAFF, 1) .pattern(" %") .pattern(" # ") diff --git a/src/main/java/net/pythonbear/tead/entity/CustomizedArrowEntity.java b/src/main/java/net/pythonbear/tead/entity/CustomizedArrowEntity.java index 22559c5a..ab371424 100644 --- a/src/main/java/net/pythonbear/tead/entity/CustomizedArrowEntity.java +++ b/src/main/java/net/pythonbear/tead/entity/CustomizedArrowEntity.java @@ -1,6 +1,7 @@ package net.pythonbear.tead.entity; import com.google.common.collect.Sets; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.entity.*; import net.minecraft.entity.data.DataTracker; @@ -12,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.Potions; +import net.minecraft.registry.tag.FluidTags; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.world.World; import net.pythonbear.tead.item.arrow.*; @@ -64,6 +66,12 @@ public void initFromStack(ItemStack stack) { this.customization = "tnt"; } else if (item instanceof BoringArrowItem) { this.customization = "boring"; + } else if (item instanceof TorchArrowItem) { + this.customization = "torch"; + } else if (item instanceof RedstoneTorchArrowItem) { + this.customization = "redstone torch"; + } else if (item instanceof SoulTorchArrowItem) { + this.customization = "soul torch"; } else { this.customization = "none"; } @@ -118,6 +126,14 @@ protected void onHit(LivingEntity target) { } } + @Override + public void tick() { + super.tick(); + if (!this.getWorld().isClient && (this.isSubmergedIn(FluidTags.LAVA) || this.isSubmergedIn(FluidTags.WATER))) { + this.discard(); + } + } + @Override protected void onBlockHit(BlockHitResult blockHitResult) { super.onBlockHit(blockHitResult); @@ -140,8 +156,21 @@ protected void onBlockHit(BlockHitResult blockHitResult) { world.spawnEntity(tnt); this.kill(); break; + case "torch": + world.setBlockState(this.getBlockPos(), Blocks.TORCH.getDefaultState()); + this.kill(); + break; + case "redstone torch": + world.setBlockState(this.getBlockPos(), Blocks.REDSTONE_TORCH.getDefaultState()); + this.kill(); + break; + case "soul torch": + world.setBlockState(this.getBlockPos(), Blocks.SOUL_TORCH.getDefaultState()); + this.kill(); + break; case "boring": - if (world.getBlockState(blockHitResult.getBlockPos()).getBlock() == Blocks.BEDROCK) { + Block belowBlock = world.getBlockState(blockHitResult.getBlockPos()).getBlock(); + if (belowBlock == Blocks.BEDROCK || belowBlock == Blocks.LAVA || belowBlock == Blocks.WATER) { this.kill(); } else { TntEntity boringTnt = new TntEntity(EntityType.TNT, world); diff --git a/src/main/java/net/pythonbear/tead/init/TeadItemGroups.java b/src/main/java/net/pythonbear/tead/init/TeadItemGroups.java index 6da89b0b..37a7bc1b 100644 --- a/src/main/java/net/pythonbear/tead/init/TeadItemGroups.java +++ b/src/main/java/net/pythonbear/tead/init/TeadItemGroups.java @@ -25,6 +25,9 @@ public class TeadItemGroups { entries.add(TeadItems.DARK_BRICK); entries.add(TeadItems.AMETHYST_ARROW); + entries.add(TeadItems.TORCH_ARROW); + entries.add(TeadItems.REDSTONE_TORCH_ARROW); + entries.add(TeadItems.SOUL_TORCH_ARROW); entries.add(TeadItems.TNT_ARROW); entries.add(TeadItems.BORING_ARROW); entries.add(TeadItems.COPPER_ARROW); @@ -87,9 +90,9 @@ public class TeadItemGroups { entries.add(TeadItems.GOLD_SICKLE); entries.add(TeadItems.LEAD_SICKLE); entries.add(TeadItems.IRON_SICKLE); - entries.add(TeadItems.IRON_TEMPEST_KNIFE); entries.add(TeadItems.DIAMOND_SICKLE); entries.add(TeadItems.NETHERITE_SICKLE); + entries.add(TeadItems.IRON_TEMPEST_KNIFE); entries.add(TeadItems.GOLD_CLAYMORE); entries.add(TeadItems.LEAD_CLAYMORE); entries.add(TeadItems.IRON_CLAYMORE); diff --git a/src/main/java/net/pythonbear/tead/init/TeadItems.java b/src/main/java/net/pythonbear/tead/init/TeadItems.java index 1b2f283c..96fe5955 100644 --- a/src/main/java/net/pythonbear/tead/init/TeadItems.java +++ b/src/main/java/net/pythonbear/tead/init/TeadItems.java @@ -248,6 +248,12 @@ public class TeadItems { new RubyArrowItem(new FabricItemSettings())); public static final Item TNT_ARROW = registerItem("tnt_arrow", new TntArrowItem(new FabricItemSettings())); + public static final Item TORCH_ARROW = registerItem("torch_arrow", + new TorchArrowItem(new FabricItemSettings())); + public static final Item REDSTONE_TORCH_ARROW = registerItem("redstone_torch_arrow", + new RedstoneTorchArrowItem(new FabricItemSettings())); + public static final Item SOUL_TORCH_ARROW = registerItem("soul_torch_arrow", + new SoulTorchArrowItem(new FabricItemSettings())); public static final Item BORING_ARROW = registerItem("boring_arrow", new BoringArrowItem(new FabricItemSettings())); public static final Item MUSIC_DISC_BATTLE_HYMN = registerItem("music_disc_battle_hymn", diff --git a/src/main/java/net/pythonbear/tead/item/StaffItem.java b/src/main/java/net/pythonbear/tead/item/StaffItem.java index 9ae78962..e7b647f3 100644 --- a/src/main/java/net/pythonbear/tead/item/StaffItem.java +++ b/src/main/java/net/pythonbear/tead/item/StaffItem.java @@ -3,16 +3,20 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import net.minecraft.block.BlockState; +import net.minecraft.entity.EntityType; import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LightningEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.attribute.EntityAttribute; import net.minecraft.entity.attribute.EntityAttributeModifier; import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; import net.minecraft.item.ToolMaterial; import net.minecraft.item.Vanishable; import net.minecraft.world.World; +import net.pythonbear.tead.Tead; public class StaffItem extends SwordItem implements Vanishable { private final float knockbackStrength; @@ -39,21 +43,19 @@ public float getAttackDamage() { @Override public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { - if (target != attacker) { - World world = attacker.getWorld(); + World world = attacker.getWorld(); - world.getEntitiesByClass(LivingEntity.class, target.getBoundingBox().expand(this.knockbackRadius), - (livingEntity) -> true) - .forEach((entity) -> { - if (entity != attacker) { - entity.takeKnockback(this.knockbackStrength, -(entity.getX() - attacker.getX()), - -(entity.getZ() - attacker.getZ())); - if (entity != target) { - entity.animateDamage(attacker.getYaw()); - } + world.getEntitiesByClass(LivingEntity.class, target.getBoundingBox().expand(this.knockbackRadius), + (livingEntity) -> true) + .forEach((entity) -> { + if (entity != attacker) { + entity.takeKnockback(this.knockbackStrength, -(entity.getX() - attacker.getX()), + -(entity.getZ() - attacker.getZ())); + if (entity != target) { + entity.animateDamage(attacker.getYaw()); } - }); - } + } + }); return super.postHit(stack, target, attacker); } diff --git a/src/main/java/net/pythonbear/tead/item/TeadFoodComponents.java b/src/main/java/net/pythonbear/tead/item/TeadFoodComponents.java index b597e1e9..58b952ab 100644 --- a/src/main/java/net/pythonbear/tead/item/TeadFoodComponents.java +++ b/src/main/java/net/pythonbear/tead/item/TeadFoodComponents.java @@ -11,6 +11,6 @@ public class TeadFoodComponents { .statusEffect(new StatusEffectInstance(StatusEffects.RESISTANCE, 800, 2), 1) .statusEffect(new StatusEffectInstance(StatusEffects.NAUSEA, 679, 1), 1).build(); - public static final FoodComponent JERKY = new FoodComponent.Builder().alwaysEdible().hunger(4) - .saturationModifier(5).build(); + public static final FoodComponent JERKY = new FoodComponent.Builder().alwaysEdible().hunger(3) + .saturationModifier(1.8f).snack().build(); } diff --git a/src/main/java/net/pythonbear/tead/item/TrickBowItem.java b/src/main/java/net/pythonbear/tead/item/TrickBowItem.java index dcd8fd00..760cdc9c 100644 --- a/src/main/java/net/pythonbear/tead/item/TrickBowItem.java +++ b/src/main/java/net/pythonbear/tead/item/TrickBowItem.java @@ -15,6 +15,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; +import net.pythonbear.tead.Tead; import net.pythonbear.tead.init.TeadItems; import net.pythonbear.tead.item.arrow.*; @@ -29,6 +30,9 @@ public class TrickBowItem extends BowItem implements Vanishable { stack.getItem() == TeadItems.OBSIDIAN_ARROW || stack.getItem() == TeadItems.RUBY_ARROW || stack.getItem() == TeadItems.BORING_ARROW || + stack.getItem() == TeadItems.TORCH_ARROW || + stack.getItem() == TeadItems.REDSTONE_TORCH_ARROW || + stack.getItem() == TeadItems.SOUL_TORCH_ARROW || stack.getItem() == TeadItems.TNT_ARROW; public TrickBowItem(Settings settings) { super(settings); @@ -85,10 +89,7 @@ public void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int Item item = itemStack.getItem(); PersistentProjectileEntity persistentProjectileEntity; - if (item instanceof ArrowItem) { - ArrowItem arrowItem = (ArrowItem)(itemStack.getItem()); - persistentProjectileEntity = arrowItem.createArrow(world, itemStack, playerEntity); - } else if (item instanceof AmethystArrowItem) { + if (item instanceof AmethystArrowItem) { AmethystArrowItem arrowItem = (AmethystArrowItem)(itemStack.getItem()); persistentProjectileEntity = arrowItem.createArrow(world, itemStack, playerEntity); } else if (item instanceof CopperArrowItem) { @@ -106,6 +107,19 @@ public void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int } else if (item instanceof TntArrowItem) { TntArrowItem arrowItem = (TntArrowItem)(itemStack.getItem()); persistentProjectileEntity = arrowItem.createArrow(world, itemStack, playerEntity); + } else if (item instanceof TorchArrowItem) { + TorchArrowItem arrowItem = (TorchArrowItem)(itemStack.getItem()); + persistentProjectileEntity = arrowItem.createArrow(world, itemStack, playerEntity); + persistentProjectileEntity.setOnFireFor(100); + Tead.LOGGER.info("returned torch"); + } else if (item instanceof RedstoneTorchArrowItem) { + RedstoneTorchArrowItem arrowItem = (RedstoneTorchArrowItem)(itemStack.getItem()); + persistentProjectileEntity = arrowItem.createArrow(world, itemStack, playerEntity); + persistentProjectileEntity.setOnFireFor(100); + } else if (item instanceof SoulTorchArrowItem) { + SoulTorchArrowItem arrowItem = (SoulTorchArrowItem)(itemStack.getItem()); + persistentProjectileEntity = arrowItem.createArrow(world, itemStack, playerEntity); + persistentProjectileEntity.setOnFireFor(100); } else if (item instanceof BoringArrowItem) { BoringArrowItem arrowItem = (BoringArrowItem)(itemStack.getItem()); persistentProjectileEntity = arrowItem.createArrow(world, itemStack, playerEntity); diff --git a/src/main/java/net/pythonbear/tead/item/arrow/RedstoneTorchArrowItem.java b/src/main/java/net/pythonbear/tead/item/arrow/RedstoneTorchArrowItem.java new file mode 100644 index 00000000..41dfb5ed --- /dev/null +++ b/src/main/java/net/pythonbear/tead/item/arrow/RedstoneTorchArrowItem.java @@ -0,0 +1,21 @@ +package net.pythonbear.tead.item.arrow; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.PersistentProjectileEntity; +import net.minecraft.item.ArrowItem; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.pythonbear.tead.entity.CustomizedArrowEntity; + +public class RedstoneTorchArrowItem extends ArrowItem { + public RedstoneTorchArrowItem(Settings settings) { + super(settings); + } + + @Override + public PersistentProjectileEntity createArrow(World world, ItemStack stack, LivingEntity shooter) { + CustomizedArrowEntity arrowEntity = new CustomizedArrowEntity(world, shooter); + arrowEntity.initFromStack(stack); + return arrowEntity; + } +} diff --git a/src/main/java/net/pythonbear/tead/item/arrow/SoulTorchArrowItem.java b/src/main/java/net/pythonbear/tead/item/arrow/SoulTorchArrowItem.java new file mode 100644 index 00000000..bf29d448 --- /dev/null +++ b/src/main/java/net/pythonbear/tead/item/arrow/SoulTorchArrowItem.java @@ -0,0 +1,21 @@ +package net.pythonbear.tead.item.arrow; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.PersistentProjectileEntity; +import net.minecraft.item.ArrowItem; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.pythonbear.tead.entity.CustomizedArrowEntity; + +public class SoulTorchArrowItem extends ArrowItem { + public SoulTorchArrowItem(Settings settings) { + super(settings); + } + + @Override + public PersistentProjectileEntity createArrow(World world, ItemStack stack, LivingEntity shooter) { + CustomizedArrowEntity arrowEntity = new CustomizedArrowEntity(world, shooter); + arrowEntity.initFromStack(stack); + return arrowEntity; + } +} diff --git a/src/main/java/net/pythonbear/tead/item/arrow/TorchArrowItem.java b/src/main/java/net/pythonbear/tead/item/arrow/TorchArrowItem.java new file mode 100644 index 00000000..06f94751 --- /dev/null +++ b/src/main/java/net/pythonbear/tead/item/arrow/TorchArrowItem.java @@ -0,0 +1,21 @@ +package net.pythonbear.tead.item.arrow; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.PersistentProjectileEntity; +import net.minecraft.item.ArrowItem; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.pythonbear.tead.entity.CustomizedArrowEntity; + +public class TorchArrowItem extends ArrowItem { + public TorchArrowItem(Settings settings) { + super(settings); + } + + @Override + public PersistentProjectileEntity createArrow(World world, ItemStack stack, LivingEntity shooter) { + CustomizedArrowEntity arrowEntity = new CustomizedArrowEntity(world, shooter); + arrowEntity.initFromStack(stack); + return arrowEntity; + } +} diff --git a/src/main/java/net/pythonbear/tead/world/TeadConfiguredFeatures.java b/src/main/java/net/pythonbear/tead/world/TeadConfiguredFeatures.java index 2d71fd5a..868083f0 100644 --- a/src/main/java/net/pythonbear/tead/world/TeadConfiguredFeatures.java +++ b/src/main/java/net/pythonbear/tead/world/TeadConfiguredFeatures.java @@ -33,9 +33,9 @@ public static void bootstrap(Registerable> context) { List overworldLeadOres = List.of(OreFeatureConfig.createTarget(stoneReplacables, TeadBlocks.LEAD_ORE.getDefaultState())); - register(context, RUBY_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldRubyOres, 5)); - register(context, DEEPSLATE_RUBY_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldDeepslateRubyOres, 6)); - register(context, LEAD_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldLeadOres, 20)); + register(context, RUBY_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldRubyOres, 4)); + register(context, DEEPSLATE_RUBY_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldDeepslateRubyOres, 5)); + register(context, LEAD_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldLeadOres, 10)); } public static RegistryKey> registerKey(String name) { diff --git a/src/main/java/net/pythonbear/tead/world/TeadPlacedFeatures.java b/src/main/java/net/pythonbear/tead/world/TeadPlacedFeatures.java index c20492dd..a86a4f02 100644 --- a/src/main/java/net/pythonbear/tead/world/TeadPlacedFeatures.java +++ b/src/main/java/net/pythonbear/tead/world/TeadPlacedFeatures.java @@ -33,7 +33,7 @@ public static void bootstrap(Registerable context) { HeightRangePlacementModifier.uniform(YOffset.fixed(-64), YOffset.fixed(0)))); register(context, LEAD_ORE_PLACED_KEY, configureFeatureRegistryEntryLookup.getOrThrow(TeadConfiguredFeatures.LEAD_ORE_KEY), - TeadOrePlacement.modifiersWithCount(8, // veins per chunk + TeadOrePlacement.modifiersWithCount(6, // veins per chunk HeightRangePlacementModifier.uniform(YOffset.fixed(0), YOffset.fixed(64)))); } diff --git a/src/main/resources/assets/minecraft/textures/item/diamond_helmet.png b/src/main/resources/assets/minecraft/textures/item/diamond_helmet.png new file mode 100644 index 00000000..517887c3 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/item/diamond_helmet.png differ diff --git a/src/main/resources/assets/minecraft/textures/item/golden_helmet.png b/src/main/resources/assets/minecraft/textures/item/golden_helmet.png new file mode 100644 index 00000000..bd5178a9 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/item/golden_helmet.png differ diff --git a/src/main/resources/assets/minecraft/textures/item/iron_helmet.png b/src/main/resources/assets/minecraft/textures/item/iron_helmet.png new file mode 100644 index 00000000..a7295274 Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/item/iron_helmet.png differ diff --git a/src/main/resources/assets/tead/icon.png b/src/main/resources/assets/tead/icon.png index b64f42d3..842ca717 100644 Binary files a/src/main/resources/assets/tead/icon.png and b/src/main/resources/assets/tead/icon.png differ diff --git a/src/main/resources/assets/tead/lang/en_us.json b/src/main/resources/assets/tead/lang/en_us.json index 392c02e5..ec5626de 100644 --- a/src/main/resources/assets/tead/lang/en_us.json +++ b/src/main/resources/assets/tead/lang/en_us.json @@ -15,6 +15,9 @@ "item.tead.dark_brick": "Dark Brick", "item.tead.amethyst_arrow": "Amethyst Arrow", + "item.tead.torch_arrow": "Torch Arrow", + "item.tead.redstone_torch_arrow": "Redstone Torch Arrow", + "item.tead.soul_torch_arrow": "Soul Torch Arrow", "item.tead.tnt_arrow": "Explosive Arrow", "item.tead.copper_arrow": "Lightning Arrow", "item.tead.obsidian_arrow": "Obsidian Arrow", diff --git a/src/main/resources/assets/tead/models/item/battle_staff.json b/src/main/resources/assets/tead/models/item/battle_staff.json new file mode 100644 index 00000000..8a54256b --- /dev/null +++ b/src/main/resources/assets/tead/models/item/battle_staff.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "tead:item/battle_staff" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -20, 90, 60 ], + "translation": [ 0, -1.5, 2 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "thirdperson_lefthand": { + "rotation": [ -20, -90, -60 ], + "translation": [ 0, -1.5, 2 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "firstperson_righthand": { + "rotation": [ 50, -90, 80 ], + "translation": [ 1, -3, -1 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "firstperson_lefthand": { + "rotation": [ -50, -90, -80 ], + "translation": [ 1, -3, -1 ], + "scale": [ 1.5, 1.5, 1 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tead/models/item/lightning_staff.json b/src/main/resources/assets/tead/models/item/lightning_staff.json new file mode 100644 index 00000000..c3817778 --- /dev/null +++ b/src/main/resources/assets/tead/models/item/lightning_staff.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "tead:item/lightning_staff" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -20, 90, 60 ], + "translation": [ 0, -0.5, 2 ], + "scale": [ 1.2, 1.2, 1 ] + }, + "thirdperson_lefthand": { + "rotation": [ -20, -90, -60 ], + "translation": [ 0, -0.5, 2 ], + "scale": [ 1.2, 1.2, 1 ] + }, + "firstperson_righthand": { + "rotation": [ 50, -90, 80 ], + "translation": [ 1, -2, -1 ], + "scale": [ 1.1, 1.1, 1 ] + }, + "firstperson_lefthand": { + "rotation": [ -50, -90, -80 ], + "translation": [ 1, -2, -1 ], + "scale": [ 1.1, 1.1, 1 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tead/models/item/quarterstaff.json b/src/main/resources/assets/tead/models/item/quarterstaff.json new file mode 100644 index 00000000..9ddef83d --- /dev/null +++ b/src/main/resources/assets/tead/models/item/quarterstaff.json @@ -0,0 +1,28 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "tead:item/quarterstaff" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ -20, 90, 60 ], + "translation": [ 0, -1.5, 2 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "thirdperson_lefthand": { + "rotation": [ -20, -90, -60 ], + "translation": [ 0, -1.5, 2 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "firstperson_righthand": { + "rotation": [ 50, -90, 80 ], + "translation": [ 1, -3, -1 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "firstperson_lefthand": { + "rotation": [ -50, -90, -80 ], + "translation": [ 1, -3, -1 ], + "scale": [ 1.5, 1.5, 1 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tead/textures/item/copper_arrow.png b/src/main/resources/assets/tead/textures/item/copper_arrow.png index 8efeef0d..baa8f508 100644 Binary files a/src/main/resources/assets/tead/textures/item/copper_arrow.png and b/src/main/resources/assets/tead/textures/item/copper_arrow.png differ diff --git a/src/main/resources/assets/tead/textures/item/diamond_double_axe.png b/src/main/resources/assets/tead/textures/item/diamond_double_axe.png index 8932ab39..0ea01ef7 100644 Binary files a/src/main/resources/assets/tead/textures/item/diamond_double_axe.png and b/src/main/resources/assets/tead/textures/item/diamond_double_axe.png differ diff --git a/src/main/resources/assets/tead/textures/item/gold_double_axe.png b/src/main/resources/assets/tead/textures/item/gold_double_axe.png index d391c80e..53b6d8b4 100644 Binary files a/src/main/resources/assets/tead/textures/item/gold_double_axe.png and b/src/main/resources/assets/tead/textures/item/gold_double_axe.png differ diff --git a/src/main/resources/assets/tead/textures/item/iron_double_axe.png b/src/main/resources/assets/tead/textures/item/iron_double_axe.png index 8cea6bba..d44df5e0 100644 Binary files a/src/main/resources/assets/tead/textures/item/iron_double_axe.png and b/src/main/resources/assets/tead/textures/item/iron_double_axe.png differ diff --git a/src/main/resources/assets/tead/textures/item/lead_axe.png b/src/main/resources/assets/tead/textures/item/lead_axe.png index 9885e65f..c7eb8f1f 100644 Binary files a/src/main/resources/assets/tead/textures/item/lead_axe.png and b/src/main/resources/assets/tead/textures/item/lead_axe.png differ diff --git a/src/main/resources/assets/tead/textures/item/lead_double_axe.png b/src/main/resources/assets/tead/textures/item/lead_double_axe.png index ca88af2a..3e88f579 100644 Binary files a/src/main/resources/assets/tead/textures/item/lead_double_axe.png and b/src/main/resources/assets/tead/textures/item/lead_double_axe.png differ diff --git a/src/main/resources/assets/tead/textures/item/lead_pickaxe.png b/src/main/resources/assets/tead/textures/item/lead_pickaxe.png index 66982b6b..acbe5ec4 100644 Binary files a/src/main/resources/assets/tead/textures/item/lead_pickaxe.png and b/src/main/resources/assets/tead/textures/item/lead_pickaxe.png differ diff --git a/src/main/resources/assets/tead/textures/item/lead_sword.png b/src/main/resources/assets/tead/textures/item/lead_sword.png index 66fb215a..f3320de4 100644 Binary files a/src/main/resources/assets/tead/textures/item/lead_sword.png and b/src/main/resources/assets/tead/textures/item/lead_sword.png differ diff --git a/src/main/resources/assets/tead/textures/item/netherite_double_axe.png b/src/main/resources/assets/tead/textures/item/netherite_double_axe.png index 7cc7e97d..05aed2f0 100644 Binary files a/src/main/resources/assets/tead/textures/item/netherite_double_axe.png and b/src/main/resources/assets/tead/textures/item/netherite_double_axe.png differ diff --git a/src/main/resources/assets/tead/textures/item/netherite_hammer_3d.png b/src/main/resources/assets/tead/textures/item/netherite_hammer_3d.png index fbe04712..4bc3c424 100644 Binary files a/src/main/resources/assets/tead/textures/item/netherite_hammer_3d.png and b/src/main/resources/assets/tead/textures/item/netherite_hammer_3d.png differ diff --git a/src/main/resources/assets/tead/textures/item/redstone_torch_arrow.png b/src/main/resources/assets/tead/textures/item/redstone_torch_arrow.png new file mode 100644 index 00000000..45f38d1a Binary files /dev/null and b/src/main/resources/assets/tead/textures/item/redstone_torch_arrow.png differ diff --git a/src/main/resources/assets/tead/textures/item/soul_torch_arrow.png b/src/main/resources/assets/tead/textures/item/soul_torch_arrow.png new file mode 100644 index 00000000..fc5c0f62 Binary files /dev/null and b/src/main/resources/assets/tead/textures/item/soul_torch_arrow.png differ diff --git a/src/main/resources/assets/tead/textures/item/torch_arrow.png b/src/main/resources/assets/tead/textures/item/torch_arrow.png new file mode 100644 index 00000000..4e88c75c Binary files /dev/null and b/src/main/resources/assets/tead/textures/item/torch_arrow.png differ diff --git a/src/main/resources/assets/tead/textures/item/wood_double_axe.png b/src/main/resources/assets/tead/textures/item/wood_double_axe.png index e50e95a2..b622d2a2 100644 Binary files a/src/main/resources/assets/tead/textures/item/wood_double_axe.png and b/src/main/resources/assets/tead/textures/item/wood_double_axe.png differ