From 67f77cf0b5a91a81a6260ccb1a089f63a69697c5 Mon Sep 17 00:00:00 2001 From: attackeight Date: Wed, 3 Jul 2024 19:20:42 -0400 Subject: [PATCH] Change from item to tag for sturdy sheet production (closes Creators-of-Create#6655) --- src/generated/resources/.cache/cache | 3 ++- .../create/recipes/sequenced_assembly/sturdy_sheet.json | 2 +- .../resources/data/forge/tags/items/dusts/obsidian.json | 6 ++++++ src/main/java/com/simibubi/create/AllTags.java | 1 + .../foundation/data/recipe/SequencedAssemblyRecipeGen.java | 3 ++- .../create/infrastructure/data/CreateRegistrateTags.java | 2 ++ 6 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/data/forge/tags/items/dusts/obsidian.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index fa14f86d4..b0acba469 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -5457,7 +5457,7 @@ b27348bd726e0d99d20104f2a66572bee8f82520 data/create/recipes/scorchia_from_stone afefabc59a37e792b78f4a6a2d437c100a64139d data/create/recipes/scoria_from_stone_types_scoria_stonecutting.json d6e16599de7424513e1457b07acb6370815d2bd7 data/create/recipes/scoria_pillar_from_stone_types_scoria_stonecutting.json 2f660f8cc0a9740ba7e7992d3d51f04b67d23871 data/create/recipes/sequenced_assembly/precision_mechanism.json -de17d82738a5e0242eb3109fd2a75337160fc843 data/create/recipes/sequenced_assembly/sturdy_sheet.json +b98fa962bdd63929416cb50b4df1130cf8bf067b data/create/recipes/sequenced_assembly/sturdy_sheet.json 7610e0be633b1ade7ae39db3dbbfe1bd14aa333a data/create/recipes/sequenced_assembly/track.json 5e7648d55555c263539a2696b8d1f8d352a71dc9 data/create/recipes/small_andesite_brick_slab.json 4734a4ed04708b841f530ea95f23214e3b5d0ea4 data/create/recipes/small_andesite_brick_slab_from_stone_types_andesite_stonecutting.json @@ -5787,6 +5787,7 @@ d6a4e4fe1204b718010543a28a9b9ec4e0977bd7 data/forge/tags/fluids/tea.json 5af3164b14c92d2d6e235b5d4eebd93cbee37c0a data/forge/tags/items/buckets/honey.json 2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough.json 2f7cf5a2d485f25d451da9771ed466591cfa5204 data/forge/tags/items/dough/wheat.json +a3ea70dc4ecbf3beeded920313e2770dd4a2dd6a data/forge/tags/items/dusts/obsidian.json 25078dad07e8f75134a98c2dd0f0511c55146bd5 data/forge/tags/items/flour.json 25078dad07e8f75134a98c2dd0f0511c55146bd5 data/forge/tags/items/flour/wheat.json 16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/items/glass/colorless.json diff --git a/src/generated/resources/data/create/recipes/sequenced_assembly/sturdy_sheet.json b/src/generated/resources/data/create/recipes/sequenced_assembly/sturdy_sheet.json index e7bc7550f..58b38e5c7 100644 --- a/src/generated/resources/data/create/recipes/sequenced_assembly/sturdy_sheet.json +++ b/src/generated/resources/data/create/recipes/sequenced_assembly/sturdy_sheet.json @@ -1,7 +1,7 @@ { "type": "create:sequenced_assembly", "ingredient": { - "item": "create:powdered_obsidian" + "tag": "forge:dusts/obsidian" }, "transitionalItem": { "item": "create:unprocessed_obsidian_sheet" diff --git a/src/generated/resources/data/forge/tags/items/dusts/obsidian.json b/src/generated/resources/data/forge/tags/items/dusts/obsidian.json new file mode 100644 index 000000000..547c14cad --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/obsidian.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "create:powdered_obsidian" + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index bbd5d9c02..0223d507d 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -186,6 +186,7 @@ public class AllTags { STRIPPED_LOGS(FORGE), STRIPPED_WOOD(FORGE), PLATES(FORGE), + OBSIDIAN_DUST(FORGE,"dusts/obsidian"), WRENCH(FORGE, "tools/wrench"), ALLURITE(MOD,"stone_types/galosphere/allurite"), diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java index fdfbae03d..b176a6831 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/SequencedAssemblyRecipeGen.java @@ -5,6 +5,7 @@ import java.util.stream.Stream; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; +import com.simibubi.create.AllTags; import com.simibubi.create.AllTags.AllItemTags; import com.simibubi.create.Create; import com.simibubi.create.content.fluids.transfer.FillingRecipe; @@ -51,7 +52,7 @@ public class SequencedAssemblyRecipeGen extends CreateRecipeProvider { .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.largeCog())) .addStep(DeployerApplicationRecipe::new, rb -> rb.require(I.ironNugget()))), - REINFORCED_SHEET = create("sturdy_sheet", b -> b.require(AllItems.POWDERED_OBSIDIAN.get()) + REINFORCED_SHEET = create("sturdy_sheet", b -> b.require(AllItemTags.OBSIDIAN_DUST.tag) .transitionTo(AllItems.INCOMPLETE_REINFORCED_SHEET.get()) .addOutput(AllItems.STURDY_SHEET.get(), 1) .loops(1) diff --git a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java index 14f60dd65..29e9ffa07 100644 --- a/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java +++ b/src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java @@ -146,6 +146,8 @@ public class CreateRegistrateTags { prov.tag(Tags.Items.INGOTS) .addTag(AllItemTags.CREATE_INGOTS.tag); + prov.tag(AllItemTags.OBSIDIAN_DUST.tag).add(AllItems.POWDERED_OBSIDIAN.get()); + // COMPAT genStrippedWoodItemTags(prov);