aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/material
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
commit55f64675b42ac8d3c557cc850f78664bee006f6f (patch)
tree2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/core/material
parent0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff)
downloadGT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2
GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/core/material')
-rw-r--r--src/main/java/gtPlusPlus/core/material/ALLOY.java635
-rw-r--r--src/main/java/gtPlusPlus/core/material/ELEMENT.java294
-rw-r--r--src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java88
-rw-r--r--src/main/java/gtPlusPlus/core/material/Material.java449
-rw-r--r--src/main/java/gtPlusPlus/core/material/MaterialGenerator.java93
-rw-r--r--src/main/java/gtPlusPlus/core/material/MaterialStack.java12
-rw-r--r--src/main/java/gtPlusPlus/core/material/NONMATERIAL.java8
-rw-r--r--src/main/java/gtPlusPlus/core/material/ORES.java630
-rw-r--r--src/main/java/gtPlusPlus/core/material/Particle.java21
-rw-r--r--src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java94
-rw-r--r--src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java116
-rw-r--r--src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java153
-rw-r--r--src/main/java/gtPlusPlus/core/material/state/MaterialState.java2
13 files changed, 1019 insertions, 1576 deletions
diff --git a/src/main/java/gtPlusPlus/core/material/ALLOY.java b/src/main/java/gtPlusPlus/core/material/ALLOY.java
index a3c373b860..d9df4b115e 100644
--- a/src/main/java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/main/java/gtPlusPlus/core/material/ALLOY.java
@@ -17,12 +17,12 @@ public final class ALLOY {
public static final Material STAINLESS_STEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.StainlessSteel);
public static final Material OSMIRIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Osmiridium);
public static final Material POLYETHYLENE = MaterialUtils.generateMaterialFromGtENUM(Materials.Plastic);
- public static final Material POLYTETRAFLUOROETHYLENE =
- MaterialUtils.generateMaterialFromGtENUM(Materials.Polytetrafluoroethylene);
+ public static final Material POLYTETRAFLUOROETHYLENE = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.Polytetrafluoroethylene);
public static final Material ENERGYCRYSTAL = new Material(
"Energy Crystal", // Material Name
MaterialState.SOLID, // State
- new short[] {228, 255, 0, 0}, // Material Colour
+ new short[] { 228, 255, 0, 0 }, // Material Colour
4660, // Melting Point in C
5735, // Boiling Point in C
90, // Protons
@@ -30,163 +30,138 @@ public final class ALLOY {
true, // Uses Blast furnace?
"⬟ ⯂ ⬢ ⬣ ⯃ ⯄",
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().AER, 5),
- new MaterialStack(ELEMENT.getInstance().IGNIS, 5),
- new MaterialStack(ELEMENT.getInstance().TERRA, 5),
- new MaterialStack(ELEMENT.getInstance().AQUA, 5)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().AER, 5),
+ new MaterialStack(ELEMENT.getInstance().IGNIS, 5),
+ new MaterialStack(ELEMENT.getInstance().TERRA, 5),
+ new MaterialStack(ELEMENT.getInstance().AQUA, 5) });
public static final Material BLOODSTEEL = new Material(
"Blood Steel", // Material Name
MaterialState.SOLID, // State
- new short[] {142, 28, 0, 0}, // Material Colour
+ new short[] { 142, 28, 0, 0 }, // Material Colour
2500, // Melting Point in C
0, // Boiling Point in C
100, // Protons
100, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {new MaterialStack(ALLOY.STEEL, 5), new MaterialStack(ELEMENT.getInstance().IGNIS, 5)});
+ new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 5),
+ new MaterialStack(ELEMENT.getInstance().IGNIS, 5) });
public static final Material STABALLOY = new Material(
"Staballoy", // Material Name
MaterialState.SOLID, // State
- new short[] {68, 75, 66, 0}, // Material Colour
+ new short[] { 68, 75, 66, 0 }, // Material Colour
3450, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().URANIUM238, 9),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().URANIUM238, 9),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 1) });
public static final Material TANTALLOY_60 = new Material(
"Tantalloy-60", // Material Name
MaterialState.SOLID, // State
- new short[] {213, 231, 237, 0}, // Material Colour
+ new short[] { 213, 231, 237, 0 }, // Material Colour
3025, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 46)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 46) });
public static final Material TANTALLOY_61 = new Material(
"Tantalloy-61", // Material Name
MaterialState.SOLID, // State
- new short[] {193, 211, 217, 0}, // Material Colour
+ new short[] { 193, 211, 217, 0 }, // Material Colour
3030, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.TANTALLOY_60, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.TANTALLOY_60, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8) });
public static final Material TUMBAGA = new Material(
"Tumbaga", // Material Name
MaterialState.SOLID, // State
- new short[] {255, 178, 15, 0}, // Material Colour
+ new short[] { 255, 178, 15, 0 }, // Material Colour
-1,
-1,
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().GOLD, 70), new MaterialStack(ELEMENT.getInstance().COPPER, 30)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 70),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 30) });
public static final Material POTIN = new Material(
"Potin", // Material Name
MaterialState.SOLID, // State
- new short[] {201, 151, 129, 0}, // Material Colour
+ new short[] { 201, 151, 129, 0 }, // Material Colour
-1,
-1,
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LEAD, 40),
- new MaterialStack(ALLOY.BRONZE, 40),
- new MaterialStack(ELEMENT.getInstance().TIN, 20)
- });
-
- /*public static final Material BEDROCKIUM = new Material(
- "Bedrockium", //Material Name
- new short[]{32, 32, 32, 0}, //Material Colour
- 7735, //Melting Point in C
- 0, //Boiling Point in C
- 100, //Protons
- 100, //Neutrons
- false, //Uses Blast furnace?
- //Material Stacks with Percentage of required elements.
- null);*/
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LEAD, 40),
+ new MaterialStack(ALLOY.BRONZE, 40), new MaterialStack(ELEMENT.getInstance().TIN, 20) });
+
+ /*
+ * public static final Material BEDROCKIUM = new Material( "Bedrockium", //Material Name new short[]{32, 32, 32, 0},
+ * //Material Colour 7735, //Melting Point in C 0, //Boiling Point in C 100, //Protons 100, //Neutrons false, //Uses
+ * Blast furnace? //Material Stacks with Percentage of required elements. null);
+ */
public static final Material INCONEL_625 = new Material(
"Inconel-625", // Material Name
MaterialState.SOLID, // State
- new short[] {128, 200, 128, 0}, // Material Colour
+ new short[] { 128, 200, 128, 0 }, // Material Colour
2425, // Melting Point in C
3758,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 3),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 7),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10),
- new MaterialStack(INVAR, 10),
- new MaterialStack(NICHROME, 13)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 3),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 7),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), new MaterialStack(INVAR, 10),
+ new MaterialStack(NICHROME, 13) });
public static final Material INCONEL_690 = new Material(
"Inconel-690", // Material Name
MaterialState.SOLID, // State
- new short[] {118, 220, 138, 0}, // Material Colour
+ new short[] { 118, 220, 138, 0 }, // Material Colour
3425, // Melting Point in C
4895,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 5),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10),
- new MaterialStack(NICHROME, 15)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CHROMIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10), new MaterialStack(NICHROME, 15) });
public static final Material INCONEL_792 = new Material(
"Inconel-792", // Material Name
MaterialState.SOLID, // State
- new short[] {108, 240, 118, 0}, // Material Colour
+ new short[] { 108, 240, 118, 0 }, // Material Colour
3425, // Melting Point in C
6200,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 20),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20),
- new MaterialStack(NICHROME, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 20),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 10),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 20), new MaterialStack(NICHROME, 10) });
public static final Material NITINOL_60 = new Material(
"Nitinol 60", // Material Name
@@ -198,29 +173,24 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 40),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 60)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 40),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 60) });
public static final Material ZERON_100 = new Material(
"Zeron-100", // Material Name
MaterialState.SOLID, // State
- new short[] {180, 180, 20, 0}, // Material Colour
+ new short[] { 180, 180, 20, 0 }, // Material Colour
6100,
9785,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 26),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 6),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
- new MaterialStack(ELEMENT.getInstance().COPPER, 20),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
- new MaterialStack(ALLOY.STEEL, 40)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CHROMIUM, 26),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 6),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+ 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
@@ -232,13 +202,11 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STEEL, 64),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
- new MaterialStack(ELEMENT.getInstance().COBALT, 8),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 64),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 8), });
public static final Material MARAGING300 = new Material(
"Maraging Steel 300", // Material Name
@@ -250,13 +218,11 @@ public final class ALLOY {
-1,
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[] { 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
@@ -268,33 +234,29 @@ public final class ALLOY {
-1,
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[] { 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 AQUATIC_STEEL = new Material(
"Watertight Steel", // Material Name
MaterialState.SOLID, // State
- new short[] {120, 120, 180}, // Material Colour
+ new short[] { 120, 120, 180 }, // Material Colour
2673, // Melting Point in C
4835,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STEEL, 60),
- new MaterialStack(ELEMENT.getInstance().CARBON, 10),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 5),
- new MaterialStack(ELEMENT.getInstance().SILICON, 10),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 5),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 5)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 60),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 10),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 5),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 10),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 5),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 5) });
public static final Material STELLITE = new Material(
"Stellite", // Material Name
@@ -306,12 +268,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().COBALT, 35),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 35),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 20),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 35),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 35),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 20),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 10) });
public static final Material TALONITE = new Material(
"Talonite", // Material Name
@@ -323,12 +283,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().COBALT, 40),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 30),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 20),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 40),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 30),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 20),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 10) });
public static final Material HASTELLOY_W = new Material(
"Hastelloy-W", // Material Name
@@ -340,13 +298,11 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 06),
- new MaterialStack(ELEMENT.getInstance().COBALT, 2),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 6),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 62)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 06),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 2),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 24),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 6),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 62) });
public static final Material HASTELLOY_X = new Material(
"Hastelloy-X", // Material Name
@@ -358,14 +314,12 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 18),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 2),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 8),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 48)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 18),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 2),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 8),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 22),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 48) });
public static final Material HASTELLOY_N = new Material(
"Hastelloy-N", // Material Name
@@ -377,13 +331,11 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 8),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 60)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 8),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 8),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 8),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 60) });
public static final Material HASTELLOY_C276 = new Material(
"Hastelloy-C276", // Material Name
@@ -395,14 +347,12 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().COBALT, 2),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 2),
- new MaterialStack(ELEMENT.getInstance().COPPER, 2),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 14),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 64)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 2),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 16),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 2),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 2),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 14),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 64) });
public static final Material INCOLOY_020 = new Material(
"Incoloy-020", // Material Name
@@ -414,12 +364,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 40),
- new MaterialStack(ELEMENT.getInstance().COPPER, 4),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 36)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 40),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 4),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 36) });
public static final Material INCOLOY_DS = new Material(
"Incoloy-DS", // Material Name
@@ -431,12 +379,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 46),
- new MaterialStack(ELEMENT.getInstance().COBALT, 18),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 18),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 18)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 46),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 18),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 18),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 18) });
public static final Material INCOLOY_MA956 = new Material(
"Incoloy-MA956", // Material Name
@@ -448,17 +394,15 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 64),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 64),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4) });
public static final Material TUNGSTEN_CARBIDE = new Material(
"Tungsten Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {44, 44, 44, 0}, // Material Colour
+ new short[] { 44, 44, 44, 0 }, // Material Colour
3422, // Melting Point in C
-1,
-1,
@@ -466,10 +410,8 @@ public final class ALLOY {
true, // Uses Blast furnace?
false, // Generate cells
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CARBON, 50),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CARBON, 50),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50) });
public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material(
"Tungsten Titanium Carbide", // Material Name
@@ -481,69 +423,60 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(TUNGSTEN_CARBIDE, 70), new MaterialStack(ELEMENT.getInstance().TITANIUM, 30)
- });
+ new MaterialStack[] { new MaterialStack(TUNGSTEN_CARBIDE, 70),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 30) });
public static final Material SILICON_CARBIDE = new Material(
"Silicon Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {40, 48, 36, 0}, // Material Colour
+ new short[] { 40, 48, 36, 0 }, // Material Colour
1414, // Melting Point in C
-1,
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().SILICON, 50),
- new MaterialStack(ELEMENT.getInstance().CARBON, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SILICON, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50) });
public static final Material TANTALUM_CARBIDE = new Material(
"Tantalum Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {139, 136, 120, 0}, // Material Colour
+ new short[] { 139, 136, 120, 0 }, // Material Colour
2980, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 50),
- new MaterialStack(ELEMENT.getInstance().CARBON, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TANTALUM, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50) });
public static final Material ZIRCONIUM_CARBIDE = new Material(
"Zirconium Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {222, 202, 180, 0}, // Material Colour
+ new short[] { 222, 202, 180, 0 }, // Material Colour
1555, // Melting Point in C
-1,
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50),
- new MaterialStack(ELEMENT.getInstance().CARBON, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50) });
public static final Material NIOBIUM_CARBIDE = new Material(
"Niobium Carbide", // Material Name
MaterialState.SOLID, // State
- new short[] {205, 197, 191, 0}, // Material Colour
+ new short[] { 205, 197, 191, 0 }, // Material Colour
2477, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50),
- new MaterialStack(ELEMENT.getInstance().CARBON, 50)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NIOBIUM, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50) });
public static final Material ARCANITE = new Material(
"Arcanite", // Material Name
@@ -555,30 +488,26 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().THORIUM232, 40),
- new MaterialStack(ENERGYCRYSTAL, 40),
- new MaterialStack(ELEMENT.getInstance().ORDO, 10),
- new MaterialStack(ELEMENT.getInstance().PERDITIO, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 40),
+ new MaterialStack(ENERGYCRYSTAL, 40), new MaterialStack(ELEMENT.getInstance().ORDO, 10),
+ new MaterialStack(ELEMENT.getInstance().PERDITIO, 10) });
public static final Material LEAGRISIUM = new Material(
"Grisium", // Material Name
MaterialState.SOLID, // State
- new short[] {53, 93, 106, 0}, // Material Colour
+ new short[] { 53, 93, 106, 0 }, // Material Colour
3850, // Melting Point in C
5550, // Boiling Point in C
96, // Protons
128, // Neutrons
true, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 18),
- new MaterialStack(ELEMENT.getInstance().CARBON, 18),
- new MaterialStack(ELEMENT.getInstance().POTASSIUM, 18),
- new MaterialStack(ELEMENT.getInstance().LITHIUM, 18),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 18),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
- }); // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TITANIUM, 18),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 18),
+ new MaterialStack(ELEMENT.getInstance().POTASSIUM, 18),
+ new MaterialStack(ELEMENT.getInstance().LITHIUM, 18),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 18),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10) }); // Material Stacks with Percentage of
+ // required elements.
public static final Material EGLIN_STEEL_BASE = new Material(
"Eglin Steel Base Compound", // Material Name
@@ -590,45 +519,38 @@ public final class ALLOY {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().IRON, 12),
- new MaterialStack(KANTHAL, 3),
- new MaterialStack(INVAR, 15)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 12), new MaterialStack(KANTHAL, 3),
+ new MaterialStack(INVAR, 15) });
public static final Material EGLIN_STEEL = new Material(
"Eglin Steel", // Material Name
MaterialState.SOLID, // State
- new short[] {139, 69, 19, 0}, // Material Colour
+ new short[] { 139, 69, 19, 0 }, // Material Colour
1048, // Melting Point in C
1973, // Boiling Point in C
-1,
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.EGLIN_STEEL_BASE, 10),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
- new MaterialStack(ELEMENT.getInstance().SILICON, 4),
- new MaterialStack(ELEMENT.getInstance().CARBON, 1)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.EGLIN_STEEL_BASE, 10),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 4),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 1) });
public static final Material HG1223 = new Material(
"HG-1223", // Material Name
MaterialState.LIQUID, // State
- new short[] {39, 85, 159, 0}, // Material Colour
+ new short[] { 39, 85, 159, 0 }, // Material Colour
6357, // Melting Point in C
8563, // Boiling Point in C
-1,
-1,
false, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().MERCURY, 1),
- new MaterialStack(ELEMENT.getInstance().BARIUM, 2),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
- new MaterialStack(ELEMENT.getInstance().COPPER, 3),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().MERCURY, 1),
+ new MaterialStack(ELEMENT.getInstance().BARIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 3),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) });
public static final Material HS188A = new Material(
"HS188-A", // Material Name
@@ -639,16 +561,12 @@ public final class ALLOY {
-1, // Protons
-1, // Neutrons
true, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().COBALT, 20),
- new MaterialStack(ELEMENT.getInstance().HAFNIUM, 20),
- new MaterialStack(TALONITE, 16),
- new MaterialStack(ELEMENT.getInstance().RHENIUM, 10),
- new MaterialStack(NIOBIUM_CARBIDE, 10),
- new MaterialStack(HASTELLOY_X, 8),
- new MaterialStack(TUNGSTENSTEEL, 8),
- new MaterialStack(ZIRCONIUM_CARBIDE, 8),
- }); // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().COBALT, 20),
+ new MaterialStack(ELEMENT.getInstance().HAFNIUM, 20), new MaterialStack(TALONITE, 16),
+ new MaterialStack(ELEMENT.getInstance().RHENIUM, 10), new MaterialStack(NIOBIUM_CARBIDE, 10),
+ new MaterialStack(HASTELLOY_X, 8), new MaterialStack(TUNGSTENSTEEL, 8),
+ new MaterialStack(ZIRCONIUM_CARBIDE, 8), }); // Material Stacks with Percentage of required
+ // elements.
/**
* Stargate Materials - #D2FFA9 210, 255, 170
@@ -662,10 +580,8 @@ public final class ALLOY {
-1,
-1,
true, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 3),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 7)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 3),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 7) });
public static final Material TRINIUM_NAQUADAH = new Material(
"Trinium Naquadah Alloy", // Material Name
@@ -676,10 +592,8 @@ public final class ALLOY {
-1,
-1,
false, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5),
- new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5),
+ new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9) });
public static final Material TRINIUM_NAQUADAH_CARBON = new Material(
"Trinium Naquadah Carbonite", // Material Name
MaterialState.SOLID, // State
@@ -689,27 +603,22 @@ public final class ALLOY {
-1,
-1,
true, // Uses Blast furnace?
- new MaterialStack[] {
- new MaterialStack(TRINIUM_NAQUADAH, 9), new MaterialStack(ELEMENT.getInstance().CARBON, 1)
- });
+ new MaterialStack[] { new MaterialStack(TRINIUM_NAQUADAH, 9),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 1) });
public static final Material TRINIUM_REINFORCED_STEEL = new Material(
"Arceus Alloy 2B", // Material Name
MaterialState.SOLID, // State
- new short[] {205, 197, 23, 0}, // Material Colour
+ new short[] { 205, 197, 23, 0 }, // Material Colour
7555, // Melting Point in C
12350,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 30),
- new MaterialStack(ALLOY.MARAGING350, 40),
- new MaterialStack(ALLOY.TUNGSTENSTEEL, 20),
- new MaterialStack(ALLOY.OSMIRIDIUM, 10),
- new MaterialStack(ELEMENT.getInstance().STRONTIUM, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 30),
+ new MaterialStack(ALLOY.MARAGING350, 40), new MaterialStack(ALLOY.TUNGSTENSTEEL, 20),
+ new MaterialStack(ALLOY.OSMIRIDIUM, 10), new MaterialStack(ELEMENT.getInstance().STRONTIUM, 10) });
/*
* Witchery Material
@@ -718,18 +627,16 @@ public final class ALLOY {
public static final Material KOBOLDITE = new Material(
"Koboldite", // Material Name
MaterialState.SOLID, // State
- new short[] {80, 210, 255, 0}, // Material Colour
+ new short[] { 80, 210, 255, 0 }, // Material Colour
-1, // Melting Point in C
-1,
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 35),
- new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30),
- new MaterialStack(ELEMENT.getInstance().IRON, 35)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 35),
+ new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30),
+ new MaterialStack(ELEMENT.getInstance().IRON, 35) });
/*
* Top Tier Alloys
@@ -745,13 +652,11 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().HELIUM, 20),
- new MaterialStack(ELEMENT.getInstance().LITHIUM, 20),
- new MaterialStack(ELEMENT.getInstance().COBALT, 20),
- new MaterialStack(ELEMENT.getInstance().PLATINUM, 20),
- new MaterialStack(ELEMENT.getInstance().ERBIUM, 20)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().HELIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().LITHIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 20),
+ new MaterialStack(ELEMENT.getInstance().PLATINUM, 20),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 20) });
// 0lafe Compound
public static final Material LAFIUM = new Material(
@@ -764,16 +669,14 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.HASTELLOY_N, 8),
- new MaterialStack(ELEMENT.getInstance().NAQUADAH, 4),
- new MaterialStack(ELEMENT.getInstance().SAMARIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
- new MaterialStack(ELEMENT.getInstance().ARGON, 2),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 6),
- new MaterialStack(ELEMENT.getInstance().NICKEL, 8),
- new MaterialStack(ELEMENT.getInstance().CARBON, 2)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.HASTELLOY_N, 8),
+ new MaterialStack(ELEMENT.getInstance().NAQUADAH, 4),
+ new MaterialStack(ELEMENT.getInstance().SAMARIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 4),
+ new MaterialStack(ELEMENT.getInstance().ARGON, 2),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 6),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 8),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 2) });
// Cinobi Alloy
public static final Material CINOBITE = new Material(
@@ -786,38 +689,31 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.ZERON_100, 16),
- new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 7),
- new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 5),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
- new MaterialStack(ELEMENT.getInstance().MERCURY, 2),
- new MaterialStack(ELEMENT.getInstance().TIN, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
- new MaterialStack(ALLOY.OSMIRIDIUM, 6)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.ZERON_100, 16),
+ new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 7),
+ new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().MERCURY, 2),
+ new MaterialStack(ELEMENT.getInstance().TIN, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 12), new MaterialStack(ALLOY.OSMIRIDIUM, 6) });
// Piky Alloy
public static final Material PIKYONIUM = new Material(
"Pikyonium 64B", // Material Name
MaterialState.SOLID, // State
- new short[] {52, 103, 186, 0}, // Material Colour
+ new short[] { 52, 103, 186, 0 }, // Material Colour
6850, // Melting Point in C
11765, // Boiling Point in C
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.INCONEL_792, 16),
- new MaterialStack(ALLOY.EGLIN_STEEL, 10),
- new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 8),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 6),
- new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4),
- new MaterialStack(ELEMENT.getInstance().PLATINUM, 4),
- new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
- new MaterialStack(ALLOY.TUNGSTENSTEEL, 8)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.INCONEL_792, 16), new MaterialStack(ALLOY.EGLIN_STEEL, 10),
+ new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 8),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 6),
+ new MaterialStack(ELEMENT.getInstance().ANTIMONY, 4),
+ new MaterialStack(ELEMENT.getInstance().PLATINUM, 4),
+ new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), new MaterialStack(ALLOY.TUNGSTENSTEEL, 8) });
// Piky Alloy
public static final Material ABYSSAL = new Material(
@@ -830,53 +726,45 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STAINLESS_STEEL, 10),
- new MaterialStack(ALLOY.TUNGSTEN_CARBIDE, 10),
- new MaterialStack(ALLOY.NICHROME, 10),
- new MaterialStack(ALLOY.BRONZE, 10),
- new MaterialStack(ALLOY.INCOLOY_MA956, 10),
- new MaterialStack(ELEMENT.getInstance().IODINE, 2),
- new MaterialStack(ELEMENT.getInstance().RADON, 2),
- new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STAINLESS_STEEL, 10),
+ new MaterialStack(ALLOY.TUNGSTEN_CARBIDE, 10), new MaterialStack(ALLOY.NICHROME, 10),
+ new MaterialStack(ALLOY.BRONZE, 10), new MaterialStack(ALLOY.INCOLOY_MA956, 10),
+ new MaterialStack(ELEMENT.getInstance().IODINE, 2),
+ new MaterialStack(ELEMENT.getInstance().RADON, 2),
+ new MaterialStack(ELEMENT.getInstance().GERMANIUM, 2), });
// Alkalus Alloy
public static final Material LAURENIUM = new Material(
"Laurenium", // Material Name
MaterialState.SOLID, // State
- new short[] {244, 168, 255, 0}, // Material Colour
+ new short[] { 244, 168, 255, 0 }, // Material Colour
6825, // Melting Point in C
11355, // Boiling Point in C
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.EGLIN_STEEL, 40),
- new MaterialStack(ELEMENT.getInstance().INDIUM, 10),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
- new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 5),
- new MaterialStack(ELEMENT.getInstance().RHENIUM, 5),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.EGLIN_STEEL, 40),
+ new MaterialStack(ELEMENT.getInstance().INDIUM, 10),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 20),
+ new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().RHENIUM, 5), });
// Bot Alloy
public static final Material BOTMIUM = new Material(
"Botmium", // Material Name
MaterialState.SOLID, // State
- new short[] {80, 160, 80, 0}, // Material Colour
+ new short[] { 80, 160, 80, 0 }, // Material Colour
8220, // Melting Point in C
10540, // Boiling Point in C
-1,
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.NITINOL_60, 2),
- new MaterialStack(ELEMENT.getInstance().OSMIUM, 12),
- new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 12),
- new MaterialStack(ELEMENT.getInstance().THALLIUM, 6),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.NITINOL_60, 2),
+ new MaterialStack(ELEMENT.getInstance().OSMIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().THALLIUM, 6), });
// Titansteel
public static final Material TITANSTEEL = new Material(
@@ -889,12 +777,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3),
- new MaterialStack(ELEMENT.getInstance().IGNIS, 1),
- new MaterialStack(ELEMENT.getInstance().TERRA, 1),
- new MaterialStack(ELEMENT.getInstance().PERDITIO, 1),
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.TUNGSTEN_TITANIUM_CARBIDE, 3),
+ new MaterialStack(ELEMENT.getInstance().IGNIS, 1),
+ new MaterialStack(ELEMENT.getInstance().TERRA, 1),
+ new MaterialStack(ELEMENT.getInstance().PERDITIO, 1), });
public static final Material OCTIRON = new Material(
"Octiron", // Material Name
@@ -906,13 +792,9 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ARCANITE, 30),
- new MaterialStack(TITANSTEEL, 30),
- new MaterialStack(ENERGYCRYSTAL, 5),
- new MaterialStack(STEEL_BLACK, 10),
- new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25)
- });
+ new MaterialStack[] { new MaterialStack(ARCANITE, 30), new MaterialStack(TITANSTEEL, 30),
+ new MaterialStack(ENERGYCRYSTAL, 5), new MaterialStack(STEEL_BLACK, 10),
+ new MaterialStack(ELEMENT.getInstance().THAUMIUM, 25) });
public static final Material BLACK_TITANIUM = new Material(
"Black Titanium", // Material Name
@@ -924,17 +806,15 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 55),
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8),
- new MaterialStack(ELEMENT.getInstance().COBALT, 6),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 4),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4),
- new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().ARGON, 5)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TITANIUM, 55),
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 12),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 8),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 6),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 4),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 4),
+ new MaterialStack(ELEMENT.getInstance().PALLADIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ARGON, 5) });
public static final Material BABBIT_ALLOY = new Material(
"Babbit Alloy", // Material Name
@@ -946,12 +826,10 @@ public final class ALLOY {
-1,
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TIN, 10),
- new MaterialStack(ELEMENT.getInstance().LEAD, 72),
- new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TIN, 10),
+ new MaterialStack(ELEMENT.getInstance().LEAD, 72),
+ new MaterialStack(ELEMENT.getInstance().ANTIMONY, 16),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 2) });
public static final Material INDALLOY_140 = new Material(
"Indalloy 140", // Material Name
@@ -963,13 +841,10 @@ public final class ALLOY {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().BISMUTH, 47),
- new MaterialStack(ELEMENT.getInstance().LEAD, 25),
- new MaterialStack(ELEMENT.getInstance().TIN, 13),
- new MaterialStack(ELEMENT.getInstance().CADMIUM, 10),
- new MaterialStack(ELEMENT.getInstance().INDIUM, 5)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BISMUTH, 47),
+ new MaterialStack(ELEMENT.getInstance().LEAD, 25), new MaterialStack(ELEMENT.getInstance().TIN, 13),
+ new MaterialStack(ELEMENT.getInstance().CADMIUM, 10),
+ new MaterialStack(ELEMENT.getInstance().INDIUM, 5) });
// Quantum
public static final Material QUANTUM = new Material(
@@ -982,14 +857,10 @@ public final class ALLOY {
200, // Neutrons
true, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ALLOY.STELLITE, 15),
- new MaterialStack(ALLOY.ENERGYCRYSTAL, 5),
- new MaterialStack(ALLOY.SILICON_CARBIDE, 5),
- new MaterialStack(ELEMENT.getInstance().GALLIUM, 5),
- new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5),
- new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5),
- new MaterialStack(ELEMENT.getInstance().BISMUTH, 5),
- new MaterialStack(ELEMENT.getInstance().GERMANIUM, 5)
- });
+ new MaterialStack[] { new MaterialStack(ALLOY.STELLITE, 15), new MaterialStack(ALLOY.ENERGYCRYSTAL, 5),
+ new MaterialStack(ALLOY.SILICON_CARBIDE, 5), new MaterialStack(ELEMENT.getInstance().GALLIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().BISMUTH, 5),
+ new MaterialStack(ELEMENT.getInstance().GERMANIUM, 5) });
}
diff --git a/src/main/java/gtPlusPlus/core/material/ELEMENT.java b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
index fca5a36821..f73c1af0ab 100644
--- a/src/main/java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/main/java/gtPlusPlus/core/material/ELEMENT.java
@@ -11,126 +11,20 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
public final class ELEMENT {
- public static final String[] NAMES = new String[] {
- "Hydrogen",
- "Helium",
- "Lithium",
- "Beryllium",
- "Boron",
- "Carbon",
- "Nitrogen",
- "Oxygen",
- "Fluorine",
- "Neon",
- "Sodium",
- "Magnesium",
- "Aluminium",
- "Silicon",
- "Phosphorus",
- "Sulfur",
- "Chlorine",
- "Argon",
- "Potassium",
- "Calcium",
- "Scandium",
- "Titanium",
- "Vanadium",
- "Chromium",
- "Manganese",
- "Iron",
- "Cobalt",
- "Nickel",
- "Copper",
- "Zinc",
- "Gallium",
- "Germanium",
- "Arsenic",
- "Selenium",
- "Bromine",
- "Krypton",
- "Rubidium",
- "Strontium",
- "Yttrium",
- "Zirconium",
- "Niobium",
- "Molybdenum",
- "Technetium",
- "Ruthenium",
- "Rhodium",
- "Palladium",
- "Silver",
- "Cadmium",
- "Indium",
- "Tin",
- "Antimony",
- "Tellurium",
- "Iodine",
- "Xenon",
- "Caesium",
- "Barium",
- "Lanthanum",
- "Cerium",
- "Praseodymium",
- "Neodymium",
- "Promethium",
- "Samarium",
- "Europium",
- "Gadolinium",
- "Terbium",
- "Dysprosium",
- "Holmium",
- "Erbium",
- "Thulium",
- "Ytterbium",
- "Lutetium",
- "Hafnium",
- "Tantalum",
- "Tungsten",
- "Rhenium",
- "Osmium",
- "Iridium",
- "Platinum",
- "Gold",
- "Mercury",
- "Thallium",
- "Lead",
- "Bismuth",
- "Polonium",
- "Astatine",
- "Radon",
- "Francium",
- "Radium",
- "Actinium",
- "Thorium",
- "Protactinium",
- "Uranium",
- "Neptunium",
- "Plutonium",
- "Americium",
- "Curium",
- "Berkelium",
- "Californium",
- "Einsteinium",
- "Fermium",
- "Mendelevium",
- "Nobelium",
- "Lawrencium",
- "Rutherfordium",
- "Dubnium",
- "Seaborgium",
- "Bohrium",
- "Hassium",
- "Meitnerium",
- "Darmstadtium",
- "Roentgenium",
- "Copernicium",
- "Nihonium",
- "Flerovium",
- "Moscovium",
- "Livermorium",
- "Tennessine",
- "Oganesson"
- };
+ public static final String[] NAMES = new String[] { "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon",
+ "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus",
+ "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium",
+ "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium",
+ "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum",
+ "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony",
+ "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium",
+ "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium",
+ "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum",
+ "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium",
+ "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium",
+ "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium",
+ "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium",
+ "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson" };
// First 50 Elements
public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
@@ -145,7 +39,7 @@ public final class ELEMENT {
public final Material NEON = new Material(
"Neon",
MaterialState.PURE_GAS,
- new short[] {240, 180, 30},
+ new short[] { 240, 180, 30 },
-248,
-246,
10,
@@ -179,7 +73,7 @@ public final class ELEMENT {
public final Material GERMANIUM = new Material(
"Germanium",
MaterialState.SOLID,
- new short[] {200, 200, 200},
+ new short[] { 200, 200, 200 },
937,
2830,
32,
@@ -191,7 +85,7 @@ public final class ELEMENT {
public final Material SELENIUM = new Material(
"Selenium",
MaterialState.SOLID,
- new short[] {190, 190, 190},
+ new short[] { 190, 190, 190 },
217,
685,
34,
@@ -202,7 +96,7 @@ public final class ELEMENT {
public final Material BROMINE = new Material(
"Bromine",
MaterialState.PURE_LIQUID,
- new short[] {200, 25, 25},
+ new short[] { 200, 25, 25 },
-7,
58,
35,
@@ -213,7 +107,7 @@ public final class ELEMENT {
public final Material KRYPTON = new Material(
"Krypton",
MaterialState.PURE_GAS,
- new short[] {5, 200, 220},
+ new short[] { 5, 200, 220 },
-157,
-153,
36,
@@ -222,13 +116,13 @@ public final class ELEMENT {
"Kr",
0); // Not a GT Inherited Material
public final Material RUBIDIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Rubidium);
- public final Material STRONTIUM = MaterialUtils.generateMaterialFromGtENUM(
- Materials.Strontium, new short[] {230, 210, 110}, TextureSet.SET_FLINT);
+ public final Material STRONTIUM = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.Strontium, new short[] { 230, 210, 110 }, TextureSet.SET_FLINT);
public final Material YTTRIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yttrium);
public final Material ZIRCONIUM = new Material(
"Zirconium",
MaterialState.SOLID,
- new short[] {255, 250, 205},
+ new short[] { 255, 250, 205 },
1855,
4377,
40,
@@ -242,7 +136,7 @@ public final class ELEMENT {
"Technetium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {220, 220, 220},
+ new short[] { 220, 220, 220 },
2200,
4877,
43,
@@ -253,7 +147,7 @@ public final class ELEMENT {
public final Material RUTHENIUM = new Material(
"Ruthenium",
MaterialState.SOLID,
- new short[] {220, 220, 220},
+ new short[] { 220, 220, 220 },
2250,
3900,
44,
@@ -264,7 +158,7 @@ public final class ELEMENT {
public final Material RHODIUM = new Material(
"Rhodium",
MaterialState.SOLID,
- new short[] {220, 220, 220},
+ new short[] { 220, 220, 220 },
1966,
3727,
45,
@@ -281,7 +175,7 @@ public final class ELEMENT {
public final Material TELLURIUM = new Material(
"Tellurium",
MaterialState.SOLID,
- new short[] {210, 210, 210},
+ new short[] { 210, 210, 210 },
449,
989,
52,
@@ -293,7 +187,7 @@ public final class ELEMENT {
"Iodine",
MaterialState.SOLID,
TextureSet.SET_SHINY,
- new short[] {96, 96, 96},
+ new short[] { 96, 96, 96 },
114,
184,
53,
@@ -304,7 +198,7 @@ public final class ELEMENT {
public final Material XENON = new Material(
"Xenon",
MaterialState.PURE_GAS,
- new short[] {5, 105, 210},
+ new short[] { 5, 105, 210 },
-111,
-108,
54,
@@ -326,7 +220,7 @@ public final class ELEMENT {
public final Material DYSPROSIUM = new Material(
"Dysprosium",
MaterialState.SOLID,
- new short[] {180, 180, 180},
+ new short[] { 180, 180, 180 },
1412,
2562,
66,
@@ -342,7 +236,7 @@ public final class ELEMENT {
public final Material HAFNIUM = new Material(
"Hafnium",
MaterialState.SOLID,
- new short[] {128, 128, 128},
+ new short[] { 128, 128, 128 },
2150,
5400,
72,
@@ -357,7 +251,7 @@ public final class ELEMENT {
public final Material RHENIUM = new Material(
"Rhenium",
MaterialState.SOLID,
- new short[] {150, 150, 150},
+ new short[] { 150, 150, 150 },
3180,
3627,
75,
@@ -373,7 +267,7 @@ public final class ELEMENT {
public final Material THALLIUM = new Material(
"Thallium",
MaterialState.SOLID,
- new short[] {175, 175, 175},
+ new short[] { 175, 175, 175 },
304,
1457,
81,
@@ -387,7 +281,7 @@ public final class ELEMENT {
"Polonium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {180, 170, 180},
+ new short[] { 180, 170, 180 },
254,
962,
84,
@@ -399,7 +293,7 @@ public final class ELEMENT {
"Astatine",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {170, 180, 170},
+ new short[] { 170, 180, 170 },
302,
337,
85,
@@ -412,7 +306,7 @@ public final class ELEMENT {
"Francium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {170, 160, 170},
+ new short[] { 170, 160, 170 },
27,
677,
87,
@@ -424,7 +318,7 @@ public final class ELEMENT {
"Radium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {165, 165, 165},
+ new short[] { 165, 165, 165 },
700,
1737,
88,
@@ -436,7 +330,7 @@ public final class ELEMENT {
"Actinium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {150, 165, 165},
+ new short[] { 150, 165, 165 },
1050,
3200,
89,
@@ -459,7 +353,7 @@ public final class ELEMENT {
"Protactinium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {190, 150, 170},
+ new short[] { 190, 150, 170 },
1568,
4027,
91,
@@ -473,7 +367,7 @@ public final class ELEMENT {
"Neptunium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {200, 220, 205},
+ new short[] { 200, 220, 205 },
640,
3902,
93,
@@ -488,7 +382,7 @@ public final class ELEMENT {
"Curium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {175, 85, 110},
+ new short[] { 175, 85, 110 },
1340,
3110,
96,
@@ -500,7 +394,7 @@ public final class ELEMENT {
"Berkelium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {110, 250, 85},
+ new short[] { 110, 250, 85 },
985,
710,
97,
@@ -512,7 +406,7 @@ public final class ELEMENT {
"Californium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {85, 110, 205},
+ new short[] { 85, 110, 205 },
899,
1472,
98,
@@ -524,7 +418,7 @@ public final class ELEMENT {
"Einsteinium",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {255, 85, 110},
+ new short[] { 255, 85, 110 },
860,
3500,
99,
@@ -536,7 +430,7 @@ public final class ELEMENT {
"Fermium",
MaterialState.LIQUID,
TextureSets.NUCLEAR.get(),
- new short[] {75, 90, 25},
+ new short[] { 75, 90, 25 },
1527,
3850,
100,
@@ -547,20 +441,20 @@ public final class ELEMENT {
// Misc
public final Material AER = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedAir, TextureSets.GEM_A.get());
- public final Material IGNIS =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire, TextureSets.GEM_A.get());
- public final Material TERRA =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEarth, TextureSets.GEM_A.get());
- public final Material AQUA =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedWater, TextureSets.GEM_A.get());
- public final Material PERDITIO =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEntropy, TextureSets.GEM_A.get());
- public final Material ORDO =
- MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedOrder, TextureSets.GEM_A.get());
+ public final Material IGNIS = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedFire, TextureSets.GEM_A.get());
+ public final Material TERRA = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedEarth, TextureSets.GEM_A.get());
+ public final Material AQUA = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedWater, TextureSets.GEM_A.get());
+ public final Material PERDITIO = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedEntropy, TextureSets.GEM_A.get());
+ public final Material ORDO = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.InfusedOrder, TextureSets.GEM_A.get());
// Fictional
- public final Material YELLORIUM = MaterialUtils.generateMaterialFromGtENUM(
- Materials.Yellorium, new short[] {255, 242, 10}, TextureSets.NUCLEAR.get());
+ public final Material YELLORIUM = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.Yellorium, new short[] { 255, 242, 10 }, TextureSets.NUCLEAR.get());
public final Material NAQUADAH = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadah);
public final Material NAQUADAH_ENRICHED = MaterialUtils.generateMaterialFromGtENUM(Materials.NaquadahEnriched);
public final Material NAQUADRIA = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadria);
@@ -586,7 +480,7 @@ public final class ELEMENT {
"Uranium 232",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {88, 220, 103, 0},
+ new short[] { 88, 220, 103, 0 },
1132,
4131,
92,
@@ -598,7 +492,7 @@ public final class ELEMENT {
"Uranium 233",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {73, 220, 83, 0},
+ new short[] { 73, 220, 83, 0 },
1132,
4131,
92,
@@ -610,7 +504,7 @@ public final class ELEMENT {
"Thorium 232",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {15, 60, 15, 0},
+ new short[] { 15, 60, 15, 0 },
Materials.Thorium.mMeltingPoint,
Materials.Thorium.mBlastFurnaceTemp,
90,
@@ -691,7 +585,8 @@ public final class ELEMENT {
2,
false); // Not a GT Inherited Material
- public final Material MAGIC = MaterialUtils.generateMaterialFromGtENUM(Materials.Magic, new short[] {10, 185, 140});
+ public final Material MAGIC = MaterialUtils
+ .generateMaterialFromGtENUM(Materials.Magic, new short[] { 10, 185, 140 });
public final Material THAUMIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Thaumium);
static {
@@ -739,7 +634,7 @@ public final class ELEMENT {
"Trinium",
MaterialState.SOLID,
TextureSet.SET_FINE,
- new short[] {70, 110, 30},
+ new short[] { 70, 110, 30 },
604,
4057,
181,
@@ -752,7 +647,7 @@ public final class ELEMENT {
"Refined Trinium",
MaterialState.SOLID,
TextureSets.REFINED.get(),
- new short[] {210, 255, 170},
+ new short[] { 210, 255, 170 },
4304,
14057,
181,
@@ -760,7 +655,7 @@ public final class ELEMENT {
false,
"Ke",
0,
- new MaterialStack[] {new MaterialStack(TRINIUM, 1)}); // Not a GT Inherited Material
+ new MaterialStack[] { new MaterialStack(TRINIUM, 1) }); // Not a GT Inherited Material
}
}
@@ -774,7 +669,7 @@ public final class ELEMENT {
"Celestial Tungsten",
MaterialState.SOLID,
TextureSets.REFINED.get(),
- new short[] {50, 50, 50, 2},
+ new short[] { 50, 50, 50, 2 },
INSTANCE.TUNGSTEN.getMeltingPointC() + 6500,
INSTANCE.TUNGSTEN.getBoilingPointC() + 7500,
160,
@@ -786,7 +681,7 @@ public final class ELEMENT {
"Astral Titanium",
MaterialState.SOLID,
TextureSets.REFINED.get(),
- new short[] {220, 160, 240, 2},
+ new short[] { 220, 160, 240, 2 },
INSTANCE.TITANIUM.getMeltingPointC() + 7500,
INSTANCE.TITANIUM.getBoilingPointC() + 7500,
145,
@@ -797,7 +692,7 @@ public final class ELEMENT {
public static final Material CHRONOMATIC_GLASS = new Material(
"Chromatic Glass",
MaterialState.SOLID,
- new short[] {255, 255, 255, 3},
+ new short[] { 255, 255, 255, 3 },
9200,
17550,
40,
@@ -821,7 +716,7 @@ public final class ELEMENT {
"Hypogen",
MaterialState.SOLID,
TextureSets.NUCLEAR.get(),
- new short[] {220, 120, 75, 2},
+ new short[] { 220, 120, 75, 2 },
11255,
19377,
240,
@@ -833,7 +728,7 @@ public final class ELEMENT {
"Rhugnor",
MaterialState.SOLID,
TextureSets.ENRICHED.get(),
- new short[] {190, 0, 255, 0},
+ new short[] { 190, 0, 255, 0 },
8750,
14757,
184,
@@ -845,7 +740,7 @@ public final class ELEMENT {
"Force",
MaterialState.SOLID,
TextureSets.ENRICHED.get(),
- new short[] {250, 250, 20, 0},
+ new short[] { 250, 250, 20, 0 },
4550,
6830,
63,
@@ -859,7 +754,7 @@ public final class ELEMENT {
"Black Metal",
MaterialState.SOLID,
TextureSet.SET_METALLIC,
- new short[] {5, 5, 5},
+ new short[] { 5, 5, 5 },
2350,
4650,
24,
@@ -867,16 +762,17 @@ public final class ELEMENT {
false,
"҈",
0,
- new MaterialStack[] {
- new MaterialStack(getInstance().LEAD, 15),
- new MaterialStack(getInstance().MANGANESE, 25),
- new MaterialStack(getInstance().CARBON, 60)
- }); // Not a GT Inherited Material
+ new MaterialStack[] { new MaterialStack(getInstance().LEAD, 15),
+ new MaterialStack(getInstance().MANGANESE, 25), new MaterialStack(getInstance().CARBON, 60) }); // Not
+ // a
+ // GT
+ // Inherited
+ // Material
public static final Material WHITE_METAL = new Material(
"White Metal",
MaterialState.SOLID,
TextureSet.SET_METALLIC,
- new short[] {255, 255, 255},
+ new short[] { 255, 255, 255 },
4560,
7580,
35,
@@ -884,18 +780,15 @@ public final class ELEMENT {
false,
"҉",
0,
- new MaterialStack[] {
- new MaterialStack(getInstance().COPPER, 5),
- new MaterialStack(getInstance().ANTIMONY, 10),
- new MaterialStack(getInstance().PLATINUM, 10),
- new MaterialStack(getInstance().TIN, 75)
- }); // Not a GT Inherited Material
+ new MaterialStack[] { new MaterialStack(getInstance().COPPER, 5),
+ new MaterialStack(getInstance().ANTIMONY, 10), new MaterialStack(getInstance().PLATINUM, 10),
+ new MaterialStack(getInstance().TIN, 75) }); // Not a GT Inherited Material
public static final Material GRANITE = new Material(
"Ancient Granite",
MaterialState.SOLID,
TextureSet.SET_SAND,
- new short[] {107, 107, 107},
+ new short[] { 107, 107, 107 },
500,
2000,
16,
@@ -904,22 +797,21 @@ public final class ELEMENT {
"«»",
0,
false,
- new MaterialStack[] {
- new MaterialStack(getInstance().OXYGEN, 16),
- new MaterialStack(getInstance().IRON, 10),
- new MaterialStack(getInstance().SILICONDIOXIDE, 10),
- new MaterialStack(getInstance().ALUMINIUMOXIDE, 6),
- new MaterialStack(getInstance().POTASSIUM, 6),
- new MaterialStack(getInstance().CALCIUM, 4),
- new MaterialStack(getInstance().SODIUM, 4),
- new MaterialStack(getInstance().YTTERBIUM, 2)
- }); // Not a GT Inherited Material
+ new MaterialStack[] { new MaterialStack(getInstance().OXYGEN, 16),
+ new MaterialStack(getInstance().IRON, 10), new MaterialStack(getInstance().SILICONDIOXIDE, 10),
+ new MaterialStack(getInstance().ALUMINIUMOXIDE, 6),
+ new MaterialStack(getInstance().POTASSIUM, 6), new MaterialStack(getInstance().CALCIUM, 4),
+ new MaterialStack(getInstance().SODIUM, 4), new MaterialStack(getInstance().YTTERBIUM, 2) }); // Not
+ // a
+ // GT
+ // Inherited
+ // Material
public static final Material RUNITE = new Material(
"Runite",
MaterialState.SOLID,
TextureSet.SET_FINE,
- new short[] {60, 200, 190},
+ new short[] { 60, 200, 190 },
6750,
11550,
73,
@@ -931,7 +823,7 @@ public final class ELEMENT {
"Dragonblood",
MaterialState.SOLID,
TextureSet.SET_SHINY,
- new short[] {220, 40, 20, 2},
+ new short[] { 220, 40, 20, 2 },
10160,
17850,
96,
diff --git a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 677aa21150..c829f49bfc 100644
--- a/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/main/java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -10,8 +10,8 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
public final class MISC_MATERIALS {
/*
- * Some of these materials purely exist as data objects, items will most likely be assigned seperately.
- * Most are just compositions which will have dusts assigned to them.
+ * Some of these materials purely exist as data objects, items will most likely be assigned seperately. Most are
+ * just compositions which will have dusts assigned to them.
*/
public static void run() {
@@ -76,7 +76,7 @@ public final class MISC_MATERIALS {
public static final Material SOLAR_SALT_HOT = new Material(
"Solar Salt (Hot)",
MaterialState.PURE_LIQUID, // State
- new short[] {200, 25, 25}, // Material Colour
+ new short[] { 200, 25, 25 }, // Material Colour
1200, // Melting Point in C
3300, // Boiling Point in C
-1, // Protons
@@ -173,7 +173,7 @@ public final class MISC_MATERIALS {
"Wood's Glass", // Material Name
MaterialState.SOLID, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {220, 60, 255}, // Material Colour
+ new short[] { 220, 60, 255 }, // Material Colour
-1,
-1,
-1,
@@ -201,17 +201,12 @@ public final class MISC_MATERIALS {
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ORES.GREENOCKITE, 1),
- new MaterialStack(ORES.LANTHANITE_CE, 1),
- new MaterialStack(ORES.AGARDITE_CD, 1),
- new MaterialStack(ORES.YTTRIALITE, 1),
- new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
- new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
- new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
- new MaterialStack(ORES.CRYOLITE, 1),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(ORES.GREENOCKITE, 1), new MaterialStack(ORES.LANTHANITE_CE, 1),
+ new MaterialStack(ORES.AGARDITE_CD, 1), new MaterialStack(ORES.YTTRIALITE, 1),
+ new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
+ new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
+ new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
+ new MaterialStack(ORES.CRYOLITE, 1), new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1) });
public static final Material RARE_EARTH_MID = new Material(
"Rare Earth (II)", // Material Name
@@ -223,17 +218,12 @@ public final class MISC_MATERIALS {
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ORES.LANTHANITE_ND, 1),
- new MaterialStack(ORES.AGARDITE_ND, 1),
- new MaterialStack(ORES.YTTRIAITE, 1),
- new MaterialStack(ORES.CROCROITE, 1),
- new MaterialStack(ORES.NICHROMITE, 1),
- new MaterialStack(ORES.ZIRCON, 1),
- new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1),
- new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
- new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1)
- });
+ new MaterialStack[] { new MaterialStack(ORES.LANTHANITE_ND, 1), new MaterialStack(ORES.AGARDITE_ND, 1),
+ new MaterialStack(ORES.YTTRIAITE, 1), new MaterialStack(ORES.CROCROITE, 1),
+ new MaterialStack(ORES.NICHROMITE, 1), new MaterialStack(ORES.ZIRCON, 1),
+ new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1),
+ new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
+ new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1) });
public static final Material RARE_EARTH_HIGH = new Material(
"Rare Earth (III)", // Material Name
@@ -245,17 +235,11 @@ public final class MISC_MATERIALS {
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ORES.GADOLINITE_Y, 1),
- new MaterialStack(ORES.LEPERSONNITE, 1),
- new MaterialStack(ORES.FLORENCITE, 1),
- new MaterialStack(ORES.FLUORCAPHITE, 1),
- new MaterialStack(ORES.LAUTARITE, 1),
- new MaterialStack(ORES.DEMICHELEITE_BR, 1),
- new MaterialStack(ORES.ALBURNITE, 1),
- new MaterialStack(ORES.SAMARSKITE_Y, 1),
- new MaterialStack(ORES.AGARDITE_LA, 1),
- });
+ new MaterialStack[] { new MaterialStack(ORES.GADOLINITE_Y, 1), new MaterialStack(ORES.LEPERSONNITE, 1),
+ new MaterialStack(ORES.FLORENCITE, 1), new MaterialStack(ORES.FLUORCAPHITE, 1),
+ new MaterialStack(ORES.LAUTARITE, 1), new MaterialStack(ORES.DEMICHELEITE_BR, 1),
+ new MaterialStack(ORES.ALBURNITE, 1), new MaterialStack(ORES.SAMARSKITE_Y, 1),
+ new MaterialStack(ORES.AGARDITE_LA, 1), });
public static final Material WATER = new Material(
"Water",
@@ -369,7 +353,7 @@ public final class MISC_MATERIALS {
public static final Material ACETIC_ANHYDRIDE = new Material(
"Acetic Anhydride",
MaterialState.PURE_LIQUID, // State
- new short[] {250, 240, 110}, // Material Colour
+ new short[] { 250, 240, 110 }, // Material Colour
-73, // Melting Point in C
139, // Boiling Point in C
-1, // Protons
@@ -385,7 +369,7 @@ public final class MISC_MATERIALS {
public static final Material CHLOROACETIC_ACID = new Material(
"Chloroacetic Acid",
MaterialState.PURE_LIQUID, // State
- new short[] {230, 200, 90}, // Material Colour
+ new short[] { 230, 200, 90 }, // Material Colour
63, // Melting Point in C
189, // Boiling Point in C
-1, // Protons
@@ -402,7 +386,7 @@ public final class MISC_MATERIALS {
public static final Material DICHLOROACETIC_ACID = new Material(
"Dichloroacetic Acid",
MaterialState.PURE_LIQUID, // State
- new short[] {190, 160, 60}, // Material Colour
+ new short[] { 190, 160, 60 }, // Material Colour
13, // Melting Point in C
194, // Boiling Point in C
-1, // Protons
@@ -419,7 +403,7 @@ public final class MISC_MATERIALS {
public static final Material TRICHLOROACETIC_ACID = new Material(
"Trichloroacetic Acid",
MaterialState.PURE_LIQUID, // State
- new short[] {120, 100, 30}, // Material Colour
+ new short[] { 120, 100, 30 }, // Material Colour
57, // Melting Point in C
196, // Boiling Point in C
-1, // Protons
@@ -437,7 +421,7 @@ public final class MISC_MATERIALS {
"Chloroacetic Mixture",
MaterialState.LIQUID, // State
null,
- new short[] {210, 160, 10},
+ new short[] { 210, 160, 10 },
40,
192,
-1,
@@ -454,7 +438,7 @@ public final class MISC_MATERIALS {
public static final Material SODIUM_CYANIDE = new Material(
"Sodium Cyanide",
MaterialState.SOLID, // State
- new short[] {180, 190, 255}, // Material Colour
+ new short[] { 180, 190, 255 }, // Material Colour
563, // Melting Point in C
1496, // Boiling Point in C
-1, // Protons
@@ -470,7 +454,7 @@ public final class MISC_MATERIALS {
public static final Material CALCIUM_CHLORIDE = new Material(
"Calcium Chloride",
MaterialState.SOLID, // State
- new short[] {180, 190, 255}, // Material Colour
+ new short[] { 180, 190, 255 }, // Material Colour
563, // Melting Point in C
1496, // Boiling Point in C
-1, // Protons
@@ -485,7 +469,7 @@ public final class MISC_MATERIALS {
public static final Material CYANOACETIC_ACID = new Material(
"Cyanoacetic Acid",
MaterialState.SOLID, // State
- new short[] {130, 130, 40}, // Material Colour
+ new short[] { 130, 130, 40 }, // Material Colour
66, // Melting Point in C
108, // Boiling Point in C
-1, // Protons
@@ -502,7 +486,7 @@ public final class MISC_MATERIALS {
public static final Material SOLID_ACID_MIXTURE = new Material(
"Solid Acid Catalyst Mixture",
MaterialState.LIQUID, // State
- new short[] {80, 40, 0}, // Material Colour
+ new short[] { 80, 40, 0 }, // Material Colour
-10, // Melting Point in C
337, // Boiling Point in C
-1, // Protons
@@ -518,7 +502,7 @@ public final class MISC_MATERIALS {
public static final Material COPPER_SULFATE = new Material(
"Copper(II) Sulfate",
MaterialState.SOLID, // State
- new short[] {200, 200, 200}, // Material Colour
+ new short[] { 200, 200, 200 }, // Material Colour
590, // Melting Point in C
650, // Boiling Point in C
-1, // Protons
@@ -534,7 +518,7 @@ public final class MISC_MATERIALS {
public static final Material COPPER_SULFATE_HYDRATED = new Material(
"Copper(II) Sulfate Pentahydrate",
MaterialState.SOLID, // State
- new short[] {90, 170, 255}, // Material Colour
+ new short[] { 90, 170, 255 }, // Material Colour
590, // Melting Point in C
650, // Boiling Point in C
-1, // Protons
@@ -550,7 +534,7 @@ public final class MISC_MATERIALS {
public static final Material ETHYL_CYANOACETATE = new Material(
"Ethyl Cyanoacetate",
MaterialState.PURE_LIQUID, // State
- new short[] {0, 75, 160}, // Material Colour
+ new short[] { 0, 75, 160 }, // Material Colour
-22, // Melting Point in C
210, // Boiling Point in C
-1, // Protons
@@ -567,7 +551,7 @@ public final class MISC_MATERIALS {
public static final Material CYANOACRYLATE_POLYMER = new Material(
"Cyanoacrylate Polymer",
MaterialState.LIQUID, // State
- new short[] {140, 150, 160}, // Material Colour
+ new short[] { 140, 150, 160 }, // Material Colour
-25, // Melting Point in C
55, // Boiling Point in C
-1, // Protons
@@ -584,7 +568,7 @@ public final class MISC_MATERIALS {
public static final Material ETHYL_CYANOACRYLATE = new Material(
"Ethyl Cyanoacrylate (Super Glue)",
MaterialState.PURE_LIQUID, // State
- new short[] {170, 190, 200}, // Material Colour
+ new short[] { 170, 190, 200 }, // Material Colour
-25, // Melting Point in C
55, // Boiling Point in C
-1, // Protons
@@ -601,7 +585,7 @@ public final class MISC_MATERIALS {
public static final Material MUTATED_LIVING_SOLDER = new Material(
"Mutated Living Solder",
MaterialState.PURE_LIQUID, // State
- new short[] {147, 109, 155}, // Material Colour
+ new short[] { 147, 109, 155 }, // Material Colour
-200, // Melting Point in C
500, // Boiling Point in C
-1, // Protons
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index fa3194a67b..98ab4739d4 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -3,6 +3,19 @@ package gtPlusPlus.core.material;
import static gregtech.api.enums.GT_Values.M;
import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TextureSet;
@@ -23,25 +36,13 @@ import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
public class Material {
public static final Set<Material> mMaterialMap = new HashSet<Material>();
public static HashMap<String, Material> mMaterialCache = new HashMap<String, Material>();
- public static final Map<String, Map<String, ItemStack>> mComponentMap =
- new HashMap<String, Map<String, ItemStack>>();
+ public static final Map<String, Map<String, ItemStack>> mComponentMap = new HashMap<String, Map<String, ItemStack>>();
public static HashMap<String, String> sChemicalFormula = new HashMap<String, String>();
@@ -98,19 +99,12 @@ public class Material {
this(materialName, defaultState, null, inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba,
final MaterialStack... inputs) {
this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", 0, false, false, inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final short[] rgba,
- int radiationLevel,
+ public Material(final String materialName, final MaterialState defaultState, final short[] rgba, int radiationLevel,
MaterialStack... materialStacks) {
this(
materialName,
@@ -129,29 +123,13 @@ public class Material {
materialStacks);
}
- public Material(
- String materialName,
- MaterialState defaultState,
- short[] rgba,
- int j,
- int k,
- int l,
- int m,
- int radiationLevel,
- MaterialStack[] materialStacks) {
+ public Material(String materialName, MaterialState defaultState, short[] rgba, int j, int k, int l, int m,
+ int radiationLevel, MaterialStack[] materialStacks) {
this(materialName, defaultState, null, 0, rgba, j, k, l, m, false, "", radiationLevel, false, materialStacks);
}
- public Material(
- String materialName,
- MaterialState defaultState,
- final TextureSet set,
- short[] rgba,
- int meltingPoint,
- int boilingPoint,
- int protons,
- int neutrons,
- int radiationLevel,
+ public Material(String materialName, MaterialState defaultState, final TextureSet set, short[] rgba,
+ int meltingPoint, int boilingPoint, int protons, int neutrons, int radiationLevel,
MaterialStack[] materialStacks) {
this(
materialName,
@@ -170,16 +148,9 @@ public class Material {
materialStacks);
}
- 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) {
+ 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,
@@ -195,17 +166,9 @@ public class Material {
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 chemSymbol,
- 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 chemSymbol, final MaterialStack... inputs) {
this(
materialName,
defaultState,
@@ -221,17 +184,9 @@ public class Material {
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,
- boolean generateCells,
- 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, boolean generateCells, final MaterialStack... inputs) {
this(
materialName,
defaultState,
@@ -250,17 +205,9 @@ public class Material {
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) {
+ 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,
@@ -276,18 +223,9 @@ public class Material {
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) {
+ 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,
@@ -303,17 +241,9 @@ public class Material {
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,
+ 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,
@@ -330,18 +260,9 @@ public class Material {
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,
- boolean addCells,
+ 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, boolean addCells,
final MaterialStack... inputs) {
this(
materialName,
@@ -361,18 +282,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- TextureSet textureSet,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final String chemicalSymbol,
- final int radiationLevel,
+ public Material(final String materialName, final MaterialState defaultState, TextureSet textureSet,
+ 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,
@@ -392,19 +304,9 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- TextureSet textureSet,
- final short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- final String chemicalSymbol,
- final int radiationLevel,
- boolean addCells,
+ public Material(final String materialName, final MaterialState defaultState, TextureSet textureSet,
+ final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons,
+ final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean addCells,
final MaterialStack... inputs) {
this(
materialName,
@@ -424,18 +326,9 @@ public class Material {
inputs);
}
- private 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,
+ private 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(
materialName,
@@ -455,21 +348,10 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final TextureSet set,
- 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,
- boolean generateCells,
- final MaterialStack... inputs) {
+ public Material(final String materialName, final MaterialState defaultState, final TextureSet set,
+ 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, boolean generateCells, final MaterialStack... inputs) {
this(
materialName,
defaultState,
@@ -488,22 +370,10 @@ public class Material {
inputs);
}
- public Material(
- final String materialName,
- final MaterialState defaultState,
- final TextureSet set,
- final long durability,
- short[] rgba,
- final int meltingPoint,
- final int boilingPoint,
- final long protons,
- final long neutrons,
- final boolean blastFurnace,
- String chemicalSymbol,
- final int radiationLevel,
- boolean generateCells,
- boolean generateFluid,
- final MaterialStack... inputs) {
+ public Material(final String materialName, final MaterialState defaultState, final TextureSet set,
+ final long durability, short[] rgba, final int meltingPoint, final int boilingPoint, final long protons,
+ final long neutrons, final boolean blastFurnace, String chemicalSymbol, final int radiationLevel,
+ boolean generateCells, boolean generateFluid, final MaterialStack... inputs) {
if (mMaterialMap.add(this)) {}
@@ -516,11 +386,10 @@ public class Material {
try {
this.unlocalizedName = Utils.sanitizeString(materialName);
this.localizedName = materialName;
- this.translatedName =
- GT_LanguageManager.addStringLocalization("gtplusplus.material." + unlocalizedName, localizedName);
+ this.translatedName = GT_LanguageManager
+ .addStringLocalization("gtplusplus.material." + unlocalizedName, localizedName);
mMaterialCache.put(getLocalizedName().toLowerCase(), this);
- Logger.INFO("Stored " + getLocalizedName() + " to cache with key: "
- + getLocalizedName().toLowerCase());
+ Logger.INFO("Stored " + getLocalizedName() + " to cache with key: " + getLocalizedName().toLowerCase());
this.materialState = defaultState;
@@ -561,8 +430,7 @@ public class Material {
}
Short aAverage = MathUtils.getShortAverage(aDataSet);
- if (aAverage > Short.MAX_VALUE
- || aAverage < Short.MIN_VALUE
+ if (aAverage > Short.MAX_VALUE || aAverage < Short.MIN_VALUE
|| aAverage < 0
|| aAverage > 255) {
if (aAverage > 255) {
@@ -576,7 +444,7 @@ public class Material {
}
if (mMixedRGB != null && mMixedRGB[0] != null && mMixedRGB[1] != null && mMixedRGB[2] != null) {
- this.RGBA = new short[] {mMixedRGB[0], mMixedRGB[1], mMixedRGB[2], 0};
+ this.RGBA = new short[] { mMixedRGB[0], mMixedRGB[1], mMixedRGB[2], 0 };
} else {
this.RGBA = Materials.Steel.mRGBa;
}
@@ -679,11 +547,8 @@ public class Material {
aTempDura += safeCast_LongToInt(g.getStackMaterial().getMass() * 2000);
}
}
- this.vDurability = aTempDura > 0
- ? aTempDura
- : (this.getComposites().isEmpty()
- ? 51200
- : 32000 * this.getComposites().size());
+ this.vDurability = aTempDura > 0 ? aTempDura
+ : (this.getComposites().isEmpty() ? 51200 : 32000 * this.getComposites().size());
}
if ((this.vDurability >= 0) && (this.vDurability < 64000)) {
@@ -719,8 +584,10 @@ public class Material {
}
byte aAverage = MathUtils.getByteAverage(aDataSet);
if (aAverage > 0) {
- Logger.MATERIALS(this.getLocalizedName() + " is radioactive due to trace elements. Level: "
- + aAverage + ".");
+ Logger.MATERIALS(
+ this.getLocalizedName() + " is radioactive due to trace elements. Level: "
+ + aAverage
+ + ".");
this.isRadioactive = true;
this.vRadiationLevel = (byte) aAverage;
} else {
@@ -735,34 +602,16 @@ public class Material {
}
}
- /*if (vMaterialInput.size() > 0) {
- AutoMap<Integer> aDataSet = new AutoMap<Integer>();
-
- int bonus = 0;
- bonus += this.vMaterialInput.size();
- bonus += MathUtils.roundToClosestInt(meltingPointC/1000);
-
-
-
- aDataSet.put(bonus);
-
- for (MaterialStack m : this.vMaterialInput) {
- aDataSet.put(m.getStackMaterial().vTier);
- }
- int aAverage = MathUtils.getIntAverage(aDataSet);
- if (aAverage > Integer.MAX_VALUE || aAverage < Integer.MIN_VALUE) {
- aAverage = 0;
- }
- if (aAverage > 0) {
- this.vTier = Math.min(aAverage, 10);
- }
- else {
- this.vTier = MaterialUtils.getTierOfMaterial((int) MathUtils.celsiusToKelvin(meltingPoint));
- }
- }
- else {
- this.vTier = MaterialUtils.getTierOfMaterial((int) MathUtils.celsiusToKelvin(meltingPoint));
- }*/
+ /*
+ * if (vMaterialInput.size() > 0) { AutoMap<Integer> aDataSet = new AutoMap<Integer>(); int bonus = 0; bonus
+ * += this.vMaterialInput.size(); bonus += MathUtils.roundToClosestInt(meltingPointC/1000);
+ * aDataSet.put(bonus); for (MaterialStack m : this.vMaterialInput) {
+ * aDataSet.put(m.getStackMaterial().vTier); } int aAverage = MathUtils.getIntAverage(aDataSet); if
+ * (aAverage > Integer.MAX_VALUE || aAverage < Integer.MIN_VALUE) { aAverage = 0; } if (aAverage > 0) {
+ * this.vTier = Math.min(aAverage, 10); } else { this.vTier = MaterialUtils.getTierOfMaterial((int)
+ * MathUtils.celsiusToKelvin(meltingPoint)); } } else { this.vTier = MaterialUtils.getTierOfMaterial((int)
+ * MathUtils.celsiusToKelvin(meltingPoint)); }
+ */
this.vTier = MaterialUtils.getTierOfMaterial(meltingPoint);
// Sets the materials 'tier'. Will probably replace this logic.
@@ -847,8 +696,12 @@ public class Material {
sChemicalFormula.put(materialName.toLowerCase(), this.vChemicalFormula);
Logger.MATERIALS("Creating a Material instance for " + materialName);
- Logger.MATERIALS("Formula: " + this.vChemicalFormula + " Smallest Stack: "
- + this.smallestStackSizeWhenProcessing + " Smallest Ratio:" + ratio);
+ Logger.MATERIALS(
+ "Formula: " + this.vChemicalFormula
+ + " Smallest Stack: "
+ + this.smallestStackSizeWhenProcessing
+ + " Smallest Ratio:"
+ + ratio);
Logger.MATERIALS("Protons: " + this.vProtons);
Logger.MATERIALS("Neutrons: " + this.vNeutrons);
Logger.MATERIALS("Mass: " + this.vMass + "/units");
@@ -899,8 +752,11 @@ public class Material {
public TextureSet setTextureSet(TextureSet set, int aTier) {
if (set != null) {
- Logger.MATERIALS("Set textureset for " + this.localizedName + " to be " + set.mSetName
- + ". This textureSet was supplied.");
+ Logger.MATERIALS(
+ "Set textureset for " + this.localizedName
+ + " to be "
+ + set.mSetName
+ + ". This textureSet was supplied.");
return set;
}
@@ -952,12 +808,18 @@ public class Material {
if (aSet == null) {
if (aGem >= this.getComposites().size() / 2) {
if (MathUtils.isNumberEven(aGem)) {
- Logger.MATERIALS("Set textureset for " + this.localizedName + " to be "
- + TextureSet.SET_GEM_HORIZONTAL.mSetName + ".");
+ Logger.MATERIALS(
+ "Set textureset for " + this.localizedName
+ + " to be "
+ + TextureSet.SET_GEM_HORIZONTAL.mSetName
+ + ".");
return TextureSet.SET_GEM_HORIZONTAL;
} else {
- Logger.MATERIALS("Set textureset for " + this.localizedName + " to be "
- + TextureSet.SET_GEM_VERTICAL.mSetName + ".");
+ Logger.MATERIALS(
+ "Set textureset for " + this.localizedName
+ + " to be "
+ + TextureSet.SET_GEM_VERTICAL.mSetName
+ + ".");
return TextureSet.SET_GEM_VERTICAL;
}
}
@@ -981,16 +843,19 @@ public class Material {
sets.put(r.getStackMaterial());
}
}
- TextureSet mostUsedTypeTextureSet =
- MaterialUtils.getMostCommonTextureSet(new ArrayList<Material>(sets.values()));
+ TextureSet mostUsedTypeTextureSet = MaterialUtils
+ .getMostCommonTextureSet(new ArrayList<Material>(sets.values()));
if (mostUsedTypeTextureSet != null && mostUsedTypeTextureSet instanceof TextureSet) {
Logger.MATERIALS(
"Set textureset for " + this.localizedName + " to be " + mostUsedTypeTextureSet.mSetName + ".");
return mostUsedTypeTextureSet;
}
}
- Logger.MATERIALS("Set textureset for " + this.localizedName + " to be " + Materials.Iron.mIconSet.mSetName
- + ". [Fallback]");
+ Logger.MATERIALS(
+ "Set textureset for " + this.localizedName
+ + " to be "
+ + Materials.Iron.mIconSet.mSetName
+ + ". [Fallback]");
return Materials.Gold.mIconSet;
}
@@ -1023,7 +888,7 @@ public class Material {
if (this.RGBA != null) {
return this.RGBA;
}
- return new short[] {255, 0, 0};
+ return new short[] { 255, 0, 0 };
}
public final short[] getRGBA() {
@@ -1031,10 +896,10 @@ public class Material {
if (this.RGBA.length == 4) {
return this.RGBA;
} else {
- return new short[] {this.RGBA[0], this.RGBA[1], this.RGBA[2], 0};
+ return new short[] { this.RGBA[0], this.RGBA[1], this.RGBA[2], 0 };
}
}
- return new short[] {255, 0, 0, 0};
+ return new short[] { 255, 0, 0, 0 };
}
public final int getRgbAsHex() {
@@ -1104,8 +969,10 @@ public class Material {
if (aPrefix == OrePrefixes.cell) {
Erg = ItemUtils.getOrePrefixStack(OrePrefixes.cellMolten, Erf, stacksize);
if (Erg != null && ItemUtils.checkForInvalidItems(Erg)) {
- Logger.MATERIALS("Found \"" + OrePrefixes.cellMolten.name() + this.unlocalizedName
- + "\" using backup GT Materials option.");
+ Logger.MATERIALS(
+ "Found \"" + OrePrefixes.cellMolten.name()
+ + this.unlocalizedName
+ + "\" using backup GT Materials option.");
g.put(aKey, Erg);
mComponentMap.put(unlocalizedName, g);
return Erg;
@@ -1128,16 +995,16 @@ public class Material {
public final Block getBlock() {
Block b = Block.getBlockFromItem(getBlock(1).getItem());
if (b == null) {
- Logger.INFO("[ERROR] Tried to get invalid block for " + this.getLocalizedName()
- + ", returning debug block instead.");
+ Logger.INFO(
+ "[ERROR] Tried to get invalid block for " + this.getLocalizedName()
+ + ", returning debug block instead.");
}
return b != null ? b : Blocks.lit_furnace;
}
public final ItemStack getBlock(final int stacksize) {
ItemStack i = getComponentByPrefix(OrePrefixes.block, stacksize);
- return i != null
- ? i
+ return i != null ? i
: ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block" + this.unlocalizedName, stacksize);
}
@@ -1280,11 +1147,13 @@ public class Material {
/**
* Ore Components
+ *
* @return
*/
public final ItemStack getOre(final int stacksize) {
return ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
- "ore" + Utils.sanitizeString(this.getUnlocalizedName()), stacksize);
+ "ore" + Utils.sanitizeString(this.getUnlocalizedName()),
+ stacksize);
}
public final Block getOreBlock(final int stacksize) {
@@ -1298,9 +1167,10 @@ public class Material {
return a3;
}
- Block x = Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
- "ore" + Utils.sanitizeString(this.unlocalizedName), stacksize)
- .getItem());
+ Block x = Block.getBlockFromItem(
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
+ "ore" + Utils.sanitizeString(this.unlocalizedName),
+ stacksize).getItem());
if (x != null) {
return x;
}
@@ -1336,8 +1206,8 @@ public class Material {
}
public final boolean hasSolidForm() {
- if (ItemUtils.checkForInvalidItems(
- new ItemStack[] {getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1)})) {
+ if (ItemUtils
+ .checkForInvalidItems(new ItemStack[] { getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1) })) {
return true;
}
return false;
@@ -1479,8 +1349,10 @@ public class Material {
if (dummyFormulaArray[e] > 1) {
if (aChemFormula.length() > 3) {
- dummyFormula =
- dummyFormula + "(" + aChemFormula + ")" + dummyFormulaArray[e];
+ dummyFormula = dummyFormula + "("
+ + aChemFormula
+ + ")"
+ + dummyFormulaArray[e];
} else {
dummyFormula = dummyFormula + aChemFormula + dummyFormulaArray[e];
}
@@ -1535,17 +1407,17 @@ public class Material {
Fluid aGTBaseFluid = null;
// Clean up Internal Fluid Generation
- final Materials n1 =
- MaterialUtils.getMaterial(this.getLocalizedName(), Utils.sanitizeString(this.getLocalizedName()));
- final Materials n2 =
- MaterialUtils.getMaterial(this.getUnlocalizedName(), Utils.sanitizeString(this.getUnlocalizedName()));
+ final Materials n1 = MaterialUtils
+ .getMaterial(this.getLocalizedName(), Utils.sanitizeString(this.getLocalizedName()));
+ final Materials n2 = MaterialUtils
+ .getMaterial(this.getUnlocalizedName(), Utils.sanitizeString(this.getUnlocalizedName()));
FluidStack f1 = FluidUtils.getWildcardFluidStack(n1, 1);
FluidStack f2 = FluidUtils.getWildcardFluidStack(n2, 1);
- FluidStack f3 = FluidUtils.getWildcardFluidStack(
- Utils.sanitizeString(this.getUnlocalizedName(), new char[] {'-', '_'}), 1);
- FluidStack f4 = FluidUtils.getWildcardFluidStack(
- Utils.sanitizeString(this.getLocalizedName(), new char[] {'-', '_'}), 1);
+ FluidStack f3 = FluidUtils
+ .getWildcardFluidStack(Utils.sanitizeString(this.getUnlocalizedName(), new char[] { '-', '_' }), 1);
+ FluidStack f4 = FluidUtils
+ .getWildcardFluidStack(Utils.sanitizeString(this.getLocalizedName(), new char[] { '-', '_' }), 1);
if (f1 != null) {
aGTBaseFluid = f1.getFluid();
@@ -1560,14 +1432,16 @@ public class Material {
ItemStack aFullCell = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell" + this.getUnlocalizedName(), 1);
ItemStack aFullCell2 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell" + this.getLocalizedName(), 1);
ItemStack aFullCell3 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
- "cell" + Utils.sanitizeString(this.getUnlocalizedName(), new char[] {'-', '_'}), 1);
+ "cell" + Utils.sanitizeString(this.getUnlocalizedName(), new char[] { '-', '_' }),
+ 1);
ItemStack aFullCell4 = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(
- "cell" + Utils.sanitizeString(this.getLocalizedName(), new char[] {'-', '_'}), 1);
+ "cell" + Utils.sanitizeString(this.getLocalizedName(), new char[] { '-', '_' }),
+ 1);
Logger.MATERIALS("Generating our own fluid.");
// Generate a Cell if we need to, but first validate all four searches are invalid
- if (!ItemUtils.checkForInvalidItems(new ItemStack[] {aFullCell, aFullCell2, aFullCell3, aFullCell4})) {
+ if (!ItemUtils.checkForInvalidItems(new ItemStack[] { aFullCell, aFullCell2, aFullCell3, aFullCell4 })) {
if (this.vGenerateCells) {
Item g = new BaseItemCell(this);
aFullCell = ItemUtils.getSimpleStack(g);
@@ -1619,17 +1493,15 @@ public class Material {
this.vGenerateCells);
} else if (this.materialState == MaterialState.GAS || this.materialState == MaterialState.PURE_GAS) {
return FluidUtils.generateGas(
- unlocalizedName, this.getLocalizedName(), getMeltingPointK(), getRGBA(), vGenerateCells);
- /*return FluidUtils.addGTFluid(
- this.getUnlocalizedName(),
- this.getLocalizedName()+" Gas",
- this.RGBA,
- 2,
- this.getMeltingPointK(),
- aFullCell,
- ItemUtils.getEmptyCell(),
- 1000,
- this.vGenerateCells);*/
+ unlocalizedName,
+ this.getLocalizedName(),
+ getMeltingPointK(),
+ getRGBA(),
+ vGenerateCells);
+ /*
+ * return FluidUtils.addGTFluid( this.getUnlocalizedName(), this.getLocalizedName()+" Gas", this.RGBA, 2,
+ * this.getMeltingPointK(), aFullCell, ItemUtils.getEmptyCell(), 1000, this.vGenerateCells);
+ */
} else { // Plasma
return this.generatePlasma();
}
@@ -1779,13 +1651,13 @@ public class Material {
return registerComponentForMaterial(this, aPrefix, aStack);
}
- public static boolean registerComponentForMaterial(
- Material componentMaterial, ComponentTypes aPrefix, ItemStack aStack) {
+ public static boolean registerComponentForMaterial(Material componentMaterial, ComponentTypes aPrefix,
+ ItemStack aStack) {
return registerComponentForMaterial(componentMaterial, aPrefix.getGtOrePrefix(), aStack);
}
- public static boolean registerComponentForMaterial(
- Material componentMaterial, OrePrefixes aPrefix, ItemStack aStack) {
+ public static boolean registerComponentForMaterial(Material componentMaterial, OrePrefixes aPrefix,
+ ItemStack aStack) {
if (componentMaterial == null) {
return false;
}
@@ -1798,8 +1670,11 @@ public class Material {
ItemStack x = aMap.get(aKey);
if (x == null) {
aMap.put(aKey, aStack);
- Logger.MATERIALS("Registering a material component. Item: [" + componentMaterial.getUnlocalizedName()
- + "] Map: [" + aKey + "]");
+ Logger.MATERIALS(
+ "Registering a material component. Item: [" + componentMaterial.getUnlocalizedName()
+ + "] Map: ["
+ + aKey
+ + "]");
Material.mComponentMap.put(componentMaterial.getUnlocalizedName(), aMap);
return true;
} else {
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
index 27a9ea3750..3f1b695869 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -1,5 +1,12 @@
package gtPlusPlus.core.material;
+import java.util.Set;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
@@ -50,16 +57,10 @@ import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plasma;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Plates;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting;
-import java.util.Set;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class MaterialGenerator {
- public static final AutoMap<Set<RunnableWithInfo<Material>>> mRecipeMapsToGenerate =
- new AutoMap<Set<RunnableWithInfo<Material>>>();
+ public static final AutoMap<Set<RunnableWithInfo<Material>>> mRecipeMapsToGenerate = new AutoMap<Set<RunnableWithInfo<Material>>>();
@SuppressWarnings("unused")
private static volatile Item temp;
@@ -67,30 +68,22 @@ public class MaterialGenerator {
@SuppressWarnings("unused")
private static volatile Block tempBlock;
- public static boolean addFluidCannerRecipe(
- ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn, FluidStack rFluidOut) {
+ public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn,
+ FluidStack rFluidOut) {
return addFluidCannerRecipe(aEmpty, aFullContainer, aFluidIn, rFluidOut, null, null);
}
+
/**
* Called Reflectively from CORE.RA.addFluidCannerRecipe
+ *
* @return
*/
- public static boolean addFluidCannerRecipe(
- ItemStack aEmpty,
- ItemStack aFullContainer,
- FluidStack aFluidIn,
- FluidStack rFluidOut,
- Integer aTime,
- Integer aEu) {
- /*GT_Recipe r = new Recipe_GT(
- true,
- new ItemStack[] {aEmpty},
- new ItemStack[] {aFullContainer},
- null,
- new int[] {},
- new FluidStack[] {rFluidIn},
- new FluidStack[] {rFluidOut},
- 0, 0, 0);*/
+ public static boolean addFluidCannerRecipe(ItemStack aEmpty, ItemStack aFullContainer, FluidStack aFluidIn,
+ FluidStack rFluidOut, Integer aTime, Integer aEu) {
+ /*
+ * GT_Recipe r = new Recipe_GT( true, new ItemStack[] {aEmpty}, new ItemStack[] {aFullContainer}, null, new
+ * int[] {}, new FluidStack[] {rFluidIn}, new FluidStack[] {rFluidOut}, 0, 0, 0);
+ */
// new RecipeGen_FluidCanning(r, false);
RecipeGen_FluidCanning g = new RecipeGen_FluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0);
if (g != null && g.valid()) {
@@ -107,8 +100,8 @@ public class MaterialGenerator {
generate(matInfo, generateEverything, true);
}
- public static boolean generate(
- final Material matInfo, final boolean generateEverything, final boolean generateBlastSmelterRecipes) {
+ public static boolean generate(final Material matInfo, final boolean generateEverything,
+ final boolean generateBlastSmelterRecipes) {
try {
final String unlocalizedName = matInfo.getUnlocalizedName();
final String materialName = matInfo.getLocalizedName();
@@ -259,19 +252,20 @@ public class MaterialGenerator {
generateNuclearMaterial(matInfo, false, true, false, false, true);
if (generateDehydratorRecipe && matInfo.getFluid() != null && matInfo.getDust(0) != null) {
CORE.RA.addDehydratorRecipe(
- new ItemStack[] {CI.getNumberedCircuit(20)},
+ new ItemStack[] { CI.getNumberedCircuit(20) },
matInfo.getFluidStack(144),
null,
- new ItemStack[] {
- matInfo.getDust(1),
- },
- new int[] {10000},
+ new ItemStack[] { matInfo.getDust(1), },
+ new int[] { 10000 },
10 * (matInfo.vVoltageMultiplier / 5), // Time in ticks
matInfo.vVoltageMultiplier); // EU
} else {
Logger.INFO(
- "Nuclear Dehydrator: Did not generate recipe for " + matInfo.getLocalizedName() + " | Null Fluid? "
- + (matInfo.getFluid() == null) + " | Null Dust? " + (matInfo.getDust(0) == null));
+ "Nuclear Dehydrator: Did not generate recipe for " + matInfo.getLocalizedName()
+ + " | Null Fluid? "
+ + (matInfo.getFluid() == null)
+ + " | Null Dust? "
+ + (matInfo.getDust(0) == null));
}
}
@@ -279,12 +273,8 @@ public class MaterialGenerator {
generateNuclearMaterial(matInfo, true, true, true, generatePlates, true);
}
- public static void generateNuclearMaterial(
- final Material matInfo,
- final boolean generateBlock,
- final boolean generateDusts,
- final boolean generateIngot,
- final boolean generatePlates,
+ public static void generateNuclearMaterial(final Material matInfo, final boolean generateBlock,
+ final boolean generateDusts, final boolean generateIngot, final boolean generatePlates,
final boolean disableOptionalRecipes) {
try {
@@ -328,12 +318,8 @@ public class MaterialGenerator {
}
@SuppressWarnings("unused")
- public static void generateOreMaterial(
- final Material matInfo,
- boolean generateOre,
- boolean generateDust,
- boolean generateSmallTinyDusts,
- short[] customRGB) {
+ public static void generateOreMaterial(final Material matInfo, boolean generateOre, boolean generateDust,
+ boolean generateSmallTinyDusts, short[] customRGB) {
try {
if (matInfo == null) {
@@ -379,8 +365,9 @@ public class MaterialGenerator {
temp = new BaseItemImpureDust(matInfo);
temp = new BaseItemPurifiedDust(matInfo);
- Logger.MATERIALS("Generated all ore components for " + matInfo.getLocalizedName()
- + ", now generating processing recipes.");
+ Logger.MATERIALS(
+ "Generated all ore components for " + matInfo.getLocalizedName()
+ + ", now generating processing recipes.");
if (matInfo == FLUORIDES.FLUORITE) {
new RecipeGen_Fluorite(matInfo);
@@ -389,8 +376,9 @@ public class MaterialGenerator {
}
} catch (final Throwable t) {
- Logger.MATERIALS("[Error] " + (matInfo != null ? matInfo.getLocalizedName() : "Null Material")
- + " failed to generate.");
+ Logger.MATERIALS(
+ "[Error] " + (matInfo != null ? matInfo.getLocalizedName() : "Null Material")
+ + " failed to generate.");
t.printStackTrace();
}
}
@@ -418,8 +406,9 @@ public class MaterialGenerator {
temp = new BaseItemImpureDust(matInfo);
temp = new BaseItemPurifiedDust(matInfo);
- Logger.MATERIALS("Generated all ore & base components for " + matInfo.getLocalizedName()
- + ", now generating processing recipes.");
+ Logger.MATERIALS(
+ "Generated all ore & base components for " + matInfo.getLocalizedName()
+ + ", now generating processing recipes.");
new RecipeGen_Ore(matInfo, true);
new RecipeGen_AlloySmelter(matInfo);
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialStack.java b/src/main/java/gtPlusPlus/core/material/MaterialStack.java
index 0e05b9b3b3..f0d99ef554 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialStack.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialStack.java
@@ -1,13 +1,15 @@
package gtPlusPlus.core.material;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import net.minecraft.item.ItemStack;
+
import gregtech.api.enums.OrePrefixes;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.bartworks.BW_Utils;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import net.minecraft.item.ItemStack;
public class MaterialStack {
@@ -55,8 +57,8 @@ public class MaterialStack {
public ItemStack getUnificatedDustStack(final int amount) {
if (this.stackMaterial.werkstoffID != 0) {
- ItemStack stack =
- BW_Utils.getCorrespondingItemStack(OrePrefixes.dust, this.stackMaterial.werkstoffID, amount);
+ ItemStack stack = BW_Utils
+ .getCorrespondingItemStack(OrePrefixes.dust, this.stackMaterial.werkstoffID, amount);
if (stack != null) {
return stack;
}
diff --git a/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java b/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java
index 180bb15888..4ef9303f79 100644
--- a/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java
+++ b/src/main/java/gtPlusPlus/core/material/NONMATERIAL.java
@@ -28,12 +28,12 @@ public class NONMATERIAL {
public static final Material WROUGHT_IRON = MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron);
// PTFE
- public static final Material PTFE =
- MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic"));
+ public static final Material PTFE = MaterialUtils
+ .generateMaterialFromGtENUM(MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic"));
// Plastic
- public static final Material PLASTIC =
- MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterial("Plastic", "Rubber"));
+ public static final Material PLASTIC = MaterialUtils
+ .generateMaterialFromGtENUM(MaterialUtils.getMaterial("Plastic", "Rubber"));
static {
MEAT.setTextureSet(TextureSet.SET_ROUGH);
diff --git a/src/main/java/gtPlusPlus/core/material/ORES.java b/src/main/java/gtPlusPlus/core/material/ORES.java
index be19b58a45..12300af51a 100644
--- a/src/main/java/gtPlusPlus/core/material/ORES.java
+++ b/src/main/java/gtPlusPlus/core/material/ORES.java
@@ -10,77 +10,73 @@ public final class ORES {
"Agardite (Cd)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {170, 188, 33, 0}, // Material Colour
+ new short[] { 170, 188, 33, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (CdCa)Cu7(AsO2)4(O2H)5·3H2O
- new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().COPPER, 7),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11)
- });
+ new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 7),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 11) });
public static final Material AGARDITE_LA = new Material(
"Agardite (La)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {206, 232, 9, 0}, // Material Colour
+ new short[] { 206, 232, 9, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (LaCa)Cu5(AsO6)2(OH)4·3H2O
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().COPPER, 5),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
- });
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 5),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10) });
public static final Material AGARDITE_ND = new Material(
"Agardite (Nd)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {225, 244, 78, 0}, // Material Colour
+ new short[] { 225, 244, 78, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (NdCa)Cu6(As3O3)2(O2H)6·3H2O
- new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().COPPER, 6),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12)
- });
+ new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 6),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) });
public static final Material AGARDITE_Y = new Material(
"Agardite (Y)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {210, 232, 44, 0}, // Material Colour
+ new short[] { 210, 232, 44, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (YCa)Cu5(As2O4)3(OH)6·3H2O
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().COPPER, 5),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12)
- });
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 5),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 6),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 21),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12) });
// Alburnite
// Ag8GeTe2S4
@@ -88,39 +84,37 @@ public final class ORES {
"Alburnite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {16, 5, 105, 0}, // Material Colour
+ new short[] { 16, 5, 105, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().GOLD, 8),
- new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 4)
- });
+ new MaterialStack(ELEMENT.getInstance().GOLD, 8),
+ new MaterialStack(ELEMENT.getInstance().GERMANIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 4) });
public static final Material CERITE = new Material(
"Cerite", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {68, 13, 0, 0}, // Material Colour
+ new short[] { 68, 13, 0, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Ce,La,Ca)9(Mg,Fe+3)(SiO4)6(SiO3OH)(OH)3
- new MaterialStack(ELEMENT.getInstance().CERIUM, 9),
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 9),
- new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3),
- new MaterialStack(ELEMENT.getInstance().IRON, 3),
- new MaterialStack(ELEMENT.getInstance().SILICON, 7),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 20),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4)
- });
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 9),
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 9),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 9),
+ new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().IRON, 3),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 7),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 20),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 4) });
// Comancheite
// Hg55N24(NH2,OH)4(Cl,Br)34
@@ -128,204 +122,189 @@ public final class ORES {
"Comancheite", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {65, 205, 105, 0}, // Material Colour
+ new short[] { 65, 205, 105, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().MERCURY, 54 / 4),
- new MaterialStack(ELEMENT.getInstance().NITROGEN, 28 / 4),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12 / 4),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 8 / 4),
- new MaterialStack(ELEMENT.getInstance().CHLORINE, 34 / 4),
- new MaterialStack(ELEMENT.getInstance().BROMINE, 34 / 4)
- });
+ new MaterialStack(ELEMENT.getInstance().MERCURY, 54 / 4),
+ new MaterialStack(ELEMENT.getInstance().NITROGEN, 28 / 4),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 12 / 4),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 8 / 4),
+ new MaterialStack(ELEMENT.getInstance().CHLORINE, 34 / 4),
+ new MaterialStack(ELEMENT.getInstance().BROMINE, 34 / 4) });
public static final Material CROCROITE = new Material(
"Crocoite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_GEM_VERTICAL, // Texture Set
- new short[] {255, 143, 84, 0}, // Material Colour
+ new short[] { 255, 143, 84, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LEAD, 2),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().CAESIUM, 1),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LEAD, 2),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().CAESIUM, 1), });
public static final Material CRYOLITE = new Material(
"Cryolite (F)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_SHINY, // Texture Set
- new short[] {205, 205, 255, 0}, // Material Colour
+ new short[] { 205, 205, 255, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
- });
+ new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
// Demicheleite-(Br)
- // BiSBr
+ // BiSBr
public static final Material DEMICHELEITE_BR = new Material(
"Demicheleite (Br)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_SHINY, // Texture Set
- new short[] {165, 75, 75, 0}, // Material Colour
+ new short[] { 165, 75, 75, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().BISMUTH, 13),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 11),
- new MaterialStack(ELEMENT.getInstance().BROMINE, 1)
- });
+ new MaterialStack(ELEMENT.getInstance().BISMUTH, 13),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 11),
+ new MaterialStack(ELEMENT.getInstance().BROMINE, 1) });
public static final Material FLORENCITE = new Material(
"Florencite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {249, 249, 124, 0}, // Material Colour
+ new short[] { 249, 249, 124, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // SmAl3(PO4)2(OH)6
- new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 10),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6)
- });
+ new MaterialStack(ELEMENT.getInstance().SAMARIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 10),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 6) });
public static final Material FLUORCAPHITE = new Material(
"Fluorcaphite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {255, 255, 30, 0}, // Material Colour
+ new short[] { 255, 255, 30, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Ca,Sr,Ce,Na)5(PO4)3F
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 5),
- new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 5),
- new MaterialStack(ELEMENT.getInstance().SODIUM, 5),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 12),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6),
- });
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 5),
+ new MaterialStack(MISC_MATERIALS.STRONTIUM_OXIDE, 5),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().SODIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 3),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 12),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6), });
// Gadolinite_Ce
public static final Material GADOLINITE_CE = new Material(
"Gadolinite (Ce)", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {15, 159, 59, 0}, // Material Colour
+ new short[] { 15, 159, 59, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CERIUM, 4),
- new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
- new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
- new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 1),
- new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 7),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 14),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 7),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 14), });
// Gadolinite_Y
public static final Material GADOLINITE_Y = new Material(
"Gadolinite (Y)", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {35, 189, 99, 0}, // Material Colour
+ new short[] { 35, 189, 99, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
- new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
- new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4),
- new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
- new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 3),
- new MaterialStack(ELEMENT.getInstance().SILICON, 4),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 9),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 4),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 9), });
public static final Material GEIKIELITE = new Material(
"Geikielite", // Material Name
MaterialState.ORE, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {187, 193, 204, 0}, // Material Colour
+ new short[] { 187, 193, 204, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3) });
public static final Material GREENOCKITE = new Material(
"Greenockite", // Material Name
MaterialState.ORE, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {110, 193, 25, 0}, // Material Colour
+ new short[] { 110, 193, 25, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CADMIUM, 1), new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CADMIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 1), });
public static final Material HIBONITE = new Material(
"Hibonite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {58, 31, 0, 0}, // Material Colour
+ new short[] { 58, 31, 0, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // ((Ca,Ce)(Al,Ti,Mg)12O19)
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
- new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 19),
- });
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().MAGNESIUM, 12),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 19), });
// Honeaite
// Au3TlTe2
@@ -333,17 +312,16 @@ public final class ORES {
"Honeaite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {165, 165, 5, 0}, // Material Colour
+ new short[] { 165, 165, 5, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().GOLD, 3),
- new MaterialStack(ELEMENT.getInstance().THALLIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2)
- });
+ new MaterialStack(ELEMENT.getInstance().GOLD, 3),
+ new MaterialStack(ELEMENT.getInstance().THALLIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2) });
// Irarsite
// (Ir,Ru,Rh,Pt)AsS
@@ -351,21 +329,20 @@ public final class ORES {
"Irarsite", // Material Name
MaterialState.ORE, // State
TextureSets.ENRICHED.get(), // Texture Set
- new short[] {125, 105, 105, 0}, // Material Colour
+ new short[] { 125, 105, 105, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1),
- new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1),
- new MaterialStack(ELEMENT.getInstance().RHODIUM, 1),
- new MaterialStack(ELEMENT.getInstance().PLATINUM, 1),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 1),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 1)
- });
+ new MaterialStack(ELEMENT.getInstance().IRIDIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().RUTHENIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().RHODIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().PLATINUM, 1),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 1),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 1) });
// Kashinite
// (Ir,Rh)2S3
@@ -373,125 +350,117 @@ public final class ORES {
"Kashinite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_SHINY, // Texture Set
- new short[] {75, 105, 75, 0}, // Material Colour
+ new short[] { 75, 105, 75, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2),
- new MaterialStack(ELEMENT.getInstance().RHODIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 3)
- });
+ new MaterialStack(ELEMENT.getInstance().IRIDIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().RHODIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 3) });
- // Tl(Cl,Br)
+ // Tl(Cl,Br)
public static final Material LAFOSSAITE = new Material(
"Lafossaite", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {165, 105, 205, 0}, // Material Colour
+ new short[] { 165, 105, 205, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
- new MaterialStack(ELEMENT.getInstance().BROMINE, 1),
- new MaterialStack(ELEMENT.getInstance().THALLIUM, 1)
- });
+ new MaterialStack(ELEMENT.getInstance().CHLORINE, 1),
+ new MaterialStack(ELEMENT.getInstance().BROMINE, 1),
+ new MaterialStack(ELEMENT.getInstance().THALLIUM, 1) });
public static final Material LANTHANITE_CE = new Material(
"Lanthanite (Ce)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {186, 113, 179, 0}, // Material Colour
+ new short[] { 186, 113, 179, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Ce)2(CO3)3·8(H2O)
- new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
- });
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), });
public static final Material LANTHANITE_LA = new Material(
"Lanthanite (La)", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {219, 160, 214, 0}, // Material Colour
+ new short[] { 219, 160, 214, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (La)2(CO3)3·8(H2O)
- new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
- });
+ new MaterialStack(ELEMENT.getInstance().LANTHANUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), });
public static final Material LANTHANITE_ND = new Material(
"Lanthanite (Nd)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {153, 76, 145, 0}, // Material Colour
+ new short[] { 153, 76, 145, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Nd)2(CO3)3·8(H2O)
- new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 1),
- });
+ new MaterialStack(ELEMENT.getInstance().NEODYMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 1), });
// Iodine Source
public static final Material LAUTARITE = new Material(
"Lautarite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {165, 105, 205, 0}, // Material Colour
+ new short[] { 165, 105, 205, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().IODINE, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 6)
- });
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().IODINE, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) });
public static final Material LEPERSONNITE = new Material(
"Lepersonnite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_EMERALD, // Texture Set
- new short[] {175, 175, 20, 0}, // Material Colour
+ new short[] { 175, 175, 20, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 3),
- new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
- new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 29),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().GADOLINIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().DYSPROSIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 29),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 24) });
// Miessiite
// Pd11Te2Se2
@@ -499,36 +468,33 @@ public final class ORES {
"Miessiite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {75, 75, 75, 0}, // Material Colour
+ new short[] { 75, 75, 75, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11),
- new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SELENIUM, 2)
- });
+ new MaterialStack(ELEMENT.getInstance().PALLADIUM, 11),
+ new MaterialStack(ELEMENT.getInstance().TELLURIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SELENIUM, 2) });
public static final Material NICHROMITE = new Material(
"Nichromite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {22, 19, 19, 0}, // Material Colour
+ new short[] { 22, 19, 19, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NICKEL, 1),
- new MaterialStack(ELEMENT.getInstance().COBALT, 1),
- new MaterialStack(ELEMENT.getInstance().IRON, 3),
- new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2),
- new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NICKEL, 1),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 1),
+ new MaterialStack(ELEMENT.getInstance().IRON, 3),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().CHROMIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) });
// Perroudite
// Hg5Ag4S5(I,Br)2Cl2
@@ -536,42 +502,38 @@ public final class ORES {
"Perroudite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {77, 165, 174, 0}, // Material Colour
+ new short[] { 77, 165, 174, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
- new MaterialStack(ELEMENT.getInstance().SILVER, 4),
- new MaterialStack(ELEMENT.getInstance().IODINE, 2),
- new MaterialStack(ELEMENT.getInstance().MERCURY, 5),
- new MaterialStack(ELEMENT.getInstance().BROMINE, 2),
- new MaterialStack(ELEMENT.getInstance().CHLORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SULFUR, 5),
+ new MaterialStack(ELEMENT.getInstance().SILVER, 4),
+ new MaterialStack(ELEMENT.getInstance().IODINE, 2),
+ new MaterialStack(ELEMENT.getInstance().MERCURY, 5),
+ new MaterialStack(ELEMENT.getInstance().BROMINE, 2),
+ new MaterialStack(ELEMENT.getInstance().CHLORINE, 2) });
public static final Material POLYCRASE = new Material(
"Polycrase", // Material Name
MaterialState.ORE, // State
TextureSet.SET_ROUGH, // Texture Set
- new short[] {51, 0, 11, 0}, // Material Colour
+ new short[] { 51, 0, 11, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 6)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 6) });
// Radiobarite
// Radium, Barium, Barite?
@@ -579,245 +541,220 @@ public final class ORES {
"Barite (Rd)", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FLINT, // Texture Set
- new short[] {205, 205, 205, 0}, // Material Colour
+ new short[] { 205, 205, 205, 0 }, // Material Colour
-1,
-1,
-1,
-1,
0, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().BARIUM, 32),
- new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
- new MaterialStack(ELEMENT.getInstance().SULFUR, 16),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 15)
- });
+ new MaterialStack(ELEMENT.getInstance().BARIUM, 32),
+ new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().SULFUR, 16),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 15) });
// Samarskite_Y
public static final Material SAMARSKITE_Y = new Material(
"Samarskite (Y)", // Material Name
MaterialState.ORE, // State
TextureSets.ENRICHED.get(), // Texture Set
- new short[] {65, 163, 164, 0}, // Material Colour
+ new short[] { 65, 163, 164, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), // Y not YT/YB
- new MaterialStack(ELEMENT.getInstance().IRON, 10),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 3),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2), // Y not YT/YB
+ new MaterialStack(ELEMENT.getInstance().IRON, 10),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 2),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) });
// Samarskite_YB
public static final Material SAMARSKITE_YB = new Material(
"Samarskite (Yb)", // Material Name
MaterialState.ORE, // State
TextureSets.ENRICHED.get(), // Texture Set
- new short[] {95, 193, 194, 0}, // Material Colour
+ new short[] { 95, 193, 194, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), // Y not YT/YB
- new MaterialStack(ELEMENT.getInstance().IRON, 9),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 3),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2), // Y not YT/YB
+ new MaterialStack(ELEMENT.getInstance().IRON, 9),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 3),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 2) });
public static final Material TITANITE = new Material(
"Titanite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {184, 198, 105, 0}, // Material Colour
+ new short[] { 184, 198, 105, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 2),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 10)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 2),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 10) });
public static final Material XENOTIME = new Material(
"Xenotime", // Material Name
MaterialState.ORE, // State
TextureSet.SET_OPAL, // Texture Set
- new short[] {235, 89, 199, 0}, // Material Colour
+ new short[] { 235, 89, 199, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
- new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 8)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().YTTERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ERBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().EUROPIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 8) });
public static final Material YTTRIAITE = new Material( // TODO
"Yttriaite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_METALLIC, // Texture Set
- new short[] {255, 143, 84, 0}, // Material Colour
+ new short[] { 255, 143, 84, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), // Y not YT/YB
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
- new MaterialStack(ELEMENT.getInstance().IRON, 4),
- new MaterialStack(ELEMENT.getInstance().TIN, 1),
- new MaterialStack(ELEMENT.getInstance().NITROGEN, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), // Y not YT/YB
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 3),
+ new MaterialStack(ELEMENT.getInstance().IRON, 4), new MaterialStack(ELEMENT.getInstance().TIN, 1),
+ new MaterialStack(ELEMENT.getInstance().NITROGEN, 2) });
public static final Material YTTRIALITE = new Material(
"Yttrialite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_RUBY, // Texture Set
- new short[] {35, 189, 99, 0}, // Material Colour
+ new short[] { 35, 189, 99, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 7),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().YTTRIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 7), });
public static final Material YTTROCERITE = new Material(
"Yttrocerite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_DIAMOND, // Texture Set
- new short[] {35, 19, 199, 0}, // Material Colour
+ new short[] { 35, 19, 199, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 5),
- new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 5),
+ new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1), });
public static final Material ZIMBABWEITE = new Material(
"Zimbabweite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {193, 187, 131, 0}, // Material Colour
+ new short[] { 193, 187, 131, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
- new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2),
- new MaterialStack(ELEMENT.getInstance().LEAD, 1),
- new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 4),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 18)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().POTASSIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().LEAD, 1),
+ new MaterialStack(ELEMENT.getInstance().ARSENIC, 4),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 4),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 18) });
public static final Material ZIRCON = new Material(
"Zircon", // Material Name
MaterialState.ORE, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {195, 19, 19, 0}, // Material Colour
+ new short[] { 195, 19, 19, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().SILICON, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 4),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 4), });
public static final Material ZIRCONILITE = new Material(
"Zirconolite", // Material Name
MaterialState.ORE, // State
TextureSet.SET_FINE, // Texture Set
- new short[] {45, 26, 0, 0}, // Material Colour
+ new short[] { 45, 26, 0, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 14)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 14) });
public static final Material ZIRCOPHYLLITE = new Material(
"Zircophyllite", // Material Name
MaterialState.ORE, // State
TextureSets.REFINED.get(), // Texture Set
- new short[] {30, 0, 6, 0}, // Material Colour
+ new short[] { 30, 0, 6, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3),
- new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 7),
- new MaterialStack(ELEMENT.getInstance().IRON, 7),
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().SILICON, 8),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 13),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 7),
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().POTASSIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().SODIUM, 3),
+ new MaterialStack(ELEMENT.getInstance().MANGANESE, 7),
+ new MaterialStack(ELEMENT.getInstance().IRON, 7),
+ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 8),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 13),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 7), });
public static final Material ZIRKELITE = new Material(
"Zirkelite", // Material Name
MaterialState.ORE, // State
TextureSets.GEM_A.get(), // Texture Set
- new short[] {229, 208, 48, 0}, // Material Colour
+ new short[] { 229, 208, 48, 0 }, // Material Colour
-1,
-1,
-1,
-1,
-1, // Radiation
new MaterialStack[] { // (Ca,Th,Ce)Zr(Ti,Nb)2O7
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
- new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
- new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
- new MaterialStack(ELEMENT.getInstance().OXYGEN, 7)
- });
+ new MaterialStack(ELEMENT.getInstance().CALCIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().CERIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().NIOBIUM, 2),
+ new MaterialStack(ELEMENT.getInstance().OXYGEN, 7) });
public static final Material DEEP_EARTH_REACTOR_FUEL_DEPOSIT = new Material(
"Radioactive Mineral Mix", // Material Name
@@ -830,14 +767,11 @@ public final class ORES {
-1,
4, // Radiation
new MaterialStack[] { // Na3AlF6
- new MaterialStack(ELEMENT.getInstance().RADON, 2),
- new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
- new MaterialStack(ELEMENT.getInstance().URANIUM238, 10),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 25),
- new MaterialStack(ELEMENT.getInstance().THORIUM232, 4),
- new MaterialStack(FLUORCAPHITE, 6),
- new MaterialStack(SAMARSKITE_Y, 8),
- new MaterialStack(TITANITE, 4)
- });
+ new MaterialStack(ELEMENT.getInstance().RADON, 2),
+ new MaterialStack(ELEMENT.getInstance().RADIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 1),
+ new MaterialStack(ELEMENT.getInstance().URANIUM238, 10),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 25),
+ new MaterialStack(ELEMENT.getInstance().THORIUM232, 4), new MaterialStack(FLUORCAPHITE, 6),
+ new MaterialStack(SAMARSKITE_Y, 8), new MaterialStack(TITANITE, 4) });
}
diff --git a/src/main/java/gtPlusPlus/core/material/Particle.java b/src/main/java/gtPlusPlus/core/material/Particle.java
index 7067052cb5..77ccb2ab43 100644
--- a/src/main/java/gtPlusPlus/core/material/Particle.java
+++ b/src/main/java/gtPlusPlus/core/material/Particle.java
@@ -1,11 +1,12 @@
package gtPlusPlus.core.material;
+import net.minecraft.item.ItemStack;
+
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.item.chemistry.IonParticles;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import net.minecraft.item.ItemStack;
public class Particle {
@@ -80,14 +81,14 @@ public class Particle {
*/
// Baryons
- PROTON = new Particle(ElementaryGroup.BARYON, "Proton", new Particle[] {UP, UP, DOWN});
- NEUTRON = new Particle(ElementaryGroup.BARYON, "Neutron", new Particle[] {UP, DOWN, DOWN});
- LAMBDA = new Particle(ElementaryGroup.BARYON, "Lambda", new Particle[] {UP, DOWN, STRANGE});
- OMEGA = new Particle(ElementaryGroup.BARYON, "Omega", new Particle[] {STRANGE, STRANGE, STRANGE});
+ PROTON = new Particle(ElementaryGroup.BARYON, "Proton", new Particle[] { UP, UP, DOWN });
+ NEUTRON = new Particle(ElementaryGroup.BARYON, "Neutron", new Particle[] { UP, DOWN, DOWN });
+ LAMBDA = new Particle(ElementaryGroup.BARYON, "Lambda", new Particle[] { UP, DOWN, STRANGE });
+ OMEGA = new Particle(ElementaryGroup.BARYON, "Omega", new Particle[] { STRANGE, STRANGE, STRANGE });
// Mesons
- PION = new Particle(ElementaryGroup.MESON, "Pion", new Particle[] {MUON, MUON_NEUTRINO});
- ETA_MESON = new Particle(ElementaryGroup.MESON, "ETA Meson", new Particle[] {PION, PION, PION});
+ PION = new Particle(ElementaryGroup.MESON, "Pion", new Particle[] { MUON, MUON_NEUTRINO });
+ ETA_MESON = new Particle(ElementaryGroup.MESON, "ETA Meson", new Particle[] { PION, PION, PION });
// Wildcard
UNKNOWN = new Particle(ElementaryGroup.UNKNOWN, "Unknown");
@@ -113,15 +114,15 @@ public class Particle {
public Particle(ElementaryGroup aParticleType, String aParticleName, Particle[] aComposition) {
mParticleType = aParticleType;
mParticleName = aParticleName;
- mComposition = aComposition == null ? new Particle[] {this} : aComposition;
+ mComposition = aComposition == null ? new Particle[] { this } : aComposition;
aMap.put(this);
}
public static ItemStack getIon(String aElementName, int aCharge) {
for (String g : gtPlusPlus.core.item.chemistry.IonParticles.NameToMetaMap.keySet()) {
if (g.toLowerCase().equals(Utils.sanitizeString(aElementName.toLowerCase()))) {
- Integer meta = gtPlusPlus.core.item.chemistry.IonParticles.NameToMetaMap.get(
- Utils.sanitizeString(aElementName.toLowerCase()));
+ Integer meta = gtPlusPlus.core.item.chemistry.IonParticles.NameToMetaMap
+ .get(Utils.sanitizeString(aElementName.toLowerCase()));
if (meta == null) {
meta = 0;
}
diff --git a/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java
index dc70ccfe7a..0530436ca2 100644
--- a/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java
+++ b/src/main/java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java
@@ -6,76 +6,34 @@ public class CustomGTMaterials {
// "Fireclay").addDustItems().setRGB(173, 160, 155).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Brick,
// 1)).constructMaterial();
- /**int aMetaItemSubID,
- * TextureSet aIconSet,
- * float aToolSpeed,
- * int aDurability,
- * int aToolQuality,
- * boolean aUnificatable,
- * String aName, String aDefaultLocalName,
- * String aConfigSection,
- * boolean aCustomOre,
- * String aCustomID) {
+ /**
+ * int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, boolean
+ * aUnificatable, String aName, String aDefaultLocalName, String aConfigSection, boolean aCustomOre, String
+ * aCustomID) {
*
**/
- /*public static List<Materials> Custom_GT_Materials = new ArrayList<Materials>();
-
- public static Materials Zirconium = materialBuilder_Element(1232, TextureSet.SET_METALLIC, 6.0F, 256, 2, 1|2|8|32|64|128, 200, 200, 200, 0, "Zirconium", "Zirconium", 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Zr, Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3)));
- public static Materials Geikielite = materialBuilder(1234, TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3)));
- public static Materials Zirconolite = materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new MaterialStack(Oxygen, 7)));
-
- public static final void run(){
- Utils.LOG_INFO("[Custom] Trying to initialise custom materials.");
- }
-
- private final static boolean registerMaterial(Materials r){
- Custom_GT_Materials.add(r);
- Utils.LOG_INFO("[Custom] Registered new Gregtech material - "+r.mName);
- return true;
- }
-
- public final static Materials materialBuilder(int ID, TextureSet texture, int[] rgb, String materialName, Dyes dyeColour, List<MaterialStack> composition){
- Materials newMat = new Materials(
- ID,
- texture,
- 1.0F,
- 0,
- 2,
- 1 |8 ,
- rgb[0], rgb[1], rgb[2], 0,
- materialName, materialName,
- 0, 0, -1, 0, false, false, 3, 1, 1,
- dyeColour,
- 1,
- composition
- );
- registerMaterial(newMat);
- return newMat;
- }
-
- public final static Materials materialBuilder_Element(
- int ID, TextureSet texture,
- float a, int b, int c,
- int d, int r2, int g2, int b2, int a2,
- String materialName, String e,
- int f, int g, int h, int i,
- boolean j, boolean k,
- int l, int m, int n,
- Dyes dyeColour, Element o,
- List<TC_AspectStack> aspects){
- Materials newMat = new Materials(
- ID, texture,
- a, b, c,
- d, r2, g2, b2, a2,
- materialName, e,
- f, g, h, i, j, k, l, m, n,
- dyeColour, o,
- aspects
- );
- registerMaterial(newMat);
- return newMat;
- }
- */
+ /*
+ * public static List<Materials> Custom_GT_Materials = new ArrayList<Materials>(); public static Materials Zirconium
+ * = materialBuilder_Element(1232, TextureSet.SET_METALLIC, 6.0F, 256, 2, 1|2|8|32|64|128, 200, 200, 200, 0,
+ * "Zirconium", "Zirconium", 0, 0, 1811, 0, false, false, 3, 1, 1, Dyes.dyeLightGray, Element.Zr, Arrays.asList(new
+ * TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3))); public static Materials Geikielite = materialBuilder(1234,
+ * TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium,
+ * 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3))); public static Materials Zirconolite =
+ * materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new
+ * MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new
+ * MaterialStack(Oxygen, 7))); public static final void run(){
+ * Utils.LOG_INFO("[Custom] Trying to initialise custom materials."); } private final static boolean
+ * registerMaterial(Materials r){ Custom_GT_Materials.add(r);
+ * Utils.LOG_INFO("[Custom] Registered new Gregtech material - "+r.mName); return true; } public final static
+ * Materials materialBuilder(int ID, TextureSet texture, int[] rgb, String materialName, Dyes dyeColour,
+ * List<MaterialStack> composition){ Materials newMat = new Materials( ID, texture, 1.0F, 0, 2, 1 |8 , rgb[0],
+ * rgb[1], rgb[2], 0, materialName, materialName, 0, 0, -1, 0, false, false, 3, 1, 1, dyeColour, 1, composition );
+ * registerMaterial(newMat); return newMat; } public final static Materials materialBuilder_Element( int ID,
+ * TextureSet texture, float a, int b, int c, int d, int r2, int g2, int b2, int a2, String materialName, String e,
+ * int f, int g, int h, int i, boolean j, boolean k, int l, int m, int n, Dyes dyeColour, Element o,
+ * List<TC_AspectStack> aspects){ Materials newMat = new Materials( ID, texture, a, b, c, d, r2, g2, b2, a2,
+ * materialName, e, f, g, h, i, j, k, l, m, n, dyeColour, o, aspects ); registerMaterial(newMat); return newMat; }
+ */
}
diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java b/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
index 55e2b95535..fab71be1bf 100644
--- a/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
+++ b/src/main/java/gtPlusPlus/core/material/nuclear/FLUORIDES.java
@@ -20,12 +20,10 @@ public class FLUORIDES {
false, // Uses Blast furnace?
false, // Generate cells
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().CALCIUM, 16),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 32),
- new MaterialStack(ELEMENT.getInstance().IRON, 4),
- new MaterialStack(ELEMENT.getInstance().CARBON, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().CALCIUM, 16),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 32),
+ new MaterialStack(ELEMENT.getInstance().IRON, 4),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 2) });
// ThF4
public static final Material THORIUM_TETRAFLUORIDE = new Material(
@@ -38,10 +36,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
// ThF6
public static final Material THORIUM_HEXAFLUORIDE = new Material(
@@ -54,11 +50,9 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
- new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 12)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().THORIUM232, 1),
+ new MaterialStack(ELEMENT.getInstance().THORIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 12) });
// UF4
public static final Material URANIUM_TETRAFLUORIDE = new Material(
@@ -71,10 +65,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().URANIUM233, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().URANIUM233, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
// UF6
public static final Material URANIUM_HEXAFLUORIDE = new Material(
@@ -87,10 +79,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
// ZrF4
@@ -109,25 +99,16 @@ public class FLUORIDES {
-1,
true,
false,
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
- /* public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material(
- "Zirconium Tetrafluoride", //Material Name
- MaterialState.LIQUID, //State
- null, //Material Colour
- -1, //Melting Point in C
- -1, //Boiling Point in C
- -1, //Protons
- -1, //Neutrons
- false, //Uses Blast furnace?
- //Material Stacks with Percentage of required elements.
- new MaterialStack[]{
- new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 4)
- });*/
+ /*
+ * public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material( "Zirconium Tetrafluoride", //Material Name
+ * MaterialState.LIQUID, //State null, //Material Colour -1, //Melting Point in C -1, //Boiling Point in C -1,
+ * //Protons -1, //Neutrons false, //Uses Blast furnace? //Material Stacks with Percentage of required elements. new
+ * MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().ZIRCONIUM, 1), new
+ * MaterialStack(ELEMENT.getInstance().FLUORINE, 4) });
+ */
// BeF2
public static final Material BERYLLIUM_FLUORIDE = new Material(
@@ -140,10 +121,8 @@ public class FLUORIDES {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
// LiF
public static final Material LITHIUM_FLUORIDE = new Material(
@@ -156,10 +135,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LITHIUM7, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM7, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 1) });
// LFTR sub components
@@ -174,11 +151,9 @@ public class FLUORIDES {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(MISC_MATERIALS.AMMONIUM, 1),
- new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(MISC_MATERIALS.AMMONIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().HYDROGEN, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
// Be(OH)2
public static final Material BERYLLIUM_HYDROXIDE = new Material(
@@ -191,9 +166,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1), new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 1),
+ new MaterialStack(MISC_MATERIALS.HYDROXIDE, 2) });
// (NH4)2Be(OH)2 / (NH4)2BeF4
public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material(
@@ -206,9 +180,8 @@ public class FLUORIDES {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(MISC_MATERIALS.AMMONIUM, 2), new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(MISC_MATERIALS.AMMONIUM, 2),
+ new MaterialStack(FLUORIDES.BERYLLIUM_HYDROXIDE, 1) });
// LFTR Output
public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material(
@@ -221,10 +194,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NEPTUNIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NEPTUNIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
public static final Material TECHNETIUM_HEXAFLUORIDE = new Material(
"Technetium Hexafluoride", // Material Name
@@ -236,10 +207,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().TECHNETIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().TECHNETIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
public static final Material SELENIUM_HEXAFLUORIDE = new Material(
"Selenium Hexafluoride", // Material Name
@@ -251,10 +220,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 6)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SELENIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 6) });
public static final Material SODIUM_FLUORIDE = new Material(
"Sodium Fluoride", // Material Name
@@ -266,9 +233,8 @@ public class FLUORIDES {
-1, // Neutrons
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().SODIUM, 1), new MaterialStack(ELEMENT.getInstance().FLUORINE, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SODIUM, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 1) });
private static final FLUORIDES INSTANCE = new FLUORIDES();
diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index 549d3b4a88..e22d56f9f5 100644
--- a/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/main/java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -21,10 +21,9 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "Li2BeF4"), // Chemical Formula
4, // Radioactivity Level
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 2), new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1)
- });
+ // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 2),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) });
public static final Material LiFBeF2ThF4UF4 = new Material(
"LFTR Fuel 3", // Material Name
@@ -38,13 +37,11 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4UF4"), // Chemical Formula
5, // Radioactivity Level
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28),
- new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1)
- });
+ // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) });
public static final Material LiFBeF2ZrF4UF4 = new Material(
"LFTR Fuel 2", // Material Name
@@ -58,13 +55,11 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4UF4"), // Chemical Formula
5, // Radioactivity Level
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28),
- new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2)
- });
+ // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 65),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 28),
+ new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 5),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 2) });
public static final Material LiFBeF2ZrF4U235 = new Material(
"LFTR Fuel 1", // Material Name
@@ -76,16 +71,14 @@ public final class NUCLIDE {
-1, // Protons
-1, // Neutrons
false, // Uses Blast furnace?
- StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4")
- + StringUtils.superscript("235U"), // Chemical Formula
+ StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4") + StringUtils.superscript("235U"), // Chemical
+ // Formula
5, // Radioactivity Level
- // Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 55),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 25),
- new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6),
- new MaterialStack(ELEMENT.getInstance().URANIUM235, 14)
- });
+ // Material Stacks with Percentage of required elements.
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 55),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 25),
+ new MaterialStack(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE, 6),
+ new MaterialStack(ELEMENT.getInstance().URANIUM235, 14) });
// Misc
public static final Material BurntLftrFuel_MK1 = new Material(
@@ -99,12 +92,10 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
public static final Material BurntLftrFuel_MK2 = new Material(
"Burnt Reactor Fuel II", // Material Name
@@ -117,12 +108,10 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().LITHIUM, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
// LFTR Core Fluids
public static final Material LiFBeF2UF4FP = new Material(
@@ -136,12 +125,10 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
public static final Material Sparged_LiFBeF2UF4FP = new Material(
"Helium Sparged U Salt", // Material Name
@@ -154,12 +141,10 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().PROTACTINIUM, 1) });
public static final Material UF6F2FP = new Material(
"Phosphorous Uranium Hexafluoride (P-UF6)", // Material Name
@@ -172,11 +157,9 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript("UF6F2FP"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 3),
- new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 3),
+ new MaterialStack(ELEMENT.getInstance().PHOSPHORUS, 1) });
public static final Material LiFBeF2 = new Material(
"Stable Molten Salt Base", // Material Name
@@ -189,9 +172,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1) });
public static final Material LiFBeF2UF4 = new Material(
"LFTR Fuel Base", // Material Name
@@ -204,7 +186,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {new MaterialStack(LiFBeF2, 1), new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1)});
+ new MaterialStack[] { new MaterialStack(LiFBeF2, 1),
+ new MaterialStack(FLUORIDES.URANIUM_TETRAFLUORIDE, 1) });
// LFTR Blanket Fluids
@@ -220,9 +203,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
// Tier 2 Fuel blanket output
public static final Material LiFBeF2ThF4 = new Material(
@@ -236,11 +218,9 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
// Tier 1 Fuel blanket output
public static final Material Sparged_LiFThF4 = new Material(
@@ -254,9 +234,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1), new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
// Tier 2 Fuel blanket output
public static final Material Sparged_LiFBeF2ThF4 = new Material(
@@ -270,11 +249,9 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
- new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.LITHIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.BERYLLIUM_FLUORIDE, 1),
+ new MaterialStack(FLUORIDES.THORIUM_TETRAFLUORIDE, 1) });
public static final Material UF6F2 = new Material(
"Fluorinated Uranium Hexafluoride (F-UF6)", // Material Name
@@ -287,10 +264,8 @@ public final class NUCLIDE {
false, // Uses Blast furnace?
StringUtils.subscript("UF6F2"), // Chemical Formula
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
- new MaterialStack(ELEMENT.getInstance().FLUORINE, 2)
- });
+ new MaterialStack[] { new MaterialStack(FLUORIDES.URANIUM_HEXAFLUORIDE, 1),
+ new MaterialStack(ELEMENT.getInstance().FLUORINE, 2) });
// Secondary material is molten metal
public static final Material NAQ_FUEL_T1 = new Material(
@@ -303,10 +278,8 @@ public final class NUCLIDE {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NAQUADAH, 2),
- new MaterialStack(ELEMENT.getInstance().TANTALUM, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADAH, 2),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 3) });
// Secondary material is a plasma
public static final Material NAQ_FUEL_T2 = new Material(
@@ -319,10 +292,8 @@ public final class NUCLIDE {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 2),
- new MaterialStack(ELEMENT.getInstance().TITANIUM, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADAH_ENRICHED, 2),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 3) });
// Secondary material is a plasma
public static final Material NAQ_FUEL_T3 = new Material(
@@ -335,10 +306,8 @@ public final class NUCLIDE {
-1,
false, // Uses Blast furnace?
// Material Stacks with Percentage of required elements.
- new MaterialStack[] {
- new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 2),
- new MaterialStack(ELEMENT.getInstance().AMERICIUM, 3)
- });
+ new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().NAQUADRIA, 2),
+ new MaterialStack(ELEMENT.getInstance().AMERICIUM, 3) });
private static final NUCLIDE INSTANCE = new NUCLIDE();
diff --git a/src/main/java/gtPlusPlus/core/material/state/MaterialState.java b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java
index 5b48907656..34abbd0844 100644
--- a/src/main/java/gtPlusPlus/core/material/state/MaterialState.java
+++ b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java
@@ -1,6 +1,7 @@
package gtPlusPlus.core.material.state;
public enum MaterialState {
+
SOLID(0),
LIQUID(1),
GAS(2),
@@ -8,6 +9,7 @@ public enum MaterialState {
PURE_LIQUID(4),
ORE(5),
PURE_GAS(6);
+
private int STATE;
private MaterialState(final int State) {
generated by cgit (git 2.46.0) at 2025-03-09 23:33:26 +0000