aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2024-08-15 16:48:03 +0200
committerGitHub <noreply@github.com>2024-08-15 16:48:03 +0200
commit361adcefd72d3f58040b18cc7ae92b65ec017522 (patch)
tree8a93908c1fc4f0cf4e2395b02715f2cbd9fd805f /src/main/java/gtPlusPlus/core
parent0f990a7cfd78c3ede4db09a893e1e6edff164a2a (diff)
downloadGT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.tar.gz
GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.tar.bz2
GT5-Unofficial-361adcefd72d3f58040b18cc7ae92b65ec017522.zip
add forbidden getModItem calls (#2869)
* add forbidden getModItem calls * remove bartworks gmi * remove goodgenerators gmi * spotless * no more literals in getModItem calls * fix kekztech calls * fix kubatech calls * fix gregtech calls (1/?) * move WA from NHCore to GT5U * MTE enum expanded with bw values * MTE enum expanded with tectech values * fix inversion * fix gregtech calls (2/?) * copied enum from NHCore to GT5U and moved machine hulls * moved plasma gens and alloy smelters * moved machine matter amplifiers, assemblers, scanners, Pump, transformers * moved battery buffer 1,2,3,4, battery charger 4x4, dynamo hatches, energy hatches * moved wet transformers, hi amps transformers, turbo chargers, chest buffers, rock breakers, input hatches, output hatches * moved circuit assemblers * moved chemical bath, chemical reactor, fermenter, fluid canner, fluid extractor, fluid heater, mixer * moved autoclave, bending machine, compressor, cutting machine, distillery, electric furnace, electrolyzer, electromagnetic separator, extractor, extruder, fluid solidifier, forming press, forge hammer, lathe, precision laser engraver, macerator, matter fabricator, microwave, washing plant, polarizer, recycler, replicator, sifter, slicer, thermal centrifuge, wiremill, arc furnace, centrifuge, plasma arc furnace, canning machine * moved batteries * comment * spotless apply * yeet * imports * bronze blast furnace is no more since a while * sanitize kubatech MTE registration * merge GG's MTE enum into GT5U one * fix gregtech calls (3/4) * fix gt++ calls (1/?) * small cleanup * fix gt++ calls (2/3) * fix gt++ calls (3/3) * temporary test * fix config * Revert "temporary test" This reverts commit ad99b8a4736794aab1d01ff453809c6f7e721724. * disabled the GT check until GTNH-Intergalactic is merged into GT5U or at least its GT5U parts * spotless apply * dumb dumb * fix dynamic access to CustomItemList * update tests * fix scala test * fix script? * fix script? * actual fix? * there we go! * yeet GT for now, until we move the EOH Controller recipe somewhere else * fix dep
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r--src/main/java/gtPlusPlus/core/material/ALLOY.java424
-rw-r--r--src/main/java/gtPlusPlus/core/material/Material.java12
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java20
3 files changed, 253 insertions, 203 deletions
diff --git a/src/main/java/gtPlusPlus/core/material/ALLOY.java b/src/main/java/gtPlusPlus/core/material/ALLOY.java
index 1ee963fb97..8df8d54f12 100644
--- a/src/main/java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/main/java/gtPlusPlus/core/material/ALLOY.java
@@ -30,9 +30,10 @@ 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(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
@@ -44,7 +45,8 @@ public final class ALLOY {
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(ALLOY.STEEL, 5),
+ new MaterialStack(ELEMENT.getInstance().IGNIS, 5));
public static final Material STABALLOY = new Material(
"Staballoy", // Material Name
@@ -56,8 +58,8 @@ public final class ALLOY {
-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(ELEMENT.getInstance().URANIUM238, 9),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 1));
public static final Material TANTALLOY_60 = new Material(
"Tantalloy-60", // Material Name
@@ -69,8 +71,8 @@ public final class ALLOY {
-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(ELEMENT.getInstance().TUNGSTEN, 4),
+ new MaterialStack(ELEMENT.getInstance().TANTALUM, 46));
public static final Material TANTALLOY_61 = new Material(
"Tantalloy-61", // Material Name
@@ -82,9 +84,9 @@ public final class ALLOY {
-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(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
@@ -96,8 +98,8 @@ public final class ALLOY {
-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(ELEMENT.getInstance().GOLD, 70),
+ new MaterialStack(ELEMENT.getInstance().COPPER, 30));
public static final Material POTIN = new Material(
"Potin", // Material Name
@@ -109,8 +111,9 @@ public final class ALLOY {
-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) });
+ 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},
@@ -128,10 +131,11 @@ public final class ALLOY {
-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(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
@@ -143,9 +147,10 @@ public final class ALLOY {
-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(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
@@ -157,9 +162,10 @@ public final class ALLOY {
-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(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
@@ -171,8 +177,8 @@ 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(ELEMENT.getInstance().NICKEL, 40),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 60));
public static final Material ZERON_100 = new Material(
"Zeron-100", // Material Name
@@ -184,10 +190,12 @@ public final class ALLOY {
-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(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
@@ -199,10 +207,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(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
@@ -214,9 +223,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(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
@@ -228,9 +239,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().ALUMINIUM, 4),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4), new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
- new MaterialStack(ELEMENT.getInstance().COBALT, 8), });
+ new MaterialStack(ALLOY.STEEL, 64),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
+ new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 4),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 16),
+ new MaterialStack(ELEMENT.getInstance().COBALT, 8));
public static final Material AQUATIC_STEEL = new Material(
"Watertight Steel", // Material Name
@@ -242,10 +255,13 @@ public final class ALLOY {
-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(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
@@ -257,10 +273,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(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
@@ -272,10 +288,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(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
@@ -287,10 +303,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(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
@@ -302,11 +319,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(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
@@ -318,10 +336,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(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
@@ -333,11 +352,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(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
@@ -349,9 +369,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(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
@@ -363,9 +384,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(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
@@ -377,10 +399,10 @@ 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(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
@@ -393,8 +415,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(ELEMENT.getInstance().CARBON, 50),
+ new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 50));
public static final Material TUNGSTEN_TITANIUM_CARBIDE = new Material(
"Tungsten Titanium Carbide", // Material Name
@@ -406,8 +428,8 @@ 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(TUNGSTEN_CARBIDE, 70),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 30));
public static final Material SILICON_CARBIDE = new Material(
"Silicon Carbide", // Material Name
@@ -419,8 +441,8 @@ public final class ALLOY {
-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(ELEMENT.getInstance().SILICON, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50));
public static final Material TANTALUM_CARBIDE = new Material(
"Tantalum Carbide", // Material Name
@@ -432,8 +454,8 @@ public final class ALLOY {
-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(ELEMENT.getInstance().TANTALUM, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50));
public static final Material ZIRCONIUM_CARBIDE = new Material(
"Zirconium Carbide", // Material Name
@@ -445,8 +467,8 @@ public final class ALLOY {
-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(ELEMENT.getInstance().ZIRCONIUM, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50));
public static final Material NIOBIUM_CARBIDE = new Material(
"Niobium Carbide", // Material Name
@@ -458,8 +480,8 @@ public final class ALLOY {
-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(ELEMENT.getInstance().NIOBIUM, 50),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 50));
public static final Material ARCANITE = new Material(
"Arcanite", // Material Name
@@ -471,9 +493,10 @@ 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(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
@@ -484,11 +507,13 @@ public final class ALLOY {
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(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
@@ -500,8 +525,9 @@ 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(ELEMENT.getInstance().IRON, 12),
+ new MaterialStack(KANTHAL, 3),
+ new MaterialStack(INVAR, 15));
public static final Material EGLIN_STEEL = new Material(
"Eglin Steel", // Material Name
@@ -513,9 +539,10 @@ public final class ALLOY {
-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(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
@@ -526,9 +553,11 @@ public final class ALLOY {
-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(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
@@ -539,12 +568,15 @@ 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(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
@@ -558,8 +590,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(ELEMENT.getInstance().TRINIUM_REFINED, 3),
+ new MaterialStack(ELEMENT.getInstance().TITANIUM, 7));
public static final Material TRINIUM_NAQUADAH = new Material(
"Trinium Naquadah Alloy", // Material Name
@@ -570,8 +602,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(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
@@ -581,8 +613,8 @@ 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(TRINIUM_NAQUADAH, 9),
+ new MaterialStack(ELEMENT.getInstance().CARBON, 1));
public static final Material TRINIUM_REINFORCED_STEEL = new Material(
"Arceus Alloy 2B", // Material Name
@@ -594,9 +626,11 @@ public final class ALLOY {
-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(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
@@ -612,8 +646,9 @@ public final class ALLOY {
-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(ELEMENT.getInstance().NICKEL, 35),
+ new MaterialStack(ELEMENT.getInstance().THAUMIUM, 30),
+ new MaterialStack(ELEMENT.getInstance().IRON, 35));
/*
* Top Tier Alloys
@@ -629,10 +664,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(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(
@@ -645,11 +681,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(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(
@@ -662,12 +701,14 @@ 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(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(
@@ -680,11 +721,14 @@ public final class ALLOY {
-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(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(
@@ -697,11 +741,14 @@ 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(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(
@@ -714,10 +761,11 @@ public final class ALLOY {
-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(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(
@@ -730,9 +778,10 @@ public final class ALLOY {
-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(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(
@@ -745,9 +794,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(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
@@ -759,9 +809,11 @@ 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(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
@@ -773,13 +825,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(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
@@ -791,9 +845,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(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
@@ -805,9 +860,11 @@ 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(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(
@@ -820,9 +877,12 @@ 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(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/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index fec80060ac..95088535ce 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -601,16 +601,6 @@ 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)); }
- */
this.vTier = MaterialUtils.getTierOfMaterial(meltingPoint);
// Sets the materials 'tier'. Will probably replace this logic.
@@ -1142,7 +1132,7 @@ public class Material {
/**
* Ore Components
- *
+ *
* @return
*/
public final ItemStack getOre(final int stacksize) {
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index b7394a9a51..ac940aeecf 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1,9 +1,7 @@
package gtPlusPlus.core.recipe;
-import static gregtech.api.enums.Mods.BartWorks;
+import static goodgenerator.loader.Loaders.supercriticalFluidTurbineCasing;
import static gregtech.api.enums.Mods.EternalSingularity;
-import static gregtech.api.enums.Mods.GoodGenerator;
-import static gregtech.api.enums.Mods.GregTech;
import static gregtech.api.enums.Mods.Railcraft;
import static gregtech.api.enums.Mods.RemoteIO;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
@@ -28,10 +26,12 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
+import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import com.github.technus.tectech.recipe.TT_recipeAdder;
import com.github.technus.tectech.thing.CustomItemList;
import com.google.common.collect.ImmutableList;
+import goodgenerator.loader.Loaders;
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
@@ -549,9 +549,9 @@ public class RECIPES_Machines {
GT_Values.RA.stdBuilder()
.itemInputs(
CI.getNumberedAdvancedCircuit(18),
- GT_ModHandler.getModItem(GoodGenerator.ID, "supercriticalFluidTurbineCasing", 1),
- GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 4, 10101),
- GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 8, 10101))
+ new ItemStack(supercriticalFluidTurbineCasing, 1),
+ new ItemStack(WerkstoffLoader.items.get(OrePrefixes.plate), 4, 10101),
+ new ItemStack(WerkstoffLoader.items.get(OrePrefixes.screw), 8, 10101))
.itemOutputs(GregtechItemList.Casing_Turbine_SC.get(1))
.fluidInputs(FluidRegistry.getFluidStack("molten.adamantium alloy", 144 * 2))
.duration(5 * SECONDS)
@@ -560,10 +560,10 @@ public class RECIPES_Machines {
GT_Values.RA.stdBuilder()
.itemInputs(
CI.getNumberedAdvancedCircuit(18),
- GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 32016),
- GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 8, 10104),
- GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 16, 10104),
- GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedgearGt", 4, 10104),
+ GT_Utility.copyAmount(1, Loaders.SCTurbine),
+ new ItemStack(WerkstoffLoader.items.get(OrePrefixes.plate), 8, 10104),
+ new ItemStack(WerkstoffLoader.items.get(OrePrefixes.screw), 16, 10104),
+ new ItemStack(WerkstoffLoader.items.get(OrePrefixes.gearGt), 4, 10104),
CI.getCircuit(7, 8))
.itemOutputs(GregtechItemList.Large_SCSteam_Turbine.get(1))
.fluidInputs(FluidRegistry.getFluidStack("molten.hikarium", 144 * 8))