Skip to content

Commit

Permalink
Account for chemical refactor and rerun data after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
pupnewfster committed Aug 20, 2024
1 parent 8d6ae51 commit 8723297
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 25 deletions.

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

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

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

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

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

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

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

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

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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mekanism.common.recipe.impl;

import mekanism.api.MekanismAPITags;
import mekanism.api.chemical.infuse.InfuseType;
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 @@ -37,10 +37,10 @@ public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries)
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 and half an alloy
addCircuitInfusionUpgrade(consumer, MekanismItems.ADVANCED_CONTROL_CIRCUIT, MekanismTags.Items.CIRCUITS_BASIC, MekanismAPITags.InfuseTypes.REDSTONE, 10, basePath, "advanced");
addCircuitInfusionUpgrade(consumer, MekanismItems.ELITE_CONTROL_CIRCUIT, MekanismTags.Items.CIRCUITS_ADVANCED, MekanismAPITags.InfuseTypes.DIAMOND, 20, basePath, "elite");
addCircuitInfusionUpgrade(consumer, MekanismItems.ULTIMATE_CONTROL_CIRCUIT, MekanismTags.Items.CIRCUITS_ELITE, MekanismAPITags.InfuseTypes.REFINED_OBSIDIAN, 40, 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 @@ -52,11 +52,12 @@ private void addCircuitUpgradeRecipe(RecipeOutput consumer, IItemProvider output
.build(consumer, Mekanism.rl(basePath + name));
}

private void addCircuitInfusionUpgrade(RecipeOutput consumer, IItemProvider output, TagKey<Item> circuitTag, TagKey<InfuseType> infusionType, int singleAlloyAmount, String basePath, String 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.infusionStack().from(infusionType, singleAlloyAmount * 6), /* 3x 2 alloys */
output.getItemStack()
IngredientCreatorAccess.chemicalStack().from(infusionType, singleAlloyAmount * 6), /* 3x 2 alloys */
output.getItemStack(),
false
).build(consumer, Mekanism.rl(basePath + "infused_" + name));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ public void addRecipes(RecipeOutput consumer, HolderLookup.Provider registries)
).build(consumer, Mekanism.rl(basePath + "iron/enriched"));
ItemStackChemicalToItemStackRecipeBuilder.metallurgicInfusing(
IngredientCreatorAccess.item().from(MekanismTags.Items.PROCESSED_RESOURCES.get(ResourceType.DUST, PrimaryResource.IRON)),
IngredientCreatorAccess.infusionStack().from(MekanismAPITags.InfuseTypes.CARBON, 10),
MekanismItems.ENRICHED_IRON.getItemStack()
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/");
Expand Down

0 comments on commit 8723297

Please sign in to comment.