aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/material
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java152
-rw-r--r--src/Java/gtPlusPlus/core/material/ELEMENT.java26
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java322
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialGenerator.java60
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialStack.java35
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java100
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java16
-rw-r--r--src/Java/gtPlusPlus/core/material/state/MaterialState.java2
8 files changed, 354 insertions, 359 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)
});
-
-
+
+
}
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 0fee6f3fbd..108f4f1097 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -5,15 +5,15 @@ import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.util.materials.MaterialUtils;
public final class ELEMENT {
-
+
private static final ELEMENT thisClass = new ELEMENT();
-
+
public ELEMENT(){
-
- }
-
+
+ }
+
public static ELEMENT getInstance(){
- return thisClass;
+ return thisClass;
}
//First 50 Elements
@@ -71,7 +71,7 @@ public final class ELEMENT {
public final Material TELLURIUM = new Material("Tellurium", MaterialState.SOLID, 25600, new short[]{210, 210, 210}, 449, 989, 52, 76, false, "Te", 0);//Not a GT Inherited Material
public final Material IODINE = new Material("Iodine", MaterialState.SOLID, 25600, new short[]{96, 96, 96}, 114, 184, 53, 74, false, "I", 0);//Not a GT Inherited Material
public final Material XENON = new Material("Xenon", MaterialState.GAS, 12800, new short[]{255, 255, 255}, -111, -108, 54, 77, false, "Xe", 0);//Not a GT Inherited Material
- public final Material CESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);
+ public final Material CESIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Caesium);
public final Material BARIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Barium);
public final Material LANTHANUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Lanthanum);
public final Material CERIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Cerium);
@@ -95,12 +95,12 @@ public final class ELEMENT {
public final Material TUNGSTEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Tungsten);
public final Material RHENIUM = new Material("Rhenium", MaterialState.SOLID, 25600, new short[]{150, 150, 150}, 3180, 3627, 75, 111, false, "Re", 0);//Not a GT Inherited Material
public final Material OSMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmium);
- public final Material IRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Iridium);
- public final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum);
- public final Material GOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.Gold);
+ public final Material IRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Iridium);
+ public final Material PLATINUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Platinum);
+ public final Material GOLD = MaterialUtils.generateMaterialFromGtENUM(Materials.Gold);
public final Material MERCURY = MaterialUtils.generateMaterialFromGtENUM(Materials.Mercury); //Mercury
public final Material THALLIUM = new Material("Thallium", MaterialState.SOLID, 25600, new short[]{175, 175, 175}, 304, 1457, 81, 123, false, "Tl", 0);//Not a GT Inherited Material
- public final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);
+ public final Material LEAD = MaterialUtils.generateMaterialFromGtENUM(Materials.Lead);
public final Material BISMUTH = MaterialUtils.generateMaterialFromGtENUM(Materials.Bismuth);
public final Material POLONIUM = new Material("Polonium", MaterialState.SOLID, 25600, new short[]{180, 170, 180}, 254, 962, 84, 125, false, "Po", 1);//Not a GT Inherited Material
public final Material ASTATINE = new Material("Astatine", MaterialState.SOLID, 25600, new short[]{170, 180, 170}, 302, 337, 85, 125, false, "At", 1);//Not a GT Inherited Material
@@ -108,7 +108,7 @@ public final class ELEMENT {
public final Material FRANCIUM = new Material("Francium", MaterialState.SOLID, 25600, new short[]{170, 160, 170}, 27, 677, 87, 136, false, "Fr", 1);//Not a GT Inherited Material
public final Material RADIUM = new Material("Radium", MaterialState.SOLID, 25600, new short[]{165, 165, 165}, 700, 1737, 88, 138, false, "Ra", 1);//Not a GT Inherited Material
public final Material ACTINIUM = new Material("Actinium", MaterialState.SOLID, 25600, new short[]{150, 165, 165}, 1050, 3200, 89, 138, false, "Ac", 1);//Not a GT Inherited Material
- public final Material THORIUM = new Material("Thorium", MaterialState.SOLID, 51200, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("Th"), 1);
+ public final Material THORIUM = new Material("Thorium", MaterialState.SOLID, 51200, Materials.Thorium.mRGBa, Materials.Thorium.mMeltingPoint, Materials.Thorium.mBlastFurnaceTemp, 90, 142, false, MaterialUtils.superscript("Th"), 1);
public final Material PROTACTINIUM = new Material("Protactinium", MaterialState.SOLID, 25600, new short[]{190, 150, 170}, 1568, 4027, 91, 140, false, "Pa", 1);//Not a GT Inherited Material
public final Material URANIUM238 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium);
public final Material URANIUM235 = MaterialUtils.generateMaterialFromGtENUM(Materials.Uranium235);
@@ -121,7 +121,7 @@ public final class ELEMENT {
public final Material CALIFORNIUM = new Material("Californium", MaterialState.SOLID, 25600, new short[]{85, 110, 205}, 899, 1472, 98, 153, false, "Cf", 4);//Not a GT Inherited Material
public final Material EINSTEINIUM = new Material("Einsteinium", MaterialState.SOLID, 25600, new short[]{255, 85, 110}, 860, 3500, 99, 153, false, "Es", 5);//Not a GT Inherited Material //Boiling Point is made up
public final Material FERMIUM = new Material("Fermium", MaterialState.LIQUID, 25600, new short[]{75, 90, 25}, 1527, 3850, 100, 157, false, "Fm", 5);//Not a GT Inherited Material //Boiling Point is made up
-
+
//Misc
public final Material AER = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedAir);
public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire);
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index fe7370e777..581c5f4972 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -1,6 +1,9 @@
package gtPlusPlus.core.material;
import static gregtech.api.enums.GT_Values.M;
+
+import java.util.ArrayList;
+
import gregtech.api.enums.*;
import gtPlusPlus.core.item.base.cell.BaseItemCell;
import gtPlusPlus.core.material.state.MaterialState;
@@ -9,9 +12,6 @@ import gtPlusPlus.core.util.fluid.FluidUtils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.materials.MaterialUtils;
import gtPlusPlus.core.util.math.MathUtils;
-
-import java.util.ArrayList;
-
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -22,7 +22,7 @@ public class Material {
private final String unlocalizedName;
private final String localizedName;
-
+
private final MaterialState materialState;
private final Fluid vMoltenFluid;
@@ -30,7 +30,7 @@ public class Material {
protected Object dataVar = MathUtils.generateSingularRandomHexValue();
- private ArrayList<MaterialStack> vMaterialInput = new ArrayList<MaterialStack>();
+ private ArrayList<MaterialStack> vMaterialInput = new ArrayList<>();
public final long[] vSmallestRatio;
public final short vComponentCount;
@@ -57,23 +57,23 @@ public class Material {
public final int vToolQuality;
public final int vHarvestLevel;
- public Material(final String materialName, MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){
+ public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){
this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", 0, inputs);
}
- public Material(final String materialName, MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, MaterialStack... inputs){
+ public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, final MaterialStack... inputs){
this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", radiationLevel, inputs);
}
- public Material(final String materialName, MaterialState defaultState,final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, MaterialStack... inputs){
+ public Material(final String materialName, final MaterialState defaultState,final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, final MaterialStack... inputs){
this(materialName, defaultState, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", radiationLevel, inputs);
}
- public Material(final String materialName, MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
+ public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, inputs);
}
- public Material(final String materialName, MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
+ public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){
this.unlocalizedName = Utils.sanitizeString(materialName);
this.localizedName = materialName;
@@ -86,30 +86,30 @@ public class Material {
else {
this.boilingPointC = meltingPoint*4;
}
- this.meltingPointK = (int) MathUtils.celsiusToKelvin(meltingPointC);
- this.boilingPointK = (int) MathUtils.celsiusToKelvin(boilingPointC);
+ this.meltingPointK = (int) MathUtils.celsiusToKelvin(this.meltingPointC);
+ this.boilingPointK = (int) MathUtils.celsiusToKelvin(this.boilingPointC);
this.vProtons = protons;
this.vNeutrons = neutrons;
- this.vMass = getMass();
+ this.vMass = this.getMass();
//Sets tool Durability
- if (durability != 0){
+ if (durability != 0){
this.vDurability = durability;
}
else {
if (inputs != null){
long durabilityTemp = 0;
int counterTemp = 0;
- for (MaterialStack m : inputs){
+ for (final MaterialStack m : inputs){
if (m.getStackMaterial() != null){
if (m.getStackMaterial().vDurability != 0){
durabilityTemp = (durabilityTemp+m.getStackMaterial().vDurability);
counterTemp++;
}
- }
+ }
}
- if (durabilityTemp != 0 && counterTemp != 0){
+ if ((durabilityTemp != 0) && (counterTemp != 0)){
this.vDurability = (durabilityTemp/counterTemp);
}
else {
@@ -121,23 +121,23 @@ public class Material {
}
}
- if (this.vDurability >= 0 && this.vDurability < 64000){
+ if ((this.vDurability >= 0) && (this.vDurability < 64000)){
this.vToolQuality = 1;
this.vHarvestLevel = 2;
}
- else if (this.vDurability >= 64000 && this.vDurability < 128000){
+ else if ((this.vDurability >= 64000) && (this.vDurability < 128000)){
this.vToolQuality = 2;
this.vHarvestLevel = 2;
}
- else if (this.vDurability >= 128000 && this.vDurability < 256000){
+ else if ((this.vDurability >= 128000) && (this.vDurability < 256000)){
this.vToolQuality = 3;
this.vHarvestLevel = 2;
}
- else if (this.vDurability >= 256000 && this.vDurability < 512000){
+ else if ((this.vDurability >= 256000) && (this.vDurability < 512000)){
this.vToolQuality = 3;
this.vHarvestLevel = 3;
}
- else if (this.vDurability >= 512000 && this.vDurability <= Integer.MAX_VALUE){
+ else if ((this.vDurability >= 512000) && (this.vDurability <= Integer.MAX_VALUE)){
this.vToolQuality = 4;
this.vHarvestLevel = 4;
}
@@ -163,7 +163,7 @@ public class Material {
this.vVoltageMultiplier = this.getMeltingPointK() >= 2800 ? 64 : 16;
if (inputs == null){
- this.vMaterialInput = null;
+ this.vMaterialInput = null;
}
else {
if (inputs.length != 0){
@@ -175,25 +175,25 @@ public class Material {
}
}
- this.vComponentCount = getComponentCount(inputs);
- this.vSmallestRatio = getSmallestRatio(vMaterialInput);
+ this.vComponentCount = this.getComponentCount(inputs);
+ this.vSmallestRatio = this.getSmallestRatio(this.vMaterialInput);
int tempSmallestSize = 0;
- if (vSmallestRatio != null){
+ if (this.vSmallestRatio != null){
for (int v=0;v<this.vSmallestRatio.length;v++){
- tempSmallestSize=(int) (tempSmallestSize+vSmallestRatio[v]);
+ tempSmallestSize=(int) (tempSmallestSize+this.vSmallestRatio[v]);
}
this.smallestStackSizeWhenProcessing = tempSmallestSize; //Valid stacksizes
}
else {
- this.smallestStackSizeWhenProcessing = 1; //Valid stacksizes
+ this.smallestStackSizeWhenProcessing = 1; //Valid stacksizes
}
//Makes a Fancy Chemical Tooltip
this.vChemicalSymbol = chemicalSymbol;
- if (vMaterialInput != null){
- this.vChemicalFormula = getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true);
+ if (this.vMaterialInput != null){
+ this.vChemicalFormula = this.getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true);
}
else if (!this.vChemicalSymbol.equals("")){
Utils.LOG_WARNING("materialInput is null, using a valid chemical symbol.");
@@ -204,11 +204,11 @@ public class Material {
this.vChemicalFormula = "??";
}
- Materials isValid = Materials.get(getLocalizedName());
+ final Materials isValid = Materials.get(this.getLocalizedName());
if (isValid == Materials._NULL){
- this.vMoltenFluid = generateFluid();
+ this.vMoltenFluid = this.generateFluid();
}
- else {
+ else {
if (isValid.mFluid != null){
this.vMoltenFluid = isValid.mFluid;
}
@@ -216,230 +216,234 @@ public class Material {
this.vMoltenFluid = isValid.mGas;
}
else {
- this.vMoltenFluid = generateFluid();
+ this.vMoltenFluid = this.generateFluid();
}
}
- this.vPlasma = generatePlasma();
+ this.vPlasma = this.generatePlasma();
//dataVar = MathUtils.generateSingularRandomHexValue();
String ratio = "";
- if (vSmallestRatio != null) {
- for (int hu=0;hu<vSmallestRatio.length;hu++){
+ if (this.vSmallestRatio != null) {
+ for (int hu=0;hu<this.vSmallestRatio.length;hu++){
if (ratio.equals("")){
- ratio = String.valueOf(vSmallestRatio[hu]);
+ ratio = String.valueOf(this.vSmallestRatio[hu]);
}
else {
- ratio = ratio + ":" +vSmallestRatio[hu];
- }
+ ratio = ratio + ":" +this.vSmallestRatio[hu];
+ }
}
}
Utils.LOG_INFO("Creating a Material instance for "+materialName);
- Utils.LOG_INFO("Formula: "+vChemicalFormula + " Smallest Stack: "+smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
- Utils.LOG_INFO("Protons: "+vProtons);
- Utils.LOG_INFO("Neutrons: "+vNeutrons);
- Utils.LOG_INFO("Mass: "+vMass+"/units");
- Utils.LOG_INFO("Melting Point: "+meltingPointC+"C.");
- Utils.LOG_INFO("Boiling Point: "+boilingPointC+"C.");
+ Utils.LOG_INFO("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
+ Utils.LOG_INFO("Protons: "+this.vProtons);
+ Utils.LOG_INFO("Neutrons: "+this.vNeutrons);
+ Utils.LOG_INFO("Mass: "+this.vMass+"/units");
+ Utils.LOG_INFO("Melting Point: "+this.meltingPointC+"C.");
+ Utils.LOG_INFO("Boiling Point: "+this.boilingPointC+"C.");
}
public final String getLocalizedName(){
- if (this.localizedName != null)
+ if (this.localizedName != null) {
return this.localizedName;
+ }
return "ERROR BAD LOCALIZED NAME";
}
public final String getUnlocalizedName(){
- if (this.unlocalizedName != null)
+ if (this.unlocalizedName != null) {
return this.unlocalizedName;
+ }
return "ERROR.BAD.UNLOCALIZED.NAME";
}
-
+
final public MaterialState getState(){
return this.materialState;
}
final public short[] getRGBA(){
- if (this.RGBA != null)
+ if (this.RGBA != null) {
return this.RGBA;
+ }
return new short[] {255,0,0};
}
final public int getRgbAsHex(){
- int returnValue = Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]);
+ final int returnValue = Utils.rgbtoHexValue(this.RGBA[0], this.RGBA[1], this.RGBA[2]);
if (returnValue == 0){
- return (int) dataVar;
- }
- return Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]);
+ return (int) this.dataVar;
+ }
+ return Utils.rgbtoHexValue(this.RGBA[0], this.RGBA[1], this.RGBA[2]);
}
final public long getProtons() {
- return vProtons;
+ return this.vProtons;
}
public final long getNeutrons() {
- return vNeutrons;
+ return this.vNeutrons;
}
final public long getMass() {
- return vProtons + vNeutrons;
+ return this.vProtons + this.vNeutrons;
}
public final int getMeltingPointC() {
- return meltingPointC;
+ return this.meltingPointC;
}
public final int getBoilingPointC() {
- return boilingPointC;
+ return this.boilingPointC;
}
public final int getMeltingPointK() {
- return meltingPointK;
+ return this.meltingPoin