aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/loaders
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java63
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java48
2 files changed, 49 insertions, 62 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
index f5b20966d5..a09cbcce0d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
@@ -53,7 +53,7 @@ public class RecipeLoader_LFTR {
//1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235
configureSparging();
- FluidStack Li2BeF4 = NUCLIDE.Li2BeF4.getFluidStack(36);
+ FluidStack Li2BeF4 = NUCLIDE.Li2BeF4.getFluidStack(200);
//LiFBeF2ThF4UF4 - T3
GT_Recipe LFTR1 = new GTPP_Recipe(
@@ -62,16 +62,16 @@ public class RecipeLoader_LFTR {
new ItemStack[] {},
null, new int[] {10000, 10000, 5000, 2500},
new FluidStack[] {
- NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(18),
+ NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100),
Li2BeF4
},
new FluidStack[] {
- NUCLIDE.LiFBeF2UF4FP.getFluidStack(18),
- NUCLIDE.LiFBeF2ThF4.getFluidStack(36),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(5)
+ NUCLIDE.LiFBeF2UF4FP.getFluidStack(100),
+ NUCLIDE.LiFBeF2ThF4.getFluidStack(200),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(20),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10)
},
- 9000,//time
+ 400 * 20,//time
0,//cost
8192*4//fuel value
);
@@ -83,16 +83,16 @@ public class RecipeLoader_LFTR {
new ItemStack[] {},
null, new int[] {10000, 10000, 2500, 1250},
new FluidStack[] {
- NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(18),
+ NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100),
Li2BeF4
},
new FluidStack[] {
- NUCLIDE.LiFBeF2UF4FP.getFluidStack(12),
- NUCLIDE.LiFBeF2ThF4.getFluidStack(24),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(4),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2)
+ NUCLIDE.LiFBeF2UF4FP.getFluidStack(50),
+ NUCLIDE.LiFBeF2ThF4.getFluidStack(100),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(5)
},
- 6000,//time
+ 400 * 20,//time
0,//cost
8192//fuel value
);
@@ -104,16 +104,16 @@ public class RecipeLoader_LFTR {
new ItemStack[] {},
null, new int[] {10000, 10000, 1000, 500},
new FluidStack[] {
- NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(18),
+ NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100),
Li2BeF4
},
new FluidStack[] {
- NUCLIDE.LiFBeF2UF4FP.getFluidStack(6),
- NUCLIDE.LiFThF4.getFluidStack(12),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2),
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(1)
+ NUCLIDE.LiFBeF2UF4FP.getFluidStack(25),
+ NUCLIDE.LiFThF4.getFluidStack(50),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(4),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2)
},
- 3000,//time
+ 100 *20,//time
0,//cost
8192//fuel value
);
@@ -122,9 +122,8 @@ public class RecipeLoader_LFTR {
GasSpargingRecipeMap.addRecipe(
new FluidStack(mSpargeGases.get(0), 50),
NUCLIDE.LiFBeF2UF4FP.getFluidStack(50),
+ NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(50),
new FluidStack[] {
- NUCLIDE.Sparged_LiFBeF2UF4FP.getFluidStack(50),
- new FluidStack(mNobleGases.get(0), 50),
new FluidStack(mNobleGases.get(1), 10),
new FluidStack(mNobleGases.get(2), 10),
new FluidStack(mNobleGases.get(3), 10),
@@ -132,31 +131,29 @@ public class RecipeLoader_LFTR {
new FluidStack(mNobleGases.get(5), 10)
},
new int[] {
- 10000, 5000, 1000, 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000, 1000
});
GasSpargingRecipeMap.addRecipe(
new FluidStack(mSpargeGases.get(1), 50),
NUCLIDE.LiFThF4.getFluidStack(50),
+ NUCLIDE.Sparged_LiFThF4.getFluidStack(50),
new FluidStack[] {
- NUCLIDE.Sparged_LiFThF4.getFluidStack(50),
- new FluidStack(mFluorideGases.get(0), 50),
- new FluidStack(mFluorideGases.get(1), 10),
- new FluidStack(mFluorideGases.get(2), 10),
- new FluidStack(mFluorideGases.get(3), 10),
- new FluidStack(mFluorideGases.get(4), 10),
- new FluidStack(mFluorideGases.get(5), 10)
+ new FluidStack(mFluorideGases.get(1), 5),
+ new FluidStack(mFluorideGases.get(2), 5),
+ new FluidStack(mFluorideGases.get(3), 5),
+ new FluidStack(mFluorideGases.get(4), 5),
+ new FluidStack(mFluorideGases.get(5), 5)
},
new int[] {
- 10000, 5000, 1000, 1000, 1000, 1000, 1000
+ 500, 500, 500, 500, 500
});
GasSpargingRecipeMap.addRecipe(
new FluidStack(mSpargeGases.get(1), 50),
NUCLIDE.LiFBeF2ThF4.getFluidStack(50),
+ NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(50),
new FluidStack[] {
- NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(50),
- new FluidStack(mFluorideGases.get(0), 50),
new FluidStack(mFluorideGases.get(1), 10),
new FluidStack(mFluorideGases.get(2), 10),
new FluidStack(mFluorideGases.get(3), 10),
@@ -164,7 +161,7 @@ public class RecipeLoader_LFTR {
new FluidStack(mFluorideGases.get(5), 10)
},
new int[] {
- 10000, 5000, 1000, 1000, 1000, 1000, 1000
+ 1000, 1000, 1000, 1000, 1000
});
GTPP_Recipe.GTPP_Recipe_Map.sLiquidFluorineThoriumReactorRecipes.add(LFTR1);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
index 2eedd4e85a..94a5627882 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java
@@ -1,7 +1,6 @@
package gtPlusPlus.xmod.gregtech.loaders.recipe;
import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.Materials;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.chemistry.NuclearChem;
import gtPlusPlus.core.lib.CORE;
@@ -41,7 +40,7 @@ public class RecipeLoader_NuclearFuelProcessing {
FluidUtils.getFluidStack(aLiFBeF2ZrF4U235, 1000),
null,
90 * 60 * 20, // Duration
- MaterialUtils.getVoltageForTier(5)
+ MaterialUtils.getVoltageForTier(4)
);
// 7LiF - BeF2 - ZrF4 - UF4 - 650C
@@ -73,24 +72,15 @@ public class RecipeLoader_NuclearFuelProcessing {
// Reprocess Fuels
- final FluidStack aBurntLiFBeF2ZrF4U235 = new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 17);
- final FluidStack aBurntLiFBeF2ZrF4UF4 = new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4UF4, 17);
- final FluidStack aBurntLiFBeF2ThF4UF4 = new FluidStack(NuclearChem.Burnt_LiFBeF2ThF4UF4, 17);
- final FluidStack aHelium = Materials.Helium.getGas(1000);
- final FluidStack aFluorine = Materials.Fluorine.getGas(1000);
-
-
-
-
// Reactor Blanket step 1 - Fluorination
CORE.RA.addReactorProcessingUnitRecipe(
CI.getNumberedAdvancedCircuit(17),
- ELEMENT.getInstance().FLUORINE.getCell(5),
+ ELEMENT.getInstance().FLUORINE.getCell(6),
NUCLIDE.LiFThF4.getFluidStack(10000),
new ItemStack[] {
CI.emptyCells(4),
- ELEMENT.getInstance().LITHIUM.getCell(1),
+ FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
@@ -98,17 +88,17 @@ public class RecipeLoader_NuclearFuelProcessing {
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
},
- new int[] {10000, 10000, 1000, 1000, 1000, 500, 500, 500},
- NUCLIDE.UF6F2.getFluidStack(5000),
+ new int[] {10000, 10000, 500, 500, 500, 250, 250, 250},
+ NUCLIDE.UF6F2.getFluidStack(1500),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(5));
CORE.RA.addReactorProcessingUnitRecipe(
CI.getNumberedAdvancedCircuit(18),
- ELEMENT.getInstance().FLUORINE.getCell(5),
+ ELEMENT.getInstance().FLUORINE.getCell(6),
NUCLIDE.LiFBeF2ThF4.getFluidStack(10000),
new ItemStack[] {
CI.emptyCells(3),
- ELEMENT.getInstance().LITHIUM.getCell(1),
+ FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
@@ -118,18 +108,18 @@ public class RecipeLoader_NuclearFuelProcessing {
ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
},
new int[] {10000, 10000, 10000, 1000, 1000, 1000, 500, 500, 500},
- NUCLIDE.UF6F2.getFluidStack(10000),
+ NUCLIDE.UF6F2.getFluidStack(3000),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(5));
// Reactor Blanket step 1 - Fluorination
CORE.RA.addReactorProcessingUnitRecipe(
CI.getNumberedAdvancedCircuit(7),
- ELEMENT.getInstance().FLUORINE.getCell(10),
+ ELEMENT.getInstance().FLUORINE.getCell(6),
NUCLIDE.Sparged_LiFThF4.getFluidStack(10000),
new ItemStack[] {
- CI.emptyCells(8),
- ELEMENT.getInstance().LITHIUM.getCell(2),
+ CI.emptyCells(4),
+ FLUORIDES.LITHIUM_FLUORIDE.getCell(2),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
@@ -137,17 +127,17 @@ public class RecipeLoader_NuclearFuelProcessing {
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
},
- new int[] {10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000},
- NUCLIDE.UF6F2.getFluidStack(10000),
+ new int[] {10000, 10000, 1000, 1000, 1000, 1000, 1000, 1000},
+ NUCLIDE.UF6F2.getFluidStack(3000),
20 * 60 * 5,
MaterialUtils.getVoltageForTier(5));
CORE.RA.addReactorProcessingUnitRecipe(
CI.getNumberedAdvancedCircuit(8),
- ELEMENT.getInstance().FLUORINE.getCell(10),
+ ELEMENT.getInstance().FLUORINE.getCell(6),
NUCLIDE.Sparged_LiFBeF2ThF4.getFluidStack(10000),
new ItemStack[] {
- CI.emptyCells(6),
- ELEMENT.getInstance().LITHIUM.getCell(2),
+ CI.emptyCells(2),
+ FLUORIDES.LITHIUM_FLUORIDE.getCell(2),
FLUORIDES.BERYLLIUM_FLUORIDE.getCell(2),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
ItemUtils.getSimpleStack(ModItems.dustProtactinium233),
@@ -157,7 +147,7 @@ public class RecipeLoader_NuclearFuelProcessing {
ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
},
new int[] {10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000},
- NUCLIDE.UF6F2.getFluidStack(10000),
+ NUCLIDE.UF6F2.getFluidStack(6000),
20 * 60 * 5,
MaterialUtils.getVoltageForTier(5));
@@ -332,7 +322,7 @@ public class RecipeLoader_NuclearFuelProcessing {
null, null, null, null, null,
NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(10000),
null,
- 20 * 60 * 15, // Duration
+ 20 * 60 * 120, // Duration
MaterialUtils.getVoltageForTier(5)
);
@@ -370,7 +360,7 @@ public class RecipeLoader_NuclearFuelProcessing {
null, null, null, null, null,
NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(10000),
null,
- 20 * 60 * 30, // Duration
+ 20 * 60 * 150, // Duration
MaterialUtils.getVoltageForTier(5)
);
generated by cgit (git 2.46.0) at 2025-03-10 18:23:31 +0000