Skip to content

Commit

Permalink
fix: Missing facade crafting recipes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rover656
Rover656 committed Dec 30, 2024
1 parent bb367e9 commit 1a14aa5
Show file tree
Hide file tree
Showing 13 changed files with 353 additions and 1 deletion.
32 changes: 32 additions & 0 deletions ...onduits/src/generated/resources/data/enderio/advancement/recipes/misc/conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
32 changes: 32 additions & 0 deletions ...rc/generated/resources/data/enderio/advancement/recipes/misc/hardened_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
32 changes: 32 additions & 0 deletions ...generated/resources/data/enderio/advancement/recipes/misc/transparent_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
32 changes: 32 additions & 0 deletions ...data/enderio/advancement/recipes/misc/transparent_conduit_facade_from_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
32 changes: 32 additions & 0 deletions .../resources/data/enderio/advancement/recipes/misc/transparent_hardened_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
32 changes: 32 additions & 0 deletions ...cement/recipes/misc/transparent_hardened_conduit_facade_from_hardened_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
]
}
}
18 changes: 18 additions & 0 deletions enderio-conduits/src/generated/resources/data/enderio/recipe/conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
}
21 changes: 21 additions & 0 deletions enderio-conduits/src/generated/resources/data/enderio/recipe/hardened_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
}
21 changes: 21 additions & 0 deletions enderio-conduits/src/generated/resources/data/enderio/recipe/transparent_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
}
16 changes: 16 additions & 0 deletions ...nerated/resources/data/enderio/recipe/transparent_conduit_facade_from_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
}
21 changes: 21 additions & 0 deletions ...uits/src/generated/resources/data/enderio/recipe/transparent_hardened_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
}
16 changes: 16 additions & 0 deletions ...data/enderio/recipe/transparent_hardened_conduit_facade_from_hardened_conduit_facade.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
}
49 changes: 48 additions & 1 deletion enderio-conduits/src/main/java/com/enderio/conduits/data/recipe/ConduitRecipes.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 1a14aa5

Please sign in to comment.