From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- src/main/java/gtPlusPlus/core/material/ALLOY.java | 635 ++++++++------------- .../java/gtPlusPlus/core/material/ELEMENT.java | 294 +++------- .../gtPlusPlus/core/material/MISC_MATERIALS.java | 88 ++- .../java/gtPlusPlus/core/material/Material.java | 449 ++++++--------- .../core/material/MaterialGenerator.java | 93 ++- .../gtPlusPlus/core/material/MaterialStack.java | 12 +- .../java/gtPlusPlus/core/material/NONMATERIAL.java | 8 +- src/main/java/gtPlusPlus/core/material/ORES.java | 630 +++++++++----------- .../java/gtPlusPlus/core/material/Particle.java | 21 +- .../core/material/gregtech/CustomGTMaterials.java | 94 +-- .../core/material/nuclear/FLUORIDES.java | 116 ++-- .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 153 ++--- .../core/material/state/MaterialState.java | 2 + 13 files changed, 1019 insertions(+), 1576 deletions(-) (limited to 'src/main/java/gtPlusPlus/core/material') 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", "Flerov