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/RecipeGen_BlastSmelter.java20
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java34
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java58
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java129
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_NuclearFuelProcessing.java124
7 files changed, 227 insertions, 146 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index 9e00ada163..9e58d486d3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -131,13 +131,13 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
//Generate Recipes for all singular materials that can be made molten.
if (hasMoreInputThanACircuit){
if (M.requiresBlastFurnace()) {
- if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, (duration/(mTotalPartsCounter > 0 ? mTotalPartsCounter : 1)), (int) aVoltage)){
+ if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluidStack(fluidAmount), 100, (duration/(mTotalPartsCounter > 0 ? mTotalPartsCounter : 1)), (int) aVoltage)){
Logger.WARNING("[BAS] Success.");
Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
- if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, duration, 120)){
Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
- if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluid(16), 100, duration/9, 120)){
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, duration/9, 120)){
Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
/*if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){
@@ -153,14 +153,14 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
}
}
else {
- if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/(mTotalPartsCounter > 0 ? mTotalPartsCounter : 1)/2, (int) aVoltage)){
+ if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluidStack(fluidAmount), 100, duration/(mTotalPartsCounter > 0 ? mTotalPartsCounter : 1)/2, (int) aVoltage)){
Logger.WARNING("[BAS] Success.");
- if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration/2, 60)){
+ if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluidStack(144), M.getIngot(1), duration/2, 60)){
Logger.WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
- if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration/2, 60)){
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluidStack(144), 100, duration/2, 60)){
Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
- if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluid(16), 100, duration/2/9, 60)){
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getNugget(1), null, M.getFluidStack(16), 100, duration/2/9, 60)){
Logger.WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
/*if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/2/4, 60)){
@@ -212,7 +212,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
final int xr = r;
if ((xr > 0) && (xr <= 100)){
final int mathmatics = (r*1000);
- componentsFluid = FluidUtils.getFluidStack(M.getComposites().get(irc).getStackMaterial().getFluid(mathmatics), mathmatics);
+ componentsFluid = FluidUtils.getFluidStack(M.getComposites().get(irc).getStackMaterial().getFluidStack(mathmatics), mathmatics);
}
}
else {
@@ -254,7 +254,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
//Adds Recipe
if (M.requiresBlastFurnace()) {
- if (CORE.RA.addBlastSmelterRecipe(components, componentsFluid, M.getFluid(fluidAmount), 100, duration, (int) aVoltage)){
+ if (CORE.RA.addBlastSmelterRecipe(components, componentsFluid, M.getFluidStack(fluidAmount), 100, duration, (int) aVoltage)){
Logger.WARNING("[BAS] Success.");
}
else {
@@ -262,7 +262,7 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
}
}
else {
- if (CORE.RA.addBlastSmelterRecipe(components, componentsFluid, M.getFluid(fluidAmount), 100, duration, (int) aVoltage/2)){
+ if (CORE.RA.addBlastSmelterRecipe(components, componentsFluid, M.getFluidStack(fluidAmount), 100, duration, (int) aVoltage/2)){
Logger.WARNING("[BAS] Success.");
}
else {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index 173d11c97b..24c8eb488f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -193,7 +193,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
if (x.getStackMaterial() != null){
if (x.getStackMaterial().getDust(1) == null){
if (x.getStackMaterial().getState() != MaterialState.SOLID && x.getStackMaterial().getState() != MaterialState.ORE && x.getStackMaterial().getState() != MaterialState.PLASMA){
- oxygen = x.getStackMaterial().getFluid(1000);
+ oxygen = x.getStackMaterial().getFluidStack(1000);
break;
}
}
@@ -299,7 +299,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
if (x.getStackMaterial().getDust(1) == null){
MaterialState f = x.getStackMaterial().getState();
if (f == MaterialState.GAS || f == MaterialState.LIQUID || f == MaterialState.PURE_LIQUID || f == MaterialState.PURE_GAS){
- oxygen = x.getStackMaterial().getFluid((int) (material.vSmallestRatio[compSlot] * 1000));
+ oxygen = x.getStackMaterial().getFluidStack((int) (material.vSmallestRatio[compSlot] * 1000));
}
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 3c74c4166d..e87fc08c90 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -41,8 +41,8 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
}
// Melting Shapes to fluid
- if (material.getFluid(1) != null
- && !material.getFluid(1).getUnlocalizedName().toLowerCase().contains("plasma")) {
+ if (material.getFluidStack(1) != null
+ && !material.getFluidStack(1).getUnlocalizedName().toLowerCase().contains("plasma")) {
if (!material.requiresBlastFurnace()) {
@@ -50,7 +50,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
if (ItemUtils.checkForInvalidItems(material.getIngot(1)))
if (CORE.RA.addFluidExtractionRecipe(
material.getIngot(1), // Input
- material.getFluid(144), // Fluid Output
+ material.getFluidStack(144), // Fluid Output
1 * 20, // Duration
material.vVoltageMultiplier // Eu Tick
)) {
@@ -65,7 +65,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
if (ItemUtils.checkForInvalidItems(material.getPlate(1)))
if (CORE.RA.addFluidExtractionRecipe(
material.getPlate(1), // Input
- material.getFluid(144), // Fluid Output
+ material.getFluidStack(144), // Fluid Output
1 * 20, // Duration
material.vVoltageMultiplier // Eu Tick
)) {
@@ -80,7 +80,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1)))
if (CORE.RA.addFluidExtractionRecipe(
material.getPlateDouble(1), // Input
- material.getFluid(288), // Fluid Output
+ material.getFluidStack(288), // Fluid Output
1 * 20, // Duration
material.vVoltageMultiplier // Eu Tick
)) {
@@ -95,7 +95,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
if (ItemUtils.checkForInvalidItems(material.getNugget(1)))
if (CORE.RA.addFluidExtractionRecipe(
material.getNugget(1), // Input
- material.getFluid(16), // Fluid Output
+ material.getFluidStack(16), // Fluid Output
16, // Duration
material.vVoltageMultiplier // Eu Tick
)) {
@@ -110,7 +110,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
if (ItemUtils.checkForInvalidItems(material.getBlock(1)))
if (CORE.RA.addFluidExtractionRecipe(
material.getBlock(1), // Input
- material.getFluid(144 * 9), // Fluid Output
+ material.getFluidStack(144 * 9), // Fluid Output
288, // Duration
material.vVoltageMultiplier // Eu Tick
)) {
@@ -128,7 +128,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Ingot
if (ItemUtils.checkForInvalidItems(material.getIngot(1)))
if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), // Item Shape
- material.getFluid(144), // Fluid Input
+ material.getFluidStack(144), // Fluid Input
material.getIngot(1), // output
32, // Duration
material.vVoltageMultiplier // Eu Tick
@@ -143,7 +143,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Plate
if (ItemUtils.checkForInvalidItems(material.getPlate(1)))
if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Plate.get(0), // Item Shape
- material.getFluid(144), // Fluid Input
+ material.getFluidStack(144), // Fluid Input
material.getPlate(1), // output
32, // Duration
material.vVoltageMultiplier // Eu Tick
@@ -158,7 +158,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Nugget
if (ItemUtils.checkForInvalidItems(material.getNugget(1)))
if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Nugget.get(0), // Item Shape
- material.getFluid(16), // Fluid Input
+ material.getFluidStack(16), // Fluid Input
material.getNugget(1), // output
16, // Duration
material.vVoltageMultiplier // Eu Tick
@@ -173,7 +173,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Gears
if (ItemUtils.checkForInvalidItems(material.getGear(1)))
if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Gear.get(0), // Item Shape
- material.getFluid(576), // Fluid Input
+ material.getFluidStack(576), // Fluid Input
material.getGear(1), // output
128, // Duration
material.vVoltageMultiplier // Eu Tick
@@ -187,7 +187,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Blocks
if (ItemUtils.checkForInvalidItems(material.getBlock(1)))
if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Block.get(0), // Item Shape
- material.getFluid(144 * 9), // Fluid Input
+ material.getFluidStack(144 * 9), // Fluid Input
material.getBlock(1), // output
288, // Duration
material.vVoltageMultiplier // Eu Tick
@@ -219,7 +219,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Rod
if (ItemUtils.checkForInvalidItems(material.getRod(1)))
if (mold_Rod != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Rod.get(0), // Item Shape
- material.getFluid(72), // Fluid Input
+ material.getFluidStack(72), // Fluid Input
material.getRod(1), // output
150, // Duration
material.vVoltageMultiplier // Eu Tick
@@ -235,7 +235,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
if (ItemUtils.checkForInvalidItems(material.getLongRod(1)))
if (mold_Rod_Long != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Rod_Long.get(0), // Item
// Shape
- material.getFluid(144), // Fluid Input
+ material.getFluidStack(144), // Fluid Input
material.getLongRod(1), // output
300, // Duration
material.vVoltageMultiplier // Eu Tick
@@ -250,7 +250,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Bolt
if (ItemUtils.checkForInvalidItems(material.getBolt(1)))
if (mold_Bolt != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Bolt.get(0), // Item Shape
- material.getFluid(18), // Fluid Input
+ material.getFluidStack(18), // Fluid Input
material.getBolt(1), // output
50, // Duration
material.vVoltageMultiplier // Eu Tick
@@ -265,7 +265,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Screw
if (ItemUtils.checkForInvalidItems(material.getScrew(1)))
if (mold_Screw != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Screw.get(0), // Item Shape
- material.getFluid(18), // Fluid Input
+ material.getFluidStack(18), // Fluid Input
material.getScrew(1), // output
50, // Duration
material.vVoltageMultiplier // Eu Tick
@@ -280,7 +280,7 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
// Ring
if (ItemUtils.checkForInvalidItems(material.getRing(1)))
if (mold_Ring != null && GT_Values.RA.addFluidSolidifierRecipe(mold_Ring.get(0), // Item Shape
- material.getFluid(36), // Fluid Input
+ material.getFluidStack(36), // Fluid Input
material.getRing(1), // output
100, // Duration
material.vVoltageMultiplier // Eu Tick
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index 84188a44aa..acb7e5fe02 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -137,9 +137,9 @@ public class RecipeGen_Recycling implements Runnable {
//Fluid Extractor
if (ItemUtils.checkForInvalidItems(tempStack)) {
// mValidItems[mSlotIndex++] = tempStack;
- if ((mDust != null) && CORE.RA.addFluidExtractionRecipe(tempStack, material.getFluid(mFluidAmount), 30, material.vVoltageMultiplier)) {
+ if ((mDust != null) && CORE.RA.addFluidExtractionRecipe(tempStack, material.getFluidStack(mFluidAmount), 30, material.vVoltageMultiplier)) {
Logger.WARNING("Fluid Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle "
- + tempStack.getDisplayName() + " and obtain " + mFluidAmount+"mb of "+material.getFluid(1).getLocalizedName()+".");
+ + tempStack.getDisplayName() + " and obtain " + mFluidAmount+"mb of "+material.getFluidStack(1).getLocalizedName()+".");
}
else {
Logger.WARNING("Fluid Recycle Recipe: " + material.getLocalizedName() + " - Failed");
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 43097413be..3e2f8e061d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java
@@ -3,17 +3,12 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe;
import gregtech.api.enums.Materials;
import gregtech.api.util.GTPP_Recipe;
import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GasSpargingRecipe;
import gregtech.api.util.GasSpargingRecipeMap;
import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.chemistry.NuclearChem;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.material.nuclear.NUCLIDE;
-import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -33,20 +28,20 @@ public class RecipeLoader_LFTR {
if (mNobleGases == null) {
mNobleGases = new AutoMap<Fluid>();
mNobleGases.add(mSpargeGases.get(0));
- mNobleGases.add(ELEMENT.getInstance().XENON.getFluid(1).getFluid());
- mNobleGases.add(ELEMENT.getInstance().NEON.getFluid(1).getFluid());
- mNobleGases.add(ELEMENT.getInstance().ARGON.getFluid(1).getFluid());
- mNobleGases.add(ELEMENT.getInstance().KRYPTON.getFluid(1).getFluid());
- mNobleGases.add(ELEMENT.getInstance().RADON.getFluid(1).getFluid());
+ mNobleGases.add(ELEMENT.getInstance().XENON.getFluid());
+ mNobleGases.add(ELEMENT.getInstance().NEON.getFluid());
+ mNobleGases.add(ELEMENT.getInstance().ARGON.getFluid());
+ mNobleGases.add(ELEMENT.getInstance().KRYPTON.getFluid());
+ mNobleGases.add(ELEMENT.getInstance().RADON.getFluid());
}
if (mFluorideGases == null) {
mFluorideGases = new AutoMap<Fluid>();
mFluorideGases.add(mSpargeGases.get(1));
- mFluorideGases.add(FLUORIDES.LITHIUM_FLUORIDE.getFluid(1).getFluid());
- mFluorideGases.add(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid(1).getFluid());
- mFluorideGases.add(FLUORIDES.TECHNETIUM_HEXAFLUORIDE.getFluid(1).getFluid());
- mFluorideGases.add(FLUORIDES.SELENIUM_HEXAFLUORIDE.getFluid(1).getFluid());
- mFluorideGases.add(FLUORIDES.THORIUM_TETRAFLUORIDE.getFluid(1).getFluid());
+ mFluorideGases.add(FLUORIDES.LITHIUM_FLUORIDE.getFluid());
+ mFluorideGases.add(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid());
+ mFluorideGases.add(FLUORIDES.TECHNETIUM_HEXAFLUORIDE.getFluid());
+ mFluorideGases.add(FLUORIDES.SELENIUM_HEXAFLUORIDE.getFluid());
+ mFluorideGases.add(FLUORIDES.THORIUM_TETRAFLUORIDE.getFluid());
}
}
@@ -59,66 +54,65 @@ public class RecipeLoader_LFTR {
//1l/10t= 1000l/2.5hr LiFBeF2ZrF4U235
configureSparging();
- FluidStack Li2BeF4 = new FluidStack(ModItems.fluidFLiBeSalt, 34);
- FluidStack aBurntLi2BeF4 = new FluidStack(ModItems.fluidFLiBeSaltBurnt, 34);
+ FluidStack Li2BeF4 = NUCLIDE.Li2BeF4.getFluidStack(34);
- //LiFBeF2ThF4UF4
+ //LiFBeF2ThF4UF4 - T3
GT_Recipe LFTR1 = new GTPP_Recipe(
true,
new ItemStack[] {},
new ItemStack[] {},
null, new int[] {10000, 10000, 5000, 2500},
new FluidStack[] {
- NUCLIDE.LiFBeF2ThF4UF4.getFluid(17),
+ NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(17),
Li2BeF4
},
new FluidStack[] {
new FluidStack(NuclearChem.Burnt_LiFBeF2ThF4UF4, 17),
- aBurntLi2BeF4,
- FluidUtils.getFluidStack("molten.uraniumhexafluoride", 10),
- FluidUtils.getFluidStack("molten.uraniumhexafluoride", 5)
+ NUCLIDE.LiFBeF2ThF4.getFluidStack(34),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(10),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(5)
},
12000,//time
0,//cost
8192//fuel value
);
- //LiFBeF2ZrF4UF4
+ //LiFBeF2ZrF4UF4 - T2
GT_Recipe LFTR2 = new GTPP_Recipe(
true,
new ItemStack[] {},
new ItemStack[] {},
null, new int[] {10000, 10000, 2500, 1250},
new FluidStack[] {
- NUCLIDE.LiFBeF2ZrF4UF4.getFluid(17),
+ NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(17),
Li2BeF4
},
new FluidStack[] {
new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4UF4, 17),
- aBurntLi2BeF4,
- FluidUtils.getFluidStack("molten.uraniumhexafluoride", 4),
- FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2)
+ NUCLIDE.LiFBeF2ThF4.getFluidStack(34),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(4),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2)
},
6000,//time
0,//cost
8192//fuel value
);
- //LiFBeF2ZrF4U235
+ //LiFBeF2ZrF4U235 - T1
GT_Recipe LFTR3 = new GTPP_Recipe(
true,
new ItemStack[] {},
new ItemStack[] {},
null, new int[] {10000, 10000, 1000, 500},
new FluidStack[] {
- NUCLIDE.LiFBeF2ZrF4U235.getFluid(17),
+ NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(17),
Li2BeF4
},
new FluidStack[] {
new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 17),
- aBurntLi2BeF4,
- FluidUtils.getFluidStack("molten.uraniumhexafluoride", 2),
- FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1)
+ NUCLIDE.LiFThF4.getFluidStack(34),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(2),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(1)
},
3000,//time
0,//cost
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index 712caae6a2..ba8241d804 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -6,11 +6,11 @@ import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.chemistry.GenericChem;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MISC_MATERIALS;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.material.nuclear.NUCLIDE;
import gtPlusPlus.core.recipe.common.CI;
@@ -60,11 +60,11 @@ public class RecipeLoader_Nuclear {
private static void blastFurnace() {
GT_Values.RA.addBlastRecipe(
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustBerylliumFluoride", 1),
+ FLUORIDES.LITHIUM_FLUORIDE.getDust(2),
+ FLUORIDES.BERYLLIUM_FLUORIDE.getDust(1),
GT_Values.NF,
GT_Values.NF,
- ItemUtils.getSimpleStack(ModItems.dustLi2BeF4, 3),
+ NUCLIDE.Li2BeF4.getDust(3),
null,
60 * 20, 2000,
3000);
@@ -92,7 +92,7 @@ public class RecipeLoader_Nuclear {
CI.getNumberedCircuit(20),
ItemUtils.getItemStackFromFQRN("IC2:reactorUraniumSimpledepleted", 8),
GT_Values.NF,
- ELEMENT.getInstance().KRYPTON.getFluid(60),
+ ELEMENT.getInstance().KRYPTON.getFluidStack(60),
ItemList.IC2_Fuel_Rod_Empty.get(8),
ELEMENT.getInstance().URANIUM238.getDust(2),
ELEMENT.getInstance().URANIUM232.getSmallDust(1),
@@ -105,7 +105,7 @@ public class RecipeLoader_Nuclear {
CI.getNumberedCircuit(20),
ItemUtils.getItemStackFromFQRN("IC2:reactorMOXSimpledepleted", 8),
GT_Values.NF,
- ELEMENT.getInstance().KRYPTON.getFluid(90),
+ ELEMENT.getInstance().KRYPTON.getFluidStack(90),
ItemList.IC2_Fuel_Rod_Empty.get(8),
ELEMENT.getInstance().PLUTONIUM244.getDust(2),
ELEMENT.getInstance().PLUTONIUM241.getTinyDust(1),
@@ -119,7 +119,7 @@ public class RecipeLoader_Nuclear {
CI.getNumberedCircuit(20),
ItemList.Depleted_Thorium_1.get(8),
GT_Values.NF,
- ELEMENT.getInstance().KRYPTON.getFluid(30),
+ ELEMENT.getInstance().KRYPTON.getFluidStack(30),
ItemList.IC2_Fuel_Rod_Empty.get(8),
ELEMENT.getInstance().THORIUM.getDust(2),
ELEMENT.getInstance().THORIUM232.getDust(1),
@@ -202,26 +202,43 @@ public class RecipeLoader_Nuclear {
// LFTR Fuel Related Compounds
if (GTNH) {
// Hydroxide
- AddGregtechRecipe.addChemicalRecipeForBasicMachineOnly(
- ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF,
- FluidUtils.getFluidStack("hydroxide", 2000),
- CI.emptyCells(2), GT_Values.NI, 8 * 20, 30);
+ GT_Values.RA.addChemicalRecipe(
+ ItemUtils.getGregtechCircuit(3),
+ ELEMENT.getInstance().OXYGEN.getCell(1),
+ ELEMENT.getInstance().HYDROGEN.getFluidStack(1000),
+ MISC_MATERIALS.HYDROXIDE.getFluidStack(2000),
+ CI.emptyCells(2),
+ GT_Values.NI,
+ 8 * 20,
+ 30);
// Beryllium Hydroxide
- GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustBeryllium", 7),
- ItemUtils.getGregtechCircuit(3), FluidUtils.getFluidStack("hydroxide", 1000),
- FluidUtils.getFluidStack("berylliumhydroxide", 2000), GT_Values.NI, 8 * 20);
+ GT_Values.RA.addChemicalRecipe(
+ ItemUtils.getGregtechCircuit(3),
+ ELEMENT.getInstance().BERYLLIUM.getDust(7),
+ MISC_MATERIALS.HYDROXIDE.getFluidStack(1000),
+ FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000),
+ GT_Values.NI,
+ 8 * 20,
+ 30);
// Ammonium Bifluoride
- GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1),
- ItemUtils.getGregtechCircuit(3), FluidUtils.getFluidStack("ammonium", 1000),
- FluidUtils.getFluidStack("ammoniumbifluoride", 2000),
- CI.emptyCells(1), 26 * 20);
+ GT_Values.RA.addChemicalRecipe(
+ ItemUtils.getGregtechCircuit(3),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1),
+ MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
+ FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000),
+ CI.emptyCells(1),
+ 20 * 20,
+ 30);
// Ammonium
- AddGregtechRecipe.addChemicalRecipeForBasicMachineOnly(
- ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), GT_Values.NF,
- FluidUtils.getFluidStack("ammonium", 2000),
- CI.emptyCells(2), GT_Values.NI, 20 * 20, 30);
+ GT_Values.RA.addChemicalRecipe(
+ ItemUtils.getGregtechCircuit(3),
+ ELEMENT.getInstance().HYDROGEN.getCell(1),
+ MISC_MATERIALS.AMMONIA.getFluidStack(1000),
+ MISC_MATERIALS.AMMONIUM.getFluidStack(2000),
+ CI.emptyCells(1),
+ GT_Values.NI,
+ 20 * 20,
+ 30);
}
if (!GTNH) {
@@ -254,8 +271,8 @@ public class RecipeLoader_Nuclear {
//Technetium
GT_Values.RA.addChemicalRecipe(
+ CI.getNumberedAdvancedCircuit(22),
ItemUtils.getItemStackOfAmountFromOreDict("dustTechnetium99", 1),
- null,
FluidUtils.getFluidStack("sulfuricacid", 1000),
FluidUtils.getFluidStack("sulfuricacid", 144 * 2),
ItemUtils.getItemStackOfAmountFromOreDict("dustTechnetium", 1),
@@ -310,10 +327,10 @@ public class RecipeLoader_Nuclear {
CI.getNumberedAdvancedCircuit(13),
ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
},
- FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440),
+ FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(1440),
null,
new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10),
+ FLUORIDES.URANIUM_TETRAFLUORIDE.getDust(10),
CI.emptyCells(10)
},
new int[] { 10000 },
@@ -326,10 +343,10 @@ public class RecipeLoader_Nuclear {
CI.getNumberedAdvancedCircuit(12),
ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
}, // Item
- FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), // Fluid
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(1440),
null, // Fluid output (slot 2)
new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getDust(10),
CI.emptyCells(10) }, // Output
new int[] { 10000 },
300 * 20, // Time in ticks
@@ -369,7 +386,7 @@ public class RecipeLoader_Nuclear {
}, // Item
null, // Fluid input (slot 1)
null, // Fluid output (slot 2)
- new ItemStack[] {
+ new ItemStack[] {
ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2),
ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3)
}, // Output
@@ -429,10 +446,10 @@ public class RecipeLoader_Nuclear {
CORE.RA.addDehydratorRecipe(
new ItemStack[] {
CI.getNumberedAdvancedCircuit(6),
- ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4)
+ FLUORIDES.AMMONIUM_BIFLUORIDE.getCell(4)
},
- FluidUtils.getFluidStack("berylliumhydroxide", 2000), // Fluid input (slot 1)
- FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000),
+ FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000), // Fluid input (slot 1)
+ FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(6000),
new ItemStack[] {
ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4)
},
@@ -446,18 +463,17 @@ public class RecipeLoader_Nuclear {
CI.getNumberedAdvancedCircuit(17),
CI.emptyCells(5)
},
- FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000),
+ FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE.getFluidStack(5000),
null,
new ItemStack[] {
- ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2),
+ MISC_MATERIALS.AMMONIA.getCell(2),
ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1)
+ FLUORIDES.BERYLLIUM_FLUORIDE.getCell(1)
},
new int[] {10000, 10000, 10000},
5 * 60 * 20,
120);
-
}
private static void electroMagneticSeperator() {
@@ -495,19 +511,34 @@ public class RecipeLoader_Nuclear {
private static void fluidExtractorRecipes() {
//FLiBe fuel
- CORE.RA.addFluidExtractionRecipe(ItemUtils.getSimpleStack(ModItems.dustLi2BeF4, 1),
- new FluidStack(ModItems.fluidFLiBeSalt, 144), 100, 500);
+ CORE.RA.addFluidExtractionRecipe(
+ NUCLIDE.Li2BeF4.getDust(1),
+ NUCLIDE.Li2BeF4.getFluidStack(144),
+ 100,
+ 500);
//LFTR Fuel 1
- CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4U235.getDust(1),
- NUCLIDE.LiFBeF2ZrF4U235.getFluid(144), 250, 1000);
- CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ZrF4UF4.getDust(1),
- NUCLIDE.LiFBeF2ZrF4UF4.getFluid(144), 150, 2000);
- CORE.RA.addFluidExtractionRecipe(NUCLIDE.LiFBeF2ThF4UF4.getDust(1),
- NUCLIDE.LiFBeF2ThF4UF4.getFluid(144), 200, 1500);
+ CORE.RA.addFluidExtractionRecipe(
+ NUCLIDE.LiFBeF2ZrF4U235.getDust(1),
+ NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(144),
+ 250,
+ 1000);
+ CORE.RA.addFluidExtractionRecipe(
+ NUCLIDE.LiFBeF2ZrF4UF4.getDust(1),
+ NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(144),
+ 150,
+ 1500);
+ CORE.RA.addFluidExtractionRecipe(
+ NUCLIDE.LiFBeF2ThF4UF4.getDust(1),
+ NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144),
+ 150,
+ 2000);
//ZIRCONIUM_TETRAFLUORIDE
- CORE.RA.addFluidExtractionRecipe(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1),
- FluidUtils.getFluidStack(ModItems.fluidZrF4, 144), 200, 512+256);
+ CORE.RA.addFluidExtractionRecipe(
+ FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1),
+ FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(144),
+ 200,
+ 512+256);
}
@@ -526,8 +557,8 @@ public class RecipeLoader_Nuclear {
ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1),
null,
null,
- FluidUtils.getFluidStack("hydrofluoricacid", 144 * 5),
- FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144 * 5),
+ FluidUtils.getFluidStack("hydrofluoricacid", 5000),
+ FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(5000),
null,
3000,
500);
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 7ca838a8f0..90901e6847 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.Materials;
-import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.chemistry.NuclearChem;
import gtPlusPlus.core.lib.CORE;
@@ -21,15 +20,15 @@ public class RecipeLoader_NuclearFuelProcessing {
// Create Fuels
- final FluidStack aLithiumFluoride = FLUORIDES.LITHIUM_FLUORIDE.getFluid(100);
- final FluidStack aBerylliumFluoride = FLUORIDES.BERYLLIUM_FLUORIDE.getFluid(100);
- final FluidStack aThoriumFluoride = FLUORIDES.THORIUM_TETRAFLUORIDE.getFluid(100);
- final FluidStack aZirconiumFluoride = FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluid(100);
- final FluidStack aUraniumTetraFluoride = FLUORIDES.URANIUM_TETRAFLUORIDE.getFluid(100);
- final FluidStack aUranium235 = ELEMENT.getInstance().URANIUM235.getFluid(1000);
- final FluidStack aLiFBeF2ZrF4U235 = NUCLIDE.LiFBeF2ZrF4U235.getFluid(100);
- final FluidStack aLiFBeF2ZrF4UF4 = NUCLIDE.LiFBeF2ZrF4UF4.getFluid(100);
- final FluidStack aLiFBeF2ThF4UF4 = NUCLIDE.LiFBeF2ThF4UF4.getFluid(100);
+ final FluidStack aLithiumFluoride = FLUORIDES.LITHIUM_FLUORIDE.getFluidStack(100);
+ final FluidStack aBerylliumFluoride = FLUORIDES.BERYLLIUM_FLUORIDE.getFluidStack(100);
+ final FluidStack aThoriumFluoride = FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(100);
+ final FluidStack aZirconiumFluoride = FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(100);
+ final FluidStack aUraniumTetraFluoride = FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(100);
+ final FluidStack aUranium235 = ELEMENT.getInstance().URANIUM235.getFluidStack(1000);
+ final FluidStack aLiFBeF2ZrF4U235 = NUCLIDE.LiFBeF2ZrF4U235.getFluidStack(100);
+ final FluidStack aLiFBeF2ZrF4UF4 = NUCLIDE.LiFBeF2ZrF4UF4.getFluidStack(100);
+ final FluidStack aLiFBeF2ThF4UF4 = NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(100);
// 7LiF - BeF2 - ZrF4 - U235 - 590C
CORE.RA.addFissionFuel(
@@ -76,16 +75,85 @@ public class RecipeLoader_NuclearFuelProcessing {
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);
- FluidStack Li2BeF4 = new FluidStack(ModItems.fluidFLiBeSalt, 34);
- final FluidStack aBurntLi2BeF4 = new FluidStack(ModItems.fluidFLiBeSaltBurnt, 34);
final FluidStack aHelium = Materials.Helium.getGas(1000);
final FluidStack aFluorine = Materials.Fluorine.getGas(1000);
+
+ // Reactor Core step 0 - Process Burnt Salt
+
+
+
+ // Tier 1 Fuel - Gives back FLIBE and breeds U233
+ CORE.RA.addReactorProcessingUnitRecipe(
+ CI.getNumberedAdvancedCircuit(1),
+ CI.emptyCells(2),
+ new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4U235, 4000),
+ new ItemStack[] {
+ FLUORIDES.LITHIUM_FLUORIDE.getCell(1),
+ ELEMENT.getInstance().URANIUM233.getCell(1)
+ },
+ new int[] {10000, 10000},
+ NUCLIDE.LiFBeF2.getFluidStack(2000),
+ 20 * 60 * 60,
+ MaterialUtils.getVoltageForTier(3));
+
+ // Tier 2 Fuel
+ CORE.RA.addFissionFuel(
+ new FluidStack(NuclearChem.Burnt_LiFBeF2ZrF4UF4, 3000),
+ null, null, null, null, null, null, null, null, // Extra 5 inputs
+ FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getFluidStack(1000),
+ NUCLIDE.LiFBeF2UF4.getFluidStack(2000),
+ 60 * 60 * 20, // Duration
+ MaterialUtils.getVoltageForTier(4)
+ );
+
+ // Tier 3 Fuel
+ CORE.RA.addFissionFuel(
+ new FluidStack(NuclearChem.Burnt_LiFBeF2ThF4UF4, 3000),
+ null, null, null, null, null, null, null, null, // Extra 5 inputs
+ FLUORIDES.THORIUM_TETRAFLUORIDE.getFluidStack(1000),
+ NUCLIDE.LiFBeF2UF4.getFluidStack(2000),
+ 120 * 60 * 20, // Duration
+ MaterialUtils.getVoltageForTier(4)
+ );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ // Reactor Blanket step 0 - Splitting
+ /* CORE.RA.addReactorProcessingUnitRecipe(
+ CI.getNumberedAdvancedCircuit(6),
+ CI.emptyCells(1),
+ new FluidStack(ModItems.fluidFLiBeSaltBurnt, 3000),
+ new ItemStack[] {
+ FLUORIDES.LITHIUM_FLUORIDE.getCell(1)
+ },
+ new int[] {10000},
+ NUCLIDE.LiFBeF2.getFluidStack(2000),
+ 20 * 60 * 60,
+ MaterialUtils.getVoltageForTier(3));*/
+
+
// Reactor Blanket step 1 - Fluorination
- boolean a1 = CORE.RA.addReactorProcessingUnitRecipe(
+ CORE.RA.addReactorProcessingUnitRecipe(
CI.getNumberedAdvancedCircuit(7),
ELEMENT.getInstance().FLUORINE.getCell(10),
- NUCLIDE.LiFThF4.getFluid(10000),
+ NUCLIDE.LiFThF4.getFluidStack(10000),
new ItemStack[] {
CI.emptyCells(8),
ELEMENT.getInstance().LITHIUM.getCell(2),
@@ -97,13 +165,13 @@ public class RecipeLoader_NuclearFuelProcessing {
ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
},
new int[] {10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000},
- NUCLIDE.UF6F2.getFluid(10000),
+ NUCLIDE.UF6F2.getFluidStack(10000),
20 * 60 * 5,
MaterialUtils.getVoltageForTier(5));
- boolean a2 = CORE.RA.addReactorProcessingUnitRecipe(
+ CORE.RA.addReactorProcessingUnitRecipe(
CI.getNumberedAdvancedCircuit(8),
ELEMENT.getInstance().FLUORINE.getCell(10),
- NUCLIDE.LiFBeF2ThF4.getFluid(10000),
+ NUCLIDE.LiFBeF2ThF4.getFluidStack(10000),
new ItemStack[] {
CI.emptyCells(6),
ELEMENT.getInstance().LITHIUM.getCell(2),
@@ -116,17 +184,16 @@ public class RecipeLoader_NuclearFuelProcessing {
ItemUtils.getSimpleStack(ModItems.dustProtactinium233)
},
new int[] {10000, 10000, 10000, 2000, 2000, 2000, 2000, 2000, 2000},
- NUCLIDE.UF6F2.getFluid(10000),
+ NUCLIDE.UF6F2.getFluidStack(10000),
20 * 60 * 5,
MaterialUtils.getVoltageForTier(5));
- Logger.INFO("Adding LFTR Blanket step 1 - Fluorination ["+a1+"|"+a2+"]");
// Reactor Blanket step 2 - Sorption + Cold Trap
- boolean a3 = CORE.RA.addColdTrapRecipe(
+ CORE.RA.addColdTrapRecipe(
8,
FLUORIDES.SODIUM_FLUORIDE.getCell(2),
- NUCLIDE.UF6F2.getFluid(3000),
+ NUCLIDE.UF6F2.getFluidStack(3000),
new ItemStack[] {
ELEMENT.getInstance().FLUORINE.getCell(2),
ELEMENT.getInstance().URANIUM233.getDust(1),
@@ -134,26 +201,15 @@ public class RecipeLoader_NuclearFuelProcessing {
ELEMENT.getInstance().URANIUM233.getDust(1)
},
new int[] {10000, 3000, 2000, 1000},
- FLUORIDES.URANIUM_HEXAFLUORIDE.getFluid(1000),
+ FLUORIDES.URANIUM_HEXAFLUORIDE.getFluidStack(1000),
20 * 60 * 10,
MaterialUtils.getVoltageForTier(3));
- Logger.INFO("Adding LFTR Blanket step 2 - Sorption + Cold Trap ["+a3+"]");
- CORE.RA.addFissionFuel(
- FluidUtils.getFluidStack(aBurntLiFBeF2ZrF4U235, 500),
- FluidUtils.getFluidStack(aBerylliumFluoride, 280),
- FluidUtils.getFluidStack(aThoriumFluoride, 70),
- FluidUtils.getFluidStack(aUraniumTetraFluoride, 70),
- null, null, null, null, null, // Extra 5 inputs
- FluidUtils.getFluidStack(aLiFBeF2ThF4UF4, 1000),
- null,
- 150 * 60 * 20, // Duration
- MaterialUtils.getVoltageForTier(5)
- );
+
}
}
generated by cgit (git 2.46.0) at 2025-03-10 03:42:27 +0000