diff --git a/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/conduit_facade.json new file mode 100644 index 000000000..77d71da99 --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/conduit_facade.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "enderio:conduit_binder" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:conduit_facade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "enderio:conduit_facade" + ] + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/hardened_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/hardened_conduit_facade.json new file mode 100644 index 000000000..0963006e3 --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/hardened_conduit_facade.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "enderio:conduit_binder" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:hardened_conduit_facade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "enderio:hardened_conduit_facade" + ] + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_conduit_facade.json new file mode 100644 index 000000000..c30b4fd30 --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_conduit_facade.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "enderio:conduit_binder" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:transparent_conduit_facade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "enderio:transparent_conduit_facade" + ] + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_conduit_facade_from_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_conduit_facade_from_conduit_facade.json new file mode 100644 index 000000000..8a52f1d78 --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_conduit_facade_from_conduit_facade.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "enderio:conduit_binder" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:transparent_conduit_facade_from_conduit_facade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "enderio:transparent_conduit_facade_from_conduit_facade" + ] + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_hardened_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_hardened_conduit_facade.json new file mode 100644 index 000000000..32054ef64 --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_hardened_conduit_facade.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "enderio:conduit_binder" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:transparent_hardened_conduit_facade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "enderio:transparent_hardened_conduit_facade" + ] + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_hardened_conduit_facade_from_hardened_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_hardened_conduit_facade_from_hardened_conduit_facade.json new file mode 100644 index 000000000..c46f63468 --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/advancement/recipes/misc/transparent_hardened_conduit_facade_from_hardened_conduit_facade.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": "enderio:conduit_binder" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "enderio:transparent_hardened_conduit_facade_from_hardened_conduit_facade" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ingredient" + ] + ], + "rewards": { + "recipes": [ + "enderio:transparent_hardened_conduit_facade_from_hardened_conduit_facade" + ] + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/conduit_facade.json new file mode 100644 index 000000000..ae9177cc6 --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/recipe/conduit_facade.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "enderio:conduit_binder" + } + }, + "pattern": [ + "BBB", + "B B", + "BBB" + ], + "result": { + "count": 1, + "id": "enderio:conduit_facade" + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/hardened_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/hardened_conduit_facade.json new file mode 100644 index 000000000..7895eed02 --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/recipe/hardened_conduit_facade.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "F": { + "item": "enderio:conduit_facade" + }, + "O": { + "tag": "c:dusts/obsidian" + } + }, + "pattern": [ + " O ", + "OFO", + " O " + ], + "result": { + "count": 1, + "id": "enderio:hardened_conduit_facade" + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_conduit_facade.json new file mode 100644 index 000000000..f1b05d04e --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_conduit_facade.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "B": { + "item": "enderio:conduit_binder" + }, + "G": { + "tag": "c:glass_blocks/clear" + } + }, + "pattern": [ + "BBB", + "BGB", + "BBB" + ], + "result": { + "count": 1, + "id": "enderio:transparent_conduit_facade" + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_conduit_facade_from_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_conduit_facade_from_conduit_facade.json new file mode 100644 index 000000000..bfa5f64de --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_conduit_facade_from_conduit_facade.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "enderio:conduit_facade" + }, + { + "tag": "c:glass_blocks/clear" + } + ], + "result": { + "count": 1, + "id": "enderio:transparent_conduit_facade" + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_hardened_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_hardened_conduit_facade.json new file mode 100644 index 000000000..faf30e07a --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_hardened_conduit_facade.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "F": { + "item": "enderio:transparent_conduit_facade" + }, + "O": { + "tag": "c:dusts/obsidian" + } + }, + "pattern": [ + " O ", + "OFO", + " O " + ], + "result": { + "count": 1, + "id": "enderio:transparent_hardened_conduit_facade" + } +} \ No newline at end of file diff --git a/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_hardened_conduit_facade_from_hardened_conduit_facade.json b/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_hardened_conduit_facade_from_hardened_conduit_facade.json new file mode 100644 index 000000000..3a8cdfd80 --- /dev/null +++ b/enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_hardened_conduit_facade_from_hardened_conduit_facade.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "enderio:hardened_conduit_facade" + }, + { + "tag": "c:glass_blocks/clear" + } + ], + "result": { + "count": 1, + "id": "enderio:transparent_hardened_conduit_facade" + } +} \ No newline at end of file diff --git a/enderio-conduits/src/main/java/com/enderio/conduits/data/recipe/ConduitRecipes.java b/enderio-conduits/src/main/java/com/enderio/conduits/data/recipe/ConduitRecipes.java index b570b469d..180c184dd 100644 --- a/enderio-conduits/src/main/java/com/enderio/conduits/data/recipe/ConduitRecipes.java +++ b/enderio-conduits/src/main/java/com/enderio/conduits/data/recipe/ConduitRecipes.java @@ -1,6 +1,7 @@ package com.enderio.conduits.data.recipe; import com.enderio.EnderIOBase; +import com.enderio.base.api.EnderIO; import com.enderio.base.common.init.EIOItems; import com.enderio.base.common.tag.EIOTags; import com.enderio.conduits.api.Conduit; @@ -27,6 +28,7 @@ import net.minecraft.world.level.ItemLike; import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.conditions.ModLoadedCondition; +import net.neoforged.neoforge.common.crafting.SizedIngredient; public class ConduitRecipes extends RecipeProvider { @@ -336,7 +338,52 @@ private void buildFilterConversionRecipes(RecipeOutput recipeOutput) { } private void buildFacadeCraftingRecipes(RecipeOutput recipeOutput) { - + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ConduitItems.CONDUIT_FACADE) + .pattern("BBB") + .pattern("B B") + .pattern("BBB") + .define('B', EIOItems.CONDUIT_BINDER) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.CONDUIT_BINDER)) + .save(recipeOutput); + + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ConduitItems.HARDENED_CONDUIT_FACADE) + .pattern(" O ") + .pattern("OFO") + .pattern(" O ") + .define('O', EIOTags.Items.DUSTS_OBSIDIAN) + .define('F', ConduitItems.CONDUIT_FACADE) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.CONDUIT_BINDER)) + .save(recipeOutput); + + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ConduitItems.TRANSPARENT_CONDUIT_FACADE) + .pattern("BBB") + .pattern("BGB") + .pattern("BBB") + .define('B', EIOItems.CONDUIT_BINDER) + .define('G', EIOTags.Items.CLEAR_GLASS) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.CONDUIT_BINDER)) + .save(recipeOutput); + + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ConduitItems.TRANSPARENT_CONDUIT_FACADE) + .requires(ConduitItems.CONDUIT_FACADE) + .requires(EIOTags.Items.CLEAR_GLASS) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.CONDUIT_BINDER)) + .save(recipeOutput, EnderIO.loc("transparent_conduit_facade_from_conduit_facade")); + + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ConduitItems.TRANSPARENT_HARDENED_CONDUIT_FACADE) + .pattern(" O ") + .pattern("OFO") + .pattern(" O ") + .define('O', EIOTags.Items.DUSTS_OBSIDIAN) + .define('F', ConduitItems.TRANSPARENT_CONDUIT_FACADE) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.CONDUIT_BINDER)) + .save(recipeOutput); + + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ConduitItems.TRANSPARENT_HARDENED_CONDUIT_FACADE) + .requires(ConduitItems.HARDENED_CONDUIT_FACADE) + .requires(EIOTags.Items.CLEAR_GLASS) + .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.CONDUIT_BINDER)) + .save(recipeOutput, EnderIO.loc("transparent_hardened_conduit_facade_from_hardened_conduit_facade")); } private void buildFacadePaintingRecipes(RecipeOutput recipeOutput) {