From 5e3b362cd37271f7c17725ad9f06f0b83dec9b27 Mon Sep 17 00:00:00 2001 From: Karashok-Leo <1010177289@qq.com> Date: Wed, 21 Aug 2024 11:39:13 +0800 Subject: [PATCH] Remove mode field --- .../11add1e47030fc906af3d6ff4f9b964717e5b4a0 | 4 +- .../12b437e58e87f2b248b63e13bc980e991cb7c246 | 2 +- .../1fc8ad58f34bd25247765071e860adb9bfc5ffdf | 2 +- .../735d0050b447a8cb14d14c08d28c858e136a1127 | 2 +- .../be8eabc67a24fcccc02735e8b0fa062555804640 | 176 +++++++++--------- .../fa358172b1b8e7b2111f523d9e9f4f3061e530c6 | 2 +- .../enchantment_infusion/lang/zh_cn.json | 6 +- .../recipes/aqua_affinity/1.json | 7 +- .../recipes/bane_of_arthropods/1.json | 7 +- .../recipes/bane_of_arthropods/2.json | 7 +- .../recipes/bane_of_arthropods/3.json | 7 +- .../recipes/bane_of_arthropods/4.json | 7 +- .../recipes/bane_of_arthropods/5.json | 7 +- .../recipes/blast_protection/1.json | 7 +- .../recipes/blast_protection/2.json | 7 +- .../recipes/blast_protection/3.json | 7 +- .../recipes/blast_protection/4.json | 7 +- .../recipes/depth_strider/1.json | 7 +- .../recipes/depth_strider/2.json | 7 +- .../recipes/depth_strider/3.json | 7 +- .../recipes/efficiency/1.json | 7 +- .../recipes/efficiency/2.json | 7 +- .../recipes/efficiency/3.json | 7 +- .../recipes/efficiency/4.json | 7 +- .../recipes/efficiency/5.json | 7 +- .../recipes/feather_falling/1.json | 7 +- .../recipes/feather_falling/2.json | 7 +- .../recipes/feather_falling/3.json | 7 +- .../recipes/feather_falling/4.json | 7 +- .../recipes/fire_aspect/1.json | 7 +- .../recipes/fire_aspect/2.json | 7 +- .../recipes/fire_protection/1.json | 7 +- .../recipes/fire_protection/2.json | 7 +- .../recipes/fire_protection/3.json | 7 +- .../recipes/fire_protection/4.json | 7 +- .../recipes/fire_protection/5.json | 7 +- .../enchantment_infusion/recipes/flame/1.json | 7 +- .../recipes/fortune/1.json | 7 +- .../recipes/fortune/2.json | 7 +- .../recipes/fortune/3.json | 7 +- .../recipes/infinity/1.json | 7 +- .../recipes/knockback/1.json | 7 +- .../recipes/knockback/2.json | 7 +- .../recipes/looting/1.json | 7 +- .../recipes/looting/2.json | 7 +- .../recipes/looting/3.json | 7 +- .../recipes/multishot/1.json | 7 +- .../recipes/piercing/1.json | 7 +- .../recipes/piercing/2.json | 7 +- .../recipes/piercing/3.json | 7 +- .../recipes/piercing/4.json | 7 +- .../enchantment_infusion/recipes/power/1.json | 7 +- .../enchantment_infusion/recipes/power/2.json | 7 +- .../enchantment_infusion/recipes/power/3.json | 7 +- .../enchantment_infusion/recipes/power/4.json | 7 +- .../enchantment_infusion/recipes/power/5.json | 7 +- .../recipes/projectile_protection/1.json | 7 +- .../recipes/projectile_protection/2.json | 7 +- .../recipes/projectile_protection/3.json | 7 +- .../recipes/projectile_protection/4.json | 7 +- .../recipes/projectile_protection/5.json | 7 +- .../recipes/protection/1.json | 7 +- .../recipes/protection/2.json | 7 +- .../recipes/protection/3.json | 7 +- .../recipes/protection/4.json | 7 +- .../recipes/protection/5.json | 7 +- .../enchantment_infusion/recipes/punch/1.json | 7 +- .../enchantment_infusion/recipes/punch/2.json | 7 +- .../recipes/quick_charge/1.json | 7 +- .../recipes/quick_charge/2.json | 7 +- .../recipes/quick_charge/3.json | 7 +- .../recipes/respiration/1.json | 7 +- .../recipes/respiration/2.json | 7 +- .../recipes/respiration/3.json | 7 +- .../recipes/sharpness/1.json | 7 +- .../recipes/sharpness/2.json | 7 +- .../recipes/sharpness/3.json | 7 +- .../recipes/sharpness/4.json | 7 +- .../recipes/sharpness/5.json | 7 +- .../recipes/silk_touch/1.json | 7 +- .../enchantment_infusion/recipes/smite/1.json | 7 +- .../enchantment_infusion/recipes/smite/2.json | 7 +- .../enchantment_infusion/recipes/smite/3.json | 7 +- .../enchantment_infusion/recipes/smite/4.json | 7 +- .../enchantment_infusion/recipes/smite/5.json | 7 +- .../recipes/sweeping/1.json | 7 +- .../recipes/sweeping/2.json | 7 +- .../recipes/sweeping/3.json | 7 +- .../recipes/thorns/1.json | 7 +- .../recipes/thorns/2.json | 7 +- .../recipes/thorns/3.json | 7 +- .../recipes/unbreaking/1.json | 7 +- .../recipes/unbreaking/2.json | 7 +- .../recipes/unbreaking/3.json | 7 +- .../api/util/EIRecipeUtil.java | 16 +- .../EnchantmentInfusionRecipeBuilder.java | 11 +- .../recipe/EnchantmentInfusionRecipe.java | 41 ++-- .../EnchantmentInfusionRecipeSerializer.java | 7 +- 98 files changed, 565 insertions(+), 313 deletions(-) diff --git a/src/main/generated/.cache/11add1e47030fc906af3d6ff4f9b964717e5b4a0 b/src/main/generated/.cache/11add1e47030fc906af3d6ff4f9b964717e5b4a0 index 8c1f78b..27acbf4 100644 --- a/src/main/generated/.cache/11add1e47030fc906af3d6ff4f9b964717e5b4a0 +++ b/src/main/generated/.cache/11add1e47030fc906af3d6ff4f9b964717e5b4a0 @@ -1,2 +1,2 @@ -// 1.20.1 2024-06-25T10:17:48.717696 Enchantment Infusion/Language (zh_cn) -1eb7afbab25b811d416f5f60f2772e98d328da4b assets\enchantment_infusion\lang\zh_cn.json +// 1.20.1 2024-08-21T10:12:32.5784566 Enchantment Infusion/Language (zh_cn) +fed4247e8fa690eaedb42d0514f4d0f19096405c assets\enchantment_infusion\lang\zh_cn.json diff --git a/src/main/generated/.cache/12b437e58e87f2b248b63e13bc980e991cb7c246 b/src/main/generated/.cache/12b437e58e87f2b248b63e13bc980e991cb7c246 index ed82312..8dbe2ad 100644 --- a/src/main/generated/.cache/12b437e58e87f2b248b63e13bc980e991cb7c246 +++ b/src/main/generated/.cache/12b437e58e87f2b248b63e13bc980e991cb7c246 @@ -1,2 +1,2 @@ -// 1.20.1 2024-06-25T10:17:48.7186967 Enchantment Infusion/Tags for minecraft:block +// 1.20.1 2024-08-21T10:12:32.5794921 Enchantment Infusion/Tags for minecraft:block 12a51f4322ba8350383ce00b0425065478f42ff1 data\minecraft\tags\blocks\mineable\pickaxe.json diff --git a/src/main/generated/.cache/1fc8ad58f34bd25247765071e860adb9bfc5ffdf b/src/main/generated/.cache/1fc8ad58f34bd25247765071e860adb9bfc5ffdf index 753daf8..8d79ae3 100644 --- a/src/main/generated/.cache/1fc8ad58f34bd25247765071e860adb9bfc5ffdf +++ b/src/main/generated/.cache/1fc8ad58f34bd25247765071e860adb9bfc5ffdf @@ -1,4 +1,4 @@ -// 1.20.1 2024-06-25T10:17:48.7196957 Enchantment Infusion/Model Definitions +// 1.20.1 2024-08-21T10:12:32.5827626 Enchantment Infusion/Model Definitions 5fec1532f9a65bd278dc82648bd79670f162b133 assets\enchantment_infusion\blockstates\enchantment_infusion_pedestal.json 1f2db326d97c4598cd90da9a1694ef3486e842e5 assets\enchantment_infusion\models\item\enchantment_infusion_pedestal.json 9619c82d10cf25fcff77742605ba9c3da1624ffc assets\enchantment_infusion\blockstates\enchantment_infusion_table.json diff --git a/src/main/generated/.cache/735d0050b447a8cb14d14c08d28c858e136a1127 b/src/main/generated/.cache/735d0050b447a8cb14d14c08d28c858e136a1127 index d0eb767..fbca78f 100644 --- a/src/main/generated/.cache/735d0050b447a8cb14d14c08d28c858e136a1127 +++ b/src/main/generated/.cache/735d0050b447a8cb14d14c08d28c858e136a1127 @@ -1,3 +1,3 @@ -// 1.20.1 2024-06-25T10:17:48.7146902 Enchantment Infusion/Block Loot Tables +// 1.20.1 2024-08-21T10:12:32.572411 Enchantment Infusion/Block Loot Tables 4214d599d9298e93f254d0ee5a247172ccc22eb7 data\enchantment_infusion\loot_tables\blocks\enchantment_infusion_pedestal.json 47d850556b7bdd6508f181218baa08d487c7b466 data\enchantment_infusion\loot_tables\blocks\enchantment_infusion_table.json diff --git a/src/main/generated/.cache/be8eabc67a24fcccc02735e8b0fa062555804640 b/src/main/generated/.cache/be8eabc67a24fcccc02735e8b0fa062555804640 index 8cbec59..ae7f92d 100644 --- a/src/main/generated/.cache/be8eabc67a24fcccc02735e8b0fa062555804640 +++ b/src/main/generated/.cache/be8eabc67a24fcccc02735e8b0fa062555804640 @@ -1,92 +1,92 @@ -// 1.20.1 2024-06-25T10:17:48.7156964 Enchantment Infusion/Recipes -c5a2a2a1fff0aecd2cd91c330e89824d98f851c7 data\enchantment_infusion\recipes\multishot\1.json -5688244ccfc1ac9d12284c77dde9301635332bc9 data\enchantment_infusion\recipes\depth_strider\2.json -33813f1a8f15407672f6fe0f2a523acb80a56271 data\enchantment_infusion\recipes\piercing\4.json -430e5a0cc3bd91105ec7805e1dd98e5e42c2d85f data\enchantment_infusion\recipes\sharpness\4.json -93282e5d73ec59394f328a398cff6e876ae0be3a data\enchantment_infusion\recipes\looting\3.json -59ea0c40ddc0750600074dbc61ecccc61bdebfb6 data\enchantment_infusion\recipes\quick_charge\2.json -ff8ffe984a1f091bee5ae9c340fbcff939baf627 data\enchantment_infusion\recipes\bane_of_arthropods\4.json -4046e83f344ac5e2f9f940dc198be61f237be4b5 data\enchantment_infusion\recipes\projectile_protection\1.json -2ed91a57d204a2a7f7cfb23a8348d4fef4edaeea data\enchantment_infusion\recipes\fortune\3.json -401a180402e7257f8b4558854775e99811235848 data\enchantment_infusion\recipes\protection\4.json -7f778b2cacdbf9a63c04117c9068b7b08b79aaba data\enchantment_infusion\recipes\fire_protection\4.json -fa4aab2699ab26d26542a67cb0c5df29ba2bc2be data\enchantment_infusion\recipes\smite\1.json -43d7623b9fc8e3a75686776e4cd46a2a5ed6541f data\enchantment_infusion\recipes\efficiency\5.json -2477d91cb6943a7ba024447271564284665a6b68 data\enchantment_infusion\recipes\flame\1.json -2d61e6ea44583a43628be95c9bd96b96adc0fefa data\enchantment_infusion\recipes\power\2.json -1f75ae2d0280115baa62431f9b80f18bc8e1692c data\enchantment_infusion\recipes\bane_of_arthropods\5.json -9369eef6635c0acc09f4e2c1cfad4a12399d1b5f data\enchantment_infusion\recipes\sharpness\3.json -80e55b6d07812cf1abd46be30ef82e6ebdac4ce0 data\enchantment_infusion\recipes\smite\5.json -140c9db96595feadd0b00f65e45407b6980e12f1 data\enchantment_infusion\recipes\depth_strider\3.json -55b5081b09e85395b7d31d693866dd7b7edb4be2 data\enchantment_infusion\recipes\blast_protection\1.json -7c95051e7a4fc8e9b56edbb2015f34d6b9b6164d data\enchantment_infusion\recipes\piercing\3.json -792f021d1b2ece5a9de509fce91b0abef573a3f5 data\enchantment_infusion\recipes\protection\5.json -0afaf88ec47d61cb8aa91071392d11530ff04ccb data\enchantment_infusion\recipes\quick_charge\1.json +// 1.20.1 2024-08-21T10:12:32.5744196 Enchantment Infusion/Recipes +eef5f2561c2ffe504ec07d322c3771f7afd3dc6c data\enchantment_infusion\recipes\multishot\1.json +bb9c1a50860f94570d2c3ac685adb546489e2c64 data\enchantment_infusion\recipes\depth_strider\2.json +99962b027ea8bacedea5e851bc6a534888b51882 data\enchantment_infusion\recipes\piercing\4.json +b549e7a56b8bc9c59de37ac0d31495ef13080ae9 data\enchantment_infusion\recipes\sharpness\4.json +1e71e36f861fa7cc8cc6b914ce5c12bc0bca103c data\enchantment_infusion\recipes\looting\3.json +2a3bceab448b885b71bb94f9facd2732df45f959 data\enchantment_infusion\recipes\quick_charge\2.json +92eaacdbb269dc7e74aead6172610087569fab11 data\enchantment_infusion\recipes\bane_of_arthropods\4.json +1132c135e37aeca83525d0a8b36f5d79c1e6e890 data\enchantment_infusion\recipes\projectile_protection\1.json +bedcdb1e10a6c5c4a766c2866b014634031d3499 data\enchantment_infusion\recipes\fortune\3.json +4e98a6c41f03b4e2d34a453c2a9954514026a9a8 data\enchantment_infusion\recipes\protection\4.json +9b31f73be6a54537cd559ec737dbae4b80d4ae20 data\enchantment_infusion\recipes\fire_protection\4.json +32cea7b7fc24018dde9e3417b06c529a45426024 data\enchantment_infusion\recipes\smite\1.json +92814c5a36ecb9a686f6e57411f499731981b63d data\enchantment_infusion\recipes\efficiency\5.json +250f624e9a8feb19249085fb2edb03dedfd0785d data\enchantment_infusion\recipes\flame\1.json +6f232ed1fddcfb9ba0c7421aabb01643f1b4fe77 data\enchantment_infusion\recipes\power\2.json +def0506027ca91f4faec3ebf6036b62193b867ef data\enchantment_infusion\recipes\bane_of_arthropods\5.json +59f738865b452167a0acf57d65ee08147a6795d6 data\enchantment_infusion\recipes\sharpness\3.json +e16aad64046095ca0bc4c7b1a8902fc3ece05720 data\enchantment_infusion\recipes\smite\5.json +19ca83e5ce41feb632b009100d259abb0df6e8f5 data\enchantment_infusion\recipes\depth_strider\3.json +f9f6e7cc3e97c2199ee0a5b44531a4d3b46a0eae data\enchantment_infusion\recipes\blast_protection\1.json +2cd2682e68484f9d00d9f90ac3dd8aec007f8a00 data\enchantment_infusion\recipes\piercing\3.json +59905a022307ab38b34bf1d55598b787208e7167 data\enchantment_infusion\recipes\protection\5.json +d052affb5007dd1c45aca836d7e0153ce64b6806 data\enchantment_infusion\recipes\quick_charge\1.json 9a0328a46ff3996079274bb22474ce4d3e74b649 data\enchantment_infusion\recipes\enchantment_infusion_table.json -fca6f33481eebea1d51927b23e8b1e72f0348b1f data\enchantment_infusion\recipes\fortune\2.json -a4db2b2ebef1b2ec7bf87a2b1402ca60366f7ec7 data\enchantment_infusion\recipes\fire_protection\3.json -281017293fee8ced265ce58bb4d631633f8fe233 data\enchantment_infusion\recipes\projectile_protection\5.json -19f79aa9c33e70ea2ca09747c29f14c3c7b0fd66 data\enchantment_infusion\recipes\power\1.json -0a0b91ea28bb506f0f4d16118b89429d32812c0e data\enchantment_infusion\recipes\smite\2.json +31c80c336b4073b198f216e0c0662ed6e4c2f816 data\enchantment_infusion\recipes\fortune\2.json +ee85653e1b209f48283f36f50d412640f1746bc4 data\enchantment_infusion\recipes\fire_protection\3.json +6251bcb2d85b71bde34ebc05f07af2181d21a92b data\enchantment_infusion\recipes\projectile_protection\5.json +1196edd71d82f63c9302f7fc10632d9ff4c30d7a data\enchantment_infusion\recipes\power\1.json +018123a34e526f9892e444536eec47b45621ca11 data\enchantment_infusion\recipes\smite\2.json 895e3a0959990dcaf4912b217130132df3b3d9d7 data\enchantment_infusion\advancements\recipes\decorations\enchantment_infusion_pedestal.json -f741dca51271642855a239f180654c889a0e195b data\enchantment_infusion\recipes\power\4.json -d04a4513f2d9b5d9cb6cf1bde30e7fc0e39a9b78 data\enchantment_infusion\recipes\punch\2.json -3acda55e2f1b8c4bed881524e9a218af9f186878 data\enchantment_infusion\recipes\respiration\1.json +f1169f894cbfcdea4b4f0938431c78d7994fe88b data\enchantment_infusion\recipes\power\4.json +d20c849175a693d4d820180ad7a443417f76aa79 data\enchantment_infusion\recipes\punch\2.json +6af2b654401a6249b63182b5c770ff97a54d212d data\enchantment_infusion\recipes\respiration\1.json 1e4b06b15ff32a7f22d2b61bed08d544702a39cf data\enchantment_infusion\recipes\enchantment_infusion_pedestal.json -01c7f2c4f01c65f6c8b842543facc87c4fe6a234 data\enchantment_infusion\recipes\smite\4.json -f1ebe2bf2f624c5f95af36fcb50f2c54a61f8a17 data\enchantment_infusion\recipes\protection\3.json -c3f21dcffc5aed3464db228002b1ec33d5432aaf data\enchantment_infusion\recipes\thorns\1.json -ae14a5644542b9808c760c470c917aa5c8f171e7 data\enchantment_infusion\recipes\feather_falling\3.json -422b9f4402596f2c9e9969b76536758ce717f50a data\enchantment_infusion\recipes\sweeping\2.json -68fd85b7b360fa7a0103e04d93bc1471f6ebcacf data\enchantment_infusion\recipes\fire_protection\1.json -c12027a399c1279768b4a605cb60bb2cc49196bf data\enchantment_infusion\recipes\depth_strider\1.json -ccc21aeedf917c45a8a9c0863c392a60586d478c data\enchantment_infusion\recipes\efficiency\4.json -229df5c59a6003df20ad0b8094923a762ac4ef45 data\enchantment_infusion\recipes\efficiency\1.json -9bc5115ad7c88b79f68b4b402d27373ba08b584b data\enchantment_infusion\recipes\aqua_affinity\1.json -20c13deb358078de71607ed3b9d6aae302fe21fa data\enchantment_infusion\recipes\bane_of_arthropods\3.json -b98b9f6a65aeb9b450a41259f2fe07e11627e04a data\enchantment_infusion\recipes\blast_protection\3.json -73d14f8066c15fe95715462d8e802f45a42edf83 data\enchantment_infusion\recipes\knockback\2.json -78d61decd28014ce489d4f229daf3a5e321055d5 data\enchantment_infusion\recipes\projectile_protection\2.json -d4dfe935da20d9ca3ae2e5cc7cfaac58903df3b9 data\enchantment_infusion\recipes\unbreaking\1.json -92c58ce11f0f2d932ae0348f2da4f7aa4f0caba8 data\enchantment_infusion\recipes\piercing\1.json -e5a643b27d8d3c57bb765d008426ea05b308c3fd data\enchantment_infusion\recipes\sharpness\1.json -f3bcf599b5391af02ff6fd4c6d157ced7bf840f3 data\enchantment_infusion\recipes\projectile_protection\4.json -b5e1557086ce89a90e00c4ea874c2f819bf7dc6b data\enchantment_infusion\recipes\sweeping\3.json -55689b7a08ec6abe1a5fa9f4dfe55460c35667ec data\enchantment_infusion\recipes\silk_touch\1.json -b935e6be460708563827a504b01f21f4d47808ab data\enchantment_infusion\recipes\thorns\2.json -aeb3bbf5a0b394168608266fb2eed519607779d3 data\enchantment_infusion\recipes\protection\1.json -33b35175743e064a4add2e01ac85fc856d41b280 data\enchantment_infusion\recipes\efficiency\3.json -93c383ecfbea697b80b6a2560d9ab72d6fd36b3a data\enchantment_infusion\recipes\fortune\1.json -ec24a9dcac15c79355bded23d13a14b4a41c682c data\enchantment_infusion\recipes\fire_aspect\1.json -e955b2a0722798772d003d0aeb9072745301150e data\enchantment_infusion\recipes\blast_protection\2.json -13c70e927d5d75247afc54e998c388e48e207453 data\enchantment_infusion\recipes\projectile_protection\3.json -ea6f2e4ff0c163f80ce309e03ba18a438e0beb98 data\enchantment_infusion\recipes\respiration\3.json -d66467be0b07bdf8bfb38454afeb6a52d27017ca data\enchantment_infusion\recipes\power\5.json -8ea087f60feffba85d65ddf215e9c932a5da5a13 data\enchantment_infusion\recipes\looting\1.json -acfc22ca2919de79db511de78e979c57961bb630 data\enchantment_infusion\recipes\unbreaking\2.json -9a43e838f9e7e40004dc46bdca43c62d9d7e3145 data\enchantment_infusion\recipes\efficiency\2.json -f6a327694fd9c0a1c57be3d0089b89b67aa78317 data\enchantment_infusion\recipes\sharpness\2.json -35709e031e378974e8cb0b549345821820319fcb data\enchantment_infusion\recipes\feather_falling\2.json -c48991ed3545e90891796240fd74d37efdb8bd7f data\enchantment_infusion\recipes\bane_of_arthropods\1.json -6b31d786b14a0c3d7625b5bf64a14235b9121158 data\enchantment_infusion\recipes\thorns\3.json -be3098ac419b8f2e46be5ff1628b984a89508d60 data\enchantment_infusion\recipes\infinity\1.json -df2a42dd99a8251db59a4e9ccd4090fba8f0847f data\enchantment_infusion\recipes\fire_aspect\2.json -a628891d2daea49d9358672b372e886793bca869 data\enchantment_infusion\recipes\knockback\1.json -e648d54f20f05073c3272c04a43415b4dd513e3f data\enchantment_infusion\recipes\protection\2.json -5db82516a7d9b3587d89262fc888e30eb219499a data\enchantment_infusion\recipes\blast_protection\4.json -371f53743175dfbb8313e8f45fd63f8fc919b3f9 data\enchantment_infusion\recipes\unbreaking\3.json -a038bd875f8f7bcad04c6df9e3c0c4e0a8559cf0 data\enchantment_infusion\recipes\sharpness\5.json -712a3bd42c90e4671adb6af1fb1b6ca3e36965a2 data\enchantment_infusion\recipes\piercing\2.json -2aaab4e5768cf9e11a9cf80e367a56415108e3a9 data\enchantment_infusion\recipes\sweeping\1.json -0cf1af0579394de85e2c06df0461d22dbac34a5f data\enchantment_infusion\recipes\feather_falling\1.json -9d85a6cc9f161bbff0e68c420bb58d1ec1f2bdc6 data\enchantment_infusion\recipes\feather_falling\4.json -cb10f456ccc808528b6b8ed8f006251b7eb6317e data\enchantment_infusion\recipes\bane_of_arthropods\2.json +e1b01c1b148128e4b4510b54fbfc124d325538c0 data\enchantment_infusion\recipes\smite\4.json +e6e3871cadeac0b44e03c2618a267ef9c1319f4d data\enchantment_infusion\recipes\protection\3.json +513e61d6e3b6c2a62e2571837ff923d68e4bb19a data\enchantment_infusion\recipes\thorns\1.json +c9902981348a8e694e91b84842af986e8368a4da data\enchantment_infusion\recipes\feather_falling\3.json +9fe79084d63b9a21ee0357eea51d2703b4fced72 data\enchantment_infusion\recipes\sweeping\2.json +4767df3de6e3aa5af2b0b439c4e3cfe36267713d data\enchantment_infusion\recipes\fire_protection\1.json +dc10856f91913487be66db84401afd552572d66c data\enchantment_infusion\recipes\depth_strider\1.json +fd86e5feb23ff2046065e19dfab3bcfe782038ca data\enchantment_infusion\recipes\efficiency\4.json +aac75e020a70dfac5acce6f9bdc6b1b92052e124 data\enchantment_infusion\recipes\efficiency\1.json +b70b9bb265d232526b4cba09913251dce454dd71 data\enchantment_infusion\recipes\aqua_affinity\1.json +1948b7bfab59377921e42ff86de70996462436dd data\enchantment_infusion\recipes\bane_of_arthropods\3.json +1e5303130622198ab36ba1de1eeba304b79deff5 data\enchantment_infusion\recipes\blast_protection\3.json +5af038219a8962ed27862156e915a5591d3f3312 data\enchantment_infusion\recipes\knockback\2.json +6ee01da60c8d351f8f611c33f4bc703b5186279f data\enchantment_infusion\recipes\projectile_protection\2.json +07d05c3b59e8fe4f60c15c45c3b4b415b1f6cdc3 data\enchantment_infusion\recipes\unbreaking\1.json +b83c1e54e5900d94e7ab84368fae7b2d84e0cb8e data\enchantment_infusion\recipes\piercing\1.json +97eb31b39ce208c57d3160abc5176b9b1a4dd36a data\enchantment_infusion\recipes\sharpness\1.json +00ddc2ec4b760445da43eae109f0d5f5f3279942 data\enchantment_infusion\recipes\projectile_protection\4.json +2a67b3ddf5bcfe9eafe73b76f02f50d72c99bb71 data\enchantment_infusion\recipes\sweeping\3.json +662d42e5a7281c6d2a091f5fc2a99a68dc2910b8 data\enchantment_infusion\recipes\silk_touch\1.json +ecbc1dfa8fb4908ad2cfa1dac32f0f118799544f data\enchantment_infusion\recipes\thorns\2.json +a4d72207bef0be6bb74698052696f524722199f6 data\enchantment_infusion\recipes\protection\1.json +9bc097c63f3b495b49c62a5e6972201dc3359541 data\enchantment_infusion\recipes\efficiency\3.json +9ca71b48bb7d1d50cd50ae67c6fcb84d62154306 data\enchantment_infusion\recipes\fortune\1.json +e28d9742c98dd77aaeee8c7004cb99c86582f848 data\enchantment_infusion\recipes\fire_aspect\1.json +a18a47cf5e78fd3c6cf361a125a0451e5497dcbd data\enchantment_infusion\recipes\blast_protection\2.json +5417ae9cd12e0642464be0db5cc7cbe2469672ff data\enchantment_infusion\recipes\projectile_protection\3.json +8bc9c3c435ccf01bf6c17db955c529aa38d9abf9 data\enchantment_infusion\recipes\respiration\3.json +0cd40893eebe3bc56821a4ef74d7ed7d13cd91ee data\enchantment_infusion\recipes\power\5.json +a0aa7a0b3f7cf2217f324d0ae84dd2abfa7eee5f data\enchantment_infusion\recipes\looting\1.json +75b50f8c22b4b20ea15a628ce2456c0e9bf61899 data\enchantment_infusion\recipes\unbreaking\2.json +a8e0ccb7e4f0fe321e9bb84e8379c23bd069f0f5 data\enchantment_infusion\recipes\efficiency\2.json +aec306436b64f7b92a8c0f6acb788b9d9e12ab3a data\enchantment_infusion\recipes\sharpness\2.json +2cc1f9e78b314aa394ec97fe5fd679f1bc0d5fc9 data\enchantment_infusion\recipes\feather_falling\2.json +597ae3336585f073b17ea472364c72ea6479dddf data\enchantment_infusion\recipes\bane_of_arthropods\1.json +e8b3b3292c1de289b41ec7b873b1a4eb9e7578a9 data\enchantment_infusion\recipes\thorns\3.json +96929682becec4ed4a0d109066a6319eed201442 data\enchantment_infusion\recipes\infinity\1.json +d2bee28f0cb1571f790fe2a3d4db8cd020157d5a data\enchantment_infusion\recipes\fire_aspect\2.json +dba76a5519708ce749e58007a8ed3bfcb4207594 data\enchantment_infusion\recipes\knockback\1.json +c22804392f6f49d05b1315b6835bbd3860bf337b data\enchantment_infusion\recipes\protection\2.json +223a5f85b7c65df6a5e0afff697b27fe326d476d data\enchantment_infusion\recipes\blast_protection\4.json +9f545f2844ba2fe4d61625dc6dd3f554d5d8b232 data\enchantment_infusion\recipes\unbreaking\3.json +76381e1fd0b730de424d66783dcf2c57e6c96499 data\enchantment_infusion\recipes\sharpness\5.json +55a1888d4752a7b55600a8a9870fe06bba0a732a data\enchantment_infusion\recipes\piercing\2.json +7134e0a59b674280b12d80f34cb6dfe876381cd1 data\enchantment_infusion\recipes\sweeping\1.json +37e6754e14fb5d1561f892bd1f81d17edc47bac1 data\enchantment_infusion\recipes\feather_falling\1.json +1d9d077a9703db8a13d595e5b06ab3e5de76a043 data\enchantment_infusion\recipes\feather_falling\4.json +bac391934ded8c31d49c3a040d4cb725288644ef data\enchantment_infusion\recipes\bane_of_arthropods\2.json ef9bb1b077e0e7dd403d9fe8369f9dec49ad2c3c data\enchantment_infusion\advancements\recipes\decorations\enchantment_infusion_table.json -fb2b50ddc8cee3b5e834928d4e84660c1439acb9 data\enchantment_infusion\recipes\fire_protection\2.json -8904089e1318d90981d2314e5c9f0f74f4bc012b data\enchantment_infusion\recipes\looting\2.json -b6b56ada4ad7fca345fa6f770380696ec6f35249 data\enchantment_infusion\recipes\quick_charge\3.json -cc04d13e05b79db6340f2a6fe0ae36d8c6175535 data\enchantment_infusion\recipes\power\3.json -8483068beb1a589739dba6d13d126b8ab2985011 data\enchantment_infusion\recipes\respiration\2.json -4d11dbe64593c12ad18534a0745a35360ca8a6a2 data\enchantment_infusion\recipes\fire_protection\5.json -5b2861abcb5cc7ed4ee22875b892ee451281fe16 data\enchantment_infusion\recipes\smite\3.json -03e0f7d23fdf096642aa50745a5c6026386d46f7 data\enchantment_infusion\recipes\punch\1.json +df34240d93dbed28d9c0a46280a7db6fa1dcab94 data\enchantment_infusion\recipes\fire_protection\2.json +6fb07d8b83e666eb5fb223af6dfc7512ae29de28 data\enchantment_infusion\recipes\looting\2.json +fa31c19dd85d9e0229de61552032b488abc022d4 data\enchantment_infusion\recipes\quick_charge\3.json +893984afda0f77fd3cb73edec5dd196c1e3400e7 data\enchantment_infusion\recipes\power\3.json +03413b7df5c34ace253b3e351f32bdd6f6a00ffb data\enchantment_infusion\recipes\respiration\2.json +72ea8b5f19b6476e3265ddfa1533354fc2138aec data\enchantment_infusion\recipes\fire_protection\5.json +12fec77129e1f6a0fa783edac9ed577c9f6f5192 data\enchantment_infusion\recipes\smite\3.json +fe816ec135524c46a347c28b71393b1b15ef8266 data\enchantment_infusion\recipes\punch\1.json diff --git a/src/main/generated/.cache/fa358172b1b8e7b2111f523d9e9f4f3061e530c6 b/src/main/generated/.cache/fa358172b1b8e7b2111f523d9e9f4f3061e530c6 index aa2e705..b07f4f7 100644 --- a/src/main/generated/.cache/fa358172b1b8e7b2111f523d9e9f4f3061e530c6 +++ b/src/main/generated/.cache/fa358172b1b8e7b2111f523d9e9f4f3061e530c6 @@ -1,2 +1,2 @@ -// 1.20.1 2024-06-25T10:17:48.7186967 Enchantment Infusion/Language (en_us) +// 1.20.1 2024-08-21T10:12:32.5817176 Enchantment Infusion/Language (en_us) 2e870a67a037830baba5049a0351dbe72d99422f assets\enchantment_infusion\lang\en_us.json diff --git a/src/main/generated/assets/enchantment_infusion/lang/zh_cn.json b/src/main/generated/assets/enchantment_infusion/lang/zh_cn.json index fdd7427..0590b6f 100644 --- a/src/main/generated/assets/enchantment_infusion/lang/zh_cn.json +++ b/src/main/generated/assets/enchantment_infusion/lang/zh_cn.json @@ -1,7 +1,7 @@ { - "block.enchantment_infusion.enchantment_infusion_pedestal": "附魔灌注基座", - "block.enchantment_infusion.enchantment_infusion_table": "附魔灌注台", - "compat.enchantment_infusion.enchantment_infusion_title": "附魔灌注", + "block.enchantment_infusion.enchantment_infusion_pedestal": "魔咒灌注基座", + "block.enchantment_infusion.enchantment_infusion_table": "魔咒灌注台", + "compat.enchantment_infusion.enchantment_infusion_title": "魔咒灌注", "text.enchantment_infusion.enchantment_infusion_interrupt": "灌注中断!", "text.enchantment_infusion.pedestal_not_found": "未找到基座!", "text.enchantment_infusion.recipe_not_found": "未找到配方!" diff --git a/src/main/generated/data/enchantment_infusion/recipes/aqua_affinity/1.json b/src/main/generated/data/enchantment_infusion/recipes/aqua_affinity/1.json index f2b18e0..3083ed2 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/aqua_affinity/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/aqua_affinity/1.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:aqua_affinity", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/1.json b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/1.json index 178cd73..7821dfa 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/1.json @@ -16,6 +16,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:bane_of_arthropods", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/2.json b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/2.json index 9ce9554..40662aa 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/2.json @@ -19,6 +19,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:bane_of_arthropods", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/3.json b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/3.json index 4a45f86..b9ab62d 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/3.json @@ -22,6 +22,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:bane_of_arthropods", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/4.json b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/4.json index 54128fd..6b43ac1 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/4.json @@ -25,6 +25,9 @@ "item": "minecraft:lapis_block" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:bane_of_arthropods", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/5.json b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/5.json index 31f1aa5..f0c00ee 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/5.json +++ b/src/main/generated/data/enchantment_infusion/recipes/bane_of_arthropods/5.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 5, - "mode": "ADD" + "input": { + "enchantment": "minecraft:bane_of_arthropods", + "min_level": 4 + }, + "level": 5 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/blast_protection/1.json b/src/main/generated/data/enchantment_infusion/recipes/blast_protection/1.json index 6b1f5a4..3f6ebec 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/blast_protection/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/blast_protection/1.json @@ -13,6 +13,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:blast_protection", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/blast_protection/2.json b/src/main/generated/data/enchantment_infusion/recipes/blast_protection/2.json index c62395a..4368990 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/blast_protection/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/blast_protection/2.json @@ -19,6 +19,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:blast_protection", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/blast_protection/3.json b/src/main/generated/data/enchantment_infusion/recipes/blast_protection/3.json index c8c7a24..f9ea657 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/blast_protection/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/blast_protection/3.json @@ -22,6 +22,9 @@ "item": "minecraft:obsidian" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:blast_protection", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/blast_protection/4.json b/src/main/generated/data/enchantment_infusion/recipes/blast_protection/4.json index b08c28b..6c02ebb 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/blast_protection/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/blast_protection/4.json @@ -28,6 +28,9 @@ "item": "minecraft:gold_block" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:blast_protection", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/depth_strider/1.json b/src/main/generated/data/enchantment_infusion/recipes/depth_strider/1.json index 7e94e59..da0cb2c 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/depth_strider/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/depth_strider/1.json @@ -16,6 +16,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:depth_strider", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/depth_strider/2.json b/src/main/generated/data/enchantment_infusion/recipes/depth_strider/2.json index ecff4b3..be3464b 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/depth_strider/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/depth_strider/2.json @@ -22,6 +22,9 @@ "item": "minecraft:prismarine_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:depth_strider", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/depth_strider/3.json b/src/main/generated/data/enchantment_infusion/recipes/depth_strider/3.json index 51548f0..5caf174 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/depth_strider/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/depth_strider/3.json @@ -28,6 +28,9 @@ "item": "minecraft:nautilus_shell" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:depth_strider", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/efficiency/1.json b/src/main/generated/data/enchantment_infusion/recipes/efficiency/1.json index c2af440..d0f0c1f 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/efficiency/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/efficiency/1.json @@ -16,6 +16,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:efficiency", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/efficiency/2.json b/src/main/generated/data/enchantment_infusion/recipes/efficiency/2.json index a633176..4b8c292 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/efficiency/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/efficiency/2.json @@ -16,6 +16,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:efficiency", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/efficiency/3.json b/src/main/generated/data/enchantment_infusion/recipes/efficiency/3.json index 8a8108c..90e77a1 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/efficiency/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/efficiency/3.json @@ -28,6 +28,9 @@ "item": "minecraft:obsidian" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:efficiency", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/efficiency/4.json b/src/main/generated/data/enchantment_infusion/recipes/efficiency/4.json index ed6245f..94b341e 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/efficiency/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/efficiency/4.json @@ -28,6 +28,9 @@ "item": "minecraft:obsidian" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:efficiency", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/efficiency/5.json b/src/main/generated/data/enchantment_infusion/recipes/efficiency/5.json index 2980c30..c098fe4 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/efficiency/5.json +++ b/src/main/generated/data/enchantment_infusion/recipes/efficiency/5.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 5, - "mode": "ADD" + "input": { + "enchantment": "minecraft:efficiency", + "min_level": 4 + }, + "level": 5 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/feather_falling/1.json b/src/main/generated/data/enchantment_infusion/recipes/feather_falling/1.json index 49871a6..4257633 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/feather_falling/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/feather_falling/1.json @@ -16,6 +16,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:feather_falling", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/feather_falling/2.json b/src/main/generated/data/enchantment_infusion/recipes/feather_falling/2.json index 366aa0d..424ccbe 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/feather_falling/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/feather_falling/2.json @@ -19,6 +19,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:feather_falling", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/feather_falling/3.json b/src/main/generated/data/enchantment_infusion/recipes/feather_falling/3.json index 8a9ff74..8660399 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/feather_falling/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/feather_falling/3.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:feather_falling", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/feather_falling/4.json b/src/main/generated/data/enchantment_infusion/recipes/feather_falling/4.json index 9cf8e24..b2c6c2b 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/feather_falling/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/feather_falling/4.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:feather_falling", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fire_aspect/1.json b/src/main/generated/data/enchantment_infusion/recipes/fire_aspect/1.json index 8364859..5303937 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fire_aspect/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fire_aspect/1.json @@ -19,6 +19,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fire_aspect", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fire_aspect/2.json b/src/main/generated/data/enchantment_infusion/recipes/fire_aspect/2.json index 8e04894..d789b0a 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fire_aspect/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fire_aspect/2.json @@ -22,6 +22,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fire_aspect", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/1.json b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/1.json index a6b2946..07291d2 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/1.json @@ -16,6 +16,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fire_protection", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/2.json b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/2.json index 4edac4c..83c1bb9 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/2.json @@ -19,6 +19,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fire_protection", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/3.json b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/3.json index 91b8cf7..b191782 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/3.json @@ -25,6 +25,9 @@ "item": "minecraft:blaze_rod" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fire_protection", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/4.json b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/4.json index c808a18..5db94ed 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/4.json @@ -28,6 +28,9 @@ "item": "minecraft:blaze_rod" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fire_protection", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/5.json b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/5.json index 7871a1f..9c603ef 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fire_protection/5.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fire_protection/5.json @@ -28,6 +28,9 @@ "item": "minecraft:blaze_rod" } ], - "level": 5, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fire_protection", + "min_level": 4 + }, + "level": 5 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/flame/1.json b/src/main/generated/data/enchantment_infusion/recipes/flame/1.json index 3e49f69..8cb4afc 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/flame/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/flame/1.json @@ -13,6 +13,9 @@ "item": "minecraft:blaze_rod" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:flame", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fortune/1.json b/src/main/generated/data/enchantment_infusion/recipes/fortune/1.json index 88c5854..1a2561b 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fortune/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fortune/1.json @@ -28,6 +28,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fortune", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fortune/2.json b/src/main/generated/data/enchantment_infusion/recipes/fortune/2.json index 522f4c0..c940e4d 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fortune/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fortune/2.json @@ -28,6 +28,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fortune", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/fortune/3.json b/src/main/generated/data/enchantment_infusion/recipes/fortune/3.json index 96e4615..df01e88 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/fortune/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/fortune/3.json @@ -28,6 +28,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:fortune", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/infinity/1.json b/src/main/generated/data/enchantment_infusion/recipes/infinity/1.json index 1db8ab9..54cadba 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/infinity/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/infinity/1.json @@ -28,6 +28,9 @@ "item": "minecraft:diamond_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:infinity", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/knockback/1.json b/src/main/generated/data/enchantment_infusion/recipes/knockback/1.json index ea94410..a78d92d 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/knockback/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/knockback/1.json @@ -16,6 +16,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:knockback", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/knockback/2.json b/src/main/generated/data/enchantment_infusion/recipes/knockback/2.json index f323632..e39c2f1 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/knockback/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/knockback/2.json @@ -19,6 +19,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:knockback", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/looting/1.json b/src/main/generated/data/enchantment_infusion/recipes/looting/1.json index 717b2d8..c6fe9ad 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/looting/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/looting/1.json @@ -28,6 +28,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:looting", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/looting/2.json b/src/main/generated/data/enchantment_infusion/recipes/looting/2.json index 7ef17cb..faca268 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/looting/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/looting/2.json @@ -28,6 +28,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:looting", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/looting/3.json b/src/main/generated/data/enchantment_infusion/recipes/looting/3.json index 56bd4fd..c7f2692 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/looting/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/looting/3.json @@ -28,6 +28,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:looting", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/multishot/1.json b/src/main/generated/data/enchantment_infusion/recipes/multishot/1.json index d17928e..39d48bb 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/multishot/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/multishot/1.json @@ -28,6 +28,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:multishot", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/piercing/1.json b/src/main/generated/data/enchantment_infusion/recipes/piercing/1.json index 1657c4a..b93ecd6 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/piercing/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/piercing/1.json @@ -19,6 +19,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:piercing", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/piercing/2.json b/src/main/generated/data/enchantment_infusion/recipes/piercing/2.json index 89c4f1f..da24b71 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/piercing/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/piercing/2.json @@ -22,6 +22,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:piercing", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/piercing/3.json b/src/main/generated/data/enchantment_infusion/recipes/piercing/3.json index f8760c3..9ada0b5 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/piercing/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/piercing/3.json @@ -25,6 +25,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:piercing", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/piercing/4.json b/src/main/generated/data/enchantment_infusion/recipes/piercing/4.json index 93798e3..24bdf21 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/piercing/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/piercing/4.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:piercing", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/power/1.json b/src/main/generated/data/enchantment_infusion/recipes/power/1.json index fd4801c..288fa2a 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/power/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/power/1.json @@ -13,6 +13,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:power", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/power/2.json b/src/main/generated/data/enchantment_infusion/recipes/power/2.json index 2b8a232..7ca4e70 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/power/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/power/2.json @@ -19,6 +19,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:power", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/power/3.json b/src/main/generated/data/enchantment_infusion/recipes/power/3.json index 7a5ce7e..ce9a598 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/power/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/power/3.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:power", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/power/4.json b/src/main/generated/data/enchantment_infusion/recipes/power/4.json index beffbc6..04914c9 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/power/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/power/4.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:power", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/power/5.json b/src/main/generated/data/enchantment_infusion/recipes/power/5.json index ef634fa..0c5b743 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/power/5.json +++ b/src/main/generated/data/enchantment_infusion/recipes/power/5.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 5, - "mode": "ADD" + "input": { + "enchantment": "minecraft:power", + "min_level": 4 + }, + "level": 5 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/1.json b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/1.json index 861a602..79ccc28 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/1.json @@ -16,6 +16,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:projectile_protection", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/2.json b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/2.json index 540d5cb..e8ea11f 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/2.json @@ -19,6 +19,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:projectile_protection", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/3.json b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/3.json index 39e7071..63b2e4d 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/3.json @@ -22,6 +22,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:projectile_protection", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/4.json b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/4.json index 8a3a54f..f5c7cdd 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/4.json @@ -22,6 +22,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:projectile_protection", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/5.json b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/5.json index cbfbf87..114a32a 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/5.json +++ b/src/main/generated/data/enchantment_infusion/recipes/projectile_protection/5.json @@ -25,6 +25,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 5, - "mode": "ADD" + "input": { + "enchantment": "minecraft:projectile_protection", + "min_level": 4 + }, + "level": 5 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/protection/1.json b/src/main/generated/data/enchantment_infusion/recipes/protection/1.json index 0b875de..a70f082 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/protection/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/protection/1.json @@ -19,6 +19,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:protection", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/protection/2.json b/src/main/generated/data/enchantment_infusion/recipes/protection/2.json index 5c50949..a400d7d 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/protection/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/protection/2.json @@ -25,6 +25,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:protection", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/protection/3.json b/src/main/generated/data/enchantment_infusion/recipes/protection/3.json index 3b08cf0..17efee0 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/protection/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/protection/3.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:protection", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/protection/4.json b/src/main/generated/data/enchantment_infusion/recipes/protection/4.json index 49ecffb..b5dbee3 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/protection/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/protection/4.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:protection", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/protection/5.json b/src/main/generated/data/enchantment_infusion/recipes/protection/5.json index 97ae5c0..06d09c2 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/protection/5.json +++ b/src/main/generated/data/enchantment_infusion/recipes/protection/5.json @@ -28,6 +28,9 @@ "item": "minecraft:diamond_block" } ], - "level": 5, - "mode": "ADD" + "input": { + "enchantment": "minecraft:protection", + "min_level": 4 + }, + "level": 5 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/punch/1.json b/src/main/generated/data/enchantment_infusion/recipes/punch/1.json index 55c7659..8bd5c61 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/punch/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/punch/1.json @@ -16,6 +16,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:punch", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/punch/2.json b/src/main/generated/data/enchantment_infusion/recipes/punch/2.json index edd22ea..721d798 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/punch/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/punch/2.json @@ -19,6 +19,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:punch", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/quick_charge/1.json b/src/main/generated/data/enchantment_infusion/recipes/quick_charge/1.json index c15e176..51ab0b1 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/quick_charge/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/quick_charge/1.json @@ -16,6 +16,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:quick_charge", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/quick_charge/2.json b/src/main/generated/data/enchantment_infusion/recipes/quick_charge/2.json index 4743634..9bceae6 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/quick_charge/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/quick_charge/2.json @@ -19,6 +19,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:quick_charge", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/quick_charge/3.json b/src/main/generated/data/enchantment_infusion/recipes/quick_charge/3.json index 4dc8870..6150c00 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/quick_charge/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/quick_charge/3.json @@ -19,6 +19,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:quick_charge", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/respiration/1.json b/src/main/generated/data/enchantment_infusion/recipes/respiration/1.json index c6f8697..528a409 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/respiration/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/respiration/1.json @@ -13,6 +13,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:respiration", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/respiration/2.json b/src/main/generated/data/enchantment_infusion/recipes/respiration/2.json index 8b0905f..165695a 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/respiration/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/respiration/2.json @@ -28,6 +28,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:respiration", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/respiration/3.json b/src/main/generated/data/enchantment_infusion/recipes/respiration/3.json index b609e2b..1d8672c 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/respiration/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/respiration/3.json @@ -28,6 +28,9 @@ "item": "minecraft:amethyst_shard" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:respiration", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/sharpness/1.json b/src/main/generated/data/enchantment_infusion/recipes/sharpness/1.json index f64e029..4763093 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/sharpness/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/sharpness/1.json @@ -16,6 +16,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:sharpness", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/sharpness/2.json b/src/main/generated/data/enchantment_infusion/recipes/sharpness/2.json index 6dce134..e31ffeb 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/sharpness/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/sharpness/2.json @@ -19,6 +19,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:sharpness", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/sharpness/3.json b/src/main/generated/data/enchantment_infusion/recipes/sharpness/3.json index 27f7b60..bf20c4d 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/sharpness/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/sharpness/3.json @@ -16,6 +16,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:sharpness", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/sharpness/4.json b/src/main/generated/data/enchantment_infusion/recipes/sharpness/4.json index be88956..8ada886 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/sharpness/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/sharpness/4.json @@ -19,6 +19,9 @@ "item": "minecraft:lapis_block" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:sharpness", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/sharpness/5.json b/src/main/generated/data/enchantment_infusion/recipes/sharpness/5.json index c0fa1a3..acdc824 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/sharpness/5.json +++ b/src/main/generated/data/enchantment_infusion/recipes/sharpness/5.json @@ -22,6 +22,9 @@ "item": "minecraft:lapis_block" } ], - "level": 5, - "mode": "ADD" + "input": { + "enchantment": "minecraft:sharpness", + "min_level": 4 + }, + "level": 5 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/silk_touch/1.json b/src/main/generated/data/enchantment_infusion/recipes/silk_touch/1.json index 98af640..a968550 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/silk_touch/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/silk_touch/1.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:silk_touch", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/smite/1.json b/src/main/generated/data/enchantment_infusion/recipes/smite/1.json index 3acfa35..91b0837 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/smite/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/smite/1.json @@ -16,6 +16,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:smite", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/smite/2.json b/src/main/generated/data/enchantment_infusion/recipes/smite/2.json index c5e0944..a72add3 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/smite/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/smite/2.json @@ -19,6 +19,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:smite", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/smite/3.json b/src/main/generated/data/enchantment_infusion/recipes/smite/3.json index 00a43e9..f0f331f 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/smite/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/smite/3.json @@ -22,6 +22,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:smite", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/smite/4.json b/src/main/generated/data/enchantment_infusion/recipes/smite/4.json index e4e0eca..6335d86 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/smite/4.json +++ b/src/main/generated/data/enchantment_infusion/recipes/smite/4.json @@ -25,6 +25,9 @@ "item": "minecraft:lapis_block" } ], - "level": 4, - "mode": "ADD" + "input": { + "enchantment": "minecraft:smite", + "min_level": 3 + }, + "level": 4 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/smite/5.json b/src/main/generated/data/enchantment_infusion/recipes/smite/5.json index 4464cf7..a0b66be 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/smite/5.json +++ b/src/main/generated/data/enchantment_infusion/recipes/smite/5.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 5, - "mode": "ADD" + "input": { + "enchantment": "minecraft:smite", + "min_level": 4 + }, + "level": 5 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/sweeping/1.json b/src/main/generated/data/enchantment_infusion/recipes/sweeping/1.json index 312e7ab..769f809 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/sweeping/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/sweeping/1.json @@ -13,6 +13,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:sweeping", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/sweeping/2.json b/src/main/generated/data/enchantment_infusion/recipes/sweeping/2.json index c253f65..d13cfc4 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/sweeping/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/sweeping/2.json @@ -22,6 +22,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:sweeping", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/sweeping/3.json b/src/main/generated/data/enchantment_infusion/recipes/sweeping/3.json index 685bb1c..30e95c4 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/sweeping/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/sweeping/3.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:sweeping", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/thorns/1.json b/src/main/generated/data/enchantment_infusion/recipes/thorns/1.json index 5cc5613..34db3ab 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/thorns/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/thorns/1.json @@ -13,6 +13,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:thorns", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/thorns/2.json b/src/main/generated/data/enchantment_infusion/recipes/thorns/2.json index 5b827b4..0f20222 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/thorns/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/thorns/2.json @@ -22,6 +22,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:thorns", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/thorns/3.json b/src/main/generated/data/enchantment_infusion/recipes/thorns/3.json index be67208..75efe3d 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/thorns/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/thorns/3.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:thorns", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/unbreaking/1.json b/src/main/generated/data/enchantment_infusion/recipes/unbreaking/1.json index 491e368..146062e 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/unbreaking/1.json +++ b/src/main/generated/data/enchantment_infusion/recipes/unbreaking/1.json @@ -16,6 +16,9 @@ "item": "minecraft:lapis_block" } ], - "level": 1, - "mode": "ADD" + "input": { + "enchantment": "minecraft:unbreaking", + "min_level": 0 + }, + "level": 1 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/unbreaking/2.json b/src/main/generated/data/enchantment_infusion/recipes/unbreaking/2.json index 9ceae14..6f44a54 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/unbreaking/2.json +++ b/src/main/generated/data/enchantment_infusion/recipes/unbreaking/2.json @@ -22,6 +22,9 @@ "item": "minecraft:lapis_block" } ], - "level": 2, - "mode": "ADD" + "input": { + "enchantment": "minecraft:unbreaking", + "min_level": 1 + }, + "level": 2 } \ No newline at end of file diff --git a/src/main/generated/data/enchantment_infusion/recipes/unbreaking/3.json b/src/main/generated/data/enchantment_infusion/recipes/unbreaking/3.json index d4dc2f3..5be8745 100644 --- a/src/main/generated/data/enchantment_infusion/recipes/unbreaking/3.json +++ b/src/main/generated/data/enchantment_infusion/recipes/unbreaking/3.json @@ -28,6 +28,9 @@ "item": "minecraft:lapis_block" } ], - "level": 3, - "mode": "ADD" + "input": { + "enchantment": "minecraft:unbreaking", + "min_level": 2 + }, + "level": 3 } \ No newline at end of file diff --git a/src/main/java/karashokleo/enchantment_infusion/api/util/EIRecipeUtil.java b/src/main/java/karashokleo/enchantment_infusion/api/util/EIRecipeUtil.java index 58252ec..e1454aa 100644 --- a/src/main/java/karashokleo/enchantment_infusion/api/util/EIRecipeUtil.java +++ b/src/main/java/karashokleo/enchantment_infusion/api/util/EIRecipeUtil.java @@ -1,7 +1,6 @@ package karashokleo.enchantment_infusion.api.util; import karashokleo.enchantment_infusion.content.data.EnchantmentInfusionRecipeBuilder; -import karashokleo.enchantment_infusion.content.recipe.EnchantmentInfusionRecipe; import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.enchantment.Enchantment; import net.minecraft.util.Identifier; @@ -15,13 +14,13 @@ public static void add(Consumer consumer, Ench { EnchantmentInfusionRecipeBuilder builder = new EnchantmentInfusionRecipeBuilder(); consumer.accept(builder); - builder.offerTo( - exporter, - recipeId, - enchantment, - EnchantmentInfusionRecipe.Mode.ADD, - level - ); + builder.withTableIngredient(enchantment, level - 1) + .offerTo( + exporter, + recipeId, + enchantment, + level + ); } public static void set(Consumer consumer, Enchantment enchantment, int level, Consumer exporter, Identifier recipeId) @@ -32,7 +31,6 @@ public static void set(Consumer consumer, Ench exporter, recipeId, enchantment, - EnchantmentInfusionRecipe.Mode.SET, level ); } diff --git a/src/main/java/karashokleo/enchantment_infusion/content/data/EnchantmentInfusionRecipeBuilder.java b/src/main/java/karashokleo/enchantment_infusion/content/data/EnchantmentInfusionRecipeBuilder.java index c9c3ac3..bcb6ba8 100644 --- a/src/main/java/karashokleo/enchantment_infusion/content/data/EnchantmentInfusionRecipeBuilder.java +++ b/src/main/java/karashokleo/enchantment_infusion/content/data/EnchantmentInfusionRecipeBuilder.java @@ -5,7 +5,6 @@ import com.google.gson.JsonParseException; import karashokleo.enchantment_infusion.api.recipe.EnchantmentIngredient; import karashokleo.enchantment_infusion.api.util.EnchantmentSerial; -import karashokleo.enchantment_infusion.content.recipe.EnchantmentInfusionRecipe; import karashokleo.enchantment_infusion.init.EIRecipes; import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.enchantment.Enchantment; @@ -51,18 +50,18 @@ public EnchantmentInfusionRecipeBuilder withPedestalItem(int count, Ingredient i return this; } - public void offerTo(Consumer exporter, Identifier recipeId, Enchantment enchantment, EnchantmentInfusionRecipe.Mode mode, int level) + public void offerTo(Consumer exporter, Identifier recipeId, Enchantment enchantment, int level) { - offerTo(exporter, recipeId, enchantment, mode, level, false); + offerTo(exporter, recipeId, enchantment, level, false); } - public void offerTo(Consumer exporter, Identifier recipeId, Enchantment enchantment, EnchantmentInfusionRecipe.Mode mode, int level, boolean force) + public void offerTo(Consumer exporter, Identifier recipeId, Enchantment enchantment, int level, boolean force) { if (ingredients.isEmpty()) throw new JsonParseException("No ingredients for enchantment infusion recipe"); if (ingredients.size() > 8) throw new JsonParseException("Too many ingredients for enchantment infusion recipe"); - exporter.accept(new EnchantmentInfusionRecipeJsonProvider(recipeId, input, ingredients, enchantment, mode, level, force)); + exporter.accept(new EnchantmentInfusionRecipeJsonProvider(recipeId, input, ingredients, enchantment, level, force)); } public record EnchantmentInfusionRecipeJsonProvider( @@ -70,7 +69,6 @@ public record EnchantmentInfusionRecipeJsonProvider( @Nullable EnchantmentIngredient input, List ingredients, Enchantment enchantment, - EnchantmentInfusionRecipe.Mode mode, int level, boolean force ) implements RecipeJsonProvider @@ -89,7 +87,6 @@ public void serialize(JsonObject json) jsonArray.add(ingredient.toJson()); json.add("ingredients", jsonArray); json.addProperty("enchantment", EnchantmentSerial.encode(enchantment)); - json.addProperty("mode", mode.name()); json.addProperty("level", level); json.addProperty("force", force); } diff --git a/src/main/java/karashokleo/enchantment_infusion/content/recipe/EnchantmentInfusionRecipe.java b/src/main/java/karashokleo/enchantment_infusion/content/recipe/EnchantmentInfusionRecipe.java index 19bcc13..771cce3 100644 --- a/src/main/java/karashokleo/enchantment_infusion/content/recipe/EnchantmentInfusionRecipe.java +++ b/src/main/java/karashokleo/enchantment_infusion/content/recipe/EnchantmentInfusionRecipe.java @@ -17,30 +17,27 @@ import java.util.Map; +/** + * @param id Recipe id + * @param input The enchantment that table stack should have + * @param ingredients Ingredients on the pedestals + * @param enchantment The output enchantment + * @param level The output level + * @param force Ignore enchantment target matching and enchantment compatibility + */ public record EnchantmentInfusionRecipe( Identifier id, @Nullable EnchantmentIngredient input, DefaultedList ingredients, Enchantment enchantment, - Mode mode, int level, boolean force ) implements InfusionRecipe { - public enum Mode - { - ADD, SET - } - @Override public Ingredient getTableIngredient() { - if (input != null) return input.toVanilla(); - else return switch (mode) - { - case ADD -> EnchantmentIngredient.of(enchantment, level - 1); - case SET -> Ingredient.ofItems(Items.BOOK); - }; + return input == null ? Ingredient.ofItems(Items.BOOK) : input.toVanilla(); } @Override @@ -53,8 +50,13 @@ public DefaultedList getPedestalIngredient() public ItemStack infuse(ItemStack tableStack) { ItemStack stack = tableStack.isOf(Items.BOOK) ? Items.ENCHANTED_BOOK.getDefaultStack() : tableStack; + Map enchantments = EnchantmentHelper.get(stack); + if (input != null) enchantments.remove(input.enchantment()); enchantments.put(enchantment, level); + + tableStack.removeSubNbt("Enchantments"); + tableStack.removeSubNbt("StoredEnchantments"); EnchantmentHelper.set(enchantments, stack); return stack; } @@ -66,18 +68,15 @@ public boolean matchTableStack(ItemStack stack) stack.isOf(Items.ENCHANTED_BOOK) || enchantment.isAcceptableItem(stack); - boolean input = this.input != null && this.input.test(stack); - boolean compatible = EnchantmentHelper.isCompatible(EnchantmentHelper.get(stack).keySet(), enchantment); - boolean flag = force || (acceptable && input && compatible); + boolean flag = force || (acceptable && compatible); + + boolean input = this.input == null || this.input.test(stack); + + boolean upgrade = EnchantmentHelper.get(stack).getOrDefault(enchantment, 0) < level; - int current_level = EnchantmentHelper.get(stack).getOrDefault(enchantment, 0); - return switch (mode) - { - case ADD -> flag && current_level == level - 1; - case SET -> flag && current_level < level; - }; + return flag && input && upgrade; } @Override diff --git a/src/main/java/karashokleo/enchantment_infusion/content/recipe/EnchantmentInfusionRecipeSerializer.java b/src/main/java/karashokleo/enchantment_infusion/content/recipe/EnchantmentInfusionRecipeSerializer.java index f81977d..a4c0b3b 100644 --- a/src/main/java/karashokleo/enchantment_infusion/content/recipe/EnchantmentInfusionRecipeSerializer.java +++ b/src/main/java/karashokleo/enchantment_infusion/content/recipe/EnchantmentInfusionRecipeSerializer.java @@ -31,10 +31,9 @@ public EnchantmentInfusionRecipe read(Identifier id, JsonObject json) if (ingredients.size() > 8) throw new JsonParseException("Too many ingredients for enchantment infusion recipe"); Enchantment enchantment = EnchantmentSerial.decode(JsonHelper.getString(json, "enchantment")); - EnchantmentInfusionRecipe.Mode mode = EnchantmentInfusionRecipe.Mode.valueOf(JsonHelper.getString(json, "mode")); int level = JsonHelper.getInt(json, "level"); boolean force = JsonHelper.getBoolean(json, "force", false); - return new EnchantmentInfusionRecipe(id, input, ingredients, enchantment, mode, level, force); + return new EnchantmentInfusionRecipe(id, input, ingredients, enchantment, level, force); } private static DefaultedList getIngredients(JsonArray json) @@ -58,10 +57,9 @@ public EnchantmentInfusionRecipe read(Identifier id, PacketByteBuf buf) DefaultedList ingredients = DefaultedList.ofSize(buf.readVarInt(), Ingredient.EMPTY); ingredients.replaceAll(ingredient -> Ingredient.fromPacket(buf)); Enchantment enchantment = EnchantmentSerial.decode(buf.readString()); - EnchantmentInfusionRecipe.Mode mode = buf.readEnumConstant(EnchantmentInfusionRecipe.Mode.class); int level = buf.readInt(); boolean force = buf.readBoolean(); - return new EnchantmentInfusionRecipe(id, input, ingredients, enchantment, mode, level, force); + return new EnchantmentInfusionRecipe(id, input, ingredients, enchantment, level, force); } @Override @@ -74,7 +72,6 @@ public void write(PacketByteBuf buf, EnchantmentInfusionRecipe recipe) for (Ingredient ingredient : recipe.ingredients()) ingredient.write(buf); buf.writeString(EnchantmentSerial.encode(recipe.enchantment())); - buf.writeEnumConstant(recipe.mode()); buf.writeInt(recipe.level()); buf.writeBoolean(recipe.force()); }