From b7735d4a148007b4f579e296940cc4599f4da346 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sun, 29 Nov 2020 20:18:20 +0000 Subject: [PATCH] Ouch, hot! --- src/generated/resources/.cache/cache | 2 ++ .../actuallyadditions/black_quartz.json | 32 +++++++++++++++++++ .../recipes/black_quartz.json | 9 ++++++ .../data/GeneratorRecipes.java | 11 ++++--- 4 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/black_quartz.json create mode 100644 src/generated/resources/data/actuallyadditions/recipes/black_quartz.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1d187a88c..9080e3aa7 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -611,6 +611,7 @@ ff80a66586e72226565ede5db5968bba67a09446 assets/actuallyadditions/models/item/wh 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 +ab44c71e2754288db548d97b38684b96fd65f62d data/actuallyadditions/advancements/recipes/actuallyadditions/black_quartz.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 @@ -730,6 +731,7 @@ cb45575707d43736601e5dfa43ef83e413bc8f66 data/actuallyadditions/loot_tables/bloc 7435bafb1dba16f6ae029c96a33f238236555a34 data/actuallyadditions/recipes/advanced_coil.json ee5c40d27eb3079524d3a7d7985d296b5c58e7a4 data/actuallyadditions/recipes/advanced_leaf_blower.json 3f1b239f944653fded630291a67592da6618b702 data/actuallyadditions/recipes/basic_coil.json +4be11314d6ad06b6ff5a11410a6fb492e2894430 data/actuallyadditions/recipes/black_quartz.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/black_quartz.json b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/black_quartz.json new file mode 100644 index 000000000..18cbf0135 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/advancements/recipes/actuallyadditions/black_quartz.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "actuallyadditions:black_quartz" + ] + }, + "criteria": { + "has_black_quartz_ore": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "actuallyadditions:ore_black_quartz_block" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "actuallyadditions:black_quartz" + } + } + }, + "requirements": [ + [ + "has_black_quartz_ore", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/black_quartz.json b/src/generated/resources/data/actuallyadditions/recipes/black_quartz.json new file mode 100644 index 000000000..7866ec180 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/black_quartz.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "actuallyadditions:ore_black_quartz_block" + }, + "result": "actuallyadditions:black_quartz", + "experience": 0.7, + "cookingtime": 100 +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java index 59ad22c61..d82822e84 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorRecipes.java @@ -2,11 +2,9 @@ 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.data.*; import net.minecraft.item.Items; +import net.minecraft.item.crafting.Ingredient; import net.minecraftforge.common.Tags; import java.util.function.Consumer; @@ -47,5 +45,10 @@ public class GeneratorRecipes extends RecipeProvider { .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); + + + + // Hot stuff + CookingRecipeBuilder.smeltingRecipe(Ingredient.fromItems(ActuallyBlocks.ORE_BLACK_QUARTZ.get()), ActuallyItems.BLACK_QUARTS.get(), 0.7F, 100).addCriterion("has_black_quartz_ore", hasItem(ActuallyBlocks.ORE_BLACK_QUARTZ.get())).build(consumer); } }