diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ede7c97..e14b821a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.19.4-1.0.0] - 19/08/2023 + +### Ported to 1.19.4 +### Fixed issue with a recipe book +### Fixed issue with omnitrix crafter +### Smiting table recipies removed till I make my own smiting table + ## [1.19.3-1.0.4] - 25/02/2023 ### Fixed an issue where blocks where unminable diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 00000000..ba5e600a --- /dev/null +++ b/TODO.txt @@ -0,0 +1,4 @@ +//TODO: Add the omnitrix. +//TODO: Entity system is broken +//TODO: Switch from gradle to gradle.kts +//TODO: Create custom smiting table \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9248597f..f329a50b 100644 --- a/build.gradle +++ b/build.gradle @@ -88,6 +88,15 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' //core implementation group: 'io.github.realyusufismail', name: 'realyusufismailcore', version: '1.19-1.1.1' + //anotation + annotationProcessor("org.projectlombok:lombok:1.18.28") + compileOnly("org.projectlombok:lombok:1.18.28") +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } } test { diff --git a/src/generated/resources/.cache/0edc5100534d12411f0ce9fd53049108416df013 b/src/generated/resources/.cache/0edc5100534d12411f0ce9fd53049108416df013 index c7fe0489..f5a34bde 100644 --- a/src/generated/resources/.cache/0edc5100534d12411f0ce9fd53049108416df013 +++ b/src/generated/resources/.cache/0edc5100534d12411f0ce9fd53049108416df013 @@ -1,4 +1,4 @@ -// 1.19.3 2022-12-23T08:18:27.253917 Ben 10 Mod - Block States/Models +// 1.19.4 2023-08-19T08:46:14.5600331 Ben 10 Mod - Block States/Models 72298f0d1cd9dade3a62dfe80b9a8d20e3eced93 assets/bentenmod/blockstates/black_diamond_block.json de50442b0274bb53d6417e6220fb679d50ad2e69 assets/bentenmod/blockstates/black_diamond_ore.json 7b3012455c76a2e66e768d0e6bb4c26fcd6418f2 assets/bentenmod/blockstates/deepslate_black_diamond_ore.json diff --git a/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 b/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 new file mode 100644 index 00000000..d31415e1 --- /dev/null +++ b/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 @@ -0,0 +1,2 @@ +// 1.19.4 2023-08-19T08:50:11.0846813 Pack Metadata +24a1f662b719648327321c2f6d9c072b57ac0cf8 pack.mcmeta diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 801f9a16..2a0ad279 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,4 +1,4 @@ -// 1.19.3 2023-02-25T19:18:15.727814 Registries +// 1.19.4 2023-08-19T08:46:14.5561219 Registries 90d27b0c372edd9a76a712e19c1eea0c68d7b06f data/bentenmod/worldgen/configured_feature/black_diamond_ore.json 2daff9d59043f8481972129cd05ea0b0f3f13849 data/bentenmod/worldgen/configured_feature/fire_ore.json f343138b00838da5078970d619db7ba80cc96e88 data/bentenmod/worldgen/configured_feature/imperium_ore.json diff --git a/src/generated/resources/.cache/56569326b38df5a756362e8d3352d5c3a196cbd4 b/src/generated/resources/.cache/56569326b38df5a756362e8d3352d5c3a196cbd4 index 2210c1b3..fb13c4c8 100644 --- a/src/generated/resources/.cache/56569326b38df5a756362e8d3352d5c3a196cbd4 +++ b/src/generated/resources/.cache/56569326b38df5a756362e8d3352d5c3a196cbd4 @@ -1,4 +1,4 @@ -// 1.19.3 2022-12-25T12:27:19.576814 Tags for minecraft:item mod id bentenmod +// 1.19.4 2023-08-19T08:46:14.5680559 Tags for minecraft:item mod id bentenmod 9ee6e9079e711cddbdaba599cc6539ceede75a3e data/forge/tags/items/ingots/black_diamond.json 0559742cc6855d467ea42c935dc8d24097e02fc9 data/forge/tags/items/ingots/fire.json 07a54f35234d52248296bc886ede841de40506c4 data/forge/tags/items/ingots/imperium.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index efd72741..2059ee75 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.19.3 2022-12-25T12:27:19.57115 Loot Tables +// 1.19.4 2023-08-19T08:46:14.5411269 Loot Tables 892dfc30d034aa063244a27af394b32b85b77d4b data/bentenmod/loot_tables/blocks/black_diamond_block.json 4b30588c79a6f98075cc562ba1e15160efaebb0a data/bentenmod/loot_tables/blocks/black_diamond_ore.json 4b30588c79a6f98075cc562ba1e15160efaebb0a data/bentenmod/loot_tables/blocks/deepslate_black_diamond_ore.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 142f566d..668a8d28 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.19.3 2022-12-25T12:27:19.573887 Recipes +// 1.19.4 2023-08-19T08:46:14.548124 Recipes 1e82cc63feba3e8b54aaeed853b8e70f15c6693a data/bentenmod/advancements/recipes/building_blocks/black_diamond_block.json f96199053d094c7f8119f0fceb6d8a470040543e data/bentenmod/advancements/recipes/building_blocks/fire_block.json 3e77571dfdf893426917ec102a0432f53a87e021 data/bentenmod/advancements/recipes/building_blocks/imperium_block.json @@ -8,13 +8,9 @@ acd691c96e478b231afa2792bc0647c53399c1dc data/bentenmod/advancements/recipes/bui 676217be42df0b94b7f51ed4ece5474612f619b5 data/bentenmod/advancements/recipes/building_blocks/omntrix_block.json d9fbdd13b273ee368faca55c434403b68e3d2415 data/bentenmod/advancements/recipes/building_blocks/ruby_block.json ea3847428d71bfae9506978351b40c501612e5c1 data/bentenmod/advancements/recipes/building_blocks/speed_block.json -b705cdd15a6b46ccb84c266338dc68d8728e7d4a data/bentenmod/advancements/recipes/combat/black_diamond_boots.json 0d8843b46e6049e2803c839334db82362927619c data/bentenmod/advancements/recipes/combat/black_diamond_boots_blasting_smelt.json -2847716ab357b78b7a27d6f9702e937d81445afe data/bentenmod/advancements/recipes/combat/black_diamond_chestplate.json 750288eb1c12d62a747dffae22a7e2d4905cb19b data/bentenmod/advancements/recipes/combat/black_diamond_chestplate_blasting_smelt.json -2c0a5a324010d8c1ac230a3601d4e9603cdc5b19 data/bentenmod/advancements/recipes/combat/black_diamond_helmet.json 24fd29af8331ff6145ec58f48f227120f80d93d3 data/bentenmod/advancements/recipes/combat/black_diamond_helmet_blasting_smelt.json -e9dd70884cfdf06c679167c39744fa2f1910003c data/bentenmod/advancements/recipes/combat/black_diamond_leggings.json a53d22d4c54b760acabdef8ee50e6d96cefecb4f data/bentenmod/advancements/recipes/combat/black_diamond_leggings_blasting_smelt.json f05404aae2295c6ea7447ed5f94891a40cf997d8 data/bentenmod/advancements/recipes/combat/boots.json cc2b45a8c87b1582004356f88b49db008a6a3367 data/bentenmod/advancements/recipes/combat/boots_blasting_smelt.json @@ -34,13 +30,9 @@ c0cfb8309a80ff879b1b97004fc424c9c9630d3e data/bentenmod/advancements/recipes/com 44ed7ce44e8b033ff60e214418d349263ac83f52 data/bentenmod/advancements/recipes/combat/heatblast_leggings_blasting_smelt.json 22f0dd1be26717ad16380666051d4490c04b0eca data/bentenmod/advancements/recipes/combat/helmet.json 48c0cccaae91753260ff8dcf6e041cac5b36572c data/bentenmod/advancements/recipes/combat/helmet_blasting_smelt.json -84b7e5a0b062e3b26a6032fc0b79782158c4db8c data/bentenmod/advancements/recipes/combat/infinitum_boots.json 983636d422a9809362636239f8a5727d7871502a data/bentenmod/advancements/recipes/combat/infinitum_boots_blasting_smelt.json -01e446704501c34efdcdcc807d54b5d4ba2d8383 data/bentenmod/advancements/recipes/combat/infinitum_chestplate.json f3186c73eea600537d0669e22eceee2ee5e8bdcd data/bentenmod/advancements/recipes/combat/infinitum_chestplate_blasting_smelt.json -be9db18f33eebe6923a228ec67e44049f9491490 data/bentenmod/advancements/recipes/combat/infinitum_helmet.json bfb838539b3580f4a7a59c944d5a2c8362ee420c data/bentenmod/advancements/recipes/combat/infinitum_helmet_blasting_smelt.json -814e757ab18e145191379d5c6d31df301e5af924 data/bentenmod/advancements/recipes/combat/infinitum_leggings.json f9e693b132da15d89bd498be27623368dc119abc data/bentenmod/advancements/recipes/combat/infinitum_leggings_blasting_smelt.json acda2823130663d26afa83398b7e6e721f3ab1a7 data/bentenmod/advancements/recipes/combat/jacket.json 77cc3e88ed0e7ae67302bc6d09d3dfe7f469bfdd data/bentenmod/advancements/recipes/combat/jacket_blasting_smelt.json @@ -87,121 +79,93 @@ d4b908df42b9428c85ef13bba2807f34bf4eccdc data/bentenmod/advancements/recipes/mis 07b62140f7a6d6488894b5baa66d149ee5c506ca data/bentenmod/advancements/recipes/misc/speed_ore_blasting_smelt.json 1fbff1cd0ae393427f0cb848b4a1ff60997df742 data/bentenmod/advancements/recipes/misc/speed_ore_smelt.json 7ea77c342e39fdf3894b48b0a90035b27e656ac4 data/bentenmod/advancements/recipes/tools/axe.json -ff295ceae331f14981c91372bc8331cf81fae098 data/bentenmod/advancements/recipes/tools/black_diamond_axe.json -0c928bbb2eecd62a6eeefc68e733df808834154b data/bentenmod/advancements/recipes/tools/black_diamond_hoe.json -564b1d1b3b7546aeec8f3d8cf54af7b595b98ca1 data/bentenmod/advancements/recipes/tools/black_diamond_pickaxe.json -0c04fce9fd7db8d3328f1c53f518eedae90f21e5 data/bentenmod/advancements/recipes/tools/black_diamond_shovel.json -01b413e9ff6d76a6df3ffb7246b7c1e6a7e334b3 data/bentenmod/advancements/recipes/tools/black_diamond_sword.json 026d4cf071e63f5a745d9f6d0a0cff562880e973 data/bentenmod/advancements/recipes/tools/heatblast_sword.json 1fa07c3dc849eaee17c5a90d3cc2b3cb1f7d09a2 data/bentenmod/advancements/recipes/tools/imperium_pickaxe.json 0559fa9c44df3b93fd5b9e338aefca5ec03c4b1b data/bentenmod/advancements/recipes/tools/imperium_sword.json 0fd2f1ddde389f5abcfe0ef51947bf6bc670ee01 data/bentenmod/advancements/recipes/tools/imperium_upgraded_pickaxe.json -e9eac3e85e83c6ad304f0121d1da56e5787b2d9f data/bentenmod/advancements/recipes/tools/infinitum_axe.json -a5a8dfbc509ee612796602858f7e874393ddf3b7 data/bentenmod/advancements/recipes/tools/infinitum_hoe.json -fd40f54f78781faf53a0414c7f87793943956c8f data/bentenmod/advancements/recipes/tools/infinitum_pickaxe.json -c0bcc95be2d89a1ab003b2908de53e5157135348 data/bentenmod/advancements/recipes/tools/infinitum_shovel.json -7e39241dbaae58ff0db9533f8ddc9d4169942f0b data/bentenmod/advancements/recipes/tools/infinitum_sword.json 73e5c041a1221d6bc2e020e16ee44fbb2ff80164 data/bentenmod/advancements/recipes/tools/sword.json -bdd5785e38e800cd5d3a6f4ae4f38919b1e5eec0 data/bentenmod/recipes/axe.json +a52962c4fbb37deb04e7a62ca52609a96ec0ca29 data/bentenmod/recipes/axe.json 1d8206db2af1f803f11101e43213a2b9850e8bc2 data/bentenmod/recipes/black_diamond.json -97039685d8d0a463b8e2cd87ed450cef044318c9 data/bentenmod/recipes/black_diamond_axe.json -22e976e227d21ec6bf0c7007a2c66a70bd097543 data/bentenmod/recipes/black_diamond_block.json -f66baacd4dae6b15a114e682a63a67a40fb60218 data/bentenmod/recipes/black_diamond_boots.json +b2e9494cbf7f2d4306ff3daa4d17e5a90dd6a792 data/bentenmod/recipes/black_diamond_block.json 8573d7d2b0f33968be619dacdf355354ae94f5c1 data/bentenmod/recipes/black_diamond_boots_blasting_smelt.json -71968012ca41a3445897c860522c412de0743871 data/bentenmod/recipes/black_diamond_chestplate.json a1996c8436b55dd1ccb46d4bdf3fde6c17c7078f data/bentenmod/recipes/black_diamond_chestplate_blasting_smelt.json -58275e65a8c5818875d71a80de565093b5d96bca data/bentenmod/recipes/black_diamond_helmet.json 9cf37cc112c3ac57f3a866333ebe5bd2d5a1edf0 data/bentenmod/recipes/black_diamond_helmet_blasting_smelt.json -39885b3b1fa8fe34c5e8c39ee8fd0834ece14e3a data/bentenmod/recipes/black_diamond_hoe.json -4947af2be56d1df0fd208b4941f9ab5343818e73 data/bentenmod/recipes/black_diamond_leggings.json 046139c2aeb27edc92b11f570c63d0f1b5641785 data/bentenmod/recipes/black_diamond_leggings_blasting_smelt.json 60a406b006636a7115a5a36b35d7936e921cbb5a data/bentenmod/recipes/black_diamond_ore_blasting_smelt.json 17db43c6e15f499e80c950a34e4d4737706d5844 data/bentenmod/recipes/black_diamond_ore_smelt.json -84009659800b9720bcb8d6c197f0e53d163c6afb data/bentenmod/recipes/black_diamond_pickaxe.json 3cf83df26456ba9092cf80a729829c86d4e34d30 data/bentenmod/recipes/black_diamond_scrap.json -755acee1b6ddd2b36daad9ec6209f5227dcb4733 data/bentenmod/recipes/black_diamond_shovel.json -a021855909ecc675eea18eae610a2cede6c63f95 data/bentenmod/recipes/black_diamond_sword.json -cb4b5a3e96a5039bbbb9beaf858bce2098288235 data/bentenmod/recipes/boots.json +c85a7e0c1651ae7ef6d6ceb2fbee7f98202a5f7e data/bentenmod/recipes/boots.json 85e17c1e120aa3beb6b4b8dd1ceae87a70c46980 data/bentenmod/recipes/boots_blasting_smelt.json -c1b6b644b65ab9ed6e4061ddac0a7cc75c9ddbe8 data/bentenmod/recipes/chestplate.json +850dd6011f287f3675e311bbc84bcc2cc68fe772 data/bentenmod/recipes/chestplate.json cb94a30b71da1322ae0cc0a3933157c7d195a93b data/bentenmod/recipes/chestplate_blasting_smelt.json -abb5881d9a96aceab3a1844dfc3f202bc0317f05 data/bentenmod/recipes/enchanted_golden_apple.json -6a77e390802075548c490adffd9f48a00685dacf data/bentenmod/recipes/enchanted_omnitrix_apple.json +3c1ede14d6e18890b83cb20612ff44c5fd3c02ff data/bentenmod/recipes/enchanted_golden_apple.json +03ad99e2aa03846aed87904844eeb5ce85b29943 data/bentenmod/recipes/enchanted_omnitrix_apple.json 9e59044113822b53955b9999892b98a5a0147d82 data/bentenmod/recipes/fire.json -fdda1c2b744943f9102a8a46f0fb4f72509712b7 data/bentenmod/recipes/fire_apple.json -bb2ac1c1fa3b0c2cb15d644516980f277ba00d0a data/bentenmod/recipes/fire_block.json +52859af3ae3c7c9abff61623e1278053367b4362 data/bentenmod/recipes/fire_apple.json +7561008001587ba26f0a1a3f85693d002f33fbef data/bentenmod/recipes/fire_block.json 4f58ce0fd5886cf2b9d8e1b81ce093f2e5164292 data/bentenmod/recipes/fire_ore_blasting_smelt.json b6edf3c2bd0a31ba159a86dbc03092f23b80f7b2 data/bentenmod/recipes/fire_ore_smelt.json ae9b67650350532cb4031a4f1d317a6ef71fe12f data/bentenmod/recipes/fourarms_boots_blasting_smelt.json b7725324362c948c515335ea6fc3f8dd1a5ac1ca data/bentenmod/recipes/fourarms_chestplate_blasting_smelt.json 56b2c0de63f75d439354fab87ddc1c4346efdce4 data/bentenmod/recipes/fourarms_helmet_blasting_smelt.json f9b66296fe6d45854b86dec74099bb622298a123 data/bentenmod/recipes/fourarms_leggings_blasting_smelt.json -7f0f93637abce12e0d8e71fadf16907a0aebae9a data/bentenmod/recipes/heatblast_boots.json +bde7635d40d7888ac6a9e36db09652bc8d6e3243 data/bentenmod/recipes/heatblast_boots.json 48dbeefafce7b9d3f4fd4064e1bf4c9d15045aa7 data/bentenmod/recipes/heatblast_boots_blasting_smelt.json -150e40601219a9c323386407c54a3debdce26193 data/bentenmod/recipes/heatblast_chestplate.json +a9420ce73f60d74a3efb14306f7271c5b10f3d70 data/bentenmod/recipes/heatblast_chestplate.json ad20d4c37db71c07165e432218a3878ccd3d2c8b data/bentenmod/recipes/heatblast_chestplate_blasting_smelt.json -5065214b11d3d6e7c13b64dc67f6ed7482ce2059 data/bentenmod/recipes/heatblast_helmet.json +83a32d7b1ee0bd3e4ed0a2cfeedf1e7442229cc0 data/bentenmod/recipes/heatblast_helmet.json 6766305a28ba580298c09bdf21e9af96214560b7 data/bentenmod/recipes/heatblast_helmet_blasting_smelt.json -1f36c17016d119781a5cca202b572fbc48bf5694 data/bentenmod/recipes/heatblast_leggings.json +0d31927bf40a740408e4ccdb254251b577ba8b47 data/bentenmod/recipes/heatblast_leggings.json bdc4bad00f77d76568319baaf71b478dc519bc2b data/bentenmod/recipes/heatblast_leggings_blasting_smelt.json -c4f7cc5d053b990212bcebe1aa279ffce2581142 data/bentenmod/recipes/heatblast_sword.json -3ea3236def449c7e63f5d15c0c62158112a0426f data/bentenmod/recipes/helmet.json +d23b51eeaf088adaed20457622767b353b209dc0 data/bentenmod/recipes/heatblast_sword.json +1b9478896bc6de5c47f6a82a70650086dfe8f321 data/bentenmod/recipes/helmet.json 6e62475a89c39788de3893a71e128991c4d9b226 data/bentenmod/recipes/helmet_blasting_smelt.json 72c15653b9923b530a85c4052fe01d39366fa5a8 data/bentenmod/recipes/imperium.json -bb853e55431af4d6bc82f710ebead0fe786085f3 data/bentenmod/recipes/imperium_block.json -de34457f9d8d77fd5566baeca80aa913cd2f9c54 data/bentenmod/recipes/imperium_pickaxe.json +55e224f666036c683386a541dc5e78700401b578 data/bentenmod/recipes/imperium_block.json +a0bed618875b26d083167f2a270c5bad0552291f data/bentenmod/recipes/imperium_pickaxe.json 58978d21c55575939a79a0153a344d229adc6dfa data/bentenmod/recipes/imperium_raw_ore_blasting_smelt.json f00bb4643b0de7b0d970e45e28bae227364e2a5b data/bentenmod/recipes/imperium_raw_ore_smelt.json -df58e7ae66264fe5df871fcb9dd5657839c083da data/bentenmod/recipes/imperium_sword.json -264adf9cb4775400f601153138fd44ac344a9df5 data/bentenmod/recipes/imperium_upgraded_pickaxe.json +225ee6e39de82901191a3871cd2f8c82a652d77a data/bentenmod/recipes/imperium_sword.json +e726f4030dc32d3d769aaedf788c2e327e2b0c26 data/bentenmod/recipes/imperium_upgraded_pickaxe.json 05bf15bafd92affe94071c5cfdb7d03d77c17c6a data/bentenmod/recipes/infinitum.json -bdecde04d19685fa70eac9b30be46d501351ec3e data/bentenmod/recipes/infinitum_axe.json -aa359c78656390205908d8e3be9b45aeecd560e0 data/bentenmod/recipes/infinitum_block.json -94383d41f8dca76534d96c5d86294d4190bcd984 data/bentenmod/recipes/infinitum_boots.json +7a83f05da14fada8bcef22e68e5e22239cb48d8b data/bentenmod/recipes/infinitum_block.json b542d6334b83b42c7ce4acd93ae5e2dfc4c13b39 data/bentenmod/recipes/infinitum_boots_blasting_smelt.json -8098c002029ac2af731d4d418b9ef07e8ff4d389 data/bentenmod/recipes/infinitum_chestplate.json 1bf41cac3dcaf58ad70bdb1b927870a822fc8373 data/bentenmod/recipes/infinitum_chestplate_blasting_smelt.json -873df5b85ff73fe07caa5ea9a0a623cfd96a9a1c data/bentenmod/recipes/infinitum_helmet.json 21934aa30a26e343b5850247d2e20256e74a96d0 data/bentenmod/recipes/infinitum_helmet_blasting_smelt.json -ebeef89e965a884f1996e06dec92c5e82990c221 data/bentenmod/recipes/infinitum_hoe.json -3e9368808bfc7bad1859611ad1337dada7d0eca0 data/bentenmod/recipes/infinitum_leggings.json 91898822616fb43df386cfb79d3d3fc629a81061 data/bentenmod/recipes/infinitum_leggings_blasting_smelt.json 65e6cd85624ad9de3bcad9ea404dac71eb3df4fc data/bentenmod/recipes/infinitum_ore_blasting_smelt.json 9f9ff950374c61015d021ee978b386081143b8e6 data/bentenmod/recipes/infinitum_ore_smelt.json -62b4fdd8c50579940a876b8e36aa953f3e77e417 data/bentenmod/recipes/infinitum_pickaxe.json c00678678c0f16e63e44df1d1d9822e460646379 data/bentenmod/recipes/infinitum_scrap.json -5ca0d28a96f387a5785476cce314c1a6264352b1 data/bentenmod/recipes/infinitum_shovel.json -00af7069a3ebd1206dcce291ca73ee9ceaedd60b data/bentenmod/recipes/infinitum_sword.json -8c9e3d3972155c1b4b5ef2964e8706c7f9953a43 data/bentenmod/recipes/jacket.json +a0d3e1bc3c5d0b57d72c8a22a6599d47b432a826 data/bentenmod/recipes/jacket.json 9d32faa7ccbb4a77dadab19546c37083125b546e data/bentenmod/recipes/jacket_blasting_smelt.json -ff091ca1cd8c1c4c4e5ed92584bb78af192e2f94 data/bentenmod/recipes/kraab_spawn_egg.json -56f54b0e9503383c0f50699f9b273e68c8c72099 data/bentenmod/recipes/legendary_block.json +9013a4f9d52548fbfc68d032ce3327469ca176bd data/bentenmod/recipes/kraab_spawn_egg.json +617481d24cf610b56e2232e058b45226a89dab27 data/bentenmod/recipes/legendary_block.json d241a870b2d8ef6f97c147d09c2978ed924a281f data/bentenmod/recipes/legendary_ore.json 31c7e4b169fb2e0b190365bd435439c83d156e08 data/bentenmod/recipes/legendary_ore_blasting_smelt.json b8114a40d5e87ecdc2c0283ce7ab7dc5d14dfc2e data/bentenmod/recipes/legendary_ore_smelt.json -e4d72247df21d3cc30dcf101cdf465bf11aa1de5 data/bentenmod/recipes/leggings.json +1af4d10c2da70c91f8b540f5b0bda9edb9ffe8ed data/bentenmod/recipes/leggings.json 7aee4ac5f15bca85ee5d52dce6e3f7e2dea0bd37 data/bentenmod/recipes/leggings_blasting_smelt.json 525d10c1c3a6e35542bdb79e9b36897f89574c8e data/bentenmod/recipes/omnitrix.json -12541b72741f25d3fd5b11e861fc3b5b2d690615 data/bentenmod/recipes/omnitrix_apple.json -817d6e0a0db57edfb283b7873a0414c221a86a1c data/bentenmod/recipes/omnitrix_block.json +f73a453c01c3c13a8f86438801f29dc37317259e data/bentenmod/recipes/omnitrix_apple.json +2240a0dea0fb56cce6a84bcdf9737acf0f37ad7a data/bentenmod/recipes/omnitrix_block.json 09660b59a924505de67b47b852dffb9b3aa96e61 data/bentenmod/recipes/omnitrix_ore_blasting_smelt.json ecc8c31c2289fdb9428fb19539461c6a0ace2546 data/bentenmod/recipes/omnitrix_ore_smelt.json -28fe0608639d231a5044194b6520b98f43903d68 data/bentenmod/recipes/omntrix_block.json +87809945b2ed14c4b458b8e1129bb28b623829da data/bentenmod/recipes/omntrix_block.json e703367a786efa5828cff09c750285b3fb4bce41 data/bentenmod/recipes/ruby.json -9ac7ce6bafcae369067dd1e1b53aa5a19f1d1d8f data/bentenmod/recipes/ruby_apple.json -a079cf9ffe03637dce5126b6a94014e8fda79fff data/bentenmod/recipes/ruby_block.json +f7a9c98a67066f164dc6025e15b388b0da0cc7f0 data/bentenmod/recipes/ruby_apple.json +0ace4acfcde07acdba9c40d28f96a3fe3be8d9eb data/bentenmod/recipes/ruby_block.json 9192266b2f975a861b2edeb784946f2ef8b1d2ea data/bentenmod/recipes/ruby_ore_blasting_smelt.json c152607653922f69e5d2621fc8214733d315cf59 data/bentenmod/recipes/ruby_ore_smelt.json b2d8732a44030f4bea1ee07aa4ddfdde0e09cb8c data/bentenmod/recipes/speed.json -4160ecac2791144ce9bba9910e62f51155863cd7 data/bentenmod/recipes/speed_block.json +182105beaaeac616e30348104d66e5f68fd1f439 data/bentenmod/recipes/speed_block.json d51e7672a0ff0e515948d48a695cf79f8f06f5a2 data/bentenmod/recipes/speed_ore_blasting_smelt.json dac4deb3890a69582f1a7ff36789aa67c6a26171 data/bentenmod/recipes/speed_ore_smelt.json -685ecf11d6646a799a042b754548c0cf207f2370 data/bentenmod/recipes/sword.json -faa8e895c2d348bbb91539374306a4f92dda3223 data/bentenmod/recipes/xlr8_boots.json +38a72c26232679eff540fb331226f14da1508f01 data/bentenmod/recipes/sword.json +09bbeb7d7b83c855323cabe91434d9c06bbc2ded data/bentenmod/recipes/xlr8_boots.json 0906805c39323c0085179b1fef55a1213cb179d7 data/bentenmod/recipes/xlr8_boots_blasting_smelt.json -9d96588bbafa0c4538da8f8020c0ba4d02177a42 data/bentenmod/recipes/xlr8_chestplate.json +7f1132f19280baa53ed8cd937326e4e8b601de88 data/bentenmod/recipes/xlr8_chestplate.json cde42a80193317050e4dda16186c178f80407cba data/bentenmod/recipes/xlr8_chestplate_blasting_smelt.json -356dfad3dc647e31cc32f73ce18a3870b173502f data/bentenmod/recipes/xlr8_helmet.json +4d4fd2f3881d925af97c1bf5c7e67b20e26022c8 data/bentenmod/recipes/xlr8_helmet.json 08c1cff044f500a7f33397c2f8c2d190e0208039 data/bentenmod/recipes/xlr8_helmet_blasting_smelt.json -4768a05ab3c4e4b76e10f5315c02b5999cf0623a data/bentenmod/recipes/xlr8_leggings.json +e02a98b6e8501aa592f710bed34115c2f92682b1 data/bentenmod/recipes/xlr8_leggings.json 692cc89eaaeb8ea96d013ec8e8a78b3bfdbf0502 data/bentenmod/recipes/xlr8_leggings_blasting_smelt.json diff --git a/src/generated/resources/.cache/a71a5fdc03bcf972367738bf342fc8be3890b9ad b/src/generated/resources/.cache/a71a5fdc03bcf972367738bf342fc8be3890b9ad index f54e8174..445470fb 100644 --- a/src/generated/resources/.cache/a71a5fdc03bcf972367738bf342fc8be3890b9ad +++ b/src/generated/resources/.cache/a71a5fdc03bcf972367738bf342fc8be3890b9ad @@ -1,4 +1,4 @@ -// 1.19.3 2022-12-25T12:27:19.576049 Item Models: bentenmod +// 1.19.4 2023-08-19T08:46:14.5640452 Item Models: bentenmod 28a0aa00149acfbb2e0427267cd325dc8f8b34ce assets/bentenmod/models/item/axe.json e1374325b4dd1ef3765d0b62a69cc7dcb64c7245 assets/bentenmod/models/item/black_diamond.json 4edc58fc2d6525b016e3fa31fd7f5adfbc78edfe assets/bentenmod/models/item/black_diamond_axe.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 1060ecc9..3233ca3b 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.19.3 2022-12-25T12:27:19.575631 Languages: en_us +// 1.19.4 2023-08-19T08:46:14.5572054 Languages: en_us 4fc5abc01e8153886e0eb386d9dafae643672664 assets/bentenmod/lang/en_us.json diff --git a/src/generated/resources/.cache/d67bd44c07bd8c5111ab974358f31cbd0b22c3fc b/src/generated/resources/.cache/d67bd44c07bd8c5111ab974358f31cbd0b22c3fc index 4c4f9db5..9efee452 100644 --- a/src/generated/resources/.cache/d67bd44c07bd8c5111ab974358f31cbd0b22c3fc +++ b/src/generated/resources/.cache/d67bd44c07bd8c5111ab974358f31cbd0b22c3fc @@ -1,4 +1,4 @@ -// 1.19.3 2023-02-25T19:18:57.106016 Tags for minecraft:block mod id bentenmod +// 1.19.4 2023-08-19T08:46:14.5660507 Tags for minecraft:block mod id bentenmod 4368cd2804b35fbf3a55f6b11f75a8b2badc1334 data/forge/tags/blocks/ores.json 48a131ac33ee139b1a834ff80a60e020fb0485d8 data/forge/tags/blocks/ores/black_diamonds.json d08851005d3eddbd7250441c11e13a6ad5d8d1dc data/forge/tags/blocks/ores/fire.json diff --git a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 index 3f4969b0..85d4e738 100644 --- a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 +++ b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 @@ -1,4 +1,4 @@ -// 1.19.3 2022-12-23T14:04:07.133698 Advancements +// 1.19.4 2023-08-19T08:46:14.5710478 Advancements 89f21f22d9ff3337a2c205a9e5589a64f6ef560d data/bentenmod/advancements/ascalon.json 154ea3969166a33139136ceef2967a5bdbec01c3 data/bentenmod/advancements/black_diamond_armour.json 73b9d03b195052bf9b8dbce6ab271757fb9e1552 data/bentenmod/advancements/black_diamond_block.json diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_boots.json b/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_boots.json deleted file mode 100644 index c5206135..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_boots.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/black_diamond" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:black_diamond_boots" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:black_diamond_boots" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_chestplate.json b/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_chestplate.json deleted file mode 100644 index 639de2a6..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_chestplate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/black_diamond" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:black_diamond_chestplate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:black_diamond_chestplate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_helmet.json b/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_helmet.json deleted file mode 100644 index 272f038a..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_helmet.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/black_diamond" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:black_diamond_helmet" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:black_diamond_helmet" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_leggings.json b/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_leggings.json deleted file mode 100644 index 8b5ce178..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/combat/black_diamond_leggings.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/black_diamond" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:black_diamond_leggings" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:black_diamond_leggings" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_boots.json b/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_boots.json deleted file mode 100644 index 20a50ea0..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_boots.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/infinitum" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:infinitum_boots" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:infinitum_boots" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_chestplate.json b/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_chestplate.json deleted file mode 100644 index 0f080724..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_chestplate.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/infinitum" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:infinitum_chestplate" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:infinitum_chestplate" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_helmet.json b/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_helmet.json deleted file mode 100644 index 9f20cd57..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_helmet.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/infinitum" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:infinitum_helmet" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:infinitum_helmet" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_leggings.json b/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_leggings.json deleted file mode 100644 index 5fd31ceb..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/combat/infinitum_leggings.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/infinitum" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:infinitum_leggings" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:infinitum_leggings" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_axe.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_axe.json deleted file mode 100644 index 0c8afbf4..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_axe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/black_diamond" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:black_diamond_axe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:black_diamond_axe" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_hoe.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_hoe.json deleted file mode 100644 index 35feabb4..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_hoe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/black_diamond" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:black_diamond_hoe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:black_diamond_hoe" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_pickaxe.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_pickaxe.json deleted file mode 100644 index d2903e7a..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/black_diamond" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:black_diamond_pickaxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:black_diamond_pickaxe" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_shovel.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_shovel.json deleted file mode 100644 index 6cd3458a..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/black_diamond" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:black_diamond_shovel" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:black_diamond_shovel" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_sword.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_sword.json deleted file mode 100644 index 1919810f..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/black_diamond_sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/black_diamond" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:black_diamond_sword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:black_diamond_sword" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_axe.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_axe.json deleted file mode 100644 index 46a0007f..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_axe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/infinitum" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:infinitum_axe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:infinitum_axe" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_hoe.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_hoe.json deleted file mode 100644 index c8aebd29..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_hoe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/infinitum" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:infinitum_hoe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:infinitum_hoe" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_pickaxe.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_pickaxe.json deleted file mode 100644 index 22447286..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_pickaxe.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/infinitum" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:infinitum_pickaxe" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:infinitum_pickaxe" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_shovel.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_shovel.json deleted file mode 100644 index b0774716..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_shovel.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/infinitum" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:infinitum_shovel" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:infinitum_shovel" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_sword.json b/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_sword.json deleted file mode 100644 index 53fdff3c..00000000 --- a/src/generated/resources/data/bentenmod/advancements/recipes/tools/infinitum_sword.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/infinitum" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "bentenmod:infinitum_sword" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "bentenmod:infinitum_sword" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/axe.json b/src/generated/resources/data/bentenmod/recipes/axe.json index a4d27f98..51b95c6b 100644 --- a/src/generated/resources/data/bentenmod/recipes/axe.json +++ b/src/generated/resources/data/bentenmod/recipes/axe.json @@ -19,5 +19,6 @@ ], "result": { "item": "bentenmod:axe" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_axe.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_axe.json deleted file mode 100644 index 85d186f7..00000000 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:black_diamond" - }, - "base": { - "item": "minecraft:diamond_axe" - }, - "result": { - "item": "bentenmod:black_diamond_axe" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_block.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_block.json index 348d97b4..dbaff12b 100644 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_block.json +++ b/src/generated/resources/data/bentenmod/recipes/black_diamond_block.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:black_diamond_block" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_boots.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_boots.json deleted file mode 100644 index e13c0155..00000000 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_boots.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:black_diamond" - }, - "base": { - "item": "minecraft:diamond_boots" - }, - "result": { - "item": "bentenmod:black_diamond_boots" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_chestplate.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_chestplate.json deleted file mode 100644 index 22e4382a..00000000 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_chestplate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:black_diamond" - }, - "base": { - "item": "minecraft:diamond_chestplate" - }, - "result": { - "item": "bentenmod:black_diamond_chestplate" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_helmet.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_helmet.json deleted file mode 100644 index c50fd098..00000000 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:black_diamond" - }, - "base": { - "item": "minecraft:diamond_helmet" - }, - "result": { - "item": "bentenmod:black_diamond_helmet" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_hoe.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_hoe.json deleted file mode 100644 index 8d9da593..00000000 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:black_diamond" - }, - "base": { - "item": "minecraft:diamond_hoe" - }, - "result": { - "item": "bentenmod:black_diamond_hoe" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_leggings.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_leggings.json deleted file mode 100644 index 824f7186..00000000 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_leggings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:black_diamond" - }, - "base": { - "item": "minecraft:diamond_leggings" - }, - "result": { - "item": "bentenmod:black_diamond_leggings" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_pickaxe.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_pickaxe.json deleted file mode 100644 index 45a87cb7..00000000 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:black_diamond" - }, - "base": { - "item": "minecraft:diamond_pickaxe" - }, - "result": { - "item": "bentenmod:black_diamond_pickaxe" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_shovel.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_shovel.json deleted file mode 100644 index 3bc7b862..00000000 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:black_diamond" - }, - "base": { - "item": "minecraft:diamond_shovel" - }, - "result": { - "item": "bentenmod:black_diamond_shovel" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/black_diamond_sword.json b/src/generated/resources/data/bentenmod/recipes/black_diamond_sword.json deleted file mode 100644 index 6a749e81..00000000 --- a/src/generated/resources/data/bentenmod/recipes/black_diamond_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:black_diamond" - }, - "base": { - "item": "minecraft:diamond_sword" - }, - "result": { - "item": "bentenmod:black_diamond_sword" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/boots.json b/src/generated/resources/data/bentenmod/recipes/boots.json index aa9b4528..a597a70c 100644 --- a/src/generated/resources/data/bentenmod/recipes/boots.json +++ b/src/generated/resources/data/bentenmod/recipes/boots.json @@ -12,5 +12,6 @@ ], "result": { "item": "bentenmod:boots" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/chestplate.json b/src/generated/resources/data/bentenmod/recipes/chestplate.json index 648dccf3..fcdf2520 100644 --- a/src/generated/resources/data/bentenmod/recipes/chestplate.json +++ b/src/generated/resources/data/bentenmod/recipes/chestplate.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:chestplate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/enchanted_golden_apple.json b/src/generated/resources/data/bentenmod/recipes/enchanted_golden_apple.json index 7c44bf9a..6b9e7a31 100644 --- a/src/generated/resources/data/bentenmod/recipes/enchanted_golden_apple.json +++ b/src/generated/resources/data/bentenmod/recipes/enchanted_golden_apple.json @@ -16,5 +16,6 @@ ], "result": { "item": "minecraft:enchanted_golden_apple" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/enchanted_omnitrix_apple.json b/src/generated/resources/data/bentenmod/recipes/enchanted_omnitrix_apple.json index ba64cef1..4e826a3c 100644 --- a/src/generated/resources/data/bentenmod/recipes/enchanted_omnitrix_apple.json +++ b/src/generated/resources/data/bentenmod/recipes/enchanted_omnitrix_apple.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:enchanted_omnitrix_apple" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/fire_apple.json b/src/generated/resources/data/bentenmod/recipes/fire_apple.json index 5abf2f35..4ff188ca 100644 --- a/src/generated/resources/data/bentenmod/recipes/fire_apple.json +++ b/src/generated/resources/data/bentenmod/recipes/fire_apple.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:fire_apple" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/fire_block.json b/src/generated/resources/data/bentenmod/recipes/fire_block.json index 015eb4da..eba9a431 100644 --- a/src/generated/resources/data/bentenmod/recipes/fire_block.json +++ b/src/generated/resources/data/bentenmod/recipes/fire_block.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:fire_block" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/heatblast_boots.json b/src/generated/resources/data/bentenmod/recipes/heatblast_boots.json index 1959b983..9503efca 100644 --- a/src/generated/resources/data/bentenmod/recipes/heatblast_boots.json +++ b/src/generated/resources/data/bentenmod/recipes/heatblast_boots.json @@ -12,5 +12,6 @@ ], "result": { "item": "bentenmod:heatblast_boots" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/heatblast_chestplate.json b/src/generated/resources/data/bentenmod/recipes/heatblast_chestplate.json index e722c2b7..4309d1c5 100644 --- a/src/generated/resources/data/bentenmod/recipes/heatblast_chestplate.json +++ b/src/generated/resources/data/bentenmod/recipes/heatblast_chestplate.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:heatblast_chestplate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/heatblast_helmet.json b/src/generated/resources/data/bentenmod/recipes/heatblast_helmet.json index 23d73c00..232a10cf 100644 --- a/src/generated/resources/data/bentenmod/recipes/heatblast_helmet.json +++ b/src/generated/resources/data/bentenmod/recipes/heatblast_helmet.json @@ -12,5 +12,6 @@ ], "result": { "item": "bentenmod:heatblast_helmet" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/heatblast_leggings.json b/src/generated/resources/data/bentenmod/recipes/heatblast_leggings.json index ea70d24d..361e9e4e 100644 --- a/src/generated/resources/data/bentenmod/recipes/heatblast_leggings.json +++ b/src/generated/resources/data/bentenmod/recipes/heatblast_leggings.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:heatblast_leggings" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/heatblast_sword.json b/src/generated/resources/data/bentenmod/recipes/heatblast_sword.json index 08c4f5c0..eccc9355 100644 --- a/src/generated/resources/data/bentenmod/recipes/heatblast_sword.json +++ b/src/generated/resources/data/bentenmod/recipes/heatblast_sword.json @@ -19,5 +19,6 @@ ], "result": { "item": "bentenmod:heatblast_sword" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/helmet.json b/src/generated/resources/data/bentenmod/recipes/helmet.json index 538441f4..e70dc5c2 100644 --- a/src/generated/resources/data/bentenmod/recipes/helmet.json +++ b/src/generated/resources/data/bentenmod/recipes/helmet.json @@ -12,5 +12,6 @@ ], "result": { "item": "bentenmod:helmet" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/imperium_block.json b/src/generated/resources/data/bentenmod/recipes/imperium_block.json index 76959bc8..a5eb660c 100644 --- a/src/generated/resources/data/bentenmod/recipes/imperium_block.json +++ b/src/generated/resources/data/bentenmod/recipes/imperium_block.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:imperium_block" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/imperium_pickaxe.json b/src/generated/resources/data/bentenmod/recipes/imperium_pickaxe.json index c3636a0d..d5e51343 100644 --- a/src/generated/resources/data/bentenmod/recipes/imperium_pickaxe.json +++ b/src/generated/resources/data/bentenmod/recipes/imperium_pickaxe.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:imperium_pickaxe" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/imperium_sword.json b/src/generated/resources/data/bentenmod/recipes/imperium_sword.json index b77d1f3f..4cdc4bf1 100644 --- a/src/generated/resources/data/bentenmod/recipes/imperium_sword.json +++ b/src/generated/resources/data/bentenmod/recipes/imperium_sword.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:imperium_sword" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/imperium_upgraded_pickaxe.json b/src/generated/resources/data/bentenmod/recipes/imperium_upgraded_pickaxe.json index 81e2863d..1c493adc 100644 --- a/src/generated/resources/data/bentenmod/recipes/imperium_upgraded_pickaxe.json +++ b/src/generated/resources/data/bentenmod/recipes/imperium_upgraded_pickaxe.json @@ -1,6 +1,6 @@ { - "type": "minecraft:crafting_shaped", - "category": "equipment", + "type": "bentenmod:omnitrix_crafter_shaped", + "category": "tools", "key": { "A": { "item": "bentenmod:imperium_pickaxe" diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_axe.json b/src/generated/resources/data/bentenmod/recipes/infinitum_axe.json deleted file mode 100644 index e5dd6582..00000000 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_axe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:infinitum" - }, - "base": { - "item": "bentenmod:black_diamond_axe" - }, - "result": { - "item": "bentenmod:infinitum_axe" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_block.json b/src/generated/resources/data/bentenmod/recipes/infinitum_block.json index b79a3aec..e2ccbdec 100644 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_block.json +++ b/src/generated/resources/data/bentenmod/recipes/infinitum_block.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:infinitum_block" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_boots.json b/src/generated/resources/data/bentenmod/recipes/infinitum_boots.json deleted file mode 100644 index 0de0a027..00000000 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_boots.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:infinitum" - }, - "base": { - "item": "bentenmod:black_diamond_boots" - }, - "result": { - "item": "bentenmod:infinitum_boots" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_chestplate.json b/src/generated/resources/data/bentenmod/recipes/infinitum_chestplate.json deleted file mode 100644 index 3467384a..00000000 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_chestplate.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:infinitum" - }, - "base": { - "item": "bentenmod:black_diamond_chestplate" - }, - "result": { - "item": "bentenmod:infinitum_chestplate" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_helmet.json b/src/generated/resources/data/bentenmod/recipes/infinitum_helmet.json deleted file mode 100644 index af4046b9..00000000 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_helmet.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:infinitum" - }, - "base": { - "item": "bentenmod:black_diamond_helmet" - }, - "result": { - "item": "bentenmod:infinitum_helmet" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_hoe.json b/src/generated/resources/data/bentenmod/recipes/infinitum_hoe.json deleted file mode 100644 index fd362c68..00000000 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_hoe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:infinitum" - }, - "base": { - "item": "bentenmod:black_diamond_hoe" - }, - "result": { - "item": "bentenmod:infinitum_hoe" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_leggings.json b/src/generated/resources/data/bentenmod/recipes/infinitum_leggings.json deleted file mode 100644 index 128e0bbc..00000000 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_leggings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:infinitum" - }, - "base": { - "item": "bentenmod:black_diamond_leggings" - }, - "result": { - "item": "bentenmod:infinitum_leggings" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_pickaxe.json b/src/generated/resources/data/bentenmod/recipes/infinitum_pickaxe.json deleted file mode 100644 index ca90891d..00000000 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_pickaxe.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:infinitum" - }, - "base": { - "item": "bentenmod:black_diamond_pickaxe" - }, - "result": { - "item": "bentenmod:infinitum_pickaxe" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_shovel.json b/src/generated/resources/data/bentenmod/recipes/infinitum_shovel.json deleted file mode 100644 index 99cabe9d..00000000 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_shovel.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:infinitum" - }, - "base": { - "item": "bentenmod:black_diamond_shovel" - }, - "result": { - "item": "bentenmod:infinitum_shovel" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/infinitum_sword.json b/src/generated/resources/data/bentenmod/recipes/infinitum_sword.json deleted file mode 100644 index 09237ae9..00000000 --- a/src/generated/resources/data/bentenmod/recipes/infinitum_sword.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smithing", - "addition": { - "item": "bentenmod:infinitum" - }, - "base": { - "item": "bentenmod:black_diamond_sword" - }, - "result": { - "item": "bentenmod:infinitum_sword" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/jacket.json b/src/generated/resources/data/bentenmod/recipes/jacket.json index e0315443..6483a1d7 100644 --- a/src/generated/resources/data/bentenmod/recipes/jacket.json +++ b/src/generated/resources/data/bentenmod/recipes/jacket.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:jacket" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/kraab_spawn_egg.json b/src/generated/resources/data/bentenmod/recipes/kraab_spawn_egg.json index b74f807c..aa656af0 100644 --- a/src/generated/resources/data/bentenmod/recipes/kraab_spawn_egg.json +++ b/src/generated/resources/data/bentenmod/recipes/kraab_spawn_egg.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:crab_spawn_egg" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/legendary_block.json b/src/generated/resources/data/bentenmod/recipes/legendary_block.json index cf755b50..00fe8ccf 100644 --- a/src/generated/resources/data/bentenmod/recipes/legendary_block.json +++ b/src/generated/resources/data/bentenmod/recipes/legendary_block.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:legendary_block" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/leggings.json b/src/generated/resources/data/bentenmod/recipes/leggings.json index d0d825f6..826fe645 100644 --- a/src/generated/resources/data/bentenmod/recipes/leggings.json +++ b/src/generated/resources/data/bentenmod/recipes/leggings.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:leggings" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/omnitrix_apple.json b/src/generated/resources/data/bentenmod/recipes/omnitrix_apple.json index 5155051e..32f31cd8 100644 --- a/src/generated/resources/data/bentenmod/recipes/omnitrix_apple.json +++ b/src/generated/resources/data/bentenmod/recipes/omnitrix_apple.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:omnitrix_apple" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/omnitrix_block.json b/src/generated/resources/data/bentenmod/recipes/omnitrix_block.json index 35774483..fca8fbfc 100644 --- a/src/generated/resources/data/bentenmod/recipes/omnitrix_block.json +++ b/src/generated/resources/data/bentenmod/recipes/omnitrix_block.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:omnitrix_block" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/omntrix_block.json b/src/generated/resources/data/bentenmod/recipes/omntrix_block.json index 128a98e0..957c4516 100644 --- a/src/generated/resources/data/bentenmod/recipes/omntrix_block.json +++ b/src/generated/resources/data/bentenmod/recipes/omntrix_block.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:omnitrix_crafter" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/ruby_apple.json b/src/generated/resources/data/bentenmod/recipes/ruby_apple.json index f56ba7cf..12ecc451 100644 --- a/src/generated/resources/data/bentenmod/recipes/ruby_apple.json +++ b/src/generated/resources/data/bentenmod/recipes/ruby_apple.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:ruby_apple" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/ruby_block.json b/src/generated/resources/data/bentenmod/recipes/ruby_block.json index 4097b1a0..8075964b 100644 --- a/src/generated/resources/data/bentenmod/recipes/ruby_block.json +++ b/src/generated/resources/data/bentenmod/recipes/ruby_block.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:ruby_block" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/speed_block.json b/src/generated/resources/data/bentenmod/recipes/speed_block.json index f3d971d4..cac2f64d 100644 --- a/src/generated/resources/data/bentenmod/recipes/speed_block.json +++ b/src/generated/resources/data/bentenmod/recipes/speed_block.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:speed_block" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/sword.json b/src/generated/resources/data/bentenmod/recipes/sword.json index 5f892e85..f08e9b93 100644 --- a/src/generated/resources/data/bentenmod/recipes/sword.json +++ b/src/generated/resources/data/bentenmod/recipes/sword.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:sword" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/xlr8_boots.json b/src/generated/resources/data/bentenmod/recipes/xlr8_boots.json index 3c2e7e19..570cea93 100644 --- a/src/generated/resources/data/bentenmod/recipes/xlr8_boots.json +++ b/src/generated/resources/data/bentenmod/recipes/xlr8_boots.json @@ -12,5 +12,6 @@ ], "result": { "item": "bentenmod:xlr8_boots" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/xlr8_chestplate.json b/src/generated/resources/data/bentenmod/recipes/xlr8_chestplate.json index 7cc8e84f..4af6f48c 100644 --- a/src/generated/resources/data/bentenmod/recipes/xlr8_chestplate.json +++ b/src/generated/resources/data/bentenmod/recipes/xlr8_chestplate.json @@ -16,5 +16,6 @@ ], "result": { "item": "bentenmod:xlr8_chestplate" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/xlr8_helmet.json b/src/generated/resources/data/bentenmod/recipes/xlr8_helmet.json index d4e9d85a..e29ca296 100644 --- a/src/generated/resources/data/bentenmod/recipes/xlr8_helmet.json +++ b/src/generated/resources/data/bentenmod/recipes/xlr8_helmet.json @@ -12,5 +12,6 @@ ], "result": { "item": "bentenmod:xlr8_helmet" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/bentenmod/recipes/xlr8_leggings.json b/src/generated/resources/data/bentenmod/recipes/xlr8_leggings.json index 837d3fca..75c18fbe 100644 --- a/src/generated/resources/data/bentenmod/recipes/xlr8_leggings.json +++ b/src/generated/resources/data/bentenmod/recipes/xlr8_leggings.json @@ -13,5 +13,6 @@ ], "result": { "item": "bentenmod:xlr8_leggings" - } + }, + "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/pack.mcmeta b/src/generated/resources/pack.mcmeta new file mode 100644 index 00000000..44b40caa --- /dev/null +++ b/src/generated/resources/pack.mcmeta @@ -0,0 +1,9 @@ +{ + "pack": { + "description": { + "text": "BentenMod Mod Resources" + }, + "forge:server_data_pack_format": 12, + "pack_format": 13 + } +} \ No newline at end of file diff --git a/src/main/java/io/github/realyusufismail/bentenmod/BenTenMod.java b/src/main/java/io/github/realyusufismail/bentenmod/BenTenMod.java index a5257fb4..c419110d 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/BenTenMod.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/BenTenMod.java @@ -39,8 +39,6 @@ import io.github.realyusufismail.bentenmod.core.item.ModSpawnEggItem; import io.github.realyusufismail.bentenmod.core.itemgroup.BenTenModItemGroup; import io.github.realyusufismail.bentenmod.data.DataGenerators; -import io.github.realyusufismail.bentenmod.data.worldgen.ModOreFeatures; -import io.github.realyusufismail.bentenmod.data.worldgen.ModOrePlacements; import io.github.realyusufismail.bentenmod.entity.CrabBoltEntity; import io.github.realyusufismail.bentenmod.entity.CrabEntity; import io.github.realyusufismail.bentenmod.util.ModResourceLocation; @@ -48,18 +46,13 @@ import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRenderers; -import net.minecraft.core.RegistrySetBuilder; -import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.Blocks; import net.minecraftforge.client.event.EntityRenderersEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityAttributeCreationEvent; -import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.ForgeRegistries; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Contract; @@ -91,6 +84,7 @@ public BenTenMod() { bus.addListener(this::onRegisterEntities); bus.addListener(DataGenerators::gatherData); bus.addListener(BenTenModItemGroup::registerCreativeTab); + bus.addListener(RecipeCategoriesInit::registerRecipeCategories); GeckoLib.shadowInit(); diff --git a/src/main/java/io/github/realyusufismail/bentenmod/TODO.txt b/src/main/java/io/github/realyusufismail/bentenmod/TODO.txt deleted file mode 100644 index 2af4a980..00000000 --- a/src/main/java/io/github/realyusufismail/bentenmod/TODO.txt +++ /dev/null @@ -1,2 +0,0 @@ -//TODO: Add the omnitrix. -//TODO: Entity system is broken \ No newline at end of file diff --git a/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/IOmnitrixCraftingRecipe.java b/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/IOmnitrixCraftingRecipe.java index bfa0920e..4a40ce21 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/IOmnitrixCraftingRecipe.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/IOmnitrixCraftingRecipe.java @@ -9,4 +9,5 @@ default RecipeType getType() { return RecipeTypeInit.OMNITRIX_CRAFTER_TYPE.get(); } + OmnitrixCrafterCraftingBookCategory getCategory(); } diff --git a/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmnitrixCrafterCraftingBookCategory.java b/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmnitrixCrafterCraftingBookCategory.java new file mode 100644 index 00000000..75055296 --- /dev/null +++ b/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmnitrixCrafterCraftingBookCategory.java @@ -0,0 +1,24 @@ +package io.github.realyusufismail.bentenmod.core.blocks.bententable; + +import net.minecraft.util.StringRepresentable; + +public enum OmnitrixCrafterCraftingBookCategory implements StringRepresentable { + TOOLS("tools"), + MISC("misc"); + + private final String name; + + OmnitrixCrafterCraftingBookCategory(String name) { + this.name = name; + } + + @Override + public String getSerializedName() { + return name; + } + + public static StringRepresentable.EnumCodec codec() { + return StringRepresentable.fromEnum(OmnitrixCrafterCraftingBookCategory::values); + } +} + diff --git a/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmnitrixCrafterMenu.java b/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmnitrixCrafterMenu.java index b2422b57..9780c7ef 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmnitrixCrafterMenu.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmnitrixCrafterMenu.java @@ -22,13 +22,6 @@ * @see CraftingMenu */ public class OmnitrixCrafterMenu extends RecipeBookMenu { - public static final int RESULT_SLOT = 0; - private static final int CRAFT_SLOT_START = 1; - private static final int CRAFT_SLOT_END = 10; - private static final int INV_SLOT_START = 10; - private static final int INV_SLOT_END = 37; - private static final int USE_ROW_SLOT_START = 37; - private static final int USE_ROW_SLOT_END = 46; private final OmnitrixCrafterContainer craftSlots = new OmnitrixCrafterContainer(this, 3, 3); private final ResultContainer resultSlots = new ResultContainer(); private final ContainerLevelAccess access; @@ -75,7 +68,7 @@ protected static void slotChangedCraftingGrid(AbstractContainerMenu p_150547_, L if (optional.isPresent()) { IOmnitrixCraftingRecipe craftingrecipe = optional.get(); if (p_150551_.setRecipeUsed(p_150548_, serverplayer, craftingrecipe)) { - itemstack = craftingrecipe.assemble(p_150550_); + itemstack = craftingrecipe.assemble(p_150550_, p_150548_.registryAccess()); } } diff --git a/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmntrixCrafterShapedRecipe.java b/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmntrixCrafterShapedRecipe.java index f23f0f66..ac079069 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmntrixCrafterShapedRecipe.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/core/blocks/bententable/OmntrixCrafterShapedRecipe.java @@ -41,7 +41,9 @@ import com.google.gson.JsonSyntaxException; import io.github.realyusufismail.bentenmod.BenTenMod; import io.github.realyusufismail.bentenmod.core.init.RecipeSerializerInit; +import lombok.val; import net.minecraft.core.NonNullList; +import net.minecraft.core.RegistryAccess; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; @@ -52,6 +54,7 @@ import net.minecraft.world.level.Level; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.common.crafting.IShapedRecipe; import net.minecraftforge.registries.ForgeRegistries; import org.jetbrains.annotations.NotNull; @@ -62,7 +65,7 @@ * @see CraftingRecipe */ public class OmntrixCrafterShapedRecipe - implements IOmnitrixCraftingRecipe, Recipe { + implements IOmnitrixCraftingRecipe, IShapedRecipe { static int MAX_WIDTH = 3; static int MAX_HEIGHT = 3; @@ -72,17 +75,20 @@ public class OmntrixCrafterShapedRecipe final ItemStack result; final String group; private final ResourceLocation id; - // private final Block icon; + private final OmnitrixCrafterCraftingBookCategory craftingBookCategory; + private final boolean flag; public OmntrixCrafterShapedRecipe(ResourceLocation pId, String pGroup, int pWidth, int pHeight, - NonNullList pRecipeItems, ItemStack pResult) { + NonNullList pRecipeItems, ItemStack pResult, boolean flag, + OmnitrixCrafterCraftingBookCategory craftingBookCategory) { this.id = pId; this.group = pGroup; this.width = pWidth; this.height = pHeight; this.recipeItems = pRecipeItems; this.result = pResult; - // this.icon = icon; + this.flag = flag; + this.craftingBookCategory = craftingBookCategory; } /** @@ -173,10 +179,10 @@ private static int firstNonSpace(String pEntry) { } private static int lastNonSpace(String pEntry) { - int i; - for (i = pEntry.length() - 1; i >= 0 && pEntry.charAt(i) == ' '; --i) { + int i = pEntry.length() - 1; + while (i >= 0 && pEntry.charAt(i) == ' ') { + i--; } - return i; } @@ -269,6 +275,11 @@ public boolean matches(OmnitrixCrafterContainer pInv, Level pLevel) { return false; } + @Override + public ItemStack assemble(OmnitrixCrafterContainer pContainer, RegistryAccess pRegistryAccess) { + return this.result.copy(); + } + /** * Checks if the region of a crafting inventory is match for the recipe. */ @@ -298,13 +309,13 @@ private boolean matches(OmnitrixCrafterContainer pCraftingInventory, int pWidth, } @Override - public ItemStack assemble(OmnitrixCrafterContainer pContainer) { - return this.getResultItem().copy(); + public boolean canCraftInDimensions(int pWidth, int pHeight) { + return true; } @Override - public boolean canCraftInDimensions(int pWidth, int pHeight) { - return false; + public ItemStack getResultItem(RegistryAccess pRegistryAccess) { + return this.result; } /** @@ -315,16 +326,6 @@ public String getGroup() { return this.group; } - /** - * Get the result of this recipe, usually for display purposes (e.g. recipe book). If your - * recipe has more than one possible result (e.g. it's dynamic and depends on its inputs), then - * return an empty stack. - */ - @Override - public ItemStack getResultItem() { - return this.result; - } - @Override public NonNullList getIngredients() { return this.recipeItems; @@ -347,6 +348,21 @@ public boolean isIncomplete() { .anyMatch(ForgeHooks::hasNoElements); } + @Override + public int getRecipeWidth() { + return this.width; + } + + @Override + public int getRecipeHeight() { + return this.height; + } + + @Override + public OmnitrixCrafterCraftingBookCategory getCategory() { + return craftingBookCategory; + } + public static final class Type implements RecipeType { @Override public String toString() { @@ -360,18 +376,22 @@ public Serializer() {} @Override public OmntrixCrafterShapedRecipe fromJson(ResourceLocation pRecipeId, JsonObject pJson) { - String s = GsonHelper.getAsString(pJson, "group", ""); - Map map = OmntrixCrafterShapedRecipe + val s = GsonHelper.getAsString(pJson, "group", ""); + val craftingBookCategory = OmnitrixCrafterCraftingBookCategory.codec() + .byName(GsonHelper.getAsString(pJson, "category", null), + OmnitrixCrafterCraftingBookCategory.MISC); + val map = OmntrixCrafterShapedRecipe .keyFromJson(GsonHelper.getAsJsonObject(pJson, "key")); - String[] astring = OmntrixCrafterShapedRecipe.shrink(OmntrixCrafterShapedRecipe + val astring = OmntrixCrafterShapedRecipe.shrink(OmntrixCrafterShapedRecipe .patternFromJson(GsonHelper.getAsJsonArray(pJson, "pattern"))); int i = astring[0].length(); int j = astring.length; - NonNullList nonnulllist = - OmntrixCrafterShapedRecipe.dissolvePattern(astring, map, i, j); - ItemStack itemstack = OmntrixCrafterShapedRecipe + val nonnulllist = OmntrixCrafterShapedRecipe.dissolvePattern(astring, map, i, j); + val itemstack = OmntrixCrafterShapedRecipe .itemStackFromJson(GsonHelper.getAsJsonObject(pJson, "result")); - return new OmntrixCrafterShapedRecipe(pRecipeId, s, i, j, nonnulllist, itemstack); + val flag = GsonHelper.getAsBoolean(pJson, "show_notification", true); + return new OmntrixCrafterShapedRecipe(pRecipeId, s, i, j, nonnulllist, itemstack, flag, + craftingBookCategory); } @Override @@ -385,7 +405,10 @@ public OmntrixCrafterShapedRecipe fromJson(ResourceLocation pRecipeId, JsonObjec nonnulllist.replaceAll(ignored -> Ingredient.fromNetwork(pBuffer)); ItemStack itemstack = pBuffer.readItem(); - return new OmntrixCrafterShapedRecipe(pRecipeId, s, i, j, nonnulllist, itemstack); + val flag = pBuffer.readBoolean(); + val craftingBookCategory = pBuffer.readEnum(OmnitrixCrafterCraftingBookCategory.class); + return new OmntrixCrafterShapedRecipe(pRecipeId, s, i, j, nonnulllist, itemstack, flag, + craftingBookCategory); } @Override diff --git a/src/main/java/io/github/realyusufismail/bentenmod/core/init/RecipeBookTypesInit.java b/src/main/java/io/github/realyusufismail/bentenmod/core/init/RecipeBookTypesInit.java new file mode 100644 index 00000000..d46635de --- /dev/null +++ b/src/main/java/io/github/realyusufismail/bentenmod/core/init/RecipeBookTypesInit.java @@ -0,0 +1,7 @@ +package io.github.realyusufismail.bentenmod.core.init; + +import net.minecraft.world.inventory.RecipeBookType; + +public class RecipeBookTypesInit { + public static RecipeBookType OMNITRIX_CRAFTING = RecipeBookType.create("omnitrix_crafting"); +} diff --git a/src/main/java/io/github/realyusufismail/bentenmod/core/init/RecipeCategoriesInit.java b/src/main/java/io/github/realyusufismail/bentenmod/core/init/RecipeCategoriesInit.java index 0a9f30d7..06960d1e 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/core/init/RecipeCategoriesInit.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/core/init/RecipeCategoriesInit.java @@ -4,7 +4,7 @@ import io.github.realyusufismail.bentenmod.core.blocks.bententable.OmntrixCrafterShapedRecipe; import net.minecraft.client.RecipeBookCategories; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.RecipeType; import net.minecraftforge.client.event.RegisterRecipeBookCategoriesEvent; @@ -15,22 +15,41 @@ public class RecipeCategoriesInit { private static final RecipeType OMNITRIX_CRAFTING_RECIPE_TYPE = new OmntrixCrafterShapedRecipe.Type(); - public static final Supplier OMNTRIX_CRAFTER = () -> RecipeBookCategories - .create("omnitrix_crafter", new ItemStack(ItemInit.OMNITRIX.get())); + private static final Supplier OMNITRIX_CRAFTING_SEARCH = + () -> RecipeBookCategories.create("omnitrix_crafting_search", + new ItemStack(Items.COMPASS)); + + private static final Supplier OMNTRIX_CRAFTER_TOOLS = + () -> RecipeBookCategories.create("omnitrix_crafter_tools", + new ItemStack(ItemInit.IMPERIUM_PICKAXE_UPGRADED.get())); + + private static final Supplier OMNTRIX_CRAFTER_MISC = + () -> RecipeBookCategories.create("omnitrix_crafter_misc", + new ItemStack(Items.WHITE_WOOL)); public static void registerRecipeCategories(RegisterRecipeBookCategoriesEvent event) { - event.registerBookCategories(RecipeBookTypeInit.OMNITRIX_CRAFTER, - List.of(OMNTRIX_CRAFTER.get())); - event.registerRecipeCategoryFinder(OMNITRIX_CRAFTING_RECIPE_TYPE, - RecipeCategoriesInit::getForgingCategory); - } + event.registerBookCategories(RecipeBookTypesInit.OMNITRIX_CRAFTING, + List.of(OMNITRIX_CRAFTING_SEARCH.get(), OMNTRIX_CRAFTER_TOOLS.get(), + OMNTRIX_CRAFTER_MISC.get())); + + event.registerAggregateCategory(OMNITRIX_CRAFTING_SEARCH.get(), + List.of(OMNTRIX_CRAFTER_TOOLS.get(), OMNTRIX_CRAFTER_MISC.get())); + + event.registerAggregateCategory(OMNTRIX_CRAFTER_TOOLS.get(), + List.of(OMNTRIX_CRAFTER_TOOLS.get())); + + event.registerAggregateCategory(OMNTRIX_CRAFTER_MISC.get(), + List.of(OMNTRIX_CRAFTER_MISC.get())); - private static RecipeBookCategories getForgingCategory(Recipe recipe) { - final var recipeType = recipe.getType(); - if (recipeType == OMNITRIX_CRAFTING_RECIPE_TYPE) { - return OMNTRIX_CRAFTER.get(); - } else { - return RecipeBookCategories.UNKNOWN; - } + event.registerRecipeCategoryFinder(RecipeTypeInit.OMNITRIX_CRAFTER_TYPE.get(), (it) -> { + if (it instanceof OmntrixCrafterShapedRecipe) { + return switch (((OmntrixCrafterShapedRecipe) it).getCategory()) { + case TOOLS -> OMNTRIX_CRAFTER_TOOLS.get(); + case MISC -> OMNTRIX_CRAFTER_MISC.get(); + }; + } else { + return OMNTRIX_CRAFTER_MISC.get(); + } + }); } } diff --git a/src/main/java/io/github/realyusufismail/bentenmod/core/material/CustomArmorMaterial.java b/src/main/java/io/github/realyusufismail/bentenmod/core/material/CustomArmorMaterial.java index 3d9f4e9c..9e227235 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/core/material/CustomArmorMaterial.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/core/material/CustomArmorMaterial.java @@ -35,7 +35,6 @@ import io.github.realyusufismail.bentenmod.core.init.ItemInit; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; -import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.ArmorMaterial; import net.minecraft.world.item.crafting.Ingredient; @@ -45,6 +44,7 @@ import java.util.function.Supplier; public enum CustomArmorMaterial implements ArmorMaterial { + // TODO: Fix these values ARMOUR("legendary", 30, new int[] {6, 9, 12, 6}, 20, SoundEvents.ARMOR_EQUIP_NETHERITE, 4.0F, 0.3f, () -> Ingredient.of(ItemInit.LEGENDARY.get())), JACKET("jacket", 30, new int[] {6, 9, 12, 6}, 20, SoundEvents.ARMOR_EQUIP_NETHERITE, 4.0F, 0.3f, @@ -63,7 +63,6 @@ public enum CustomArmorMaterial implements ArmorMaterial { 4.0F, 0.3f, () -> Ingredient.of(ItemInit.FIRE.get())); - private static final int[] baseDurability = {128, 144, 160, 112}; private final String name; private final int durabilityMultiplier; private final int[] armorVal; @@ -87,18 +86,15 @@ public enum CustomArmorMaterial implements ArmorMaterial { this.repairIngredient = repairIngredient.get(); } - public int getDefenseForSlot(EquipmentSlot slot) { - return this.armorVal[slot.getIndex()]; - } - @Override - public int getDurabilityForType(ArmorItem.Type pType) { - return durabilityMultiplier * armorVal[pType.getSlot().ordinal()]; + public int getDurabilityForType(ArmorItem.Type type) { + return durabilityMultiplier * armorVal[type.ordinal()]; } + @Override public int getDefenseForType(ArmorItem.Type pType) { - return armorVal[pType.getSlot().ordinal()]; + return armorVal[pType.ordinal()]; } @Override diff --git a/src/main/java/io/github/realyusufismail/bentenmod/core/material/CustomToolMaterial.java b/src/main/java/io/github/realyusufismail/bentenmod/core/material/CustomToolMaterial.java index 6564229d..fa980c52 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/core/material/CustomToolMaterial.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/core/material/CustomToolMaterial.java @@ -39,39 +39,35 @@ import java.util.function.Supplier; public enum CustomToolMaterial implements Tier { - - SWORD(20, 2500, 60f, 10f, 40, () -> Ingredient.of(ItemInit.LEGENDARY.get())), - HEATBLAST_SWORD(20, 2500, 60f, 10f, 40, () -> Ingredient.of(ItemInit.FIRE.get())), - BLACK_DIAMOND_SWORD(20, 2000, 60f, 12f, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), - BLACK_DIAMOND_AXE(20, 2500, 60f, 11f, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), - BLACK_DIAMOND_PICKAXE(20, 2500, 60f, 8f, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), - BLACK_DIAMOND_SHOVEL(20, 2500, 60f, 9f, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), - BLACK_DIAMOND_HOE(20, 2500, 60f, 6f, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), - INFINITUM_SWORD(20, 3000, 70f, 14f, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), - INFINITUM_AXE(20, 3000, 70f, 13f, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), - INFINITUM_PICKAXE(20, 3000, 70f, 12f, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), - INFINITUM_SHOVEL(20, 3000, 70f, 10f, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), - INFINITUM_HOE(20, 3000, 70f, 7f, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), - AXE(50, 2500, 80f, 8, 50, () -> Ingredient.of(ItemInit.RUBY.get())), - IMPERIUM_SWORD(3, 3000, 70f, 7.5f, 40, () -> Ingredient.of(ItemInit.IMPERIUM.get())), - IMPERIUM_PICKAXE(2, 2500, 40f, 6f, 40, () -> Ingredient.of(ItemInit.IMPERIUM.get())), - IMPERIUM_PICKAXE_UPGRADED(3, 3000, 50f, 5f, 40, () -> Ingredient.of(ItemInit.IMPERIUM.get())), - IMPERIUM_AXE(3, 3000, 50f, 5f, 40, () -> Ingredient.of(ItemInit.IMPERIUM.get())); + // TODO: Fix these values + SWORD(3, 2500, 40, () -> Ingredient.of(ItemInit.LEGENDARY.get())), + HEATBLAST_SWORD(3, 2500, 40, () -> Ingredient.of(ItemInit.FIRE.get())), + BLACK_DIAMOND_SWORD(3, 2000, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), + BLACK_DIAMOND_AXE(3, 2500, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), + BLACK_DIAMOND_PICKAXE(3, 2500, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), + BLACK_DIAMOND_SHOVEL(3, 2500, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), + BLACK_DIAMOND_HOE(3, 2500, 40, () -> Ingredient.of(ItemInit.BLACK_DIAMOND.get())), + INFINITUM_SWORD(3, 3000, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), + INFINITUM_AXE(3, 3000, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), + INFINITUM_PICKAXE(3, 3000, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), + INFINITUM_SHOVEL(3, 3000, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), + INFINITUM_HOE(3, 3000, 40, () -> Ingredient.of(ItemInit.INFINITUM.get())), + AXE(3, 2500, 50, () -> Ingredient.of(ItemInit.RUBY.get())), + IMPERIUM_SWORD(3, 3000, 40, () -> Ingredient.of(ItemInit.IMPERIUM.get())), + IMPERIUM_PICKAXE(2, 2500, 40, () -> Ingredient.of(ItemInit.IMPERIUM.get())), + IMPERIUM_PICKAXE_UPGRADED(3, 3000, 40, () -> Ingredient.of(ItemInit.IMPERIUM.get())), + IMPERIUM_AXE(3, 3000, 40, () -> Ingredient.of(ItemInit.IMPERIUM.get())); private final int harvestLevel; private final int maxUses; - private final float efficiency; - private final float attackDamage; private final int enchantability; private final Ingredient repairMaterial; - CustomToolMaterial(int harvestLevel, int maxUses, float efficiency, float attackDamage, - int enchantability, Supplier repairMaterial) { + CustomToolMaterial(int harvestLevel, int maxUses, int enchantability, + Supplier repairMaterial) { this.harvestLevel = harvestLevel; this.maxUses = maxUses; - this.efficiency = efficiency; - this.attackDamage = attackDamage; this.enchantability = enchantability; this.repairMaterial = repairMaterial.get(); } @@ -81,14 +77,20 @@ public int getUses() { return this.maxUses; } + /** + * The speed which is 4 + this value. 4 is the speed of the fist. + * + * @return value is set to 0 as the main speed is set in the item class + */ @Override public float getSpeed() { - return this.efficiency; + return 0f; } + /** @return This is set to 0 as the main attack damage is set in the item class */ @Override public float getAttackDamageBonus() { - return this.attackDamage; + return 0f; } @Override diff --git a/src/main/java/io/github/realyusufismail/bentenmod/data/DataGenerators.java b/src/main/java/io/github/realyusufismail/bentenmod/data/DataGenerators.java index 6ce20c93..828d9a90 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/data/DataGenerators.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/data/DataGenerators.java @@ -32,7 +32,6 @@ package io.github.realyusufismail.bentenmod.data; -import io.github.realyusufismail.bentenmod.BenTenMod; import io.github.realyusufismail.bentenmod.data.advancments.ModAdvancementProvider; import io.github.realyusufismail.bentenmod.data.client.ModBlockStateProvider; import io.github.realyusufismail.bentenmod.data.client.ModItemModelProvider; @@ -42,9 +41,16 @@ import io.github.realyusufismail.bentenmod.data.tags.ModBlockTagsProvider; import io.github.realyusufismail.bentenmod.data.tags.ModItemTagsProvider; import io.github.realyusufismail.bentenmod.data.worldgen.ModWorldGenerationProvider; +import net.minecraft.DetectedVersion; +import net.minecraft.data.metadata.PackMetadataGenerator; +import net.minecraft.network.chat.Component; +import net.minecraft.server.packs.PackType; +import net.minecraft.server.packs.metadata.pack.PackMetadataSection; import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; + +import java.util.Arrays; +import java.util.function.Function; +import java.util.stream.Collectors; public class DataGenerators { private DataGenerators() {} @@ -75,5 +81,15 @@ public static void gatherData(GatherDataEvent event) { // ore gen gen.addProvider(true, new ModWorldGenerationProvider(gen.getPackOutput(), lookup)); + + // pack.mcmeta + gen.addProvider(true, + new PackMetadataGenerator(gen.getPackOutput()).add(PackMetadataSection.TYPE, + new PackMetadataSection(Component.literal("BentenMod Mod Resources"), + DetectedVersion.BUILT_IN.getPackVersion(PackType.CLIENT_RESOURCES), + Arrays.stream(PackType.values()) + .collect(Collectors.toMap(Function.identity(), + DetectedVersion.BUILT_IN::getPackVersion))))); + } } diff --git a/src/main/java/io/github/realyusufismail/bentenmod/data/recipe/ModRecipeProvider.java b/src/main/java/io/github/realyusufismail/bentenmod/data/recipe/ModRecipeProvider.java index 5faae201..f03cc97f 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/data/recipe/ModRecipeProvider.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/data/recipe/ModRecipeProvider.java @@ -33,6 +33,7 @@ package io.github.realyusufismail.bentenmod.data.recipe; import io.github.realyusufismail.bentenmod.BenTenMod; +import io.github.realyusufismail.bentenmod.core.blocks.bententable.OmnitrixCrafterCraftingBookCategory; import io.github.realyusufismail.bentenmod.core.init.BlockInit; import io.github.realyusufismail.bentenmod.core.init.EntityTypesInit; import io.github.realyusufismail.bentenmod.core.init.ItemInit; @@ -443,7 +444,9 @@ protected void buildRecipes(Consumer consumer) { .unlockedBy(HAS_ITEM, has(TagsInit.Items.INGOTS_RUBY)) .save(consumer, modId("kraab_spawn_egg")); - OmnitrixRecipeBuilder.shaped(RecipeCategory.TOOLS, IMPERIUM_PICKAXE_UPGRADED.get()) + OmnitrixRecipeBuilder.INSTANCE + .shaped(OmnitrixCrafterCraftingBookCategory.TOOLS, RecipeCategory.TOOLS, + IMPERIUM_PICKAXE_UPGRADED.get()) .define('A', IMPERIUM_PICKAXE.get()) .define('L', TagsInit.Items.INGOTS_OMNITRIX) .pattern(" A ") @@ -691,122 +694,110 @@ protected void buildRecipes(Consumer consumer) { .save(consumer, modId("jacket_blasting_smelt")); - // Upgrade table - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(Items.DIAMOND_SWORD), - Ingredient.of(ItemInit.BLACK_DIAMOND.get()), ItemInit.BLACK_DIAMOND_SWORD.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) - .save(consumer, modId("black_diamond_sword")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(Items.DIAMOND_AXE), - Ingredient.of(ItemInit.BLACK_DIAMOND.get()), ItemInit.BLACK_DIAMOND_AXE.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) - .save(consumer, modId("black_diamond_axe")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(Items.DIAMOND_PICKAXE), - Ingredient.of(ItemInit.BLACK_DIAMOND.get()), - ItemInit.BLACK_DIAMOND_PICKAXE.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) - .save(consumer, modId("black_diamond_pickaxe")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(Items.DIAMOND_SHOVEL), - Ingredient.of(ItemInit.BLACK_DIAMOND.get()), - ItemInit.BLACK_DIAMOND_SHOVEL.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) - .save(consumer, modId("black_diamond_shovel")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(Items.DIAMOND_HOE), - Ingredient.of(ItemInit.BLACK_DIAMOND.get()), ItemInit.BLACK_DIAMOND_HOE.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) - .save(consumer, modId("black_diamond_hoe")); - - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.COMBAT, Ingredient.of(Items.DIAMOND_HELMET), - Ingredient.of(ItemInit.BLACK_DIAMOND.get()), - ItemInit.BLACK_DIAMOND_HELMET.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) - .save(consumer, modId("black_diamond_helmet")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.COMBAT, Ingredient.of(Items.DIAMOND_CHESTPLATE), - Ingredient.of(ItemInit.BLACK_DIAMOND.get()), - ItemInit.BLACK_DIAMOND_CHESTPLATE.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) - .save(consumer, modId("black_diamond_chestplate")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.COMBAT, Ingredient.of(Items.DIAMOND_LEGGINGS), - Ingredient.of(ItemInit.BLACK_DIAMOND.get()), - ItemInit.BLACK_DIAMOND_LEGGINGS.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) - .save(consumer, modId("black_diamond_leggings")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.COMBAT, Ingredient.of(Items.DIAMOND_BOOTS), - Ingredient.of(ItemInit.BLACK_DIAMOND.get()), ItemInit.BLACK_DIAMOND_BOOTS.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) - .save(consumer, modId("black_diamond_boots")); - - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(ItemInit.BLACK_DIAMOND_SWORD.get()), - Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_SWORD.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) - .save(consumer, modId("infinitum_sword")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(ItemInit.BLACK_DIAMOND_AXE.get()), - Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_AXE.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) - .save(consumer, modId("infinitum_axe")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(ItemInit.BLACK_DIAMOND_PICKAXE.get()), - Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_PICKAXE.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) - .save(consumer, modId("infinitum_pickaxe")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(ItemInit.BLACK_DIAMOND_SHOVEL.get()), - Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_SHOVEL.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) - .save(consumer, modId("infinitum_shovel")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.TOOLS, Ingredient.of(ItemInit.BLACK_DIAMOND_HOE.get()), - Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_HOE.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) - .save(consumer, modId("infinitum_hoe")); - - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.COMBAT, Ingredient.of(ItemInit.BLACK_DIAMOND_HELMET.get()), - Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_HELMET.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) - .save(consumer, modId("infinitum_helmet")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.COMBAT, Ingredient.of(ItemInit.BLACK_DIAMOND_CHESTPLATE.get()), - Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_CHESTPLATE.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) - .save(consumer, modId("infinitum_chestplate")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.COMBAT, Ingredient.of(ItemInit.BLACK_DIAMOND_LEGGINGS.get()), - Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_LEGGINGS.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) - .save(consumer, modId("infinitum_leggings")); - - YusufUpgradeRecipeBuilder - .smithing(RecipeCategory.COMBAT, Ingredient.of(ItemInit.BLACK_DIAMOND_BOOTS.get()), - Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_BOOTS.get()) - .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) - .save(consumer, modId("infinitum_boots")); + /* + * // Upgrade table YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(Items.DIAMOND_SWORD), Ingredient.of(ItemInit.BLACK_DIAMOND.get()), + * ItemInit.BLACK_DIAMOND_SWORD.get()) .unlocks("has_item", + * has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) .save(consumer, modId("black_diamond_sword")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(Items.DIAMOND_AXE), Ingredient.of(ItemInit.BLACK_DIAMOND.get()), + * ItemInit.BLACK_DIAMOND_AXE.get()) .unlocks("has_item", + * has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) .save(consumer, modId("black_diamond_axe")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(Items.DIAMOND_PICKAXE), Ingredient.of(ItemInit.BLACK_DIAMOND.get()), + * ItemInit.BLACK_DIAMOND_PICKAXE.get()) .unlocks("has_item", + * has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) .save(consumer, + * modId("black_diamond_pickaxe")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(Items.DIAMOND_SHOVEL), Ingredient.of(ItemInit.BLACK_DIAMOND.get()), + * ItemInit.BLACK_DIAMOND_SHOVEL.get()) .unlocks("has_item", + * has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) .save(consumer, modId("black_diamond_shovel")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(Items.DIAMOND_HOE), Ingredient.of(ItemInit.BLACK_DIAMOND.get()), + * ItemInit.BLACK_DIAMOND_HOE.get()) .unlocks("has_item", + * has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) .save(consumer, modId("black_diamond_hoe")); + * + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.COMBAT, + * Ingredient.of(Items.DIAMOND_HELMET), Ingredient.of(ItemInit.BLACK_DIAMOND.get()), + * ItemInit.BLACK_DIAMOND_HELMET.get()) .unlocks("has_item", + * has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) .save(consumer, modId("black_diamond_helmet")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.COMBAT, + * Ingredient.of(Items.DIAMOND_CHESTPLATE), Ingredient.of(ItemInit.BLACK_DIAMOND.get()), + * ItemInit.BLACK_DIAMOND_CHESTPLATE.get()) .unlocks("has_item", + * has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) .save(consumer, + * modId("black_diamond_chestplate")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.COMBAT, + * Ingredient.of(Items.DIAMOND_LEGGINGS), Ingredient.of(ItemInit.BLACK_DIAMOND.get()), + * ItemInit.BLACK_DIAMOND_LEGGINGS.get()) .unlocks("has_item", + * has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) .save(consumer, + * modId("black_diamond_leggings")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.COMBAT, + * Ingredient.of(Items.DIAMOND_BOOTS), Ingredient.of(ItemInit.BLACK_DIAMOND.get()), + * ItemInit.BLACK_DIAMOND_BOOTS.get()) .unlocks("has_item", + * has(TagsInit.Items.INGOTS_BLACK_DIAMOND)) .save(consumer, modId("black_diamond_boots")); + * + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(ItemInit.BLACK_DIAMOND_SWORD.get()), + * Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_SWORD.get()) + * .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) .save(consumer, + * modId("infinitum_sword")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(ItemInit.BLACK_DIAMOND_AXE.get()), Ingredient.of(ItemInit.INFINITUM.get()), + * ItemInit.INFINITUM_AXE.get()) .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) + * .save(consumer, modId("infinitum_axe")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(ItemInit.BLACK_DIAMOND_PICKAXE.get()), + * Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_PICKAXE.get()) + * .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) .save(consumer, + * modId("infinitum_pickaxe")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(ItemInit.BLACK_DIAMOND_SHOVEL.get()), + * Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_SHOVEL.get()) + * .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) .save(consumer, + * modId("infinitum_shovel")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.TOOLS, + * Ingredient.of(ItemInit.BLACK_DIAMOND_HOE.get()), Ingredient.of(ItemInit.INFINITUM.get()), + * ItemInit.INFINITUM_HOE.get()) .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) + * .save(consumer, modId("infinitum_hoe")); + * + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.COMBAT, + * Ingredient.of(ItemInit.BLACK_DIAMOND_HELMET.get()), + * Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_HELMET.get()) + * .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) .save(consumer, + * modId("infinitum_helmet")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.COMBAT, + * Ingredient.of(ItemInit.BLACK_DIAMOND_CHESTPLATE.get()), + * Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_CHESTPLATE.get()) + * .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) .save(consumer, + * modId("infinitum_chestplate")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.COMBAT, + * Ingredient.of(ItemInit.BLACK_DIAMOND_LEGGINGS.get()), + * Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_LEGGINGS.get()) + * .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) .save(consumer, + * modId("infinitum_leggings")); + * + * YusufUpgradeRecipeBuilder .smithing(RecipeCategory.COMBAT, + * Ingredient.of(ItemInit.BLACK_DIAMOND_BOOTS.get()), + * Ingredient.of(ItemInit.INFINITUM.get()), ItemInit.INFINITUM_BOOTS.get()) + * .unlocks("has_item", has(TagsInit.Items.INGOTS_INFINITUM)) .save(consumer, + * modId("infinitum_boots")); + **/ } private Ingredient ingredient(Item entry) { diff --git a/src/main/java/io/github/realyusufismail/bentenmod/data/recipe/OmnitrixRecipeBuilder.java b/src/main/java/io/github/realyusufismail/bentenmod/data/recipe/OmnitrixRecipeBuilder.java index 0a4eb3de..1b9a057e 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/data/recipe/OmnitrixRecipeBuilder.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/data/recipe/OmnitrixRecipeBuilder.java @@ -37,7 +37,9 @@ import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import io.github.realyusufismail.bentenmod.core.blocks.bententable.OmnitrixCrafterCraftingBookCategory; import io.github.realyusufismail.bentenmod.core.init.RecipeSerializerInit; +import lombok.val; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementRewards; import net.minecraft.advancements.CriterionTriggerInstance; @@ -46,11 +48,9 @@ import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeBuilder; import net.minecraft.data.recipes.RecipeCategory; -import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.level.ItemLike; @@ -58,34 +58,35 @@ import org.jetbrains.annotations.NotNull; import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.function.Consumer; public class OmnitrixRecipeBuilder implements RecipeBuilder { - private final RecipeCategory recipeCategory; - private final Item result; - private final int count; private final List rows = Lists.newArrayList(); private final Map key = Maps.newLinkedHashMap(); - private final Advancement.Builder advancement = Advancement.Builder.advancement(); - private String group; + private Advancement.Builder advancement = null; + private String group = null; + private OmnitrixCrafterCraftingBookCategory bookCategory = null; - public OmnitrixRecipeBuilder(RecipeCategory recipeCategory, ItemLike itemLike, int count) { - this.recipeCategory = recipeCategory; - this.result = itemLike.asItem(); - this.count = count; - } + private RecipeCategory recipeCategory = null; + private Item result = null; + private Integer count = null; - public static OmnitrixRecipeBuilder shaped(RecipeCategory recipeCategory, ItemLike itemLike) { - return shaped(recipeCategory, itemLike, 1); + public static final OmnitrixRecipeBuilder INSTANCE = new OmnitrixRecipeBuilder(); + + public OmnitrixRecipeBuilder shaped(OmnitrixCrafterCraftingBookCategory bookCategory, + RecipeCategory recipeCategory, ItemLike itemLike) { + return shaped(bookCategory, recipeCategory, itemLike, 1); } - public static OmnitrixRecipeBuilder shaped(RecipeCategory recipeCategory, ItemLike itemLike, - int count) { - return new OmnitrixRecipeBuilder(recipeCategory, itemLike, count); + public OmnitrixRecipeBuilder shaped(OmnitrixCrafterCraftingBookCategory bookCategory, + RecipeCategory recipeCategory, ItemLike itemLike, int count) { + this.recipeCategory = recipeCategory; + this.result = itemLike.asItem(); + this.count = count; + this.bookCategory = bookCategory; + this.advancement = Advancement.Builder.advancement(); + return this; } public OmnitrixRecipeBuilder define(Character character, TagKey itemTag) { @@ -144,24 +145,14 @@ public void save(@NotNull Consumer finishedRecipeConsumer, .addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(resourceLocation)) .rewards(AdvancementRewards.Builder.recipe(resourceLocation)) .requirements(RequirementsStrategy.OR); - finishedRecipeConsumer.accept(new ShapedRecipeBuilder.Result(resourceLocation, this.result, - this.count, this.group == null ? "" : this.group, - determineBookCategory(this.recipeCategory), this.rows, this.key, this.advancement, - resourceLocation - .withPrefix("recipes/" + this.recipeCategory.getFolderName() + "/"))); - } - - private static CraftingBookCategory determineBookCategory(RecipeCategory p_250736_) { - - return switch (p_250736_) { - case BUILDING_BLOCKS -> CraftingBookCategory.BUILDING; - case TOOLS, COMBAT -> CraftingBookCategory.EQUIPMENT; - case REDSTONE -> CraftingBookCategory.REDSTONE; - default -> CraftingBookCategory.MISC; - }; + finishedRecipeConsumer.accept(new Result(Optional.ofNullable(bookCategory).orElseThrow(), + resourceLocation, Optional.ofNullable(this.result).orElseThrow(), + Optional.ofNullable(this.count).orElseThrow(), + Optional.ofNullable(this.group).orElse(""), this.rows, this.key, + Optional.ofNullable(this.advancement).orElseThrow(), + resourceLocation.withPrefix("recipes/" + recipeCategory.getFolderName() + "/"))); } - private void ensureValid(ResourceLocation resourceLocation) { if (this.rows.isEmpty()) { throw new IllegalStateException( @@ -195,9 +186,9 @@ private void ensureValid(ResourceLocation resourceLocation) { } } - public record Result(CraftingBookCategory category, ResourceLocation id, Item result, int count, - String group, List pattern, Map key, - Advancement.Builder advancement, + public record Result(OmnitrixCrafterCraftingBookCategory category, ResourceLocation id, + Item result, int count, String group, List pattern, + Map key, Advancement.Builder advancement, ResourceLocation advancementId) implements FinishedRecipe { public void serializeRecipeData(@NotNull JsonObject jsonObject) { @@ -207,7 +198,7 @@ public void serializeRecipeData(@NotNull JsonObject jsonObject) { jsonObject.addProperty("category", this.category.getSerializedName()); - JsonArray jsonarray = new JsonArray(); + val jsonarray = new JsonArray(); for (String s : this.pattern) { jsonarray.add(s); diff --git a/src/main/java/io/github/realyusufismail/bentenmod/data/tags/ModItemTagsProvider.java b/src/main/java/io/github/realyusufismail/bentenmod/data/tags/ModItemTagsProvider.java index 3d322e7b..6a8ee510 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/data/tags/ModItemTagsProvider.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/data/tags/ModItemTagsProvider.java @@ -50,8 +50,8 @@ public class ModItemTagsProvider extends ItemTagsProvider { public ModItemTagsProvider(DataGenerator dataGenerator, BlockTagsProvider blockTagProvider, CompletableFuture provider, ExistingFileHelper existingFileHelper) { - super(dataGenerator.getPackOutput(), provider, blockTagProvider, BenTenMod.MOD_ID, - existingFileHelper); + super(dataGenerator.getPackOutput(), provider, blockTagProvider.contentsGetter(), + BenTenMod.MOD_ID, existingFileHelper); } @Override diff --git a/src/main/java/io/github/realyusufismail/bentenmod/entity/CrabBoltEntity.java b/src/main/java/io/github/realyusufismail/bentenmod/entity/CrabBoltEntity.java index 8c2f642a..5608daa6 100644 --- a/src/main/java/io/github/realyusufismail/bentenmod/entity/CrabBoltEntity.java +++ b/src/main/java/io/github/realyusufismail/bentenmod/entity/CrabBoltEntity.java @@ -36,7 +36,7 @@ import net.minecraft.core.particles.DustParticleOptions; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; -import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.damagesource.DamageSources; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.projectile.AbstractArrow; @@ -95,8 +95,8 @@ protected void onHitEntity(EntityHitResult result) { if (!level.isClientSide) { Entity target = result.getEntity(); Entity shooter = getOwner(); - target.hurt(DamageSource.arrow(this, shooter == null ? this : shooter), - (float) getBaseDamage()); + target.hurt(new DamageSources(target.level.registryAccess()).arrow(this, + shooter == null ? this : shooter), (float) getBaseDamage()); } } diff --git a/src/main/java/io/github/realyusufismail/bentenmod/package-info.java b/src/main/java/io/github/realyusufismail/bentenmod/package-info.java deleted file mode 100644 index 25c5a6cf..00000000 --- a/src/main/java/io/github/realyusufismail/bentenmod/package-info.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * BSD 3-Clause License - * - * Copyright (c) 2021, Yusuf Ismail - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are permitted - * provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of conditions - * and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list of - * conditions and the following disclaimer in the documentation and/or other materials provided with - * the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors may be used to - * endorse or promote products derived from this software without specific prior written permission. - * - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - * WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -@MethodsReturnNonnullByDefault -package io.github.realyusufismail.bentenmod; - -import com.mojang.math.MethodsReturnNonnullByDefault; diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta deleted file mode 100644 index 8739cdd4..00000000 --- a/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "description": "Ben Ten Mob mod resources", - "pack_format": 6 - - } -} diff --git a/update.json b/update.json deleted file mode 100644 index 30a45e74..00000000 --- a/update.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "homepage": "https://www.curseforge.com/minecraft/mc-mods/ben-ten-mod", - "1.19.3" : { - "1.19.3-1.0.0" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md", - "1.19.3-1.0.1" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md", - "1.19.3-1.0.2" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md", - "1.19.3-1.0.3" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md", - "1.19.3-1.0.4" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.3/CHANGELOG.md" - }, - "1.19.2" : { - "1.19.2-1.0.0" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.2/CHANGELOG.md" - }, - "1.19.1" : { - "1.19.1-1.0.0.beta" : "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.19.1/CHANGELOG.md" - }, - "1.18.1": { - "1.18.1-1.0": "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.18.1/CHANGELOG.md" - }, - "1.17.1": { - "1.17.1-1.0": "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.17.1/CHANGELOG.md" - }, - "1.16.5": { - "1.16.5-1.19": "https://github.com/RealYusufIsmail/Ben-10-Mod/blob/1.16.5/CHANGELOG.md" - }, - "promos": { - "1.16.5-latest": "1.16.5-1.19", - "1.16.5-recommended": "1.16.5-1.18", - "1.17.1-latest": "1.17.1-1.0", - "1.17.1-recommended": "1.17.1-1.0", - "1.18.1-latest": "1.18.1-1.0", - "1.18.1-recommended": "1.18.1-1.0", - "1.19.1-latest" : "1.19.1-1.0.0.beta", - "1.19.1-recommended" : "1.19.1-1.0.0", - "1.19.2-latest" : "1.19.2-1.0.0", - "1.19.2-recommended" : "1.19.2-1.0.0", - "1.19.3-latest" : "1.19.3-1.0.4", - "1.19.3-recommended" : "1.19.3-1.0.4" - } -}