From 5677ca21c821601e1f5734a7e8fe5d6d54350cab Mon Sep 17 00:00:00 2001 From: cnlimiter Date: Mon, 8 Jan 2024 02:44:17 +0800 Subject: [PATCH] + nineBlock storage recipes --- .../recipes/misc/extreme_crafting_table.json | 4 +- ...from_double_compressed_crafting_table.json | 35 +++++++ .../building_blocks/crafting_table.json} | 8 +- ..._table_from_compressed_crafting_table.json | 35 +++++++ .../building_blocks}/crystal_matrix.json | 8 +- .../double_compressed_crafting_table.json | 35 +++++++ .../recipes/building_blocks}/infinity.json | 8 +- .../recipes/building_blocks}/neutron.json | 8 +- .../recipes/misc/crystal_matrix_ingot.json | 35 +++++++ .../recipes/misc/infinity_ingot.json} | 10 +- .../neutron_ingot_from_neutron_block.json | 35 +++++++ .../misc/neutron_ingot_from_nuggets.json | 35 +++++++ .../recipes/misc/neutron_nugget.json | 35 +++++++ .../recipes/misc/neutron_pile.json} | 8 +- .../misc/neutron_pile_from_ingots.json} | 8 +- ...from_double_compressed_crafting_table.json | 14 +++ .../minecraft/recipes/crafting_table.json | 13 +++ ...table_from_compressed_crafting_table.json} | 11 ++- .../recipes/crystal_matrix.json | 10 +- .../recipes/crystal_matrix_ingot.json | 13 +++ .../double_compressed_crafting_table.json | 10 +- .../recipes/infinity.json | 10 +- .../minecraft/recipes/infinity_ingot.json | 13 +++ .../recipes/neutron.json | 10 +- .../neutron_ingot_from_neutron_block.json | 14 +++ .../recipes/neutron_ingot_from_nuggets.json} | 9 +- .../minecraft/recipes/neutron_nugget.json | 13 +++ .../data/minecraft/recipes/neutron_pile.json | 13 +++ .../recipes/neutron_pile_from_ingots.json} | 9 +- .../init/data/provider/recipe/ModRecipes.java | 92 ++++--------------- 30 files changed, 424 insertions(+), 137 deletions(-) create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/building_blocks/compressed_crafting_table_from_double_compressed_crafting_table.json rename src/generated/resources/data/{avaritia/advancements/recipes/misc/double_compressed_crafting_table.json => minecraft/advancements/recipes/building_blocks/crafting_table.json} (77%) create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crafting_table_from_compressed_crafting_table.json rename src/generated/resources/data/{avaritia/advancements/recipes/misc => minecraft/advancements/recipes/building_blocks}/crystal_matrix.json (78%) create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/building_blocks/double_compressed_crafting_table.json rename src/generated/resources/data/{avaritia/advancements/recipes/misc => minecraft/advancements/recipes/building_blocks}/infinity.json (80%) rename src/generated/resources/data/{avaritia/advancements/recipes/misc => minecraft/advancements/recipes/building_blocks}/neutron.json (81%) create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/crystal_matrix_ingot.json rename src/generated/resources/data/{avaritia/advancements/recipes/misc/compressed_crafting_table.json => minecraft/advancements/recipes/misc/infinity_ingot.json} (75%) create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_ingot_from_neutron_block.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_ingot_from_nuggets.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_nugget.json rename src/generated/resources/data/{avaritia/advancements/recipes/misc/neutron_ingot.json => minecraft/advancements/recipes/misc/neutron_pile.json} (79%) rename src/generated/resources/data/{avaritia/advancements/recipes/misc/neutron_nugget.json => minecraft/advancements/recipes/misc/neutron_pile_from_ingots.json} (77%) create mode 100644 src/generated/resources/data/minecraft/recipes/compressed_crafting_table_from_double_compressed_crafting_table.json create mode 100644 src/generated/resources/data/minecraft/recipes/crafting_table.json rename src/generated/resources/data/{avaritia/recipes/compressed_crafting_table.json => minecraft/recipes/crafting_table_from_compressed_crafting_table.json} (69%) rename src/generated/resources/data/{avaritia => minecraft}/recipes/crystal_matrix.json (75%) create mode 100644 src/generated/resources/data/minecraft/recipes/crystal_matrix_ingot.json rename src/generated/resources/data/{avaritia => minecraft}/recipes/double_compressed_crafting_table.json (77%) rename src/generated/resources/data/{avaritia => minecraft}/recipes/infinity.json (74%) create mode 100644 src/generated/resources/data/minecraft/recipes/infinity_ingot.json rename src/generated/resources/data/{avaritia => minecraft}/recipes/neutron.json (74%) create mode 100644 src/generated/resources/data/minecraft/recipes/neutron_ingot_from_neutron_block.json rename src/generated/resources/data/{avaritia/recipes/neutron_ingot.json => minecraft/recipes/neutron_ingot_from_nuggets.json} (76%) create mode 100644 src/generated/resources/data/minecraft/recipes/neutron_nugget.json create mode 100644 src/generated/resources/data/minecraft/recipes/neutron_pile.json rename src/generated/resources/data/{avaritia/recipes/neutron_nugget.json => minecraft/recipes/neutron_pile_from_ingots.json} (76%) diff --git a/src/generated/resources/data/avaritia/advancements/recipes/misc/extreme_crafting_table.json b/src/generated/resources/data/avaritia/advancements/recipes/misc/extreme_crafting_table.json index ce694ac6..6fbd8ab9 100644 --- a/src/generated/resources/data/avaritia/advancements/recipes/misc/extreme_crafting_table.json +++ b/src/generated/resources/data/avaritia/advancements/recipes/misc/extreme_crafting_table.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item": { + "has_block": { "conditions": { "items": [ { @@ -22,7 +22,7 @@ }, "requirements": [ [ - "has_item", + "has_block", "has_the_recipe" ] ], diff --git a/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/compressed_crafting_table_from_double_compressed_crafting_table.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/compressed_crafting_table_from_double_compressed_crafting_table.json new file mode 100644 index 00000000..b08a6164 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/compressed_crafting_table_from_double_compressed_crafting_table.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_double_compressed_crafting_table": { + "conditions": { + "items": [ + { + "items": [ + "avaritia:double_compressed_crafting_table" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:compressed_crafting_table_from_double_compressed_crafting_table" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_double_compressed_crafting_table", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:compressed_crafting_table_from_double_compressed_crafting_table" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/advancements/recipes/misc/double_compressed_crafting_table.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crafting_table.json similarity index 77% rename from src/generated/resources/data/avaritia/advancements/recipes/misc/double_compressed_crafting_table.json rename to src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crafting_table.json index 095e9831..2c2ae50a 100644 --- a/src/generated/resources/data/avaritia/advancements/recipes/misc/double_compressed_crafting_table.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crafting_table.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item": { + "has_compressed_crafting_table": { "conditions": { "items": [ { @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "avaritia:double_compressed_crafting_table" + "recipe": "minecraft:crafting_table" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", + "has_compressed_crafting_table", "has_the_recipe" ] ], "rewards": { "recipes": [ - "avaritia:double_compressed_crafting_table" + "minecraft:crafting_table" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crafting_table_from_compressed_crafting_table.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crafting_table_from_compressed_crafting_table.json new file mode 100644 index 00000000..86b8561f --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crafting_table_from_compressed_crafting_table.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crafting_table": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:crafting_table" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:crafting_table_from_compressed_crafting_table" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_crafting_table", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:crafting_table_from_compressed_crafting_table" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/advancements/recipes/misc/crystal_matrix.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crystal_matrix.json similarity index 78% rename from src/generated/resources/data/avaritia/advancements/recipes/misc/crystal_matrix.json rename to src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crystal_matrix.json index f6fc7b6f..ba5a0bac 100644 --- a/src/generated/resources/data/avaritia/advancements/recipes/misc/crystal_matrix.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/crystal_matrix.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item": { + "has_crystal_matrix_ingot": { "conditions": { "items": [ { @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "avaritia:crystal_matrix" + "recipe": "minecraft:crystal_matrix" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", + "has_crystal_matrix_ingot", "has_the_recipe" ] ], "rewards": { "recipes": [ - "avaritia:crystal_matrix" + "minecraft:crystal_matrix" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/double_compressed_crafting_table.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/double_compressed_crafting_table.json new file mode 100644 index 00000000..7ef8b376 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/double_compressed_crafting_table.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_compressed_crafting_table": { + "conditions": { + "items": [ + { + "items": [ + "avaritia:compressed_crafting_table" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:double_compressed_crafting_table" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_compressed_crafting_table", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:double_compressed_crafting_table" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/advancements/recipes/misc/infinity.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/infinity.json similarity index 80% rename from src/generated/resources/data/avaritia/advancements/recipes/misc/infinity.json rename to src/generated/resources/data/minecraft/advancements/recipes/building_blocks/infinity.json index 13d26f3a..57ccafa3 100644 --- a/src/generated/resources/data/avaritia/advancements/recipes/misc/infinity.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/infinity.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item": { + "has_infinity_ingot": { "conditions": { "items": [ { @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "avaritia:infinity" + "recipe": "minecraft:infinity" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", + "has_infinity_ingot", "has_the_recipe" ] ], "rewards": { "recipes": [ - "avaritia:infinity" + "minecraft:infinity" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/avaritia/advancements/recipes/misc/neutron.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/neutron.json similarity index 81% rename from src/generated/resources/data/avaritia/advancements/recipes/misc/neutron.json rename to src/generated/resources/data/minecraft/advancements/recipes/building_blocks/neutron.json index 5fa96e36..1af105e1 100644 --- a/src/generated/resources/data/avaritia/advancements/recipes/misc/neutron.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/neutron.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item": { + "has_neutron_ingot": { "conditions": { "items": [ { @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "avaritia:neutron" + "recipe": "minecraft:neutron" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", + "has_neutron_ingot", "has_the_recipe" ] ], "rewards": { "recipes": [ - "avaritia:neutron" + "minecraft:neutron" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/crystal_matrix_ingot.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/crystal_matrix_ingot.json new file mode 100644 index 00000000..3cd9e9cf --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/crystal_matrix_ingot.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crystal_matrix": { + "conditions": { + "items": [ + { + "items": [ + "avaritia:crystal_matrix" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:crystal_matrix_ingot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_crystal_matrix", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:crystal_matrix_ingot" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/advancements/recipes/misc/compressed_crafting_table.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/infinity_ingot.json similarity index 75% rename from src/generated/resources/data/avaritia/advancements/recipes/misc/compressed_crafting_table.json rename to src/generated/resources/data/minecraft/advancements/recipes/misc/infinity_ingot.json index c427303c..e3859194 100644 --- a/src/generated/resources/data/avaritia/advancements/recipes/misc/compressed_crafting_table.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/infinity_ingot.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "": { + "has_infinity": { "conditions": { "items": [ { "items": [ - "minecraft:air" + "avaritia:infinity" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "avaritia:compressed_crafting_table" + "recipe": "minecraft:infinity_ingot" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "", + "has_infinity", "has_the_recipe" ] ], "rewards": { "recipes": [ - "avaritia:compressed_crafting_table" + "minecraft:infinity_ingot" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_ingot_from_neutron_block.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_ingot_from_neutron_block.json new file mode 100644 index 00000000..6845ee17 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_ingot_from_neutron_block.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_neutron": { + "conditions": { + "items": [ + { + "items": [ + "avaritia:neutron" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:neutron_ingot_from_neutron_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_neutron", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:neutron_ingot_from_neutron_block" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_ingot_from_nuggets.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_ingot_from_nuggets.json new file mode 100644 index 00000000..14e4bae3 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_ingot_from_nuggets.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_neutron_nugget": { + "conditions": { + "items": [ + { + "items": [ + "avaritia:neutron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:neutron_ingot_from_nuggets" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_neutron_nugget", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:neutron_ingot_from_nuggets" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_nugget.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_nugget.json new file mode 100644 index 00000000..8a242737 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_nugget.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_neutron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "avaritia:neutron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:neutron_nugget" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_neutron_ingot", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:neutron_nugget" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/advancements/recipes/misc/neutron_ingot.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_pile.json similarity index 79% rename from src/generated/resources/data/avaritia/advancements/recipes/misc/neutron_ingot.json rename to src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_pile.json index 6474433c..a87724ff 100644 --- a/src/generated/resources/data/avaritia/advancements/recipes/misc/neutron_ingot.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_pile.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item": { + "has_neutron_nugget": { "conditions": { "items": [ { @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "avaritia:neutron_ingot" + "recipe": "minecraft:neutron_pile" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", + "has_neutron_nugget", "has_the_recipe" ] ], "rewards": { "recipes": [ - "avaritia:neutron_ingot" + "minecraft:neutron_pile" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/avaritia/advancements/recipes/misc/neutron_nugget.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_pile_from_ingots.json similarity index 77% rename from src/generated/resources/data/avaritia/advancements/recipes/misc/neutron_nugget.json rename to src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_pile_from_ingots.json index b2767434..b55b1905 100644 --- a/src/generated/resources/data/avaritia/advancements/recipes/misc/neutron_nugget.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/neutron_pile_from_ingots.json @@ -1,7 +1,7 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_item": { + "has_neutron_pile": { "conditions": { "items": [ { @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "avaritia:neutron_nugget" + "recipe": "minecraft:neutron_pile_from_ingots" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", + "has_neutron_pile", "has_the_recipe" ] ], "rewards": { "recipes": [ - "avaritia:neutron_nugget" + "minecraft:neutron_pile_from_ingots" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/minecraft/recipes/compressed_crafting_table_from_double_compressed_crafting_table.json b/src/generated/resources/data/minecraft/recipes/compressed_crafting_table_from_double_compressed_crafting_table.json new file mode 100644 index 00000000..e2625aeb --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/compressed_crafting_table_from_double_compressed_crafting_table.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "compressed_crafting_table", + "ingredients": [ + { + "item": "avaritia:double_compressed_crafting_table" + } + ], + "result": { + "count": 9, + "item": "avaritia:compressed_crafting_table" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/crafting_table.json b/src/generated/resources/data/minecraft/recipes/crafting_table.json new file mode 100644 index 00000000..a48b1956 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/crafting_table.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "avaritia:compressed_crafting_table" + } + ], + "result": { + "count": 9, + "item": "minecraft:crafting_table" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/recipes/compressed_crafting_table.json b/src/generated/resources/data/minecraft/recipes/crafting_table_from_compressed_crafting_table.json similarity index 69% rename from src/generated/resources/data/avaritia/recipes/compressed_crafting_table.json rename to src/generated/resources/data/minecraft/recipes/crafting_table_from_compressed_crafting_table.json index c1afacd8..df58d6a4 100644 --- a/src/generated/resources/data/avaritia/recipes/compressed_crafting_table.json +++ b/src/generated/resources/data/minecraft/recipes/crafting_table_from_compressed_crafting_table.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", - "category": "misc", + "category": "building", + "group": "crafting_table", "key": { - "x": { + "#": { "item": "minecraft:crafting_table" } }, "pattern": [ - "xxx", - "xxx", - "xxx" + "###", + "###", + "###" ], "result": { "item": "avaritia:compressed_crafting_table" diff --git a/src/generated/resources/data/avaritia/recipes/crystal_matrix.json b/src/generated/resources/data/minecraft/recipes/crystal_matrix.json similarity index 75% rename from src/generated/resources/data/avaritia/recipes/crystal_matrix.json rename to src/generated/resources/data/minecraft/recipes/crystal_matrix.json index 01cc3000..5b80fb82 100644 --- a/src/generated/resources/data/avaritia/recipes/crystal_matrix.json +++ b/src/generated/resources/data/minecraft/recipes/crystal_matrix.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", - "category": "misc", + "category": "building", "key": { - "x": { + "#": { "item": "avaritia:crystal_matrix_ingot" } }, "pattern": [ - "xxx", - "xxx", - "xxx" + "###", + "###", + "###" ], "result": { "item": "avaritia:crystal_matrix" diff --git a/src/generated/resources/data/minecraft/recipes/crystal_matrix_ingot.json b/src/generated/resources/data/minecraft/recipes/crystal_matrix_ingot.json new file mode 100644 index 00000000..285254e1 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/crystal_matrix_ingot.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "avaritia:crystal_matrix" + } + ], + "result": { + "count": 9, + "item": "avaritia:crystal_matrix_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/recipes/double_compressed_crafting_table.json b/src/generated/resources/data/minecraft/recipes/double_compressed_crafting_table.json similarity index 77% rename from src/generated/resources/data/avaritia/recipes/double_compressed_crafting_table.json rename to src/generated/resources/data/minecraft/recipes/double_compressed_crafting_table.json index 354a18f4..f39688ef 100644 --- a/src/generated/resources/data/avaritia/recipes/double_compressed_crafting_table.json +++ b/src/generated/resources/data/minecraft/recipes/double_compressed_crafting_table.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", - "category": "misc", + "category": "building", "key": { - "x": { + "#": { "item": "avaritia:compressed_crafting_table" } }, "pattern": [ - "xxx", - "xxx", - "xxx" + "###", + "###", + "###" ], "result": { "item": "avaritia:double_compressed_crafting_table" diff --git a/src/generated/resources/data/avaritia/recipes/infinity.json b/src/generated/resources/data/minecraft/recipes/infinity.json similarity index 74% rename from src/generated/resources/data/avaritia/recipes/infinity.json rename to src/generated/resources/data/minecraft/recipes/infinity.json index 9f76f14b..e26183da 100644 --- a/src/generated/resources/data/avaritia/recipes/infinity.json +++ b/src/generated/resources/data/minecraft/recipes/infinity.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", - "category": "misc", + "category": "building", "key": { - "x": { + "#": { "item": "avaritia:infinity_ingot" } }, "pattern": [ - "xxx", - "xxx", - "xxx" + "###", + "###", + "###" ], "result": { "item": "avaritia:infinity" diff --git a/src/generated/resources/data/minecraft/recipes/infinity_ingot.json b/src/generated/resources/data/minecraft/recipes/infinity_ingot.json new file mode 100644 index 00000000..4973ce3a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/infinity_ingot.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "avaritia:infinity" + } + ], + "result": { + "count": 9, + "item": "avaritia:infinity_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/recipes/neutron.json b/src/generated/resources/data/minecraft/recipes/neutron.json similarity index 74% rename from src/generated/resources/data/avaritia/recipes/neutron.json rename to src/generated/resources/data/minecraft/recipes/neutron.json index e7c07d79..b0985701 100644 --- a/src/generated/resources/data/avaritia/recipes/neutron.json +++ b/src/generated/resources/data/minecraft/recipes/neutron.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", - "category": "misc", + "category": "building", "key": { - "x": { + "#": { "item": "avaritia:neutron_ingot" } }, "pattern": [ - "xxx", - "xxx", - "xxx" + "###", + "###", + "###" ], "result": { "item": "avaritia:neutron" diff --git a/src/generated/resources/data/minecraft/recipes/neutron_ingot_from_neutron_block.json b/src/generated/resources/data/minecraft/recipes/neutron_ingot_from_neutron_block.json new file mode 100644 index 00000000..32a04a61 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/neutron_ingot_from_neutron_block.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "neutron_ingot", + "ingredients": [ + { + "item": "avaritia:neutron" + } + ], + "result": { + "count": 9, + "item": "avaritia:neutron_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/recipes/neutron_ingot.json b/src/generated/resources/data/minecraft/recipes/neutron_ingot_from_nuggets.json similarity index 76% rename from src/generated/resources/data/avaritia/recipes/neutron_ingot.json rename to src/generated/resources/data/minecraft/recipes/neutron_ingot_from_nuggets.json index a5cc65e7..1c153c94 100644 --- a/src/generated/resources/data/avaritia/recipes/neutron_ingot.json +++ b/src/generated/resources/data/minecraft/recipes/neutron_ingot_from_nuggets.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", "category": "misc", + "group": "neutron_ingot", "key": { - "x": { + "#": { "item": "avaritia:neutron_nugget" } }, "pattern": [ - "xxx", - "xxx", - "xxx" + "###", + "###", + "###" ], "result": { "item": "avaritia:neutron_ingot" diff --git a/src/generated/resources/data/minecraft/recipes/neutron_nugget.json b/src/generated/resources/data/minecraft/recipes/neutron_nugget.json new file mode 100644 index 00000000..241c5b0a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/neutron_nugget.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "avaritia:neutron_ingot" + } + ], + "result": { + "count": 9, + "item": "avaritia:neutron_nugget" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/neutron_pile.json b/src/generated/resources/data/minecraft/recipes/neutron_pile.json new file mode 100644 index 00000000..139d2e8e --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/neutron_pile.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "avaritia:neutron_nugget" + } + ], + "result": { + "count": 9, + "item": "avaritia:neutron_pile" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/avaritia/recipes/neutron_nugget.json b/src/generated/resources/data/minecraft/recipes/neutron_pile_from_ingots.json similarity index 76% rename from src/generated/resources/data/avaritia/recipes/neutron_nugget.json rename to src/generated/resources/data/minecraft/recipes/neutron_pile_from_ingots.json index 42a27b2f..b4cd7bf5 100644 --- a/src/generated/resources/data/avaritia/recipes/neutron_nugget.json +++ b/src/generated/resources/data/minecraft/recipes/neutron_pile_from_ingots.json @@ -1,15 +1,16 @@ { "type": "minecraft:crafting_shaped", "category": "misc", + "group": "neutron_pile", "key": { - "x": { + "#": { "item": "avaritia:neutron_pile" } }, "pattern": [ - "xxx", - "xxx", - "xxx" + "###", + "###", + "###" ], "result": { "item": "avaritia:neutron_nugget" diff --git a/src/main/java/committee/nova/mods/avaritia/init/data/provider/recipe/ModRecipes.java b/src/main/java/committee/nova/mods/avaritia/init/data/provider/recipe/ModRecipes.java index 04081c89..25c01956 100644 --- a/src/main/java/committee/nova/mods/avaritia/init/data/provider/recipe/ModRecipes.java +++ b/src/main/java/committee/nova/mods/avaritia/init/data/provider/recipe/ModRecipes.java @@ -13,6 +13,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; import org.jetbrains.annotations.NotNull; @@ -33,29 +34,17 @@ public ModRecipes(DataGenerator output) { @Override protected void buildRecipes(@NotNull Consumer consumer) { InventoryChangeTrigger.TriggerInstance lul = has(Items.AIR); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.compressed_crafting_table.get()) - .pattern("xxx") - .pattern("xxx") - .pattern("xxx") - .define('x', Items.CRAFTING_TABLE) - - .unlockedBy("", lul).save(consumer); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.crystal_matrix.get()) - .pattern("xxx") - .pattern("xxx") - .pattern("xxx") - .define('x', ModItems.crystal_matrix_ingot.get()) - - .unlockedBy("has_item", has(ModItems.crystal_matrix_ingot.get())).save(consumer); + nineBlockStorageRecipesRecipesWithCustomUnpacking(consumer, RecipeCategory.MISC, ModItems.neutron_ingot.get(), RecipeCategory.BUILDING_BLOCKS, ModBlocks.neutron.get(), "neutron_ingot_from_neutron_block", "neutron_ingot"); + nineBlockStorageRecipesWithCustomPacking(consumer, RecipeCategory.MISC, ModItems.neutron_nugget.get(), RecipeCategory.MISC, ModItems.neutron_ingot.get(), "neutron_ingot_from_nuggets", "neutron_ingot"); + nineBlockStorageRecipesWithCustomPacking(consumer, RecipeCategory.MISC, ModItems.neutron_pile.get(), RecipeCategory.MISC, ModItems.neutron_nugget.get(), "neutron_pile_from_ingots", "neutron_pile"); + nineBlockStorageRecipes(consumer, RecipeCategory.MISC, ModItems.infinity_ingot.get(), RecipeCategory.BUILDING_BLOCKS, ModBlocks.infinity.get()); + nineBlockStorageRecipes(consumer, RecipeCategory.MISC, ModItems.crystal_matrix_ingot.get(), RecipeCategory.BUILDING_BLOCKS, ModBlocks.crystal_matrix.get()); + nineBlockStorageRecipesRecipesWithCustomUnpacking(consumer, RecipeCategory.BUILDING_BLOCKS, ModBlocks.compressed_crafting_table.get(), RecipeCategory.BUILDING_BLOCKS, ModBlocks.double_compressed_crafting_table.get(), + "compressed_crafting_table_from_double_compressed_crafting_table", "compressed_crafting_table"); + nineBlockStorageRecipesWithCustomPacking(consumer, RecipeCategory.BUILDING_BLOCKS, Blocks.CRAFTING_TABLE, RecipeCategory.BUILDING_BLOCKS, ModBlocks.compressed_crafting_table.get(), + "crafting_table_from_compressed_crafting_table", "crafting_table"); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.crystal_matrix_ingot.get()) - .pattern("xyx") - .pattern("xyx") - .define('x', ModItems.diamond_lattice.get()) - .define('y', Items.NETHER_STAR) - - .unlockedBy("has_item", has(ModItems.diamond_lattice.get())).save(consumer); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.diamond_lattice.get()) .pattern("x x") @@ -63,16 +52,15 @@ protected void buildRecipes(@NotNull Consumer consumer) { .pattern("x x") .define('x', Items.DIAMOND) .define('y', Items.NETHERITE_SCRAP) - .unlockedBy("", lul).save(consumer); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.double_compressed_crafting_table.get()) - .pattern("xxx") - .pattern("xxx") - .pattern("xxx") - .define('x', ModBlocks.compressed_crafting_table.get()) + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.crystal_matrix_ingot.get()) + .pattern("xyx") + .pattern("xyx") + .define('x', ModItems.diamond_lattice.get()) + .define('y', Items.NETHER_STAR) - .unlockedBy("has_item", has(ModBlocks.compressed_crafting_table.get())).save(consumer); + .unlockedBy("has_item", has(ModItems.diamond_lattice.get())).save(consumer); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.extreme_crafting_table.get()) .pattern("xxx") @@ -80,40 +68,7 @@ protected void buildRecipes(@NotNull Consumer consumer) { .pattern("xxx") .define('x', ModBlocks.crystal_matrix.get()) .define('y', ModBlocks.double_compressed_crafting_table.get()) - - .unlockedBy("has_item", has(ModBlocks.double_compressed_crafting_table.get())).save(consumer); - - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.infinity.get()) - .pattern("xxx") - .pattern("xxx") - .pattern("xxx") - .define('x', ModItems.infinity_ingot.get()) - - .unlockedBy("has_item", has(ModItems.infinity_ingot.get())).save(consumer); - - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.neutron.get()) - .pattern("xxx") - .pattern("xxx") - .pattern("xxx") - .define('x', ModItems.neutron_ingot.get()) - - .unlockedBy("has_item", has(ModItems.neutron_ingot.get())).save(consumer); - - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.neutron_ingot.get()) - .pattern("xxx") - .pattern("xxx") - .pattern("xxx") - .define('x', ModItems.neutron_nugget.get()) - - .unlockedBy("has_item", has(ModItems.neutron_nugget.get())).save(consumer); - - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.neutron_nugget.get()) - .pattern("xxx") - .pattern("xxx") - .pattern("xxx") - .define('x', ModItems.neutron_pile.get()) - - .unlockedBy("has_item", has(ModItems.neutron_pile.get())).save(consumer); + .unlockedBy("has_block", has(ModBlocks.double_compressed_crafting_table.get())).save(consumer); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.endless_cake.get()) .pattern("aaa") @@ -148,17 +103,8 @@ protected void buildRecipes(@NotNull Consumer consumer) { .unlockedBy("has_item", has(ModItems.record_fragment.get())) .save(consumer); -// ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.neutron_ingot.get(), 9) -// .requires(ModBlocks.neutron.get()) -// .save(consumer); -// -// ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.infinity_ingot.get(), 9) -// .requires(ModBlocks.infinity.get()) -// .save(consumer); -// -// ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.crystal_matrix_ingot.get(), 9) -// .requires(ModBlocks.crystal_matrix.get()) -// .save(consumer); + + ModShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, ModItems.cosmic_meatballs.get()) .requires(Items.PORKCHOP)