From 9ed218167b7972941c3d93559753cde78bae8957 Mon Sep 17 00:00:00 2001 From: Bruno Ploumhans <13494793+Technici4n@users.noreply.github.com> Date: Fri, 17 Jan 2025 22:12:33 +0100 Subject: [PATCH] Fix #674: Buff cryofluid hot ingot cooling. Tweak cryofluid fabrication recipe to make it more readable (#1009) --- .../annealed_copper/heat_exchanger/hot_ingot.json | 6 +++--- .../materials/chromium/heat_exchanger/hot_ingot.json | 6 +++--- .../materials/kanthal/heat_exchanger/hot_ingot.json | 6 +++--- .../materials/platinum/heat_exchanger/hot_ingot.json | 6 +++--- .../stainless_steel/heat_exchanger/hot_ingot.json | 6 +++--- .../superconductor/heat_exchanger/hot_ingot.json | 6 +++--- .../materials/titanium/heat_exchanger/hot_ingot.json | 6 +++--- .../materials/recipe/StandardRecipes.java | 4 ++-- .../recipe/materials/vacuum_freezer/cryofluid.json | 11 +++++------ 9 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json index 68d7b8e3f..b2aee2d4b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/annealed_copper/heat_exchanger/hot_ingot.json @@ -4,17 +4,17 @@ "eu": 8, "fluid_inputs": [ { - "amount": 100, + "amount": 20, "fluid": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { - "amount": 65, + "amount": 13, "fluid": "modern_industrialization:argon" }, { - "amount": 25, + "amount": 5, "fluid": "modern_industrialization:helium" } ], diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json index 99c0ba108..3cefd3344 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/chromium/heat_exchanger/hot_ingot.json @@ -4,17 +4,17 @@ "eu": 8, "fluid_inputs": [ { - "amount": 100, + "amount": 20, "fluid": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { - "amount": 65, + "amount": 13, "fluid": "modern_industrialization:argon" }, { - "amount": 25, + "amount": 5, "fluid": "modern_industrialization:helium" } ], diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json index 603ae065f..e94c0f7f8 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/kanthal/heat_exchanger/hot_ingot.json @@ -4,17 +4,17 @@ "eu": 8, "fluid_inputs": [ { - "amount": 100, + "amount": 20, "fluid": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { - "amount": 65, + "amount": 13, "fluid": "modern_industrialization:argon" }, { - "amount": 25, + "amount": 5, "fluid": "modern_industrialization:helium" } ], diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json index 0eec0048d..88ee7da28 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/platinum/heat_exchanger/hot_ingot.json @@ -4,17 +4,17 @@ "eu": 8, "fluid_inputs": [ { - "amount": 100, + "amount": 20, "fluid": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { - "amount": 65, + "amount": 13, "fluid": "modern_industrialization:argon" }, { - "amount": 25, + "amount": 5, "fluid": "modern_industrialization:helium" } ], diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json index 5c43a12cf..634312f1b 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/stainless_steel/heat_exchanger/hot_ingot.json @@ -4,17 +4,17 @@ "eu": 8, "fluid_inputs": [ { - "amount": 100, + "amount": 20, "fluid": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { - "amount": 65, + "amount": 13, "fluid": "modern_industrialization:argon" }, { - "amount": 25, + "amount": 5, "fluid": "modern_industrialization:helium" } ], diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json index 691f9c6ba..0314fbd35 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/superconductor/heat_exchanger/hot_ingot.json @@ -4,17 +4,17 @@ "eu": 8, "fluid_inputs": [ { - "amount": 100, + "amount": 20, "fluid": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { - "amount": 65, + "amount": 13, "fluid": "modern_industrialization:argon" }, { - "amount": 25, + "amount": 5, "fluid": "modern_industrialization:helium" } ], diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json index da9761c71..8aaa8b22c 100644 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json +++ b/src/generated/resources/data/modern_industrialization/recipe/materials/titanium/heat_exchanger/hot_ingot.json @@ -4,17 +4,17 @@ "eu": 8, "fluid_inputs": [ { - "amount": 100, + "amount": 20, "fluid": "modern_industrialization:cryofluid" } ], "fluid_outputs": [ { - "amount": 65, + "amount": 13, "fluid": "modern_industrialization:argon" }, { - "amount": 25, + "amount": 5, "fluid": "modern_industrialization:helium" } ], diff --git a/src/main/java/aztech/modern_industrialization/materials/recipe/StandardRecipes.java b/src/main/java/aztech/modern_industrialization/materials/recipe/StandardRecipes.java index 7fe8f5787..789037185 100644 --- a/src/main/java/aztech/modern_industrialization/materials/recipe/StandardRecipes.java +++ b/src/main/java/aztech/modern_industrialization/materials/recipe/StandardRecipes.java @@ -166,8 +166,8 @@ public static void apply(MaterialBuilder.RecipeContext ctx) { // HEAT EXCHANGER new MIRecipeBuilder(ctx, MIMachineRecipeTypes.HEAT_EXCHANGER, "hot_ingot", 8, 10).addPartInput(HOT_INGOT, 1) - .addFluidInput(MIFluids.CRYOFLUID, 100) - .addPartOutput(INGOT, 1).addFluidOutput(MIFluids.ARGON, 65).addFluidOutput(MIFluids.HELIUM, 25); + .addFluidInput(MIFluids.CRYOFLUID, 20) + .addPartOutput(INGOT, 1).addFluidOutput(MIFluids.ARGON, 13).addFluidOutput(MIFluids.HELIUM, 5); new MIRecipeBuilder(ctx, MIMachineRecipeTypes.POLARIZER, "rod_magnetic", 8, 200).addTaggedPartInput(ROD, 1).addPartOutput(ROD_MAGNETIC, 1); new MIRecipeBuilder(ctx, MIMachineRecipeTypes.POLARIZER, "wire_magnetic", 8, 200).addTaggedPartInput(WIRE, 1).addPartOutput(WIRE_MAGNETIC, 1); diff --git a/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json b/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json index 52e1ae6f6..c6061aeac 100644 --- a/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json +++ b/src/main/resources/data/modern_industrialization/recipe/materials/vacuum_freezer/cryofluid.json @@ -1,23 +1,22 @@ { "type": "modern_industrialization:vacuum_freezer", - "eu": 64, + "eu": 256, "duration" : 250, "fluid_inputs" : [ { "fluid" : "modern_industrialization:argon", - "amount": 35 + "amount": 140 }, { "fluid" : "modern_industrialization:helium", - "amount": 15 + "amount": 60 } ], "fluid_outputs": { "fluid" : "modern_industrialization:cryofluid", - "amount" : 50 + "amount" : 200 } - -} \ No newline at end of file +}