From 434a4dc742f85031b2019fae52b9280961d90e94 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sun, 6 Dec 2020 20:15:48 +0000 Subject: [PATCH] Augment recipes & some notes --- src/generated/resources/.cache/cache | 18 +++++ .../drill_block_placing_augment.json | 32 +++++++++ .../drill_fortune_augment_i.json | 32 +++++++++ .../drill_fortune_augment_ii.json | 32 +++++++++ .../drill_mining_augment_i.json | 32 +++++++++ .../drill_mining_augment_ii.json | 32 +++++++++ .../drill_silk_touch_augment.json | 32 +++++++++ .../drill_speed_augment_i.json | 32 +++++++++ .../drill_speed_augment_ii.json | 32 +++++++++ .../drill_speed_augment_iii.json | 32 +++++++++ .../recipes/drill_block_placing_augment.json | 25 +++++++ .../recipes/drill_fortune_augment_i.json | 22 +++++++ .../recipes/drill_fortune_augment_ii.json | 22 +++++++ .../recipes/drill_mining_augment_i.json | 22 +++++++ .../recipes/drill_mining_augment_ii.json | 22 +++++++ .../recipes/drill_silk_touch_augment.json | 22 +++++++ .../recipes/drill_speed_augment_i.json | 22 +++++++ .../recipes/drill_speed_augment_ii.json | 22 +++++++ .../recipes/drill_speed_augment_iii.json | 22 +++++++ .../common/items/useables/DrillItem.java | 5 ++ .../data/GeneratorRecipes.java | 65 +++++++++++++++++++ 21 files changed, 577 insertions(+) create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_block_placing_augment.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_fortune_augment_i.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_fortune_augment_ii.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_i.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_ii.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_silk_touch_augment.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_i.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_ii.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_iii.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_block_placing_augment.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_fortune_augment_i.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_fortune_augment_ii.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_mining_augment_i.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_mining_augment_ii.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_silk_touch_augment.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_i.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_ii.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_iii.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 3c403bb64..730ce2334 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -633,20 +633,29 @@ d8aad07e5b11238e218e48a5afa1641736e2ef83 data/actuallyadditions/advancements/rec 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 +934787a92fa1509c999da4423c88151d8a01c0ed data/actuallyadditions/advancements/recipes/actuallyadditions/drill_block_placing_augment.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 +aa166e6387f4071b1adf83f00cd619afd5ec6b9c data/actuallyadditions/advancements/recipes/actuallyadditions/drill_fortune_augment_i.json +dee4db5b7719e8a655d419ac0b0f4c14f196ed4d data/actuallyadditions/advancements/recipes/actuallyadditions/drill_fortune_augment_ii.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 +f050ce0a3da75c0bbd9d519567dbb52462cca87c data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_i.json +93c33d47900604f465a462f2c04561418566cb3e data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_ii.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 +62c0e7170bb939df11b56c17188eee3b868bbd88 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_silk_touch_augment.json +2ff34ab24bc3b97e220c9f9d8c8c07d923e8b6b8 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_i.json +f9c761fb1b9701a3915f5693da3fc914365e67ab data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_ii.json +c0de3e2e3ff6f64b38447cd66f73029f84cb7394 data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_iii.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 @@ -823,20 +832,29 @@ f9e8d41186fb1775eee7e522deedde006c34299f data/actuallyadditions/recipes/diamatin 03f0ac70324ef0af25e5f94d674eabf98791bfda data/actuallyadditions/recipes/diamatine_empowered_crystal_block_of.json b3535d312b1acde7b10ccff0a0975ac7d15258c1 data/actuallyadditions/recipes/double_battery.json dcd17a1bea3083809bbb417c5370feb7ce854e3e data/actuallyadditions/recipes/drill_black.json +3007822dfec278521ce1b703dfec3295083b3856 data/actuallyadditions/recipes/drill_block_placing_augment.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 +837072f79a561012710a0ce331ce0986700e30e3 data/actuallyadditions/recipes/drill_fortune_augment_i.json +818ad251c6f009b2ee402368628903003e5dce3f data/actuallyadditions/recipes/drill_fortune_augment_ii.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 +395f39ff59924d9de24199762f5f74b5ad70ffdc data/actuallyadditions/recipes/drill_mining_augment_i.json +2eda3890e9ccb94eabebbf57f7afe64b40034441 data/actuallyadditions/recipes/drill_mining_augment_ii.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 +2bb027af946620947b4a627e0899c0d8975210f1 data/actuallyadditions/recipes/drill_silk_touch_augment.json +3c733eda742979aff56f8c218faae851591468fc data/actuallyadditions/recipes/drill_speed_augment_i.json +4694d254b0d0f359fe8448b6690a8637ef667635 data/actuallyadditions/recipes/drill_speed_augment_ii.json +6ddc32a9e73b0106093e914e899d33864ca387be data/actuallyadditions/recipes/drill_speed_augment_iii.json 5e4f44dc337c0da51bfa6fd22b8899c6ca672244 data/actuallyadditions/recipes/drill_white.json 42341d0e94c874ede024465ec450aeba1097295f data/actuallyadditions/recipes/drill_yellow.json 7fb8fbef9e4c6b7dd6f3b40630d283d1d760f0b6 data/actuallyadditions/recipes/emeradic_crystal_block_of.json diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_block_placing_augment.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_block_placing_augment.json new file mode 100644 index 000000000..73a84b7f5 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_block_placing_augment.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_block_placing_augment" + ] + }, + "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_block_placing_augment" + } + } + }, + "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_fortune_augment_i.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_fortune_augment_i.json new file mode 100644 index 000000000..3f254a72f --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_fortune_augment_i.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_fortune_augment_i" + ] + }, + "criteria": { + "has_empowered_diamatine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:diamatine_empowered_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_fortune_augment_i" + } + } + }, + "requirements": [ + [ + "has_empowered_diamatine", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_fortune_augment_ii.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_fortune_augment_ii.json new file mode 100644 index 000000000..4c1274d42 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_fortune_augment_ii.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_fortune_augment_ii" + ] + }, + "criteria": { + "has_enercasing": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:ender_casing_block" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_fortune_augment_ii" + } + } + }, + "requirements": [ + [ + "has_enercasing", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_i.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_i.json new file mode 100644 index 000000000..5a11222f3 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_i.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_mining_augment_i" + ] + }, + "criteria": { + "has_diamatine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:diamatine_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_mining_augment_i" + } + } + }, + "requirements": [ + [ + "has_diamatine", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_ii.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_ii.json new file mode 100644 index 000000000..c1650e953 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_mining_augment_ii.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_mining_augment_ii" + ] + }, + "criteria": { + "has_empowered_enori": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:enori_empowered_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_mining_augment_ii" + } + } + }, + "requirements": [ + [ + "has_empowered_enori", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_silk_touch_augment.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_silk_touch_augment.json new file mode 100644 index 000000000..a39fcb3e2 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_silk_touch_augment.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_silk_touch_augment" + ] + }, + "criteria": { + "has_empowered_emeradic": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:emeradic_empowered_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_silk_touch_augment" + } + } + }, + "requirements": [ + [ + "has_empowered_emeradic", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_i.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_i.json new file mode 100644 index 000000000..f3e89e6b4 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_i.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_speed_augment_i" + ] + }, + "criteria": { + "has_restonia": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:restonia_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_speed_augment_i" + } + } + }, + "requirements": [ + [ + "has_restonia", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_ii.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_ii.json new file mode 100644 index 000000000..55cdd8e47 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_ii.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_speed_augment_ii" + ] + }, + "criteria": { + "has_cake": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:cake" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_speed_augment_ii" + } + } + }, + "requirements": [ + [ + "has_cake", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_iii.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_iii.json new file mode 100644 index 000000000..639816372 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/drill_speed_augment_iii.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:drill_speed_augment_iii" + ] + }, + "criteria": { + "has_empowered_diamatine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:diamatine_empowered_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:drill_speed_augment_iii" + } + } + }, + "requirements": [ + [ + "has_empowered_diamatine", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_block_placing_augment.json b/src/generated/resources/data/actuallyadditions/recipes/drill_block_placing_augment.json new file mode 100644 index 000000000..5b7bd2b1d --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_block_placing_augment.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "dcd", + "aba" + ], + "key": { + "a": { + "tag": "forge:cobblestone" + }, + "b": { + "item": "minecraft:paper" + }, + "c": { + "item": "actuallyadditions:basic_coil" + }, + "d": { + "item": "actuallyadditions:enori_crystal" + } + }, + "result": { + "item": "actuallyadditions:drill_block_placing_augment" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_fortune_augment_i.json b/src/generated/resources/data/actuallyadditions/recipes/drill_fortune_augment_i.json new file mode 100644 index 000000000..92aa913ac --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_fortune_augment_i.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "minecraft:glowstone" + }, + "b": { + "tag": "forge:dusts/redstone" + }, + "c": { + "item": "actuallyadditions:crystal_emeradic_empowered_block" + } + }, + "result": { + "item": "actuallyadditions:drill_fortune_augment_i" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_fortune_augment_ii.json b/src/generated/resources/data/actuallyadditions/recipes/drill_fortune_augment_ii.json new file mode 100644 index 000000000..53fd61315 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_fortune_augment_ii.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "minecraft:glowstone" + }, + "b": { + "item": "actuallyadditions:restonia_crystal" + }, + "c": { + "item": "actuallyadditions:ender_casing_block" + } + }, + "result": { + "item": "actuallyadditions:drill_fortune_augment_ii" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_mining_augment_i.json b/src/generated/resources/data/actuallyadditions/recipes/drill_mining_augment_i.json new file mode 100644 index 000000000..d00291b4d --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_mining_augment_i.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "actuallyadditions:diamatine_crystal" + }, + "b": { + "item": "actuallyadditions:enori_crystal" + }, + "c": { + "item": "actuallyadditions:basic_coil" + } + }, + "result": { + "item": "actuallyadditions:drill_mining_augment_i" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_mining_augment_ii.json b/src/generated/resources/data/actuallyadditions/recipes/drill_mining_augment_ii.json new file mode 100644 index 000000000..d64821c17 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_mining_augment_ii.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "actuallyadditions:diamatine_crystal" + }, + "b": { + "item": "actuallyadditions:enori_empowered_crystal" + }, + "c": { + "item": "actuallyadditions:advanced_coil" + } + }, + "result": { + "item": "actuallyadditions:drill_mining_augment_ii" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_silk_touch_augment.json b/src/generated/resources/data/actuallyadditions/recipes/drill_silk_touch_augment.json new file mode 100644 index 000000000..bb0429236 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_silk_touch_augment.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "actuallyadditions:emeradic_empowered_crystal" + }, + "b": { + "item": "actuallyadditions:diamatine_crystal" + }, + "c": { + "item": "actuallyadditions:advanced_coil" + } + }, + "result": { + "item": "actuallyadditions:drill_silk_touch_augment" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_i.json b/src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_i.json new file mode 100644 index 000000000..2f6896b13 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_i.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "actuallyadditions:enori_crystal" + }, + "b": { + "item": "minecraft:sugar" + }, + "c": { + "item": "actuallyadditions:restonia_crystal" + } + }, + "result": { + "item": "actuallyadditions:drill_speed_augment_i" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_ii.json b/src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_ii.json new file mode 100644 index 000000000..2a0ad07a6 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_ii.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "actuallyadditions:enori_crystal" + }, + "b": { + "item": "minecraft:sugar" + }, + "c": { + "item": "minecraft:cake" + } + }, + "result": { + "item": "actuallyadditions:drill_speed_augment_ii" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_iii.json b/src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_iii.json new file mode 100644 index 000000000..5d3b3ea35 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/drill_speed_augment_iii.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "aba", + "bcb", + "aba" + ], + "key": { + "a": { + "item": "actuallyadditions:enori_empowered_crystal" + }, + "b": { + "item": "minecraft:sugar" + }, + "c": { + "item": "actuallyadditions:diamatine_empowered_crystal" + } + }, + "result": { + "item": "actuallyadditions:drill_speed_augment_iii" + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/useables/DrillItem.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/useables/DrillItem.java index deb6d951a..3b4712c59 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/useables/DrillItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/items/useables/DrillItem.java @@ -45,6 +45,11 @@ import java.util.function.Consumer; import static de.ellpeck.actuallyadditions.common.items.misc.DrillAugmentItem.AugmentType; +/** + * @implNote The augment system might be made more abstract as I think other things might use it. + * + * todo: Still need to support the placement augment. Tired out after all the AOE crap + */ public class DrillItem extends CrystalFluxItem { public static final String NBT_AUGMENT_TAG = "augments"; diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java index 093f7fb6a..1b455466a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java @@ -74,6 +74,7 @@ public class GeneratorRecipes extends RecipeProvider { .addCriterion("has_battery", hasItem(ActuallyItems.SINGLE_BATTERY.get())) .build(consumer); + // Drills ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_CORE.get()) .key('a', ActuallyBlocks.CRYSTAL_ENORI.get()).key('b', ActuallyItems.BASIC_COIL.get()) .key('c', ActuallyItems.RESTONIA_CRYSTAL.get()) @@ -104,6 +105,70 @@ public class GeneratorRecipes extends RecipeProvider { drillColor(ActuallyItems.DRILL_WHITE, Tags.Items.DYES_WHITE).build(consumer); drillColor(ActuallyItems.DRILL_YELLOW, Tags.Items.DYES_YELLOW).build(consumer); + // Drill augments + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_SPEED_AUGMENT_I.get()) + .key('a', ActuallyItems.ENORI_CRYSTAL.get()).key('b', Items.SUGAR) + .key('c', ActuallyItems.RESTONIA_CRYSTAL.get()) + .patternLine("aba").patternLine("bcb").patternLine("aba") + .addCriterion("has_restonia", hasItem(ActuallyItems.RESTONIA_CRYSTAL.get())) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_SPEED_AUGMENT_II.get()) + .key('a', ActuallyItems.ENORI_CRYSTAL.get()).key('b', Items.SUGAR) + .key('c', Items.CAKE) + .patternLine("aba").patternLine("bcb").patternLine("aba") + .addCriterion("has_cake", hasItem(Items.CAKE)) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_SPEED_AUGMENT_III.get()) + .key('a', ActuallyItems.ENORI_EMPOWERED_CRYSTAL.get()).key('b', Items.SUGAR) + .key('c', ActuallyItems.DIAMATINE_EMPOWERED_CRYSTAL.get()) + .patternLine("aba").patternLine("bcb").patternLine("aba") + .addCriterion("has_empowered_diamatine", hasItem(ActuallyItems.DIAMATINE_EMPOWERED_CRYSTAL.get())) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_SILK_TOUCH_AUGMENT.get()) + .key('a', ActuallyItems.EMERADIC_EMPOWERED_CRYSTAL.get()).key('b', ActuallyItems.DIAMATINE_CRYSTAL.get()) + .key('c', ActuallyItems.ADVANCED_COIL.get()) + .patternLine("aba").patternLine("bcb").patternLine("aba") + .addCriterion("has_empowered_emeradic", hasItem(ActuallyItems.EMERADIC_EMPOWERED_CRYSTAL.get())) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_FORTUNE_AUGMENT_I.get()) + .key('a', Blocks.GLOWSTONE).key('b', Tags.Items.DUSTS_REDSTONE) + .key('c', ActuallyBlocks.CRYSTAL_EMPOWERED_EMERADIC.get()) + .patternLine("aba").patternLine("bcb").patternLine("aba") + .addCriterion("has_empowered_diamatine", hasItem(ActuallyItems.DIAMATINE_EMPOWERED_CRYSTAL.get())) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_FORTUNE_AUGMENT_II.get()) + .key('a', Blocks.GLOWSTONE).key('b', ActuallyItems.RESTONIA_CRYSTAL.get()) + .key('c', ActuallyBlocks.ENDER_CASING.get()) + .patternLine("aba").patternLine("bcb").patternLine("aba") + .addCriterion("has_enercasing", hasItem(ActuallyBlocks.ENDER_CASING.get())) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_MINING_AUGMENT_I.get()) + .key('a', ActuallyItems.DIAMATINE_CRYSTAL.get()).key('b', ActuallyItems.ENORI_CRYSTAL.get()) + .key('c', ActuallyItems.BASIC_COIL.get()) + .patternLine("aba").patternLine("bcb").patternLine("aba") + .addCriterion("has_diamatine", hasItem(ActuallyItems.DIAMATINE_CRYSTAL.get())) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_MINING_AUGMENT_II.get()) + .key('a', ActuallyItems.DIAMATINE_CRYSTAL.get()).key('b', ActuallyItems.ENORI_EMPOWERED_CRYSTAL.get()) + .key('c', ActuallyItems.ADVANCED_COIL.get()) + .patternLine("aba").patternLine("bcb").patternLine("aba") + .addCriterion("has_empowered_enori", hasItem(ActuallyItems.ENORI_EMPOWERED_CRYSTAL.get())) + .build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.DRILL_BLOCK_PLACING_AUGMENT.get()) + .key('a', Tags.Items.COBBLESTONE).key('b', Items.PAPER) + .key('c', ActuallyItems.BASIC_COIL.get()).key('d', ActuallyItems.ENORI_CRYSTAL.get()) + .patternLine("aba").patternLine("dcd").patternLine("aba") + .addCriterion("has_basic_coil", hasItem(ActuallyItems.BASIC_COIL.get())) + .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);