aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2023-09-09 16:43:46 +0100
committerGitHub <noreply@github.com>2023-09-09 17:43:46 +0200
commit200c08016c1ec8e152501f09e9869675e3cadece (patch)
treee915d43fe2119b84dd870b706aa1643b5879c457
parent56b498e1733d03a65965633cd03a447ca4a7fcbd (diff)
downloadGT5-Unofficial-200c08016c1ec8e152501f09e9869675e3cadece.tar.gz
GT5-Unofficial-200c08016c1ec8e152501f09e9869675e3cadece.tar.bz2
GT5-Unofficial-200c08016c1ec8e152501f09e9869675e3cadece.zip
2 small recipe fixes (#357)
Former-commit-id: 2976d9ecd9f23516d46d54780f1ba609a1ea2e0f
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java12
2 files changed, 10 insertions, 4 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java
index 0754d514b2..97133ccec5 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java
@@ -49,7 +49,7 @@ public class ArtificialMicaLine {
GT_Values.RA.stdBuilder().itemInputs(Materials.RockSalt.getDust(4))
.itemOutputs(WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 9))
.fluidInputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000))
- .fluidOutputs(Materials.HydrochloricAcid.getGas(2000)).duration(1 * SECONDS).eut(8)
+ .fluidOutputs(Materials.HydrochloricAcid.getFluid(2000)).duration(1 * SECONDS).eut(8)
.addTo(sMixerRecipes);
// 2K + CO2 + O = K2CO3
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java
index 776d6a1a2a..a20a3e4d82 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java
@@ -22,6 +22,7 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
+import gregtech.api.util.GT_RecipeBuilder;
import gregtech.api.util.GT_Utility;
public class Centrifuge implements Runnable {
@@ -82,7 +83,7 @@ public class Centrifuge implements Runnable {
.noFluidInputs().noFluidOutputs().duration(2 * MINUTES + 30 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(sCentrifugeRecipes);
- GT_Values.RA.stdBuilder()
+ GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder()
.itemInputs(new ItemStack(GT_TileEntity_HTGR.HTGRMaterials.aHTGR_Materials, 1, i + 6))
.itemOutputs(
fuel.recycledItems[0],
@@ -90,8 +91,13 @@ public class Centrifuge implements Runnable {
fuel.recycledItems[2],
fuel.recycledItems[3],
fuel.recycledItems[4])
- .outputChances(fuel.recycleChances).noFluidInputs().fluidOutputs(fuel.recycledFluid)
- .duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sCentrifugeRecipes);
+ .outputChances(fuel.recycleChances).noFluidInputs();
+ if (fuel.recycledFluid == null) {
+ recipeBuilder.noFluidOutputs();
+ } else {
+ recipeBuilder.fluidOutputs(fuel.recycledFluid);
+ }
+ recipeBuilder.duration(1 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sCentrifugeRecipes);
i += MATERIALS_PER_FUEL;
}