diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-12-07 19:14:28 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-12-07 19:14:28 +0000 |
| commit | f59af4cca6ba29e355f4ebde31f4ae16131f4230 (patch) | |
| tree | c9272ac2de527dcd5d83463d50dc0fc053e0a310 /src/Java/gtPlusPlus/core | |
| parent | 680fef1a0f49d8706fd58093da63a2d9438d0641 (diff) | |
| download | GT5-Unofficial-f59af4cca6ba29e355f4ebde31f4ae16131f4230.tar.gz GT5-Unofficial-f59af4cca6ba29e355f4ebde31f4ae16131f4230.tar.bz2 GT5-Unofficial-f59af4cca6ba29e355f4ebde31f4ae16131f4230.zip | |
Added more LFTR fuel processing.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
3 files changed, 9 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java index db41da43b2..f112b0d2a5 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/NuclearChem.java @@ -18,6 +18,9 @@ public class NuclearChem extends ItemPackage { public static Fluid Burnt_LiFBeF2ZrF4UF4; public static Fluid Burnt_LiFBeF2ZrF4U235; + + public static Fluid Impure_LiFBeF2; + public static Fluid GeneticMutagen; private static boolean generateMutagenRecipe = false; @@ -65,7 +68,7 @@ public class NuclearChem extends ItemPackage { Burnt_LiFBeF2ThF4UF4 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ThF4UF4", "Burnt LiFBeF2ThF4UF4 Salt", 545, new short[]{48, 175, 48, 100}, null, null); Burnt_LiFBeF2ZrF4UF4 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ZrF4UF4", "Burnt LiFBeF2ZrF4UF4 Salt", 520, new short[]{48, 168, 68, 100}, null, null); Burnt_LiFBeF2ZrF4U235 = FluidUtils.generateFluidNonMolten("BurntLiFBeF2ZrF4U235", "Burnt LiFBeF2ZrF4U235 Salt", 533, new short[]{68, 185, 48, 100}, null, null); - + Impure_LiFBeF2 = FluidUtils.generateFluidNonMolten("ImpureLiFBeF2", "Impure LiFBeF2 Salt", 533, new short[]{110, 75, 186, 100}, null, null); if (FluidUtils.getFluidStack("fluid.Mutagen", 1) == null) { GeneticMutagen = FluidUtils.generateFluidNonMolten("GeneticMutagen", "Genetic Mutagen", 12, new short[]{22, 148, 185, 100}, null, null); generateMutagenRecipe = true; diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java index a8dcb37f02..f48ed9f5cb 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java @@ -277,7 +277,7 @@ public class MaterialGenerator { } public static void generateNuclearDusts(final Material matInfo, boolean generateDehydratorRecipe){ - generateNuclearMaterial(matInfo, false, true, false, false, false); + generateNuclearMaterial(matInfo, false, true, false, false, true); if (generateDehydratorRecipe && matInfo.getFluid() != null && matInfo.getDust(0) != null) { CORE.RA.addDehydratorRecipe( new ItemStack[] { @@ -302,7 +302,7 @@ public class MaterialGenerator { } public static void generateNuclearMaterial(final Material matInfo, final boolean generateBlock, - final boolean generateDusts, final boolean generateIngot, final boolean generatePlates, final boolean generateMiscRecipes){ + final boolean generateDusts, final boolean generateIngot, final boolean generatePlates, final boolean disableOptionalRecipes){ try { if (generateBlock) { @@ -324,14 +324,14 @@ public class MaterialGenerator { new RecipeGen_Assembler(matInfo); } - if (generateMiscRecipes) { + if (!disableOptionalRecipes) { new RecipeGen_ShapedCrafting(matInfo); new RecipeGen_Fluids(matInfo); new RecipeGen_MaterialProcessing(matInfo); new RecipeGen_Recycling(matInfo); } - new RecipeGen_DustGeneration(matInfo, generateMiscRecipes); + new RecipeGen_DustGeneration(matInfo, disableOptionalRecipes); new RecipeGen_Plasma(matInfo); } catch (final Throwable t){ diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java index 8fe99f16e7..4d3233f948 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java +++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java @@ -160,7 +160,7 @@ public final class NUCLIDE { new MaterialStack[]{ new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1), new MaterialStack(ELEMENT.getInstance().FLUORINE, 3), - new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) + new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1) }); public static final Material LiFBeF2 = new Material( |