From 2f4bb3ddcfa4a986929e4371549c36b83c201f33 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Wed, 2 Dec 2020 18:17:29 +0000 Subject: [PATCH] Item tags, drill, battery, teleport staff and more recipes --- src/generated/resources/.cache/cache | 51 ++++++++++++- .../assets/actuallyadditions/lang/en_us.json | 2 +- .../actuallyadditions/double_battery.json | 43 +++++++++++ .../actuallyadditions/drill_black.json | 32 +++++++++ .../recipes/actuallyadditions/drill_blue.json | 32 +++++++++ .../actuallyadditions/drill_brown.json | 32 +++++++++ .../recipes/actuallyadditions/drill_core.json | 32 +++++++++ .../recipes/actuallyadditions/drill_cyan.json | 32 +++++++++ .../recipes/actuallyadditions/drill_gray.json | 32 +++++++++ .../actuallyadditions/drill_green.json | 32 +++++++++ .../actuallyadditions/drill_light_blue.json | 32 +++++++++ .../actuallyadditions/drill_light_gray.json | 32 +++++++++ .../recipes/actuallyadditions/drill_lime.json | 32 +++++++++ .../actuallyadditions/drill_magenta.json | 32 +++++++++ .../actuallyadditions/drill_orange.json | 32 +++++++++ .../recipes/actuallyadditions/drill_pink.json | 32 +++++++++ .../actuallyadditions/drill_purple.json | 32 +++++++++ .../recipes/actuallyadditions/drill_red.json | 32 +++++++++ .../actuallyadditions/drill_white.json | 32 +++++++++ .../actuallyadditions/drill_yellow.json | 32 +++++++++ .../actuallyadditions/ender_casing_block.json | 43 +++++++++++ .../actuallyadditions/quadruple_battery.json | 43 +++++++++++ .../actuallyadditions/quintuple_battery.json | 43 +++++++++++ .../actuallyadditions/single_battery.json | 43 +++++++++++ .../actuallyadditions/teleport_staff.json | 32 +++++++++ .../actuallyadditions/triple_battery.json | 43 +++++++++++ .../recipes/double_battery.json | 22 ++++++ .../recipes/drill_black.json | 14 ++++ .../actuallyadditions/recipes/drill_blue.json | 14 ++++ .../recipes/drill_brown.json | 14 ++++ .../actuallyadditions/recipes/drill_core.json | 22 ++++++ .../actuallyadditions/recipes/drill_cyan.json | 14 ++++ .../actuallyadditions/recipes/drill_gray.json | 14 ++++ .../recipes/drill_green.json | 14 ++++ .../recipes/drill_light_blue.json | 25 +++++++ .../recipes/drill_light_gray.json | 14 ++++ .../actuallyadditions/recipes/drill_lime.json | 14 ++++ .../recipes/drill_magenta.json | 14 ++++ .../recipes/drill_orange.json | 14 ++++ .../actuallyadditions/recipes/drill_pink.json | 14 ++++ .../recipes/drill_purple.json | 14 ++++ .../actuallyadditions/recipes/drill_red.json | 14 ++++ .../recipes/drill_white.json | 14 ++++ .../recipes/drill_yellow.json | 14 ++++ .../recipes/ender_casing_block.json | 22 ++++++ .../recipes/quadruple_battery.json | 22 ++++++ .../recipes/quintuple_battery.json | 22 ++++++ .../recipes/single_battery.json | 22 ++++++ .../recipes/teleport_staff.json | 25 +++++++ .../recipes/triple_battery.json | 22 ++++++ .../actuallyadditions/tags/items/drills.json | 22 ++++++ .../blocks/functional/LampPowererBlock.java | 2 + .../common/items/ActuallyItems.java | 4 +- .../common/utilities/ActuallyTags.java | 16 +++++ .../actuallyadditions/data/ActuallyGens.java | 7 +- .../data/GeneratorItemTags.java | 28 ++++++++ .../data/GeneratorLanguage.java | 2 +- .../data/GeneratorRecipes.java | 71 ++++++++++++++++++- 58 files changed, 1444 insertions(+), 9 deletions(-) create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/double_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_black.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_blue.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_brown.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_core.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_cyan.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_gray.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_green.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_blue.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_gray.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_lime.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_magenta.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_orange.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_pink.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_purple.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_red.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_white.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_yellow.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/ender_casing_block.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/quadruple_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/quintuple_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/single_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/teleport_staff.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/triple_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/double_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_black.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_blue.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_brown.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_core.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_cyan.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_gray.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_green.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_light_blue.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_light_gray.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_lime.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_magenta.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_orange.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_pink.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_purple.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_red.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_white.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_yellow.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/ender_casing_block.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/quadruple_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/quintuple_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/single_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/teleport_staff.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/triple_battery.json create mode 100644 src/generated/resources/data/actuallyadditions/tags/items/drills.json create mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/utilities/ActuallyTags.java create mode 100644 src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemTags.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 20a7a6077..d2a57f0b3 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -116,7 +116,7 @@ e2c81adfe240117fa0ce2e3dfcfd04f4e1034153 assets/actuallyadditions/blockstates/wh 3670535838b4c26d01afe7ee4807c53a6cbaba12 assets/actuallyadditions/blockstates/white_wall_block.json 78e89628e3c6e891f2994b2a1794672f69826516 assets/actuallyadditions/blockstates/wood_casing_block.json 207adf3d139369e983100a6002f6f77d36d40916 assets/actuallyadditions/blockstates/xp_solidifier_block.json -2ca1b1fca672810ab26f13bdacd348f148e64d6b assets/actuallyadditions/lang/en_us.json +2a6c01438dd5bdc2071706c187ba13a39dc8ee10 assets/actuallyadditions/lang/en_us.json 8ce3f2af3288773fb581a3668c2cb90b64c9ee2f assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json de74eda6290d47ef2b26961693e537d7b8795a06 assets/actuallyadditions/models/block/atomic_reconstructor_block.json 16a76926a07fc8fa10e4a3949d15ad2ca6920bb8 assets/actuallyadditions/models/block/battery_box_block.json @@ -634,9 +634,28 @@ d8aad07e5b11238e218e48a5afa1641736e2ef83 data/actuallyadditions/advancements/rec 32c4c382aa328e0d2c96dc6b23d9c1726321690f data/actuallyadditions/advancements/recipes/actuallyadditions/diamatine_crystal_block_of.json 8493d9b3f0fb9184ed4481af981cc5a16d149377 data/actuallyadditions/advancements/recipes/actuallyadditions/diamatine_crystal_grid_of.json ee6d1da290033f997cf018c7cb3016e222292d36 data/actuallyadditions/advancements/recipes/actuallyadditions/diamatine_empowered_crystal_block_of.json +c7d4c6613f932ea6411aca5ca5b7fac13cdfd83d data/actuallyadditions/advancements/recipes/actuallyadditions/double_battery.json +86cd9cddf29ef741f8c15c1a6d3bb1f294be6eee data/actuallyadditions/advancements/recipes/actuallyadditions/drill_black.json +e9136ebb0ab6f18e15664366d72cfb8e730dfd52 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_blue.json +9509fa372b73b065f65521d60aa90d76d2515a29 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_brown.json +2b666be685f5ce238f0ba03572c80811184e9b40 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_core.json +8f72a109faed1eb0a99cc5c8aed9a48a71bb9ca7 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_cyan.json +51c8948b4fef5bda00eced7750b3f7f808792fb4 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_gray.json +7b6faccc94c8289ea6f20a330d1d725639ef826f data/actuallyadditions/advancements/recipes/actuallyadditions/drill_green.json +6193712dedef76e74046caed2741acd52026dbad data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_blue.json +03a840f9f7a153b521f10aef2080c10c8ffeec94 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_gray.json +9616020d75c98e503be9993beb7063242786c7d5 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_lime.json +89d52f507b8fbee3fbcf0052cf1004d2d727348e data/actuallyadditions/advancements/recipes/actuallyadditions/drill_magenta.json +d03c006143cd477c623ea68e31b5701881950934 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_orange.json +e2f69a1519e41dbf07642eeb636e690614f0e085 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_pink.json +3ed6379b492ecce5ac2063436b672a887a6540f6 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_purple.json +f2ed4268c5fdbd7e5f73fe9c9892e49639ecc178 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_red.json +3a668e4bd4f5483d017668dfb44b9e32a25c26ef data/actuallyadditions/advancements/recipes/actuallyadditions/drill_white.json +9e7d5ee4e4ea88ad7c26d7f0df648b8f77829760 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_yellow.json cda0cbe7d6f9a3deb501fbced73ca539cfdc8c32 data/actuallyadditions/advancements/recipes/actuallyadditions/emeradic_crystal_block_of.json 72bb8330f3f7dd79a8d9560328b6a35382cd6fd6 data/actuallyadditions/advancements/recipes/actuallyadditions/emeradic_crystal_grid_of.json 572c739a225b6947c435a0fb0c134231522f5ad6 data/actuallyadditions/advancements/recipes/actuallyadditions/emeradic_empowered_crystal_block_of.json +733be69e33ddaa9a2c6a6ed50b5615f8fefd33f9 data/actuallyadditions/advancements/recipes/actuallyadditions/ender_casing_block.json 283ccbf1bee8bd50115811ef7a2a379a389976d5 data/actuallyadditions/advancements/recipes/actuallyadditions/enderpearl_block.json 53ddc12090e442e246384b8e709640b89978daa3 data/actuallyadditions/advancements/recipes/actuallyadditions/enori_crystal_block_of.json 2e7a3894a5cd2dd8e52c9f8f56feeb07f221c2d8 data/actuallyadditions/advancements/recipes/actuallyadditions/enori_crystal_grid_of.json @@ -661,9 +680,14 @@ fa590a53b605606c91a07e49560ed6744cc16b5f data/actuallyadditions/advancements/rec 3d11aec7a96faba6d44bb0cbc25c078f5eb3c934 data/actuallyadditions/advancements/recipes/actuallyadditions/palis_crystal_block_of.json c2007ccbbcf13da8b0786e246700b378c2186e2f data/actuallyadditions/advancements/recipes/actuallyadditions/palis_crystal_grid_of.json 08ba11f37531096fae1a1e64ba67d5102b8b8bbe data/actuallyadditions/advancements/recipes/actuallyadditions/palis_empowered_crystal_block_of.json +02ae1225c505a669fffa2ec4fcf9228a9614a4ad data/actuallyadditions/advancements/recipes/actuallyadditions/quadruple_battery.json +787d744075c37cda4eb41f636a7e53514928bf55 data/actuallyadditions/advancements/recipes/actuallyadditions/quintuple_battery.json 06f694f0027c7478ef11090df108226389f1e671 data/actuallyadditions/advancements/recipes/actuallyadditions/restonia_crystal_block_of.json 8e1c72c37e5ed4761065aec27d78450e5414e4a6 data/actuallyadditions/advancements/recipes/actuallyadditions/restonia_crystal_grid_of.json 10c585c484740608c6e5ba7dc39493a91444c936 data/actuallyadditions/advancements/recipes/actuallyadditions/restonia_empowered_crystal_block_of.json +0d1c5963e66a5ef87c1fd1bf374f367089a8eedc data/actuallyadditions/advancements/recipes/actuallyadditions/single_battery.json +578fa21dff087861f9bea9df11f62ff7848be00d data/actuallyadditions/advancements/recipes/actuallyadditions/teleport_staff.json +938d83e8a10abbaedc75632a47b4aa5b58d8c08d data/actuallyadditions/advancements/recipes/actuallyadditions/triple_battery.json 634257cac64721e7107127112789c6c3c4180327 data/actuallyadditions/advancements/recipes/actuallyadditions/void_crystal_block_of.json 2c689fd732311684f7946dbd515b0d37fa766a11 data/actuallyadditions/advancements/recipes/actuallyadditions/void_crystal_grid_of.json 98178ee3e1e36fc9d41c4fda943b2ffc555b4dd9 data/actuallyadditions/advancements/recipes/actuallyadditions/void_empowered_crystal_block_of.json @@ -801,9 +825,28 @@ f78f6738d1611e63c7632b71e60b313e3aaa1d8c data/actuallyadditions/recipes/crystal_ f9e8d41186fb1775eee7e522deedde006c34299f data/actuallyadditions/recipes/diamatine_crystal_block_of.json 83993c0a74525492cdff1850fae364b2d66ac1b9 data/actuallyadditions/recipes/diamatine_crystal_grid_of.json 03f0ac70324ef0af25e5f94d674eabf98791bfda data/actuallyadditions/recipes/diamatine_empowered_crystal_block_of.json +b3535d312b1acde7b10ccff0a0975ac7d15258c1 data/actuallyadditions/recipes/double_battery.json +dcd17a1bea3083809bbb417c5370feb7ce854e3e data/actuallyadditions/recipes/drill_black.json +9acfe7a5f7a00f106a19ad6ecb426e60d33dcfff data/actuallyadditions/recipes/drill_blue.json +010fc946dd2d60b6d250e8f54b109c40ef7de08c data/actuallyadditions/recipes/drill_brown.json +a19d029baa74ef22f1c51b53df0325a4ca1b35d5 data/actuallyadditions/recipes/drill_core.json +897ff1156ec8719007af293d5889fecb6c2c7484 data/actuallyadditions/recipes/drill_cyan.json +4c0685497b24fa792238a6c8e656b3bf399cd56f data/actuallyadditions/recipes/drill_gray.json +96e322201fab33ca0b1c98048de41c67a0bbc52a data/actuallyadditions/recipes/drill_green.json +2d175d912ecfeb3eb3e742f1e2acbbe266884f91 data/actuallyadditions/recipes/drill_light_blue.json +ccd7ee7873070fd00003338bd90a8c742802a195 data/actuallyadditions/recipes/drill_light_gray.json +e205faad8fffd988c2f0fc4060527b186e759653 data/actuallyadditions/recipes/drill_lime.json +1ed47682aa59380f4e731c43882cce614b169db0 data/actuallyadditions/recipes/drill_magenta.json +be9df4d458f8889140c5a69931b69f41dde71f5c data/actuallyadditions/recipes/drill_orange.json +2d3cc049ed7bb82aa08438759abd4ad98fc91598 data/actuallyadditions/recipes/drill_pink.json +8f1b14cf788a8a463950b09712e15c490ed14564 data/actuallyadditions/recipes/drill_purple.json +1a6b16ac4056a1bf41151d0784f04280c7cd12db data/actuallyadditions/recipes/drill_red.json +5e4f44dc337c0da51bfa6fd22b8899c6ca672244 data/actuallyadditions/recipes/drill_white.json +42341d0e94c874ede024465ec450aeba1097295f data/actuallyadditions/recipes/drill_yellow.json 7fb8fbef9e4c6b7dd6f3b40630d283d1d760f0b6 data/actuallyadditions/recipes/emeradic_crystal_block_of.json f118f9988e81f887cc4c07b4004f78b55f3bd7c8 data/actuallyadditions/recipes/emeradic_crystal_grid_of.json 05aad460cc6a3286ffaf6fdd67ff2d958b1ab715 data/actuallyadditions/recipes/emeradic_empowered_crystal_block_of.json +63cc7fce3a5ae6638c81acdd2ab7322b14280965 data/actuallyadditions/recipes/ender_casing_block.json fd0332c9175b991843075bc4cc9a45b88707c641 data/actuallyadditions/recipes/enderpearl_block.json 07af7dc24cc9d91bc860f447ffad0d1ea74e0c7f data/actuallyadditions/recipes/enori_crystal_block_of.json 7d0d9195fafe77e53ce3c07154883c37582792c5 data/actuallyadditions/recipes/enori_crystal_grid_of.json @@ -828,10 +871,16 @@ c591c20534127a09ae008664b1187447cdac6328 data/actuallyadditions/recipes/lamp_pur b5fe7ff3aa387ea103d938613a2830f826bcdb2f data/actuallyadditions/recipes/palis_crystal_block_of.json 609cef8390cb99d522536e56e74bee0ba42289ad data/actuallyadditions/recipes/palis_crystal_grid_of.json 7aa1e006c72988aa7e071a3b455ae2bddf5b99f5 data/actuallyadditions/recipes/palis_empowered_crystal_block_of.json +f558e49507ea0f9221df2255c86563a2509e9e9c data/actuallyadditions/recipes/quadruple_battery.json +e2910cd001455c23b12d6e99348b4bf3b162cd24 data/actuallyadditions/recipes/quintuple_battery.json 31e0f184282650f792c416d55e4e6f512fe527ed data/actuallyadditions/recipes/restonia_crystal_block_of.json 35e75f2a140489541aa3bf31f1e69581096fa4b2 data/actuallyadditions/recipes/restonia_crystal_grid_of.json 71070336b777b3eab7815eea0f96d6208466a2a0 data/actuallyadditions/recipes/restonia_empowered_crystal_block_of.json +5257be7f8ecbeedb597f2611811e4762a1f8c51a data/actuallyadditions/recipes/single_battery.json +35d7486415ce1eab25c6c88a35c0fd6f8a457e48 data/actuallyadditions/recipes/teleport_staff.json +43a133e03c03e13df932abcd8c0a6c75dab22735 data/actuallyadditions/recipes/triple_battery.json 2809bbe513a26a52fdd66e6187b3151c49ce1b7f data/actuallyadditions/recipes/void_crystal_block_of.json aa54d14263ca954f956b209b4b248a5996f9a8aa data/actuallyadditions/recipes/void_crystal_grid_of.json 3bb0dfa1625296a2a8e305ef1ef79f96a6fd4e52 data/actuallyadditions/recipes/void_empowered_crystal_block_of.json +2290b1829e049ab3002f3576379ad58f6d7b6ace data/actuallyadditions/tags/items/drills.json 47e2d9cd180c2160d834c9f60a9fe8a9a0053b92 data/minecraft/tags/blocks/walls.json diff --git a/src/generated/resources/assets/actuallyadditions/lang/en_us.json b/src/generated/resources/assets/actuallyadditions/lang/en_us.json index 7331ccffe..edd9022c7 100644 --- a/src/generated/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/generated/resources/assets/actuallyadditions/lang/en_us.json @@ -180,7 +180,7 @@ "item.actuallyadditions.drill_fortune_augment_ii": "Drill Fortune Augment II (Gives Fortune III!)", "item.actuallyadditions.drill_gray": "Gray Drill", "item.actuallyadditions.drill_green": "Green Drill", - "item.actuallyadditions.drill_light_blue": "Light Blue Drill", + "item.actuallyadditions.drill_light_blue": "Drill", "item.actuallyadditions.drill_light_gray": "Light Gray Drill", "item.actuallyadditions.drill_lime": "Lime Drill", "item.actuallyadditions.drill_magenta": "Magenta Drill", diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/double_battery.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/double_battery.json new file mode 100644 index 000000000..67c0b0c8a --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/double_battery.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:double_battery" + ] + }, + "criteria": { + "has_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:enori_crystal" + } + ] + } + }, + "has_coil": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:advanced_coil" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:double_battery" + } + } + }, + "requirements": [ + [ + "has_base", + "has_coil", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_black.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_black.json new file mode 100644 index 000000000..fb3265e83 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_black.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_black" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_black" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_blue.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_blue.json new file mode 100644 index 000000000..f273a6e09 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_blue.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_blue" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_blue" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_brown.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_brown.json new file mode 100644 index 000000000..f6451b601 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_brown.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_brown" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_brown" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_core.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_core.json new file mode 100644 index 000000000..9cb6340c0 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_core.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_core" + ] + }, + "criteria": { + "has_basic_coil": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:basic_coil" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_core" + } + } + }, + "requirements": [ + [ + "has_basic_coil", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_cyan.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_cyan.json new file mode 100644 index 000000000..091e71ef4 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_cyan.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_cyan" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_cyan" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_gray.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_gray.json new file mode 100644 index 000000000..dd2324a1d --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_gray.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_gray" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_gray" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_green.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_green.json new file mode 100644 index 000000000..7f2aef6e1 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_green.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_green" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_green" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_blue.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_blue.json new file mode 100644 index 000000000..992d527e7 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_blue.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_light_blue" + ] + }, + "criteria": { + "has_core": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_core" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_light_blue" + } + } + }, + "requirements": [ + [ + "has_core", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_gray.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_gray.json new file mode 100644 index 000000000..7b7c24feb --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_light_gray.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_light_gray" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_light_gray" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_lime.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_lime.json new file mode 100644 index 000000000..476f04fbe --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_lime.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_lime" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_lime" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_magenta.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_magenta.json new file mode 100644 index 000000000..3b8f9d39f --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_magenta.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_magenta" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_magenta" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_orange.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_orange.json new file mode 100644 index 000000000..acc6e28a1 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_orange.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_orange" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_orange" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_pink.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_pink.json new file mode 100644 index 000000000..f075846d9 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_pink.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_pink" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_pink" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_purple.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_purple.json new file mode 100644 index 000000000..d91abc6b2 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_purple.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_purple" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_purple" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_red.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_red.json new file mode 100644 index 000000000..e729b16a6 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_red.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_red" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_red" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_white.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_white.json new file mode 100644 index 000000000..8bf4be143 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_white.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_white" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_white" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_yellow.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_yellow.json new file mode 100644 index 000000000..c802b2820 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_yellow.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_yellow" + ] + }, + "criteria": { + "has_drill": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:drill_light_blue" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_yellow" + } + } + }, + "requirements": [ + [ + "has_drill", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/ender_casing_block.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/ender_casing_block.json new file mode 100644 index 000000000..51595079e --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/ender_casing_block.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:ender_casing_block" + ] + }, + "criteria": { + "has_enderpearl": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ender_pearls" + } + ] + } + }, + "has_empowered_diamatine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:diamatine_empowered_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:ender_casing_block" + } + } + }, + "requirements": [ + [ + "has_enderpearl", + "has_empowered_diamatine", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/quadruple_battery.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/quadruple_battery.json new file mode 100644 index 000000000..74f55f92b --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/quadruple_battery.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:quadruple_battery" + ] + }, + "criteria": { + "has_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:enori_empowered_crystal" + } + ] + } + }, + "has_coil": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:advanced_coil" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:quadruple_battery" + } + } + }, + "requirements": [ + [ + "has_base", + "has_coil", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/quintuple_battery.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/quintuple_battery.json new file mode 100644 index 000000000..2d2dbb906 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/quintuple_battery.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:quintuple_battery" + ] + }, + "criteria": { + "has_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:diamatine_empowered_crystal" + } + ] + } + }, + "has_coil": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:advanced_coil" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:quintuple_battery" + } + } + }, + "requirements": [ + [ + "has_base", + "has_coil", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/single_battery.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/single_battery.json new file mode 100644 index 000000000..20f8c0398 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/single_battery.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:single_battery" + ] + }, + "criteria": { + "has_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:enori_crystal" + } + ] + } + }, + "has_coil": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:advanced_coil" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:single_battery" + } + } + }, + "requirements": [ + [ + "has_base", + "has_coil", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/teleport_staff.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/teleport_staff.json new file mode 100644 index 000000000..381aef9f3 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/teleport_staff.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:teleport_staff" + ] + }, + "criteria": { + "has_battery": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:single_battery" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:teleport_staff" + } + } + }, + "requirements": [ + [ + "has_battery", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/triple_battery.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/triple_battery.json new file mode 100644 index 000000000..f6aef79bf --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/triple_battery.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:triple_battery" + ] + }, + "criteria": { + "has_base": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:enori_empowered_crystal" + } + ] + } + }, + "has_coil": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:advanced_coil" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:triple_battery" + } + } + }, + "requirements": [ + [ + "has_base", + "has_coil", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/double_battery.json b/src/generated/resources/data/actuallyadditions/recipes/double_battery.json new file mode 100644 index 000000000..57dd33ff0 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/double_battery.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " c ", + "bab", + "bbb" + ], + "key": { + "c": { + "item": "actuallyadditions:single_battery" + }, + "a": { + "item": "actuallyadditions:advanced_coil" + }, + "b": { + "item": "actuallyadditions:enori_crystal" + } + }, + "result": { + "item": "actuallyadditions:double_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_black.json b/src/generated/resources/data/actuallyadditions/recipes/drill_black.json new file mode 100644 index 000000000..0ecba83e9 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_black.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/black" + } + ], + "result": { + "item": "actuallyadditions:drill_black" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_blue.json b/src/generated/resources/data/actuallyadditions/recipes/drill_blue.json new file mode 100644 index 000000000..1126ca23b --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_blue.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/blue" + } + ], + "result": { + "item": "actuallyadditions:drill_blue" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_brown.json b/src/generated/resources/data/actuallyadditions/recipes/drill_brown.json new file mode 100644 index 000000000..948a87a97 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_brown.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/brown" + } + ], + "result": { + "item": "actuallyadditions:drill_brown" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_core.json b/src/generated/resources/data/actuallyadditions/recipes/drill_core.json new file mode 100644 index 000000000..de33e7865 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_core.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "actuallyadditions:crystal_enori_block" + }, + "b": { + "item": "actuallyadditions:basic_coil" + }, + "c": { + "item": "actuallyadditions:restonia_crystal" + } + }, + "result": { + "item": "actuallyadditions:drill_core" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_cyan.json b/src/generated/resources/data/actuallyadditions/recipes/drill_cyan.json new file mode 100644 index 000000000..86d49de28 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_cyan.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/cyan" + } + ], + "result": { + "item": "actuallyadditions:drill_cyan" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_gray.json b/src/generated/resources/data/actuallyadditions/recipes/drill_gray.json new file mode 100644 index 000000000..897559aa5 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_gray.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/gray" + } + ], + "result": { + "item": "actuallyadditions:drill_gray" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_green.json b/src/generated/resources/data/actuallyadditions/recipes/drill_green.json new file mode 100644 index 000000000..d1e8b07f6 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_green.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/green" + } + ], + "result": { + "item": "actuallyadditions:drill_green" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_light_blue.json b/src/generated/resources/data/actuallyadditions/recipes/drill_light_blue.json new file mode 100644 index 000000000..408c90559 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_light_blue.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aaa", + "bcb", + "ddd" + ], + "key": { + "a": { + "item": "actuallyadditions:diamatine_crystal" + }, + "b": { + "item": "actuallyadditions:advanced_coil" + }, + "c": { + "item": "actuallyadditions:drill_core" + }, + "d": { + "item": "actuallyadditions:crystal_enori_block" + } + }, + "result": { + "item": "actuallyadditions:drill_light_blue" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_light_gray.json b/src/generated/resources/data/actuallyadditions/recipes/drill_light_gray.json new file mode 100644 index 000000000..85e83ab64 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_light_gray.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/light_gray" + } + ], + "result": { + "item": "actuallyadditions:drill_light_gray" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_lime.json b/src/generated/resources/data/actuallyadditions/recipes/drill_lime.json new file mode 100644 index 000000000..7edea476b --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_lime.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/lime" + } + ], + "result": { + "item": "actuallyadditions:drill_lime" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_magenta.json b/src/generated/resources/data/actuallyadditions/recipes/drill_magenta.json new file mode 100644 index 000000000..08f961b48 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_magenta.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/magenta" + } + ], + "result": { + "item": "actuallyadditions:drill_magenta" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_orange.json b/src/generated/resources/data/actuallyadditions/recipes/drill_orange.json new file mode 100644 index 000000000..c06c6b111 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_orange.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/orange" + } + ], + "result": { + "item": "actuallyadditions:drill_orange" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_pink.json b/src/generated/resources/data/actuallyadditions/recipes/drill_pink.json new file mode 100644 index 000000000..afc9aaa45 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_pink.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/pink" + } + ], + "result": { + "item": "actuallyadditions:drill_pink" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_purple.json b/src/generated/resources/data/actuallyadditions/recipes/drill_purple.json new file mode 100644 index 000000000..5feac9936 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_purple.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/purple" + } + ], + "result": { + "item": "actuallyadditions:drill_purple" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_red.json b/src/generated/resources/data/actuallyadditions/recipes/drill_red.json new file mode 100644 index 000000000..da040d5a9 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_red.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/red" + } + ], + "result": { + "item": "actuallyadditions:drill_red" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_white.json b/src/generated/resources/data/actuallyadditions/recipes/drill_white.json new file mode 100644 index 000000000..d2580a8d6 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_white.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/white" + } + ], + "result": { + "item": "actuallyadditions:drill_white" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_yellow.json b/src/generated/resources/data/actuallyadditions/recipes/drill_yellow.json new file mode 100644 index 000000000..7fb2e2c5f --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_yellow.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "actuallyadditions:drill_light_blue" + }, + { + "tag": "forge:dyes/yellow" + } + ], + "result": { + "item": "actuallyadditions:drill_yellow" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/ender_casing_block.json b/src/generated/resources/data/actuallyadditions/recipes/ender_casing_block.json new file mode 100644 index 000000000..29e2b61c6 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/ender_casing_block.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ede", + "dqd", + "ede" + ], + "key": { + "e": { + "tag": "forge:ender_pearls" + }, + "d": { + "item": "actuallyadditions:diamatine_empowered_crystal" + }, + "q": { + "item": "actuallyadditions:black_quartz_block" + } + }, + "result": { + "item": "actuallyadditions:ender_casing_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/quadruple_battery.json b/src/generated/resources/data/actuallyadditions/recipes/quadruple_battery.json new file mode 100644 index 000000000..d6927f286 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/quadruple_battery.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " c ", + "bab", + "bbb" + ], + "key": { + "c": { + "item": "actuallyadditions:triple_battery" + }, + "a": { + "item": "actuallyadditions:advanced_coil" + }, + "b": { + "item": "actuallyadditions:enori_empowered_crystal" + } + }, + "result": { + "item": "actuallyadditions:quadruple_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/quintuple_battery.json b/src/generated/resources/data/actuallyadditions/recipes/quintuple_battery.json new file mode 100644 index 000000000..ab130093e --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/quintuple_battery.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " c ", + "bab", + "bbb" + ], + "key": { + "c": { + "item": "actuallyadditions:quadruple_battery" + }, + "a": { + "item": "actuallyadditions:advanced_coil" + }, + "b": { + "item": "actuallyadditions:diamatine_empowered_crystal" + } + }, + "result": { + "item": "actuallyadditions:quintuple_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/single_battery.json b/src/generated/resources/data/actuallyadditions/recipes/single_battery.json new file mode 100644 index 000000000..1e4837505 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/single_battery.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " c ", + "bab", + "bbb" + ], + "key": { + "c": { + "item": "actuallyadditions:restonia_crystal" + }, + "a": { + "item": "actuallyadditions:advanced_coil" + }, + "b": { + "item": "actuallyadditions:enori_crystal" + } + }, + "result": { + "item": "actuallyadditions:single_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/teleport_staff.json b/src/generated/resources/data/actuallyadditions/recipes/teleport_staff.json new file mode 100644 index 000000000..50d9a42a4 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/teleport_staff.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ab", + " c ", + "cd " + ], + "key": { + "a": { + "item": "actuallyadditions:diamatine_crystal" + }, + "b": { + "item": "actuallyadditions:enderpearl_block" + }, + "c": { + "item": "actuallyadditions:ender_casing_block" + }, + "d": { + "item": "actuallyadditions:single_battery" + } + }, + "result": { + "item": "actuallyadditions:teleport_staff" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/triple_battery.json b/src/generated/resources/data/actuallyadditions/recipes/triple_battery.json new file mode 100644 index 000000000..14cf0efa4 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/triple_battery.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " c ", + "bab", + "bbb" + ], + "key": { + "c": { + "item": "actuallyadditions:double_battery" + }, + "a": { + "item": "actuallyadditions:advanced_coil" + }, + "b": { + "item": "actuallyadditions:enori_empowered_crystal" + } + }, + "result": { + "item": "actuallyadditions:triple_battery" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/tags/items/drills.json b/src/generated/resources/data/actuallyadditions/tags/items/drills.json new file mode 100644 index 000000000..92ded93ec --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/tags/items/drills.json @@ -0,0 +1,22 @@ +{ + "replace": false, + "values": [ + "actuallyadditions:drill_light_blue", + "actuallyadditions:drill_black", + "actuallyadditions:drill_black", + "actuallyadditions:drill_blue", + "actuallyadditions:drill_brown", + "actuallyadditions:drill_cyan", + "actuallyadditions:drill_gray", + "actuallyadditions:drill_green", + "actuallyadditions:drill_light_gray", + "actuallyadditions:drill_lime", + "actuallyadditions:drill_magenta", + "actuallyadditions:drill_orange", + "actuallyadditions:drill_pink", + "actuallyadditions:drill_purple", + "actuallyadditions:drill_red", + "actuallyadditions:drill_white", + "actuallyadditions:drill_yellow" + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java index 8d4146ed8..959424efb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/LampPowererBlock.java @@ -7,4 +7,6 @@ public class LampPowererBlock extends ActuallyBlock { public LampPowererBlock() { super(Properties.create(Material.ROCK)); } + + } diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java index 24194094b..c4bc87b75 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyItems.java @@ -112,13 +112,13 @@ public final class ActuallyItems { public static final RegistryObject TRIPLE_BATTERY = ITEMS.register("triple_battery", basicItem()); public static final RegistryObject QUADRUPLE_BATTERY = ITEMS.register("quadruple_battery", basicItem()); public static final RegistryObject QUINTUPLE_BATTERY = ITEMS.register("quintuple_battery", basicItem()); + public static final RegistryObject DRILL_MAIN = ITEMS.register("drill_light_blue", basicItem()); public static final RegistryObject DRILL_BLACK = ITEMS.register("drill_black", basicItem()); public static final RegistryObject DRILL_BLUE = ITEMS.register("drill_blue", basicItem()); public static final RegistryObject DRILL_BROWN = ITEMS.register("drill_brown", basicItem()); public static final RegistryObject DRILL_CYAN = ITEMS.register("drill_cyan", basicItem()); public static final RegistryObject DRILL_GRAY = ITEMS.register("drill_gray", basicItem()); public static final RegistryObject DRILL_GREEN = ITEMS.register("drill_green", basicItem()); - public static final RegistryObject DRILL_LIGHT_BLUE = ITEMS.register("drill_light_blue", basicItem()); public static final RegistryObject DRILL_LIGHT_GRAY = ITEMS.register("drill_light_gray", basicItem()); public static final RegistryObject DRILL_LIME = ITEMS.register("drill_lime", basicItem()); public static final RegistryObject DRILL_MAGENTA = ITEMS.register("drill_magenta", basicItem()); @@ -230,7 +230,7 @@ public final class ActuallyItems { BATS_WING, DRILL_CORE, LENS, ENDER_STAR, CRYSTALLIZED_CANOLA_SEED, EMPOWERED_CANOLA_SEED, LENS_OF_COLOR, LENS_OF_DETONATION, LENS_OF_CERTAIN_DEATH, LENS_OF_THE_KILLER, LENS_OF_DISENCHANTING, LENS_OF_THE_MINER, LASER_WRENCH, TELEPORT_STAFF, WINGS_OF_THE_BATS, SINGLE_BATTERY, DOUBLE_BATTERY, TRIPLE_BATTERY, QUADRUPLE_BATTERY, QUINTUPLE_BATTERY, - DRILL_BLACK, DRILL_BLUE, DRILL_BROWN, DRILL_CYAN, DRILL_GRAY, DRILL_GREEN, DRILL_LIGHT_BLUE, DRILL_LIGHT_GRAY, + DRILL_BLACK, DRILL_BLUE, DRILL_BROWN, DRILL_CYAN, DRILL_GRAY, DRILL_GREEN, DRILL_MAIN, DRILL_LIGHT_GRAY, DRILL_LIME, DRILL_MAGENTA, DRILL_ORANGE, DRILL_PINK, DRILL_PURPLE, DRILL_RED, DRILL_WHITE, DRILL_YELLOW, DRILL_SPEED_AUGMENT_I, DRILL_SPEED_AUGMENT_II, DRILL_SPEED_AUGMENT_III, DRILL_SILK_TOUCH_AUGMENT, DRILL_FORTUNE_AUGMENT_I, DRILL_FORTUNE_AUGMENT_II, DRILL_MINING_AUGMENT_I, DRILL_MINING_AUGMENT_II, DRILL_BLOCK_PLACING_AUGMENT, FERTILIZER, CUP_WITH_COFFEE, PHANTOM_CONNECTOR, diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/utilities/ActuallyTags.java b/src/main/java/de/ellpeck/actuallyadditions/common/utilities/ActuallyTags.java new file mode 100644 index 000000000..8cb35f65d --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/common/utilities/ActuallyTags.java @@ -0,0 +1,16 @@ +package de.ellpeck.actuallyadditions.common.utilities; + +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import net.minecraft.item.Item; +import net.minecraft.tags.ITag; +import net.minecraft.tags.ItemTags; + +public final class ActuallyTags { + public static class Items { + public static final ITag.INamedTag DRILLS = tag("drills"); + + private static ITag.INamedTag tag(String name) { + return ItemTags.makeWrapperTag(String.format("%s:%s", ActuallyAdditions.MOD_ID, name)); + } + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java index 2900dc9c0..6cbc64249 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java @@ -13,19 +13,22 @@ public final class ActuallyGens { @SubscribeEvent public static void runGenerator(GatherDataEvent event) { DataGenerator generator = event.getGenerator(); + ExistingFileHelper helper = event.getExistingFileHelper(); if (event.includeClient()) { - ExistingFileHelper helper = event.getExistingFileHelper(); generator.addProvider(new GeneratorBlockStates(generator, helper)); generator.addProvider(new GeneratorItemModels(generator, helper)); generator.addProvider(new GeneratorLanguage(generator)); - generator.addProvider(new GeneratorBlockTags(generator, helper)); } if (event.includeServer()) { + GeneratorBlockTags generatorBlockTags = new GeneratorBlockTags(generator, helper); + generator.addProvider(new GeneratorLoot(generator)); generator.addProvider(new GeneratorRecipes(generator)); + generator.addProvider(generatorBlockTags); + generator.addProvider(new GeneratorItemTags(generator, generatorBlockTags, helper)); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemTags.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemTags.java new file mode 100644 index 000000000..b3acbc7c7 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorItemTags.java @@ -0,0 +1,28 @@ +package de.ellpeck.actuallyadditions.data; + +import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.items.ActuallyItems; +import de.ellpeck.actuallyadditions.common.utilities.ActuallyTags; +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.ItemTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; + +import javax.annotation.Nullable; + +public class GeneratorItemTags extends ItemTagsProvider { + public GeneratorItemTags(DataGenerator dataGenerator, BlockTagsProvider blockTagProvider, @Nullable ExistingFileHelper existingFileHelper) { + super(dataGenerator, blockTagProvider, ActuallyAdditions.MOD_ID, existingFileHelper); + } + + @Override + protected void registerTags() { + getOrCreateBuilder(ActuallyTags.Items.DRILLS).add( + ActuallyItems.DRILL_MAIN.get(), + ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLACK.get(), ActuallyItems.DRILL_BLUE.get(), ActuallyItems.DRILL_BROWN.get(), + ActuallyItems.DRILL_CYAN.get(), ActuallyItems.DRILL_GRAY.get(), ActuallyItems.DRILL_GREEN.get(), ActuallyItems.DRILL_LIGHT_GRAY.get(), + ActuallyItems.DRILL_LIME.get(), ActuallyItems.DRILL_MAGENTA.get(), ActuallyItems.DRILL_ORANGE.get(), ActuallyItems.DRILL_PINK.get(), + ActuallyItems.DRILL_PURPLE.get(), ActuallyItems.DRILL_RED.get(), ActuallyItems.DRILL_WHITE.get(), ActuallyItems.DRILL_YELLOW.get() + ); + } +} diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java index cf114c366..bf11f571c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -218,13 +218,13 @@ public class GeneratorLanguage extends LanguageProvider { addItem(ActuallyItems.TRIPLE_BATTERY, "Triple Battery"); addItem(ActuallyItems.QUADRUPLE_BATTERY, "Quadruple Battery"); addItem(ActuallyItems.QUINTUPLE_BATTERY, "Quintuple Battery"); + addItem(ActuallyItems.DRILL_MAIN, "Drill"); addItem(ActuallyItems.DRILL_BLACK, "Black Drill"); addItem(ActuallyItems.DRILL_BLUE, "Blue Drill"); addItem(ActuallyItems.DRILL_BROWN, "Brown Drill"); addItem(ActuallyItems.DRILL_CYAN, "Cyan Drill"); addItem(ActuallyItems.DRILL_GRAY, "Gray Drill"); addItem(ActuallyItems.DRILL_GREEN, "Green Drill"); - addItem(ActuallyItems.DRILL_LIGHT_BLUE, "Light Blue Drill"); addItem(ActuallyItems.DRILL_LIGHT_GRAY, "Light Gray Drill"); addItem(ActuallyItems.DRILL_LIME, "Lime Drill"); addItem(ActuallyItems.DRILL_MAGENTA, "Magenta Drill"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java index 5f10aa329..b52b6bb46 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java @@ -28,8 +28,21 @@ public class GeneratorRecipes extends RecipeProvider { .patternLine("ee ").patternLine("ee ") .addCriterion("has_enderpearl", hasItem(Tags.Items.ENDER_PEARLS)).build(consumer); -// ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ENDER_CASING.get()) -// .key('e', Tags.Items.ENDER_PEARLS).key('d', ActuallyItems.DIAMATINE) + // Castings + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ENDER_CASING.get()) + .key('e', Tags.Items.ENDER_PEARLS).key('d', ActuallyItems.DIAMATINE_EMPOWERED_CRYSTAL.get()) + .key('q', ActuallyBlocks.BLACK_QUARTZ.get()) + .patternLine("ede").patternLine("dqd").patternLine("ede") + .addCriterion("has_enderpearl", hasItem(Tags.Items.ENDER_PEARLS)) + .addCriterion("has_empowered_diamatine", hasItem(ActuallyItems.DIAMATINE_EMPOWERED_CRYSTAL.get())) + .build(consumer); + + // Batteries + battery(ActuallyItems.SINGLE_BATTERY, ActuallyItems.RESTONIA_CRYSTAL, ActuallyItems.ENORI_CRYSTAL).build(consumer); + battery(ActuallyItems.DOUBLE_BATTERY, ActuallyItems.SINGLE_BATTERY, ActuallyItems.ENORI_CRYSTAL).build(consumer); + battery(ActuallyItems.TRIPLE_BATTERY, ActuallyItems.DOUBLE_BATTERY, ActuallyItems.ENORI_EMPOWERED_CRYSTAL).build(consumer); + battery(ActuallyItems.QUADRUPLE_BATTERY, ActuallyItems.TRIPLE_BATTERY, ActuallyItems.ENORI_EMPOWERED_CRYSTAL).build(consumer); + battery(ActuallyItems.QUINTUPLE_BATTERY, ActuallyItems.QUADRUPLE_BATTERY, ActuallyItems.DIAMATINE_EMPOWERED_CRYSTAL).build(consumer); ShapedRecipeBuilder.shapedRecipe(ActuallyItems.BASIC_COIL.get()) .key('r', ActuallyItems.RESTONIA_CRYSTAL.get()).key('b', ActuallyItems.BLACK_QUARTS.get()) @@ -41,6 +54,7 @@ public class GeneratorRecipes extends RecipeProvider { .patternLine("ggg").patternLine("gcg").patternLine("ggg") .addCriterion("has_basic_coil", hasItem(ActuallyItems.BASIC_COIL.get())).build(consumer); + // Functional Items ShapedRecipeBuilder.shapedRecipe(ActuallyItems.LEAF_BLOWER.get()) .key('f', Items.FLINT).key('i', ActuallyItems.ENORI_CRYSTAL.get()) .key('p', Items.PISTON).key('c', ActuallyItems.ADVANCED_COIL.get()) @@ -53,6 +67,43 @@ public class GeneratorRecipes extends RecipeProvider { .patternLine(" f ").patternLine("ip ").patternLine("ic ") .addCriterion("has_diamatine", hasItem(ActuallyItems.DIAMATINE_CRYSTAL.get())).build(consumer); + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.TELEPORT_STAFF.get()) + .key('a', ActuallyItems.DIAMATINE_CRYSTAL.get()).key('b', ActuallyBlocks.ENDERPEARL.get()) + .key('c', ActuallyBlocks.ENDER_CASING.get()).key('d', ActuallyItems.SINGLE_BATTERY.get()) + .patternLine(" ab").patternLine(" c ").patternLine("cd ") + .addCriterion("has_battery", hasItem(ActuallyItems.SINGLE_BATTERY.get())) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_CORE.get()) + .key('a', ActuallyBlocks.CRYSTAL_ENORI.get()).key('b', ActuallyItems.BASIC_COIL.get()) + .key('c', ActuallyItems.RESTONIA_CRYSTAL.get()) + .patternLine("aba").patternLine("bcb").patternLine("aba") + .addCriterion("has_basic_coil", hasItem(ActuallyItems.BASIC_COIL.get())) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_MAIN.get()) + .key('a', ActuallyItems.DIAMATINE_CRYSTAL.get()).key('b', ActuallyItems.ADVANCED_COIL.get()) + .key('c', ActuallyItems.DRILL_CORE.get()).key('d', ActuallyBlocks.CRYSTAL_ENORI.get()) + .patternLine("aaa").patternLine("bcb").patternLine("ddd") + .addCriterion("has_core", hasItem(ActuallyItems.DRILL_CORE.get())) + .build(consumer); + + drillColor(ActuallyItems.DRILL_BLACK, Tags.Items.DYES_BLACK).build(consumer); + drillColor(ActuallyItems.DRILL_BLUE, Tags.Items.DYES_BLUE).build(consumer); + drillColor(ActuallyItems.DRILL_BROWN, Tags.Items.DYES_BROWN).build(consumer); + drillColor(ActuallyItems.DRILL_CYAN, Tags.Items.DYES_CYAN).build(consumer); + drillColor(ActuallyItems.DRILL_GRAY, Tags.Items.DYES_GRAY).build(consumer); + drillColor(ActuallyItems.DRILL_GREEN, Tags.Items.DYES_GREEN).build(consumer); + drillColor(ActuallyItems.DRILL_LIGHT_GRAY, Tags.Items.DYES_LIGHT_GRAY).build(consumer); + drillColor(ActuallyItems.DRILL_LIME, Tags.Items.DYES_LIME).build(consumer); + drillColor(ActuallyItems.DRILL_MAGENTA, Tags.Items.DYES_MAGENTA).build(consumer); + drillColor(ActuallyItems.DRILL_ORANGE, Tags.Items.DYES_ORANGE).build(consumer); + drillColor(ActuallyItems.DRILL_PINK, Tags.Items.DYES_PINK).build(consumer); + drillColor(ActuallyItems.DRILL_PURPLE, Tags.Items.DYES_PURPLE).build(consumer); + drillColor(ActuallyItems.DRILL_RED, Tags.Items.DYES_RED).build(consumer); + drillColor(ActuallyItems.DRILL_WHITE, Tags.Items.DYES_WHITE).build(consumer); + drillColor(ActuallyItems.DRILL_YELLOW, Tags.Items.DYES_YELLOW).build(consumer); + // Blocks of: Crystals & back again blockOfToItem(ActuallyBlocks.CRYSTAL_ENORI, ActuallyItems.ENORI_CRYSTAL, 9, consumer); blockOfToItem(ActuallyBlocks.CRYSTAL_VOID, ActuallyItems.VOID_CRYSTAL, 9, consumer); @@ -141,4 +192,20 @@ public class GeneratorRecipes extends RecipeProvider { .addCriterion("has_color_item", hasItem(color)) .build(consumer); } + + private ShapedRecipeBuilder battery(Supplier result, Supplier special, Supplier base) { + return ShapedRecipeBuilder.shapedRecipe(result.get()) + .key('c', special.get()).key('a', ActuallyItems.ADVANCED_COIL.get()) + .key('b', base.get()) + .patternLine(" c ").patternLine("bab").patternLine("bbb") + .addCriterion("has_base", hasItem(base.get())) + .addCriterion("has_coil", hasItem(ActuallyItems.ADVANCED_COIL.get())); + } + + private ShapelessRecipeBuilder drillColor(Supplier result, ITag color) { + return ShapelessRecipeBuilder.shapelessRecipe(result.get()) + .addIngredient(ActuallyItems.DRILL_MAIN.get()) + .addIngredient(color) + .addCriterion("has_drill", hasItem(ActuallyItems.DRILL_MAIN.get())); + } }