From f40e570aa155652c97c0c45ec6a18a4bfca86087 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 24 Aug 2017 09:15:34 +1000 Subject: + Added Hydroxide, Ammonia, Ammonium, Ammonium Bifluoride, Beryllium Hydroxide. + Added a material state that doesn't generate anything except a fluid. --- .../core/material/nuclear/FLUORIDES.java | 85 +++++++++++++++++++++- 1 file changed, 82 insertions(+), 3 deletions(-) (limited to 'src/Java/gtPlusPlus/core/material/nuclear') diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java index e4576eea7b..04d41d8e30 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java +++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java @@ -105,7 +105,7 @@ public class FLUORIDES { public static final Material BERYLLIUM_FLUORIDE = new Material( "Beryllium Fluoride", //Material Name - MaterialState.LIQUID, //State + MaterialState.PURE_LIQUID, //State new short[]{120, 180, 120, 0}, //Material Colour Materials.Beryllium.mMeltingPoint, //Melting Point in C Materials.Beryllium.mBlastFurnaceTemp, //Boiling Point in C @@ -134,9 +134,88 @@ public class FLUORIDES { }); + //LFTR sub components + + public static final Material HYDROXIDE = new Material( + "Hydroxide", //Material Name + MaterialState.PURE_LIQUID, //State + new short[]{240, 220, 240, 0}, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1) + }); + + public static final Material AMMONIA = new Material( + "Ammonia", //Material Name + MaterialState.PURE_LIQUID, //State + new short[]{240, 220, 240, 0}, //Material Colour + -77, //Melting Point in C + -33, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 3) + }); + + public static final Material AMMONIUM = new Material( + "Ammonium", //Material Name + MaterialState.PURE_LIQUID, //State + new short[]{240, 220, 240, 0}, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().NITROGEN, 1), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4) + }); + + public static final Material AMMONIUM_BIFLUORIDE = new Material( + "Ammonium Bifluoride", //Material Name + MaterialState.PURE_LIQUID, //State + new short[]{240, 220, 240, 0}, //Material Colour + 126, //Melting Point in C + 240, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.AMMONIUM, 1), + new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1), + new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) + }); + + public static final Material BERYLLIUM_HYDROXIDE = new Material( + "Beryllium Hydroxide", //Material Name + MaterialState.PURE_LIQUID, //State + new short[]{180, 250, 180, 0}, //Material Colour + 1000, //Melting Point in C + -1, //Boiling Point in C + -1, + -1, + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1), + new MaterialStack(FLUORIDES.HYDROXIDE, 2) + }); + + + + //LFTR Output - - public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material( "Neptunium Hexafluoride", //Material Name MaterialState.GAS, //State -- cgit From c029e71c93755908d3225ed067b714be55c1d2c7 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 24 Aug 2017 10:11:36 +1000 Subject: + Added Ammonium Tetrafluoroberyllate. + Added recipes for all the new compounds. $ Fixed fluids not always generating for complex materials. --- src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/Java/gtPlusPlus/core/material/nuclear') diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java index 04d41d8e30..3c0783daee 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java +++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java @@ -212,6 +212,20 @@ public class FLUORIDES { new MaterialStack(FLUORIDES.HYDROXIDE, 2) }); + public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material( + "Ammonium Tetrafluoroberyllate", //Material Name + MaterialState.PURE_LIQUID, //State + new short[]{140, 220, 140, 0}, //Material Colour + 280, //Melting Point in C + -1, //Boiling Point in C + -1, //Protons + -1, + false, //Uses Blast furnace? + //Material Stacks with Percentage of required elements. + new MaterialStack[]{ + new MaterialStack(FLUORIDES.AMMONIUM, 2), + new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1) + }); -- cgit From fbf6f7b6c303ddd74e428a067008376fd5315e3f Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 24 Aug 2017 10:19:13 +1000 Subject: $ Changed BeF2 from PURE_LIQUID back to LIQUID. --- src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Java/gtPlusPlus/core/material/nuclear') diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java index 3c0783daee..87830ab493 100644 --- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java +++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java @@ -105,12 +105,12 @@ public class FLUORIDES { public static final Material BERYLLIUM_FLUORIDE = new Material( "Beryllium Fluoride", //Material Name - MaterialState.PURE_LIQUID, //State - new short[]{120, 180, 120, 0}, //Material Colour - Materials.Beryllium.mMeltingPoint, //Melting Point in C - Materials.Beryllium.mBlastFurnaceTemp, //Boiling Point in C - ((ELEMENT.getInstance().BERYLLIUM.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*2))/3), //Protons - ((ELEMENT.getInstance().BERYLLIUM.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*2))/3), //Neutrons + MaterialState.LIQUID, //State + new short[]{120, 210, 120, 0}, //Material Colour + -1, + -1, + -1, + -1, false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new MaterialStack[]{ -- cgit