diff --git a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index b2ba5358cb0..3221070985b 100644 --- a/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// Recipes 2024-08-17T12:54:00.3030715 Recipes +// Recipes 2024-08-17T13:01:53.791525 Recipes 0fc9e539372429b3e5df0dc0595978c4fc45d201 data/mekanism/recipe/antiprotonic_nucleosynthesizer.json 6d20b08ca1cc993d4c39a761361dce522fe45a7a data/mekanism/recipe/atomic_disassembler.json 00928ea6e8b57d257c773343c0dc0d337c9d4f5f data/mekanism/recipe/bin/advanced.json @@ -387,9 +387,9 @@ db8d5fead33bf8f287f001e80185b2fd79789ea9 data/mekanism/recipe/compat/farmersdeli 978e93ebc4736e97f49675ef33acf9f700f17631 data/mekanism/recipe/control_circuit/advanced.json 59dcdad611fb3168ceb4f69f7c863d9ceea7fc75 data/mekanism/recipe/control_circuit/basic.json c1820aeebce95092c3dee0d3bd0f825e9d18be46 data/mekanism/recipe/control_circuit/elite.json -d1e7a044b38329f3fda09f66c2eebe855c966082 data/mekanism/recipe/control_circuit/infused_advanced.json -32f74b91c3e64f78f6b26f1b34640c4b50839ff4 data/mekanism/recipe/control_circuit/infused_elite.json -796f5d01ad0b015ad00e254ff9c39d11d2f98165 data/mekanism/recipe/control_circuit/infused_ultimate.json +6923fda26b2b101525d03bf8b6fa33fb29b8fa5d data/mekanism/recipe/control_circuit/infused_advanced.json +d8af2becfcb3fad474f3be23ebb8e18260dea145 data/mekanism/recipe/control_circuit/infused_elite.json +711b8f2c50c0dbc5edeec06a9418ce93a882f85f 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 @@ -931,8 +931,7 @@ c6cd2fd37aab4730caf0cbee9ad07b09e0591c47 data/mekanism/recipe/mekasuit_pants.jso 2613866da1635b99ce8ca3e0867e1dc020897467 data/mekanism/recipe/meka_tool.json 214b255b24034be3e122e947d3752cecfad5007e data/mekanism/recipe/metallurgic_infuser.json b68bd5c3b900d9785322a37950819a0acbe17c4f data/mekanism/recipe/metallurgic_infusing/alloy/atomic.json -3ecf298bef606fbb90ebfb88fb69febb75252c93 data/mekanism/recipe/metallurgic_infusing/alloy/infused.json -39bb3486575988dc030f2fc0dc3418eeab89e95b data/mekanism/recipe/metallurgic_infusing/alloy/infused_copper.json +39bb3486575988dc030f2fc0dc3418eeab89e95b data/mekanism/recipe/metallurgic_infusing/alloy/infused.json 8cb06c004f403a4a61b75e7ae94f8aa314e2c297 data/mekanism/recipe/metallurgic_infusing/alloy/reinforced.json 920faaff5886f7061c1eed632e745d53fb53c121 data/mekanism/recipe/metallurgic_infusing/blackstone_to_gilded_blackstone.json 15e48031d29dbffa526dfeeca4e9d5c39baf7b40 data/mekanism/recipe/metallurgic_infusing/clay_to_slime_ball.json 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 index 0f65edf662d..8abdc487c5d 100644 --- 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 @@ -1,7 +1,7 @@ { "type": "mekanism:metallurgic_infusing", "chemical_input": { - "amount": 15, + "amount": 60, "tag": "mekanism:redstone" }, "item_input": { 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 index ba8fbb2fda5..edc894f7e13 100644 --- 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 @@ -1,7 +1,7 @@ { "type": "mekanism:metallurgic_infusing", "chemical_input": { - "amount": 30, + "amount": 120, "tag": "mekanism:diamond" }, "item_input": { 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 index a768930a1b7..c7ee42ca2c6 100644 --- 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 @@ -1,7 +1,7 @@ { "type": "mekanism:metallurgic_infusing", "chemical_input": { - "amount": 60, + "amount": 240, "tag": "mekanism:refined_obsidian" }, "item_input": { 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 373b13e30a0..a5ae30644ea 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/metallurgic_infusing/alloy/infused_copper.json b/src/datagen/generated/mekanism/data/mekanism/recipe/metallurgic_infusing/alloy/infused_copper.json deleted file mode 100644 index a5ae30644ea..00000000000 --- a/src/datagen/generated/mekanism/data/mekanism/recipe/metallurgic_infusing/alloy/infused_copper.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "mekanism:metallurgic_infusing", - "chemical_input": { - "amount": 10, - "tag": "mekanism:redstone" - }, - "item_input": { - "count": 1, - "tag": "c:ingots/copper" - }, - "output": { - "count": 1, - "id": "mekanism:alloy_infused" - } -} \ No newline at end of file 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 2ad6eba5f71..915289f3097 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/ControlCircuitRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/ControlCircuitRecipeProvider.java @@ -54,7 +54,7 @@ private void addCircuitUpgradeRecipe(RecipeOutput consumer, IItemProvider output private void addCircuitInfusionUpgrade(RecipeOutput consumer, IItemProvider output, TagKey circuitTag, TagKey infusionType, int singleAlloyAmount, String basePath, String name) { ItemStackChemicalToItemStackRecipeBuilder.metallurgicInfusing( IngredientCreatorAccess.item().from(circuitTag), - IngredientCreatorAccess.infusionStack().from(infusionType, (int) (singleAlloyAmount * 1.5F)), + IngredientCreatorAccess.infusionStack().from(infusionType, singleAlloyAmount * 6), /* 3x 2 alloys */ output.getItemStack() ).build(consumer, Mekanism.rl(basePath + "infused_" + name)); } 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 bf94e527170..4895e9b1a67 100644 --- a/src/datagen/main/java/mekanism/common/recipe/impl/MetallurgicInfuserRecipeProvider.java +++ b/src/datagen/main/java/mekanism/common/recipe/impl/MetallurgicInfuserRecipeProvider.java @@ -51,16 +51,11 @@ 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.infusionStack().from(MekanismAPITags.InfuseTypes.REDSTONE, 10), - MekanismItems.INFUSED_ALLOY.getItemStack() - ).build(consumer, Mekanism.rl(basePath + "infused")); ItemStackChemicalToItemStackRecipeBuilder.metallurgicInfusing( IngredientCreatorAccess.item().from(Tags.Items.INGOTS_COPPER), IngredientCreatorAccess.infusionStack().from(MekanismAPITags.InfuseTypes.REDSTONE, 10), MekanismItems.INFUSED_ALLOY.getItemStack() - ).build(consumer, Mekanism.rl(basePath + "infused_copper")); + ).build(consumer, Mekanism.rl(basePath + "infused")); //Reinforced ItemStackChemicalToItemStackRecipeBuilder.metallurgicInfusing( IngredientCreatorAccess.item().from(MekanismTags.Items.ALLOYS_INFUSED),