aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Mendes <70096037+Steelux8@users.noreply.github.com>2024-07-26 11:48:04 +0100
committerGitHub <noreply@github.com>2024-07-26 11:48:04 +0100
commit790ce9fe5a5862888d85314d7c09bd975f85d278 (patch)
tree9d8d81dcfe92279b892e83f289c5100b1d3e26b3 /src/main
parent2d09c1d5693de31bb500752a8dcc9074acecbd73 (diff)
downloadGT5-Unofficial-790ce9fe5a5862888d85314d7c09bd975f85d278.tar.gz
GT5-Unofficial-790ce9fe5a5862888d85314d7c09bd975f85d278.tar.bz2
GT5-Unofficial-790ce9fe5a5862888d85314d7c09bd975f85d278.zip
Remove Cell Chemistry in LFTR and Fix Recipe Tooltip (#2768)
* Add LCR recipes and fix ZnF4 output -> Added LCR equivalents to some Dehydrator recipes that forced cell chemistry, to avoid the cell usage; -> Fix one recipe that wasn't outputting Zirconium Tetrafluoride correctly. * LFTR recipe tooltip fix -> Fix the display of energy generation in LFTR recipes, which showed 0 for all recipes due to a mistake in the metadata used. * Spotless apply for branch LFTR_Quick_Fixes for #2768 (#2769) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java22
3 files changed, 25 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java
index d2171d1bdd..1000a03523 100644
--- a/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java
+++ b/src/main/java/gtPlusPlus/api/recipe/GTPPRecipeMaps.java
@@ -1,5 +1,7 @@
package gtPlusPlus.api.recipe;
+import static gregtech.api.util.GT_RecipeConstants.LFTR_OUTPUT_POWER;
+
import java.util.Arrays;
import java.util.Collections;
@@ -74,7 +76,7 @@ public class GTPPRecipeMaps {
.minInputs(0, 2)
.frontend(FluidOnlyFrontend::new)
.neiSpecialInfoFormatter(recipeInfo -> {
- final long eut = recipeInfo.recipe.mSpecialValue;
+ final long eut = recipeInfo.recipe.getMetadataOrDefault(LFTR_OUTPUT_POWER, 0);
final int duration = recipeInfo.recipe.mDuration;
return Arrays.asList(
StatCollector.translateToLocalFormatted("gtpp.nei.lftr.power", GT_Utility.formatNumbers(eut)),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
index d5a41b8ba2..3d30c455d8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
@@ -74,6 +74,7 @@ public class RecipeLoader_LFTR {
.duration(1 * MINUTES + 40 * SECONDS)
.eut(0)
.metadata(LFTR_OUTPUT_POWER, 32768 * 4)
+ .noOptimize()
.addTo(liquidFluorineThoriumReactorRecipes);
// LiFBeF2ZrF4UF4 - T2
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index c78fc8a9bd..ef7648bef4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -11,6 +11,7 @@ import static gregtech.api.recipe.RecipeMaps.fluidHeaterRecipes;
import static gregtech.api.recipe.RecipeMaps.fusionRecipes;
import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
+import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
import static gregtech.api.recipe.RecipeMaps.sifterRecipes;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
@@ -385,7 +386,7 @@ public class RecipeLoader_Nuclear {
.itemInputs(
CI.getNumberedAdvancedCircuit(11),
ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 1))
- .itemOutputs()
+ .itemOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1))
.fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 400))
.fluidOutputs(aHydrogenChloride)
.eut(500)
@@ -416,6 +417,14 @@ public class RecipeLoader_Nuclear {
.duration(6 * SECONDS)
.addTo(chemicalDehydratorRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(FLUORIDES.BERYLLIUM_HYDROXIDE.getDust(3), CI.getNumberedAdvancedCircuit(17))
+ .fluidInputs(FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(1152))
+ .fluidOutputs(Materials.Water.getFluid(2000L), FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000))
+ .eut(TierEU.RECIPE_MV)
+ .duration(5 * MINUTES)
+ .addTo(multiblockChemicalReactorRecipes);
+
// (NH4)2BeF4 → 2 NH3 + 2 HF + BeF2
// Ammonium tetrafluoroberyllate uses fluid rule because it is not a molten form of a solid
// Beryllium fluoride uses solid rule
@@ -431,6 +440,17 @@ public class RecipeLoader_Nuclear {
.eut(TierEU.RECIPE_MV)
.duration(5 * MINUTES)
.addTo(chemicalDehydratorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(CI.getNumberedAdvancedCircuit(17))
+ .itemOutputs(FLUORIDES.BERYLLIUM_FLUORIDE.getDust(3))
+ .fluidInputs(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(1000))
+ .fluidOutputs(
+ MISC_MATERIALS.AMMONIA.getFluidStack(2000),
+ FluidUtils.getFluidStack("hydrofluoricacid", 1000))
+ .eut(TierEU.RECIPE_MV)
+ .duration(5 * MINUTES)
+ .addTo(multiblockChemicalReactorRecipes);
}
private static void electroMagneticSeperator() {