Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ingredient suggestions 1 #8174

Merged
merged 6 commits into from
Aug 20, 2024
Merged

Ingredient suggestions 1 #8174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
60a0520
add infusion variants of circuit recipes with savings
thiakil Jul 28, 2024
32c2d3f
add a copper alternative to the infused alloy recipe
thiakil Jul 28, 2024
da57323
rerun datagen after rebase
thiakil Aug 17, 2024
211af10
change infusion based circuit recipes to use 3x infusion
thiakil Aug 17, 2024
8d6ae51
add enriched iron dust recipe since it ends up as dust anyway
thiakil Aug 17, 2024
8723297
Account for chemical refactor and rerun data after rebase
pupnewfster Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_advanced.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_elite.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions src/datagen/generated/mekanism/data/mekanism/recipe/control_circuit/infused_ultimate.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/datagen/generated/mekanism/data/mekanism/recipe/metallurgic_infusing/alloy/infused.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions src/datagen/generated/mekanism/data/mekanism/recipe/processing/iron/enriched_dust.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
15 changes: 15 additions & 0 deletions src/datagen/main/java/mekanism/common/recipe/impl/ControlCircuitRecipeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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<Item> circuitTag, TagKey<Item> alloyTag, String basePath,
Expand All @@ -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<Item> circuitTag, TagKey<Chemical> 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));
}
}
2 changes: 1 addition & 1 deletion src/datagen/main/java/mekanism/common/recipe/impl/MetallurgicInfuserRecipeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions src/datagen/main/java/mekanism/common/recipe/impl/OreProcessingRecipeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to add a second recipe like this, or just make the first recipe use an an or (compound) ingredient? I am fine with either. If you do decide to use an or ingredient you can use one of our helpers: BaseRecipeProvider.createIngredient, which you can see how we do it in how we add the recipes that create carbon.

I sort of think it makes more sense for it to just be a single recipe. But I am leaving that up to you.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can merge it later if we remember. Separate for now would promote visibility?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Up to you, though I don't think the visibility is that bad given the fact there is basically only ever one iron ingot in modded playthroughs, and then it just cycles between the two inputs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I am going to merge them for now. Visibility doesn't seem that bad to me for the above stated reason

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually scratch that, I didn't think about the fact that whil ethere is only one iron ingot, there are often multiple iron dusts.

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/");
Expand Down