aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/material/ALLOY.java
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/ALLOY.java
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/ALLOY.java')
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java152
1 files changed, 63 insertions, 89 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 30dd7dc87e..550a23b4c5 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -1,12 +1,18 @@
package gtPlusPlus.core.material;
+import gregtech.api.enums.Materials;
import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.util.materials.MaterialUtils;
public final class ALLOY {
+
+ //Just some GT Alloys that I need within mine.
+ public static final Material BRONZE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bronze);
+ public static final Material STEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.Steel);
public static final Material ENERGYCRYSTAL = new Material(
"Energy Crystal", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{228, 255, 0, 0}, //Material Colour
5660, //Melting Point in C
0, //Boiling Point in C
@@ -23,7 +29,7 @@ public final class ALLOY {
public static final Material BLOODSTEEL = new Material(
"Blood Steel", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{142, 28, 0, 0}, //Material Colour
2500, //Melting Point in C
0, //Boiling Point in C
@@ -38,7 +44,7 @@ public final class ALLOY {
public static final Material STABALLOY = new Material(
"Staballoy", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{68, 75, 66, 0}, //Material Colour
3450, //Melting Point in C
((ELEMENT.getInstance().URANIUM238.getBoilingPointC()*9)+(ELEMENT.getInstance().TITANIUM.getBoilingPointC()*1))/10, //Boiling Point in C
@@ -53,7 +59,7 @@ public final class ALLOY {
public static final Material TANTALLOY_60 = new Material(
"Tantalloy-60", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{213, 231, 237, 0}, //Material Colour
3025, //Melting Point in C
((ELEMENT.getInstance().TUNGSTEN.getBoilingPointC()*1)+(ELEMENT.getInstance().TANTALUM.getBoilingPointC()*8)+(ELEMENT.getInstance().TITANIUM.getBoilingPointC()*1))/10, //Boiling Point in C
@@ -68,7 +74,7 @@ public final class ALLOY {
public static final Material TANTALLOY_61 = new Material(
"Tantalloy-61", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{193, 211, 217, 0}, //Material Colour
3030, //Melting Point in C
((ELEMENT.getInstance().TUNGSTEN.getBoilingPointC()*1)+(ELEMENT.getInstance().TANTALUM.getBoilingPointC()*7)+(ELEMENT.getInstance().TITANIUM.getBoilingPointC()*1)+(ELEMENT.getInstance().YTTRIUM.getBoilingPointC()*1))/10, //Boiling Point in C
@@ -82,25 +88,9 @@ public final class ALLOY {
new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8)
});
- public static final Material BRONZE = new Material(
- "Bronze", //Material Name
- MaterialState.SOLID, //State
- new short[]{128, 128, 128, 0}, //Material Colour
- ((ELEMENT.getInstance().TIN.getMeltingPointC()*1)+(ELEMENT.getInstance().COPPER.getMeltingPointC()*3))/4, //Melting point in C
- ((ELEMENT.getInstance().TIN.getBoilingPointC()*1)+(ELEMENT.getInstance().COPPER.getBoilingPointC()*3))/4, //Boiling Point in C
- ((ELEMENT.getInstance().TIN.getProtons()*1)+(ELEMENT.getInstance().COPPER.getProtons()*3))/4, //Protons
- ((ELEMENT.getInstance().TIN.getNeutrons()*1)+(ELEMENT.getInstance().COPPER.getNeutrons()*3))/4, //Neutrons
- false, //Uses Blast furnace?
- //Material Stacks with Percentage of required elements.
- new MaterialStack[]{
- new MaterialStack(ELEMENT.getInstance().COPPER, 35),
- new MaterialStack(ELEMENT.getInstance().COPPER, 40),
- new MaterialStack(ELEMENT.getInstance().TIN, 25)
- });
-
public static final Material TUMBAGA = new Material(
"Tumbaga", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{255,178,15, 0}, //Material Colour
((ELEMENT.getInstance().GOLD.getMeltingPointC()*7)+(ELEMENT.getInstance().COPPER.getMeltingPointC()*3))/10, //Melting point in C
((ELEMENT.getInstance().GOLD.getBoilingPointC()*7)+(ELEMENT.getInstance().COPPER.getBoilingPointC()*3))/10, //Boiling Point in C
@@ -116,7 +106,7 @@ public final class ALLOY {
public static final Material POTIN = new Material(
"Potin", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{201,151,129, 0}, //Material Colour
((ELEMENT.getInstance().LEAD.getMeltingPointC()*4)+(ALLOY.BRONZE.getMeltingPointC()*4)+(ELEMENT.getInstance().TIN.getMeltingPointC()*2))/10, //Melting point in C
((ELEMENT.getInstance().LEAD.getBoilingPointC()*4)+(ALLOY.BRONZE.getBoilingPointC()*4)+(ELEMENT.getInstance().TIN.getBoilingPointC()*2))/10, //Boiling Point in C
@@ -143,7 +133,7 @@ public final class ALLOY {
public static final Material INCONEL_625 = new Material(
"Inconel-625", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{128, 200, 128, 0}, //Material Colour
1425, //Melting Point in C
((ELEMENT.getInstance().NICKEL.getBoilingPointC()*6)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*2)+(ELEMENT.getInstance().IRON.getBoilingPointC()*1)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*1))/10, //Boiling Point in C
@@ -160,7 +150,7 @@ public final class ALLOY {
public static final Material INCONEL_690 = new Material(
"Inconel-690", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{118, 220, 138, 0}, //Material Colour
1425, //Melting Point in C
((ELEMENT.getInstance().NICKEL.getBoilingPointC()*6)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*2)+(ELEMENT.getInstance().NIOBIUM.getBoilingPointC()*1)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*1))/10, //Boiling Point in C
@@ -177,7 +167,7 @@ public final class ALLOY {
public static final Material INCONEL_792 = new Material(
"Inconel-792", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{108, 240, 118, 0}, //Material Colour
1425, //Melting Point in C
((ELEMENT.getInstance().NICKEL.getBoilingPointC()*6)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*1)+(ELEMENT.getInstance().IRON.getBoilingPointC()*1)+(ELEMENT.getInstance().ALUMINIUM.getBoilingPointC()*2))/10, //Boiling Point in C
@@ -191,27 +181,11 @@ public final class ALLOY {
new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20)
});
-
- public static final Material STEEL = new Material(
- "Steel", //Material Name
- MaterialState.SOLID, //State
- new short[]{180, 180, 20, 0}, //Material Colour
- ((ELEMENT.getInstance().CARBON.getMeltingPointC()*5)+(ELEMENT.getInstance().IRON.getMeltingPointC()*95))/100, //Melting point in C
- ((ELEMENT.getInstance().CARBON.getBoilingPointC()*5)+(ELEMENT.getInstance().IRON.getBoilingPointC()*95))/100, //Boiling Point in C
- ((ELEMENT.getInstance().CARBON.getProtons()*5)+(ELEMENT.getInstance().IRON.getProtons()*95))/100, //Protons
- ((ELEMENT.getInstance().CARBON.getNeutrons()*5)+(ELEMENT.getInstance().IRON.getNeutrons()*95))/100, //Neutrons
- true, //Uses Blast furnace?
- //Material Stacks with Percentage of required elements.
- new MaterialStack[]{
- new MaterialStack(ELEMENT.getInstance().CARBON, 10),
- new MaterialStack(ELEMENT.getInstance().IRON, 30),
- new MaterialStack(ELEMENT.getInstance().IRON, 30),
- new MaterialStack(ELEMENT.getInstance().IRON, 30)
- });
+
public static final Material ZERON_100 = new Material(
"Zeron-100", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{180, 180, 20, 0}, //Material Colour
((ELEMENT.getInstance().CHROMIUM.getMeltingPointC()*25)+(ELEMENT.getInstance().NICKEL.getMeltingPointC()*6)+(ELEMENT.getInstance().COBALT.getMeltingPointC()*9)+(ALLOY.STEEL.getMeltingPointC()*60))/100, //Melting Point in C
((ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*25)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*6)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*60))/100, //Boiling Point in C
@@ -226,11 +200,11 @@ public final class ALLOY {
new MaterialStack(ELEMENT.getInstance().COPPER, 20),
new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
new MaterialStack(ALLOY.STEEL, 40)
- });
+ });
public static final Material MARAGING250 = new Material(
"Maraging Steel 250", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{140, 140, 140, 0}, //Material Colour
1413, //Melting Point in C
((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*16)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*70))/100, //Boiling Point in C
@@ -248,7 +222,7 @@ public final class ALLOY {
public static final Material MARAGING300 = new Material(
"Maraging Steel 300", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{150, 150, 150, 0}, //Material Colour
1413, //Melting Point in C
((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*10)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*21)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*14)+(ALLOY.STEEL.getBoilingPointC()*55))/100, //Boiling Point in C
@@ -257,16 +231,16 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ALLOY.STEEL, 64),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
- new MaterialStack(ELEMENT.getInstance().COBALT, 8),
+ new MaterialStack(ALLOY.STEEL, 64),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 8),
});
public static final Material MARAGING350 = new Material(
"Maraging Steel 350", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{160, 160, 160, 0}, //Material Colour
1413, //Melting Point in C
((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*15)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*21)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*9)+(ALLOY.STEEL.getBoilingPointC()*55))/100, //Boiling Point in C
@@ -275,16 +249,16 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ALLOY.STEEL, 64),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
- new MaterialStack(ELEMENT.getInstance().COBALT, 8),
+ new MaterialStack(ALLOY.STEEL, 64),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 8),
});
public static final Material STELLITE = new Material(
"Stellite", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{129, 75, 120, 0}, //Material Colour
1310, //Melting Point in C
((ELEMENT.getInstance().TITANIUM.getBoilingPointC()*10)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*35)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*35)+(ELEMENT.getInstance().MANGANESE.getBoilingPointC()*20))/100, //Boiling Point in C
@@ -301,7 +275,7 @@ public final class ALLOY {
public static final Material TALONITE = new Material(
"Talonite", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{228, 75, 120, 0}, //Material Colour
1454, //Melting Point in C
((ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*10)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*30)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*40)+(ELEMENT.getInstance().PHOSPHORUS.getBoilingPointC()*20))/100, //Boiling Point in C
@@ -318,7 +292,7 @@ public final class ALLOY {
public static final Material HASTELLOY_W = new Material(
"Hastelloy-W", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{218, 165, 32, 0}, //Material Colour
1350, //Melting Point in C
((ELEMENT.getInstance().IRON.getBoilingPointC()*6)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*24)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*65))/100, //Boiling Point in C
@@ -348,10 +322,10 @@ public final class ALLOY {
new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
new MaterialStack(ELEMENT.getInstance().NICKEL, 51)
});*/
-
+
public static final Material HASTELLOY_X = new Material(
"Hastelloy-X", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{255, 193, 37, 0}, //Material Colour
1350, //Melting Point in C
((ELEMENT.getInstance().IRON.getBoilingPointC()*18)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*9)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*22)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*51))/100, //Boiling Point in C
@@ -368,7 +342,7 @@ public final class ALLOY {
public static final Material HASTELLOY_N = new Material(
"Hastelloy-N", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{236, 213, 48, 0}, //Material Colour
1350, //Melting Point in C
((ELEMENT.getInstance().YTTRIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*16)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*7)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*72))/100, //Boiling Point in C
@@ -385,7 +359,7 @@ public final class ALLOY {
public static final Material HASTELLOY_C276 = new Material(
"Hastelloy-C276", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{238, 180, 34, 0}, //Material Colour
1350, //Melting Point in C
((ELEMENT.getInstance().COBALT.getBoilingPointC()*2)+(ELEMENT.getInstance().MOLYBDENUM.getBoilingPointC()*16)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*16)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*66))/100, //Boiling Point in C
@@ -402,7 +376,7 @@ public final class ALLOY {
public static final Material INCOLOY_020 = new Material(
"Incoloy-020", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{101, 81, 71, 0}, //Material Colour
1425, //Melting Point in C
((ELEMENT.getInstance().IRON.getBoilingPointC()*40)+(ELEMENT.getInstance().COPPER.getBoilingPointC()*4)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*20)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*36))/100, //Boiling Point in C
@@ -419,7 +393,7 @@ public final class ALLOY {
public static final Material INCOLOY_DS = new Material(
"Incoloy-DS", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{71, 101, 81, 0}, //Material Colour
1425, //Melting Point in C
((ELEMENT.getInstance().IRON.getBoilingPointC()*46)+(ELEMENT.getInstance().COBALT.getBoilingPointC()*18)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*18)+(ELEMENT.getInstance().NICKEL.getBoilingPointC()*18))/100, //Boiling Point in C
@@ -436,7 +410,7 @@ public final class ALLOY {
public static final Material INCOLOY_MA956 = new Material(
"Incoloy-MA956", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{81, 71, 101, 0}, //Material Colour
1425, //Melting Point in C
((ELEMENT.getInstance().IRON.getBoilingPointC()*75)+(ELEMENT.getInstance().ALUMINIUM.getBoilingPointC()*4)+(ELEMENT.getInstance().CHROMIUM.getBoilingPointC()*20)+(ELEMENT.getInstance().YTTRIUM.getBoilingPointC()*1))/100, //Boiling Point in C
@@ -453,7 +427,7 @@ public final class ALLOY {
public static final Material TUNGSTEN_CARBIDE = new Material(
"Tungsten Carbide", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{44, 44, 44, 0}, //Material Colour
3422, //Melting Point in C
((ELEMENT.getInstance().TUNGSTEN.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -468,7 +442,7 @@ public final class ALLOY {
public static final Material SILICON_CARBIDE = new Material(
"Silicon Carbide", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{40, 48, 36, 0}, //Material Colour
1414, //Melting Point in C
((ELEMENT.getInstance().SILICON.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -484,7 +458,7 @@ public final class ALLOY {
public static final Material TANTALUM_CARBIDE = new Material(
"Tantalum Carbide", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{139, 136, 120, 0}, //Material Colour
2980, //Melting Point in C
((ELEMENT.getInstance().TANTALUM.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -500,7 +474,7 @@ public final class ALLOY {
public static final Material ZIRCONIUM_CARBIDE = new Material(
"Zirconium Carbide", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{222, 202, 180, 0}, //Material Colour
1855, //Melting Point in C
((ELEMENT.getInstance().ZIRCONIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -516,7 +490,7 @@ public final class ALLOY {
public static final Material NIOBIUM_CARBIDE = new Material(
"Niobium Carbide", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{205, 197, 191, 0}, //Material Colour
2477, //Melting Point in C
((ELEMENT.getInstance().NIOBIUM.getBoilingPointC()*5)+(ELEMENT.getInstance().CARBON.getBoilingPointC()*5))/10, //Boiling Point in C
@@ -529,10 +503,10 @@ public final class ALLOY {
new MaterialStack(ELEMENT.getInstance().CARBON, 50),
new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
});
-
+
public static final Material LEAGRISIUM = new Material(
"Grisium", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{53, 93, 106, 0}, //Material Colour
9001, //Melting Point in C
25000, //Boiling Point in C
@@ -548,21 +522,21 @@ public final class ALLOY {
new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
}); //Material Stacks with Percentage of required elements.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
//Quantum
public static final Material QUANTUM = new Material(
"Quantum", //Material Name
- MaterialState.SOLID, //State
+ MaterialState.SOLID, //State
new short[]{128, 128, 255, 50}, //Material Colour
9999, //Melting Point in C
25000, //Boiling Point in C
@@ -580,7 +554,7 @@ public final class ALLOY {
new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 5),
new MaterialStack(ELEMENT.getInstance().BISMUTH, 5)
});
-
-
+
+
}