From 50389506c81e6f870e577e060a2cf2954ecdf561 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sun, 29 Nov 2020 18:52:20 +0000 Subject: [PATCH] Added some recipes! :D --- src/generated/resources/.cache/cache | 10 ++++ .../actuallyadditions/advanced_coil.json | 32 ++++++++++++ .../advanced_leaf_blower.json | 32 ++++++++++++ .../recipes/actuallyadditions/basic_coil.json | 32 ++++++++++++ .../actuallyadditions/enderpearl_block.json | 32 ++++++++++++ .../actuallyadditions/leaf_blower.json | 32 ++++++++++++ .../recipes/advanced_coil.json | 19 +++++++ .../recipes/advanced_leaf_blower.json | 25 +++++++++ .../actuallyadditions/recipes/basic_coil.json | 19 +++++++ .../recipes/enderpearl_block.json | 15 ++++++ .../recipes/leaf_blower.json | 25 +++++++++ .../actuallyadditions/data/ActuallyGens.java | 1 + .../data/GeneratorRecipes.java | 51 +++++++++++++++++++ 13 files changed, 325 insertions(+) create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_coil.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_leaf_blower.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/basic_coil.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/enderpearl_block.json create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/leaf_blower.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/advanced_coil.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/advanced_leaf_blower.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/basic_coil.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/enderpearl_block.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/leaf_blower.json create mode 100644 src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 5b1f0fd38..1d187a88c 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -608,6 +608,11 @@ ff80a66586e72226565ede5db5968bba67a09446 assets/actuallyadditions/models/item/wh 174559d46dbaa07d49ceff6db3708b75e7ad62a4 assets/actuallyadditions/models/item/wooden_paxel.json 7f8e5e703d9244222706c52d7b24b299e07cb2db assets/actuallyadditions/models/item/worm.json 5ee8c662c6e0448c4b6a14c03456a9e68c4dd947 assets/actuallyadditions/models/item/xp_solidifier_block.json +ef56ec29c7349f7c646cf3c9df0608213f6a47d7 data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_coil.json +65018f02e7538106661656c45ec4876ef39b6664 data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_leaf_blower.json +c1feaacd278b4d9f409c1e3963c44db1ac12c286 data/actuallyadditions/advancements/recipes/actuallyadditions/basic_coil.json +283ccbf1bee8bd50115811ef7a2a379a389976d5 data/actuallyadditions/advancements/recipes/actuallyadditions/enderpearl_block.json +fa590a53b605606c91a07e49560ed6744cc16b5f data/actuallyadditions/advancements/recipes/actuallyadditions/leaf_blower.json 54518f931aa515218eafe53b521dd7e92e8ba06c data/actuallyadditions/loot_tables/blocks/advanced_item_laser_relay_block.json 9c4253847f7dbe9f2c7817c7a7a63a820883b671 data/actuallyadditions/loot_tables/blocks/atomic_reconstructor_block.json d5c713abb08903b0dbe44e8ec40d28178f7b6af3 data/actuallyadditions/loot_tables/blocks/battery_box_block.json @@ -722,4 +727,9 @@ af7dc901bd5a58ee7f434e1da874f456fa18db81 data/actuallyadditions/loot_tables/bloc 05edfaaa6f2af2eb141be1a879b9f793dcfff2b5 data/actuallyadditions/loot_tables/blocks/white_wall_block.json f50671e462968cd65feaba0bdb5bee54d14e4b24 data/actuallyadditions/loot_tables/blocks/wood_casing_block.json cb45575707d43736601e5dfa43ef83e413bc8f66 data/actuallyadditions/loot_tables/blocks/xp_solidifier_block.json +7435bafb1dba16f6ae029c96a33f238236555a34 data/actuallyadditions/recipes/advanced_coil.json +ee5c40d27eb3079524d3a7d7985d296b5c58e7a4 data/actuallyadditions/recipes/advanced_leaf_blower.json +3f1b239f944653fded630291a67592da6618b702 data/actuallyadditions/recipes/basic_coil.json +fd0332c9175b991843075bc4cc9a45b88707c641 data/actuallyadditions/recipes/enderpearl_block.json +4b9d60fd388a6591961745f67aec943cf0285166 data/actuallyadditions/recipes/leaf_blower.json 47e2d9cd180c2160d834c9f60a9fe8a9a0053b92 data/minecraft/tags/blocks/walls.json diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_coil.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_coil.json new file mode 100644 index 000000000..86ea6ffd0 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_coil.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:advanced_coil" + ] + }, + "criteria": { + "has_basic_coil": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:basic_coil" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:advanced_coil" + } + } + }, + "requirements": [ + [ + "has_basic_coil", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_leaf_blower.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_leaf_blower.json new file mode 100644 index 000000000..c4f0118db --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/advanced_leaf_blower.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:advanced_leaf_blower" + ] + }, + "criteria": { + "has_diamatine": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:diamatine_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:advanced_leaf_blower" + } + } + }, + "requirements": [ + [ + "has_diamatine", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/basic_coil.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/basic_coil.json new file mode 100644 index 000000000..ca55ddbb3 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/basic_coil.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:basic_coil" + ] + }, + "criteria": { + "has_restonia": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:restonia_crystal" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:basic_coil" + } + } + }, + "requirements": [ + [ + "has_restonia", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/enderpearl_block.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/enderpearl_block.json new file mode 100644 index 000000000..a65d4b697 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/enderpearl_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:enderpearl_block" + ] + }, + "criteria": { + "has_enderpearl": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ender_pearls" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:enderpearl_block" + } + } + }, + "requirements": [ + [ + "has_enderpearl", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/leaf_blower.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/leaf_blower.json new file mode 100644 index 000000000..07c17d2d5 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/leaf_blower.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:leaf_blower" + ] + }, + "criteria": { + "has_coil": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:advanced_coil" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:leaf_blower" + } + } + }, + "requirements": [ + [ + "has_coil", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/advanced_coil.json b/src/generated/resources/data/actuallyadditions/recipes/advanced_coil.json new file mode 100644 index 000000000..10a5aee4f --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/advanced_coil.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ggg", + "gcg", + "ggg" + ], + "key": { + "g": { + "tag": "forge:nuggets/gold" + }, + "c": { + "item": "actuallyadditions:basic_coil" + } + }, + "result": { + "item": "actuallyadditions:advanced_coil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/advanced_leaf_blower.json b/src/generated/resources/data/actuallyadditions/recipes/advanced_leaf_blower.json new file mode 100644 index 000000000..eea768d0b --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/advanced_leaf_blower.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " f ", + "ip ", + "ic " + ], + "key": { + "f": { + "item": "minecraft:flint" + }, + "i": { + "item": "actuallyadditions:diamatine_crystal" + }, + "p": { + "item": "minecraft:piston" + }, + "c": { + "item": "actuallyadditions:advanced_coil" + } + }, + "result": { + "item": "actuallyadditions:advanced_leaf_blower" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/basic_coil.json b/src/generated/resources/data/actuallyadditions/recipes/basic_coil.json new file mode 100644 index 000000000..428334260 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/basic_coil.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " r ", + "rbr", + " r " + ], + "key": { + "r": { + "item": "actuallyadditions:restonia_crystal" + }, + "b": { + "item": "actuallyadditions:black_quartz" + } + }, + "result": { + "item": "actuallyadditions:basic_coil" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/enderpearl_block.json b/src/generated/resources/data/actuallyadditions/recipes/enderpearl_block.json new file mode 100644 index 000000000..9bbf17868 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/enderpearl_block.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ee ", + "ee " + ], + "key": { + "e": { + "tag": "forge:ender_pearls" + } + }, + "result": { + "item": "actuallyadditions:enderpearl_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/leaf_blower.json b/src/generated/resources/data/actuallyadditions/recipes/leaf_blower.json new file mode 100644 index 000000000..1c1f48e58 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/leaf_blower.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " f ", + "ip ", + "ic " + ], + "key": { + "f": { + "item": "minecraft:flint" + }, + "i": { + "item": "actuallyadditions:enori_crystal" + }, + "p": { + "item": "minecraft:piston" + }, + "c": { + "item": "actuallyadditions:advanced_coil" + } + }, + "result": { + "item": "actuallyadditions:leaf_blower" + } +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java index be7b5a857..2900dc9c0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ActuallyGens.java @@ -25,6 +25,7 @@ public final class ActuallyGens { if (event.includeServer()) { generator.addProvider(new GeneratorLoot(generator)); + generator.addProvider(new GeneratorRecipes(generator)); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java new file mode 100644 index 000000000..59ad22c61 --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java @@ -0,0 +1,51 @@ +package de.ellpeck.actuallyadditions.data; + +import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlocks; +import de.ellpeck.actuallyadditions.common.items.ActuallyItems; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.data.RecipeProvider; +import net.minecraft.data.ShapedRecipeBuilder; +import net.minecraft.item.Items; +import net.minecraftforge.common.Tags; + +import java.util.function.Consumer; + +public class GeneratorRecipes extends RecipeProvider { + public GeneratorRecipes(DataGenerator generatorIn) { + super(generatorIn); + } + + @Override + protected void registerRecipes(Consumer consumer) { + ShapedRecipeBuilder.shapedRecipe(ActuallyBlocks.ENDERPEARL.get()) + .key('e', Tags.Items.ENDER_PEARLS) + .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) + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.BASIC_COIL.get()) + .key('r', ActuallyItems.RESTONIA_CRYSTAL.get()).key('b', ActuallyItems.BLACK_QUARTS.get()) + .patternLine(" r ").patternLine("rbr").patternLine(" r ") + .addCriterion("has_restonia", hasItem(ActuallyItems.RESTONIA_CRYSTAL.get())).build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.ADVANCED_COIL.get()) + .key('g', Tags.Items.NUGGETS_GOLD).key('c', ActuallyItems.BASIC_COIL.get()) + .patternLine("ggg").patternLine("gcg").patternLine("ggg") + .addCriterion("has_basic_coil", hasItem(ActuallyItems.BASIC_COIL.get())).build(consumer); + + 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()) + .patternLine(" f ").patternLine("ip ").patternLine("ic ") + .addCriterion("has_coil", hasItem(ActuallyItems.ADVANCED_COIL.get())).build(consumer); + + ShapedRecipeBuilder.shapedRecipe(ActuallyItems.ADVANCED_LEAF_BLOWER.get()) + .key('f', Items.FLINT).key('i', ActuallyItems.DIAMATINE_CRYSTAL.get()) + .key('p', Items.PISTON).key('c', ActuallyItems.ADVANCED_COIL.get()) + .patternLine(" f ").patternLine("ip ").patternLine("ic ") + .addCriterion("has_diamatine", hasItem(ActuallyItems.DIAMATINE_CRYSTAL.get())).build(consumer); + } +}