diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_blasting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_blasting.json new file mode 100644 index 0000000000..579feb824b --- /dev/null +++ b/src/generated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_blasting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": [ + "enderio:powdered_copper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:copper_ingot_from_blasting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "enderio:copper_ingot_from_blasting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_smelting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_smelting.json new file mode 100644 index 0000000000..69108ed79d --- /dev/null +++ b/src/generated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_smelting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": [ + "enderio:powdered_copper" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:copper_ingot_from_smelting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "enderio:copper_ingot_from_smelting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_blasting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_blasting.json new file mode 100644 index 0000000000..8c59e35cac --- /dev/null +++ b/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_blasting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": [ + "enderio:powdered_gold" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:gold_ingot_from_blasting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "enderio:gold_ingot_from_blasting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_smelting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_smelting.json new file mode 100644 index 0000000000..79e402fdca --- /dev/null +++ b/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_smelting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": [ + "enderio:powdered_gold" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:gold_ingot_from_smelting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "enderio:gold_ingot_from_smelting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_blasting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_blasting.json new file mode 100644 index 0000000000..8b7cf57958 --- /dev/null +++ b/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_blasting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": [ + "enderio:powdered_iron" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:iron_ingot_from_blasting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "enderio:iron_ingot_from_blasting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_smelting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_smelting.json new file mode 100644 index 0000000000..52b5ec6c22 --- /dev/null +++ b/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_smelting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": [ + "enderio:powdered_iron" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:iron_ingot_from_smelting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "enderio:iron_ingot_from_smelting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/recipes/copper_ingot_from_blasting.json b/src/generated/resources/data/enderio/recipes/copper_ingot_from_blasting.json new file mode 100644 index 0000000000..d91166118c --- /dev/null +++ b/src/generated/resources/data/enderio/recipes/copper_ingot_from_blasting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 100, + "experience": 0.0, + "ingredient": { + "item": "enderio:powdered_copper" + }, + "result": "minecraft:copper_ingot" +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/recipes/copper_ingot_from_smelting.json b/src/generated/resources/data/enderio/recipes/copper_ingot_from_smelting.json new file mode 100644 index 0000000000..32a801b6a8 --- /dev/null +++ b/src/generated/resources/data/enderio/recipes/copper_ingot_from_smelting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.0, + "ingredient": { + "item": "enderio:powdered_copper" + }, + "result": "minecraft:copper_ingot" +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/recipes/gold_ingot_from_blasting.json b/src/generated/resources/data/enderio/recipes/gold_ingot_from_blasting.json new file mode 100644 index 0000000000..efa6455a2d --- /dev/null +++ b/src/generated/resources/data/enderio/recipes/gold_ingot_from_blasting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 100, + "experience": 0.0, + "ingredient": { + "item": "enderio:powdered_gold" + }, + "result": "minecraft:gold_ingot" +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/recipes/gold_ingot_from_smelting.json b/src/generated/resources/data/enderio/recipes/gold_ingot_from_smelting.json new file mode 100644 index 0000000000..f080cb7537 --- /dev/null +++ b/src/generated/resources/data/enderio/recipes/gold_ingot_from_smelting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.0, + "ingredient": { + "item": "enderio:powdered_gold" + }, + "result": "minecraft:gold_ingot" +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/recipes/iron_ingot_from_blasting.json b/src/generated/resources/data/enderio/recipes/iron_ingot_from_blasting.json new file mode 100644 index 0000000000..790e3414ce --- /dev/null +++ b/src/generated/resources/data/enderio/recipes/iron_ingot_from_blasting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:blasting", + "category": "misc", + "cookingtime": 100, + "experience": 0.0, + "ingredient": { + "item": "enderio:powdered_iron" + }, + "result": "minecraft:iron_ingot" +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/recipes/iron_ingot_from_smelting.json b/src/generated/resources/data/enderio/recipes/iron_ingot_from_smelting.json new file mode 100644 index 0000000000..406e5b1806 --- /dev/null +++ b/src/generated/resources/data/enderio/recipes/iron_ingot_from_smelting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.0, + "ingredient": { + "item": "enderio:powdered_iron" + }, + "result": "minecraft:iron_ingot" +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/recipes/sagmilling/copper_ore.json b/src/generated/resources/data/enderio/recipes/sagmilling/copper_ore.json new file mode 100644 index 0000000000..fef0926754 --- /dev/null +++ b/src/generated/resources/data/enderio/recipes/sagmilling/copper_ore.json @@ -0,0 +1,20 @@ +{ + "type": "enderio:sagmilling", + "energy": 2400, + "input": { + "tag": "forge:ores/copper" + }, + "outputs": [ + { + "item": "enderio:powdered_copper" + }, + { + "chance": 0.33, + "item": "enderio:powdered_copper" + }, + { + "chance": 0.15, + "item": "minecraft:cobblestone" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/recipes/sagmilling/gravel.json b/src/generated/resources/data/enderio/recipes/sagmilling/gravel.json new file mode 100644 index 0000000000..25ddfa2650 --- /dev/null +++ b/src/generated/resources/data/enderio/recipes/sagmilling/gravel.json @@ -0,0 +1,21 @@ +{ + "type": "enderio:sagmilling", + "energy": 2400, + "input": { + "tag": "forge:gravel" + }, + "outputs": [ + { + "chance": 0.7, + "item": "minecraft:sand" + }, + { + "chance": 0.3, + "item": "minecraft:sand" + }, + { + "chance": 0.1, + "item": "minecraft:flint" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/enderio/recipes/sagmilling/stone.json b/src/generated/resources/data/enderio/recipes/sagmilling/stone.json new file mode 100644 index 0000000000..b28c8340bb --- /dev/null +++ b/src/generated/resources/data/enderio/recipes/sagmilling/stone.json @@ -0,0 +1,12 @@ +{ + "type": "enderio:sagmilling", + "energy": 2400, + "input": { + "item": "minecraft:stone" + }, + "outputs": [ + { + "item": "minecraft:cobblestone" + } + ] +} \ No newline at end of file diff --git a/src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java b/src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java index 6126ffe48c..ab0893b5b9 100644 --- a/src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java +++ b/src/machines/java/com/enderio/machines/data/recipes/SagMillRecipeProvider.java @@ -57,24 +57,27 @@ protected void buildRecipes(Consumer finishedRecipeConsumer) { build1toN("glass", GLASS, SAND, 1, finishedRecipeConsumer); build1toN("bone_block",BONE_BLOCK, BONE_MEAL, 9, finishedRecipeConsumer); build1toN("soularium", SOULARIUM_INGOT.get(), SOUL_POWDER.get(), 1, finishedRecipeConsumer); - + buildOre("iron_ore", Ingredient.of(Tags.Items.ORES_IRON), POWDERED_IRON.get(), finishedRecipeConsumer); buildOre("gold_ore", Ingredient.of(Tags.Items.ORES_GOLD), POWDERED_GOLD.get(), finishedRecipeConsumer); - + buildOre("copper_ore", Ingredient.of(Tags.Items.ORES_COPPER), POWDERED_COPPER.get(), finishedRecipeConsumer); + build1toN("iron_block", Tags.Items.STORAGE_BLOCKS_IRON, POWDERED_IRON.get(), 9, finishedRecipeConsumer); build1toN("gold_block", Tags.Items.STORAGE_BLOCKS_GOLD, POWDERED_GOLD.get(), 9, finishedRecipeConsumer); build1toN("copper_block", Tags.Items.STORAGE_BLOCKS_COPPER, POWDERED_COPPER.get(), 9, finishedRecipeConsumer); build1toN("coal_block", Tags.Items.STORAGE_BLOCKS_COAL, POWDERED_COAL.get(), 9, finishedRecipeConsumer); - + + build1toN("stone", STONE, COBBLESTONE, 1, finishedRecipeConsumer); + build("coal", Ingredient.of(COAL), List.of( - output(POWDERED_COAL.get()), - output(POWDERED_COAL.get(), 0.1f), - output(EIOTags.Items.DUSTS_SULFUR, 1, 0.1f, true)), - BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer); - + output(POWDERED_COAL.get()), + output(POWDERED_COAL.get(), 0.1f), + output(EIOTags.Items.DUSTS_SULFUR, 1, 0.1f, true)), + BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer); + build("coal_ore", Ingredient.of(Tags.Items.ORES_COAL), List.of( - output(COAL, 3), - output(POWDERED_COAL.get(), 0.6f), + output(COAL, 3), + output(POWDERED_COAL.get(), 0.6f), output(DIAMOND, 0.005f), output(COBBLESTONE, 0.15f)), BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer); @@ -135,6 +138,12 @@ protected void buildRecipes(Consumer finishedRecipeConsumer) { output(SAND, 0.1f), output(FLINT, 0.05f)), BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer); + + build("gravel", Ingredient.of(Tags.Items.GRAVEL), List.of( + output(SAND, 0.7f), + output(SAND, 0.3f), + output(FLINT, 0.1f)), + BASE_ENERGY_PER_OPERATION, finishedRecipeConsumer); build("sandstone", Ingredient.of(Tags.Items.SANDSTONE), List.of( output(SAND, 2), diff --git a/src/main/java/com/enderio/base/data/recipe/MaterialRecipes.java b/src/main/java/com/enderio/base/data/recipe/MaterialRecipes.java index c7c6737ff9..753e77b580 100644 --- a/src/main/java/com/enderio/base/data/recipe/MaterialRecipes.java +++ b/src/main/java/com/enderio/base/data/recipe/MaterialRecipes.java @@ -30,6 +30,7 @@ public MaterialRecipes(PackOutput packOutput) { protected void buildRecipes(Consumer recipeConsumer) { addVanilla(recipeConsumer); addAlloys(recipeConsumer); + addIngots(recipeConsumer); addCraftingComponents(recipeConsumer); addCapacitors(recipeConsumer); addCrystals(recipeConsumer); @@ -125,6 +126,38 @@ private void addAlloys(Consumer recipeConsumer) { makeMaterialRecipes(recipeConsumer, EIOItems.END_STEEL_INGOT.get(), EIOItems.END_STEEL_NUGGET.get(), EIOBlocks.END_STEEL_BLOCK.get()); } + private void addIngots(Consumer recipeConsumer) { + SimpleCookingRecipeBuilder + .smelting(Ingredient.of(EIOItems.POWDERED_IRON.get()), RecipeCategory.MISC, Items.IRON_INGOT, 0, 200) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_IRON.get())) + .save(recipeConsumer, EnderIO.loc(Items.IRON_INGOT + "_from_smelting")); + + SimpleCookingRecipeBuilder + .blasting(Ingredient.of(EIOItems.POWDERED_IRON.get()), RecipeCategory.MISC, Items.IRON_INGOT, 0, 100) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_IRON.get())) + .save(recipeConsumer, EnderIO.loc(Items.IRON_INGOT + "_from_blasting")); + + SimpleCookingRecipeBuilder + .smelting(Ingredient.of(EIOItems.POWDERED_GOLD.get()), RecipeCategory.MISC, Items.GOLD_INGOT, 0, 200) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_GOLD.get())) + .save(recipeConsumer, EnderIO.loc(Items.GOLD_INGOT + "_from_smelting")); + + SimpleCookingRecipeBuilder + .blasting(Ingredient.of(EIOItems.POWDERED_GOLD.get()), RecipeCategory.MISC, Items.GOLD_INGOT, 0, 100) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_GOLD.get())) + .save(recipeConsumer, EnderIO.loc(Items.GOLD_INGOT + "_from_blasting")); + + SimpleCookingRecipeBuilder + .smelting(Ingredient.of(EIOItems.POWDERED_COPPER.get()), RecipeCategory.MISC, Items.COPPER_INGOT, 0, 200) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_COPPER.get())) + .save(recipeConsumer, EnderIO.loc(Items.COPPER_INGOT + "_from_smelting")); + + SimpleCookingRecipeBuilder + .blasting(Ingredient.of(EIOItems.POWDERED_COPPER.get()), RecipeCategory.MISC, Items.COPPER_INGOT, 0, 100) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_COPPER.get())) + .save(recipeConsumer, EnderIO.loc(Items.COPPER_INGOT + "_from_blasting")); + } + private void addCraftingComponents(Consumer recipeConsumer) { ShapedRecipeBuilder .shaped(RecipeCategory.MISC, EIOItems.CONDUIT_BINDER_COMPOSITE.get(), 8)