aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/material/nuclear
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-03-04 12:58:47 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-03-04 12:58:47 +1000
commitae21012d216df71f31aed6fbc9d76215fc24ceed (patch)
treecc89accbe6ce5c04b72ed3c5e46b2a185f88be6a /src/Java/gtPlusPlus/core/material/nuclear
parentba89972a22a316030f8c3bd99974f915b1d7aefc (diff)
downloadGT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.gz
GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.bz2
GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.zip
+ New texture for the slow builders ring.
+ Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material/nuclear')
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java100
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java16
2 files changed, 58 insertions, 58 deletions
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index a95703349e..0971431828 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -9,10 +9,10 @@ public class FLUORIDES {
private static final FLUORIDES thisClass = new FLUORIDES();
public FLUORIDES(){}
public static FLUORIDES getInstance(){return thisClass;}
-
+
public static final Material FLUORITE = new Material(
"Fluorite", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{75, 70, 25, 0}, //Material Colour
Materials.Fluorine.mMeltingPoint, //Melting Point in C
Materials.Fluorine.mBlastFurnaceTemp, //Boiling Point in C
@@ -26,39 +26,39 @@ public class FLUORIDES {
});
public static final Material THORIUM_TETRAFLUORIDE = new Material(
- "Thorium Tetrafluoride", //Material Name
- MaterialState.LIQUID, //State
- new short[]{25, 70, 25, 0}, //Material Colour
- Materials.Thorium.mMeltingPoint, //Melting Point in C
- Materials.Thorium.mBlastFurnaceTemp, //Boiling Point in C
- ((NUCLIDE.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
- ((NUCLIDE.getInstance().THORIUM232.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*4))/5), //Neutrons
- false, //Uses Blast furnace?
- //Material Stacks with Percentage of required elements.
- new MaterialStack[]{
- new MaterialStack(NUCLIDE.getInstance().THORIUM232, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
- });
+ "Thorium Tetrafluoride", //Material Name
+ MaterialState.LIQUID, //State
+ new short[]{25, 70, 25, 0}, //Material Colour
+ Materials.Thorium.mMeltingPoint, //Melting Point in C
+ Materials.Thorium.mBlastFurnaceTemp, //Boiling Point in C
+ ((NUCLIDE.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*4))/5), //Protons
+ ((NUCLIDE.getInstance().THORIUM232.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*4))/5), //Neutrons
+ false, //Uses Blast furnace?
+ //Material Stacks with Percentage of required elements.
+ new MaterialStack[]{
+ new MaterialStack(NUCLIDE.getInstance().THORIUM232, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
+ });
public static final Material THORIUM_HEXAFLUORIDE = new Material(
- "Thorium Hexafluoride", //Material Name
- MaterialState.LIQUID, //State
- new short[]{10, 50, 10, 0}, //Material Colour
- Materials.Thorium.mMeltingPoint, //Melting Point in C
- Materials.Thorium.mBlastFurnaceTemp, //Boiling Point in C
- ((NUCLIDE.getInstance().THORIUM232.getProtons()+NUCLIDE.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*6))/8), //Protons
- ((NUCLIDE.getInstance().THORIUM232.getNeutrons()+NUCLIDE.getInstance().THORIUM232.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*6))/8), //Neutrons
- false, //Uses Blast furnace?
- //Material Stacks with Percentage of required elements.
- new MaterialStack[]{
- new MaterialStack(NUCLIDE.getInstance().THORIUM232, 1),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 12)
- });
-
+ "Thorium Hexafluoride", //Material Name
+ MaterialState.LIQUID, //State
+ new short[]{10, 50, 10, 0}, //Material Colour
+ Materials.Thorium.mMeltingPoint, //Melting Point in C
+ Materials.Thorium.mBlastFurnaceTemp, //Boiling Point in C
+ ((NUCLIDE.getInstance().THORIUM232.getProtons()+NUCLIDE.getInstance().THORIUM232.getProtons()+(ELEMENT.getInstance().FLUORINE.getProtons()*6))/8), //Protons
+ ((NUCLIDE.getInstance().THORIUM232.getNeutrons()+NUCLIDE.getInstance().THORIUM232.getNeutrons()+(ELEMENT.getInstance().FLUORINE.getNeutrons()*6))/8), //Neutrons
+ false, //Uses Blast furnace?
+ //Material Stacks with Percentage of required elements.
+ new MaterialStack[]{
+ new MaterialStack(NUCLIDE.getInstance().THORIUM232, 1),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 12)
+ });
+
public static final Material URANIUM_TETRAFLUORIDE = new Material(
"Uranium Tetrafluoride", //Material Name
- MaterialState.LIQUID, //State
+ MaterialState.LIQUID, //State
new short[]{50, 240, 50, 0}, //Material Colour
Materials.Uranium235.mMeltingPoint, //Melting Point in C
Materials.Uranium235.mBlastFurnaceTemp, //Boiling Point in C
@@ -70,10 +70,10 @@ public class FLUORIDES {
new MaterialStack(NUCLIDE.getInstance().URANIUM233, 1),
new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
});
-
+
public static final Material URANIUM_HEXAFLUORIDE = new Material(
"Uranium Hexafluoride", //Material Name
- MaterialState.LIQUID, //State
+ MaterialState.LIQUID, //State
new short[]{70, 250, 70, 0}, //Material Colour
Materials.Uranium235.mMeltingPoint, //Melting Point in C
Materials.Uranium235.mBlastFurnaceTemp, //Boiling Point in C
@@ -85,12 +85,12 @@ public class FLUORIDES {
new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
});
-
+
//
-
+
public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material(
"Zirconium Tetrafluoride", //Material Name
- MaterialState.LIQUID, //State
+ MaterialState.LIQUID, //State
ELEMENT.getInstance().ZIRCONIUM.getRGBA(), //Material Colour
ELEMENT.getInstance().ZIRCONIUM.getMeltingPointC(), //Melting Point in C
ELEMENT.getInstance().ZIRCONIUM.getBoilingPointC(), //Boiling Point in C
@@ -102,10 +102,10 @@ public class FLUORIDES {
new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
});
-
+
public static final Material BERYLLIUM_FLUORIDE = new Material(
"Beryllium Tetrafluoride", //Material Name
- MaterialState.LIQUID, //State
+ MaterialState.LIQUID, //State
new short[]{120, 180, 120, 0}, //Material Colour
Materials.Beryllium.mMeltingPoint, //Melting Point in C
Materials.Beryllium.mBlastFurnaceTemp, //Boiling Point in C
@@ -117,10 +117,10 @@ public class FLUORIDES {
new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
});
-
+
public static final Material LITHIUM_FLUORIDE = new Material(
"Lithium Tetrafluoride", //Material Name
- MaterialState.LIQUID, //State
+ MaterialState.LIQUID, //State
new short[]{225, 220, 255, 0}, //Material Colour
Materials.Lithium.mMeltingPoint, //Melting Point in C
Materials.Lithium.mBlastFurnaceTemp, //Boiling Point in C
@@ -132,14 +132,14 @@ public class FLUORIDES {
new MaterialStack(NUCLIDE.getInstance().LITHIUM7, 1),
new MaterialStack(ELEMENT.getInstance().FLUORINE, 1)
});
-
-
+
+
//LFTR Output
-
-
+
+
public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material(
"Neptunium Hexafluoride", //Material Name
- MaterialState.GAS, //State
+ MaterialState.GAS, //State
ELEMENT.getInstance().NEPTUNIUM.getRGBA(), //Material Colour
ELEMENT.getInstance().NEPTUNIUM.getMeltingPointC(), //Melting Point in C
ELEMENT.getInstance().NEPTUNIUM.getBoilingPointC(), //Boiling Point in C
@@ -151,10 +151,10 @@ public class FLUORIDES {
new MaterialStack(ELEMENT.getInstance().NEPTUNIUM, 1),
new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
});
-
+
public static final Material TECHNETIUM_HEXAFLUORIDE = new Material(
"Technetium Hexafluoride", //Material Name
- MaterialState.GAS, //State
+ MaterialState.GAS, //State
ELEMENT.getInstance().TECHNETIUM.getRGBA(), //Material Colour
ELEMENT.getInstance().TECHNETIUM.getMeltingPointC(), //Melting Point in C
ELEMENT.getInstance().TECHNETIUM.getBoilingPointC(), //Boiling Point in C
@@ -166,10 +166,10 @@ public class FLUORIDES {
new MaterialStack(ELEMENT.getInstance().TECHNETIUM, 1),
new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
});
-
+
public static final Material SELENIUM_HEXAFLUORIDE = new Material(
"Selenium Hexafluoride", //Material Name
- MaterialState.GAS, //State
+ MaterialState.GAS, //State
ELEMENT.getInstance().SELENIUM.getRGBA(), //Material Colour
ELEMENT.getInstance().SELENIUM.getMeltingPointC(), //Melting Point in C
ELEMENT.getInstance().SELENIUM.getBoilingPointC(), //Boiling Point in C
@@ -181,5 +181,5 @@ public class FLUORIDES {
new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
});
-
+
}
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index f598102630..404710e4bf 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -18,12 +18,12 @@ public final class NUCLIDE {
public final Material URANIUM233 = new Material("Uranium 233", MaterialState.SOLID, new short[]{73, 220, 83, 0}, 1132, 4131, 92, 141, false, MaterialUtils.superscript("233U"), 2);//Not a GT Inherited Material
public final Material THORIUM232 = new Material("Thorium 232", MaterialState.SOLID, new short[]{15, 60, 15, 0}, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("232Th"), 1);//Not a GT Inherited Material
public final Material PLUTONIUM238 = new Material("Plutonium-238", MaterialState.SOLID, Materials.Plutonium241.mDurability, Materials.Plutonium241.mRGBa, Materials.Plutonium241.mMeltingPoint, Materials.Plutonium241.mBlastFurnaceTemp, 94, 144, false, MaterialUtils.superscript("238Pu"), 2);//Not a GT Inherited Material
-
-
-
+
+
+
public static final Material LiFBeF2ThF4UF4 = new Material(
"LiFBeF2ThF4UF4", //Material Name
- MaterialState.LIQUID, //State
+ MaterialState.LIQUID, //State
new short[]{40, 90, 25, 0}, //Material Colour
566, //Melting Point in C
870, //Boiling Point in C
@@ -39,10 +39,10 @@ public final class NUCLIDE {
new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1),
new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1)
});
-
+
public static final Material LiFBeF2ZrF4UF4 = new Material(
"LiFBeF2ZrF4UF4", //Material Name
- MaterialState.LIQUID, //State
+ MaterialState.LIQUID, //State
new short[]{20, 70, 45, 0}, //Material Colour
650, //Melting Point in C
940, //Boiling Point in C
@@ -58,10 +58,10 @@ public final class NUCLIDE {
new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5),
new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2)
});
-
+
public static final Material LiFBeF2ZrF4U235 = new Material(
"LiFBeF2ZrF4U235", //Material Name
- MaterialState.LIQUID, //State
+ MaterialState.LIQUID, //State
new short[]{50, 70, 15, 0}, //Material Colour
590, //Melting Point in C
890, //Boiling Point in C