From 62a305b72a9659f0cccbbb812fa2cc16bf721a7e Mon Sep 17 00:00:00 2001 From: Xander Date: Tue, 20 Aug 2024 23:12:03 +0800 Subject: [PATCH] Adjust/added a few recipes (#8174) - Switched infused alloy from using iron to using copper - Added alternate circuit recipes that let you save on the ingot, but use more infuse materials - Allow making enriched iron from iron dust --- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 8 ++++++-- .../c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 | 6 +++--- .../mekanism/assets/mekanism/lang/en_ud.json | 2 +- .../mekanism/assets/mekanism/lang/en_us.json | 2 +- .../recipe/control_circuit/infused_advanced.json | 16 ++++++++++++++++ .../recipe/control_circuit/infused_elite.json | 16 ++++++++++++++++ .../recipe/control_circuit/infused_ultimate.json | 16 ++++++++++++++++ .../metallurgic_infusing/alloy/infused.json | 2 +- .../recipe/processing/iron/enriched_dust.json | 16 ++++++++++++++++ .../client/lang/MekanismLangProvider.java | 2 +- .../impl/ControlCircuitRecipeProvider.java | 15 +++++++++++++++ .../impl/MetallurgicInfuserRecipeProvider.java | 2 +- .../recipe/impl/OreProcessingRecipeProvider.java | 6 ++++++ 13 files changed, 99 insertions(+), 10 deletions(-) create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_advanced.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_elite.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_ultimate.json create mode 100644 src/datagen/generated/mekanism/data/mekanism/recipe/processing/iron/enriched_dust.json diff --git a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 1672f479558..bc2fd5cb570 100644 --- a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// Recipes 2024-08-19T22:47:25.602549 Recipes +// Recipes 2024-08-20T10:06:51.1191648 Recipes 0fc9e539372429b3e5df0dc0595978c4fc45d201 data/mekanism/recipe/antiprotonic_nucleosynthesizer.json 6d20b08ca1cc993d4c39a761361dce522fe45a7a data/mekanism/recipe/atomic_disassembler.json 00928ea6e8b57d257c773343c0dc0d337c9d4f5f data/mekanism/recipe/bin/advanced.json @@ -411,6 +411,9 @@ db8d5fead33bf8f287f001e80185b2fd79789ea9 data/mekanism/recipe/compat/farmersdeli 978e93ebc4736e97f49675ef33acf9f700f17631 data/mekanism/recipe/control_circuit/advanced.json e92604f830d1f2ffda4194894502e3ddbb0fe11d data/mekanism/recipe/control_circuit/basic.json c1820aeebce95092c3dee0d3bd0f825e9d18be46 data/mekanism/recipe/control_circuit/elite.json +7f80015e3df088ac21982d422d9503c6e24a8d7e data/mekanism/recipe/control_circuit/infused_advanced.json +c178327fc61473e095566f7adf06416921d585fd data/mekanism/recipe/control_circuit/infused_elite.json +8376cd3ee1c035230d6974b489ae0741765a82a5 data/mekanism/recipe/control_circuit/infused_ultimate.json 78ad6052118d53e0244e7fbc31dfc825176398b4 data/mekanism/recipe/control_circuit/ultimate.json e24bc3bf593ef401ec48ec119bfade472d9ccff7 data/mekanism/recipe/crafting_formula.json 706f403b5c9c307dd34dbd4653938464aff67073 data/mekanism/recipe/crusher.json @@ -928,7 +931,7 @@ c6cd2fd37aab4730caf0cbee9ad07b09e0591c47 data/mekanism/recipe/mekasuit_pants.jso 2613866da1635b99ce8ca3e0867e1dc020897467 data/mekanism/recipe/meka_tool.json 214b255b24034be3e122e947d3752cecfad5007e data/mekanism/recipe/metallurgic_infuser.json a59d363194ef19c58220fe5612c5ba6282d4aaf8 data/mekanism/recipe/metallurgic_infusing/alloy/atomic.json -ec75c9214b2da5b0189b383df5fee162d4cb006a data/mekanism/recipe/metallurgic_infusing/alloy/infused.json +be4c82d370800106b9d5e0fe6ea288b21f4b16ce data/mekanism/recipe/metallurgic_infusing/alloy/infused.json cf5b8b045d12d4d26e72919e31ccd1fa1d7d6a21 data/mekanism/recipe/metallurgic_infusing/alloy/reinforced.json cbf1630a24eb79f6bb20a351ad24f6f4f83ed918 data/mekanism/recipe/metallurgic_infusing/blackstone_to_gilded_blackstone.json fdd238dbf1763906fa5acc49a9741accda4133a9 data/mekanism/recipe/metallurgic_infusing/clay_to_slime_ball.json @@ -1496,6 +1499,7 @@ f6c74c72645f5c0f52339f248de9ca4bb885acf4 data/mekanism/recipe/processing/iron/du 05ecec991e637309f5399a71c87fa8ea7fee0df9 data/mekanism/recipe/processing/iron/dust/from_raw_block.json 23fc78ef49824d71ffd31b53e76f4f8453739f5f data/mekanism/recipe/processing/iron/dust/from_raw_ore.json de9f3119a77fcc8292774f874449d5967a33ca0c data/mekanism/recipe/processing/iron/enriched.json +47162cc704fb2d375a8ec21ffa4ad4c7bcb94dd4 data/mekanism/recipe/processing/iron/enriched_dust.json ef64ccbbfcedfcceed60a44c318409859f2c8fd8 data/mekanism/recipe/processing/iron/ingot/from_dust_blasting.json 82da095e293a2777c0660ebe5aaefbeb83422056 data/mekanism/recipe/processing/iron/ingot/from_dust_smelting.json 90fd8a292979389eabfcae09db96fc22034eb1c9 data/mekanism/recipe/processing/iron/ore/deepslate_from_raw.json diff --git a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 index 4383faaf939..d2a92e1e6c7 100644 --- a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 +++ b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 @@ -1,5 +1,5 @@ -// 1.21.1 2024-08-19T19:44:56.1006139 Languages: en_us for mod: mekanism +// 1.21.1 2024-08-20T10:06:51.1156496 Languages: en_us for mod: mekanism 7897d55635ae6a20fd1ebc5874196e7b8ba7d726 assets/mekanism/lang/en_au.json 7897d55635ae6a20fd1ebc5874196e7b8ba7d726 assets/mekanism/lang/en_gb.json -28950c82574c6aad131bfbafdd6ac4243a0eaffd assets/mekanism/lang/en_ud.json -340e9cb395b6919ec7c621c6e557926cfa1ed1d8 assets/mekanism/lang/en_us.json +f1f4602fd9777c6e7865c365185c8d94740d3038 assets/mekanism/lang/en_ud.json +cee3a2e14228668ff9981c4cc33bc8638287417d assets/mekanism/lang/en_us.json diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json index 1f055317fbb..d9e76f84283 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json @@ -65,7 +65,7 @@ "advancements.mekanism.heat_transport.title": "ɥʇɯɹɐM ǝɥ⟘ pɐǝɹdS", "advancements.mekanism.hydrogen_powered_flight.description": "sǝᴉʞs ǝɥʇ oʇ ǝʞɐʇ oʇ ʞɔɐdʇǝՐ ɐ ǝs∩", "advancements.mekanism.hydrogen_powered_flight.title": "ʇɥᵷᴉꞁℲ pǝɹǝʍoԀ uǝᵷoɹpʎH", - "advancements.mekanism.infused_alloy.description": "ǝuoʇspǝᴚ ɥʇᴉʍ uoɹI ǝsnɟuI", + "advancements.mekanism.infused_alloy.description": "ǝuoʇspǝᴚ ɥʇᴉʍ ɹǝddoƆ ǝsnɟuI", "advancements.mekanism.infused_alloy.title": "ꞁꞁⱯ ʇᴉ pǝʇɹɐʇS ʇɐɥ⟘ ʎoꞁꞁⱯ ǝɥ⟘", "advancements.mekanism.infusing_efficiency.description": "ʎɔuǝᴉɔᴉɟɟǝ ɹᴉǝɥʇ ǝsɐǝɹɔuᴉ oʇ sʇnduᴉ uoᴉsnɟuᴉ ɹnoʎ ɥɔᴉɹuƎ", "advancements.mekanism.infusing_efficiency.title": "ʎɔuǝᴉɔᴉɟɟƎ ᵷuᴉsnɟuI", diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json index 35b41517002..06cd184af23 100644 --- a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json +++ b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json @@ -66,7 +66,7 @@ "advancements.mekanism.heat_transport.title": "Spread The Warmth", "advancements.mekanism.hydrogen_powered_flight.description": "Use a Jetpack to take to the skies", "advancements.mekanism.hydrogen_powered_flight.title": "Hydrogen Powered Flight", - "advancements.mekanism.infused_alloy.description": "Infuse Iron with Redstone", + "advancements.mekanism.infused_alloy.description": "Infuse Copper with Redstone", "advancements.mekanism.infused_alloy.title": "The Alloy That Started it All", "advancements.mekanism.infusing_efficiency.description": "Enrich your infusion inputs to increase their efficiency", "advancements.mekanism.infusing_efficiency.title": "Infusing Efficiency", diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_advanced.json b/src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_advanced.json new file mode 100644 index 00000000000..e3ff46413cf --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_advanced.json @@ -0,0 +1,16 @@ +{ + "type": "mekanism:metallurgic_infusing", + "chemical_input": { + "amount": 60, + "tag": "mekanism:redstone" + }, + "item_input": { + "count": 1, + "tag": "c:circuits/basic" + }, + "output": { + "count": 1, + "id": "mekanism:advanced_control_circuit" + }, + "per_tick_usage": false +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_elite.json b/src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_elite.json new file mode 100644 index 00000000000..d745b2572b0 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_elite.json @@ -0,0 +1,16 @@ +{ + "type": "mekanism:metallurgic_infusing", + "chemical_input": { + "amount": 120, + "tag": "mekanism:diamond" + }, + "item_input": { + "count": 1, + "tag": "c:circuits/advanced" + }, + "output": { + "count": 1, + "id": "mekanism:elite_control_circuit" + }, + "per_tick_usage": false +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_ultimate.json b/src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_ultimate.json new file mode 100644 index 00000000000..d398a9cbfa6 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_ultimate.json @@ -0,0 +1,16 @@ +{ + "type": "mekanism:metallurgic_infusing", + "chemical_input": { + "amount": 240, + "tag": "mekanism:refined_obsidian" + }, + "item_input": { + "count": 1, + "tag": "c:circuits/elite" + }, + "output": { + "count": 1, + "id": "mekanism:ultimate_control_circuit" + }, + "per_tick_usage": false +} \ No newline at end of file diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/metallurgic_infusing/alloy/infused.json b/src/datagen/generated/mekanism/data/mekanism/recipe/metallurgic_infusing/alloy/infused.json index c17915c9f39..93b231bdcb4 100644 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/metallurgic_infusing/alloy/infused.json +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/metallurgic_infusing/alloy/infused.json @@ -6,7 +6,7 @@ }, "item_input": { "count": 1, - "tag": "c:ingots/iron" + "tag": "c:ingots/copper" }, "output": { "count": 1, diff --git a/src/datagen/generated/mekanism/data/mekanism/recipe/processing/iron/enriched_dust.json b/src/datagen/generated/mekanism/data/mekanism/recipe/processing/iron/enriched_dust.json new file mode 100644 index 00000000000..598839915a8 --- /dev/null +++ b/src/datagen/generated/mekanism/data/mekanism/recipe/processing/iron/enriched_dust.json @@ -0,0 +1,16 @@ +{ + "type": "mekanism:metallurgic_infusing", + "chemical_input": { + "amount": 10, + "tag": "mekanism:carbon" + }, + "item_input": { + "count": 1, + "tag": "c:dusts/iron" + }, + "output": { + "count": 1, + "id": "mekanism:enriched_iron" + }, + "per_tick_usage": false +} \ No newline at end of file diff --git a/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java b/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java index 5bcf8a9ffdf..38bd8e6c309 100644 --- a/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java +++ b/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java @@ -666,7 +666,7 @@ private void addAdvancements() { add(MekanismAdvancements.STEEL_INGOT, "Industrial Revolution", "Infuse Iron with Carbon and repeat"); add(MekanismAdvancements.STEEL_CASING, "The Perfect Foundation", "Used in even the most advanced machines"); - add(MekanismAdvancements.INFUSED_ALLOY, "The Alloy That Started it All", "Infuse Iron with Redstone"); + add(MekanismAdvancements.INFUSED_ALLOY, "The Alloy That Started it All", "Infuse Copper with Redstone"); add(MekanismAdvancements.REINFORCED_ALLOY, "Make it Stronger", "Diamonds make everything better!"); add(MekanismAdvancements.ATOMIC_ALLOY, "Top Tier Alloy", "Create one of the strongest alloys in existence"); diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/ControlCircuitRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/ControlCircuitRecipeProvider.java index baf2b546075..1f1776d7906 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/ControlCircuitRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/ControlCircuitRecipeProvider.java @@ -1,6 +1,7 @@ package mekanism.common.recipe.impl; import mekanism.api.MekanismAPITags; +import mekanism.api.chemical.Chemical; import mekanism.api.datagen.recipe.builder.ItemStackChemicalToItemStackRecipeBuilder; import mekanism.api.providers.IItemProvider; import mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess; @@ -35,6 +36,11 @@ public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) addCircuitUpgradeRecipe(consumer, MekanismItems.ADVANCED_CONTROL_CIRCUIT, MekanismTags.Items.CIRCUITS_BASIC, MekanismTags.Items.ALLOYS_INFUSED, basePath, "advanced"); addCircuitUpgradeRecipe(consumer, MekanismItems.ELITE_CONTROL_CIRCUIT, MekanismTags.Items.CIRCUITS_ADVANCED, MekanismTags.Items.ALLOYS_REINFORCED, basePath, "elite"); addCircuitUpgradeRecipe(consumer, MekanismItems.ULTIMATE_CONTROL_CIRCUIT, MekanismTags.Items.CIRCUITS_ELITE, MekanismTags.Items.ALLOYS_ATOMIC, basePath, "ultimate"); + + //infusion variants that save on the base ingots needed, but take extra infusion material + addCircuitInfusionUpgrade(consumer, MekanismItems.ADVANCED_CONTROL_CIRCUIT, MekanismTags.Items.CIRCUITS_BASIC, MekanismAPITags.Chemicals.REDSTONE, 10, basePath, "advanced"); + addCircuitInfusionUpgrade(consumer, MekanismItems.ELITE_CONTROL_CIRCUIT, MekanismTags.Items.CIRCUITS_ADVANCED, MekanismAPITags.Chemicals.DIAMOND, 20, basePath, "elite"); + addCircuitInfusionUpgrade(consumer, MekanismItems.ULTIMATE_CONTROL_CIRCUIT, MekanismTags.Items.CIRCUITS_ELITE, MekanismAPITags.Chemicals.REFINED_OBSIDIAN, 40, basePath, "ultimate"); } private void addCircuitUpgradeRecipe(RecipeOutput consumer, IItemProvider output, TagKey circuitTag, TagKey alloyTag, String basePath, @@ -45,4 +51,13 @@ private void addCircuitUpgradeRecipe(RecipeOutput consumer, IItemProvider output .key(Pattern.ALLOY, alloyTag) .build(consumer, Mekanism.rl(basePath + name)); } + + private void addCircuitInfusionUpgrade(RecipeOutput consumer, IItemProvider output, TagKey circuitTag, TagKey infusionType, int singleAlloyAmount, String basePath, String name) { + ItemStackChemicalToItemStackRecipeBuilder.metallurgicInfusing( + IngredientCreatorAccess.item().from(circuitTag), + IngredientCreatorAccess.chemicalStack().from(infusionType, singleAlloyAmount * 6), /* 3x 2 alloys */ + output.getItemStack(), + false + ).build(consumer, Mekanism.rl(basePath + "infused_" + name)); + } } \ No newline at end of file diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/MetallurgicInfuserRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/MetallurgicInfuserRecipeProvider.java index 110c8ae34e1..c9c56dde5d5 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/MetallurgicInfuserRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/MetallurgicInfuserRecipeProvider.java @@ -56,7 +56,7 @@ public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) private void addMetallurgicInfuserAlloyRecipes(RecipeOutput consumer, String basePath) { //Infused ItemStackChemicalToItemStackRecipeBuilder.metallurgicInfusing( - IngredientCreatorAccess.item().from(Tags.Items.INGOTS_IRON), + IngredientCreatorAccess.item().from(Tags.Items.INGOTS_COPPER), IngredientCreatorAccess.chemicalStack().from(MekanismAPITags.Chemicals.REDSTONE, 10), MekanismItems.INFUSED_ALLOY.getItemStack(), false diff --git a/src/datagen/main/java/mekanism/common/recipe/impl/OreProcessingRecipeProvider.java b/src/datagen/main/java/mekanism/common/recipe/impl/OreProcessingRecipeProvider.java index e5c4c4f1410..95d4f2cb8a6 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/OreProcessingRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/OreProcessingRecipeProvider.java @@ -64,6 +64,12 @@ public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries) MekanismItems.ENRICHED_IRON.getItemStack(), false ).build(consumer, Mekanism.rl(basePath + "iron/enriched")); + ItemStackChemicalToItemStackRecipeBuilder.metallurgicInfusing( + IngredientCreatorAccess.item().from(MekanismTags.Items.PROCESSED_RESOURCES.get(ResourceType.DUST, PrimaryResource.IRON)), + IngredientCreatorAccess.chemicalStack().from(MekanismAPITags.Chemicals.CARBON, 10), + MekanismItems.ENRICHED_IRON.getItemStack(), + false + ).build(consumer, Mekanism.rl(basePath + "iron/enriched_dust")); addNetheriteProcessingRecipes(consumer, basePath + "netherite/"); addBronzeProcessingRecipes(consumer, basePath + "bronze/"); addCoalOreProcessingRecipes(consumer, basePath + "coal/");