diff --git a/src/main/java/gregtech/api/unification/material/Material.java b/src/main/java/gregtech/api/unification/material/Material.java index 569fe556e4b..f258eacef73 100644 --- a/src/main/java/gregtech/api/unification/material/Material.java +++ b/src/main/java/gregtech/api/unification/material/Material.java @@ -46,6 +46,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import crafttweaker.annotations.ZenRegister; +import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Range; @@ -520,6 +521,18 @@ public MaterialRegistry getRegistry() { return GregTechAPI.materialManager.getRegistry(getModid()); } + /** + * Create a new {@link Material.Builder}. + * + * @param id The MetaItemSubID for this Material. Must be unique to your mods material registry. + * @param resourceLocation The ModId and Name of this Material. Will be formatted as ".material." for + * the Translation Key. + */ + @Contract("_, _ -> new") + public static @NotNull Builder builder(int id, @NotNull ResourceLocation resourceLocation) { + return new Builder(id, resourceLocation); + } + /** * @since GTCEu 2.0.0 */ diff --git a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java index 8ca9b8b86dc..2e05e88dfcf 100644 --- a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java @@ -18,12 +18,12 @@ public class ElementMaterials { public static void register() { - Actinium = new Material.Builder(1, gregtechId("actinium")) + Actinium = Material.builder(1, gregtechId("actinium")) .color(0xC3D1FF).iconSet(METALLIC) .element(Elements.Ac) .build(); - Aluminium = new Material.Builder(2, gregtechId("aluminium")) + Aluminium = Material.builder(2, gregtechId("aluminium")) .ingot() .liquid(new FluidBuilder().temperature(933)) .ore() @@ -39,7 +39,7 @@ public static void register() { .blast(1700, GasTier.LOW) .build(); - Americium = new Material.Builder(3, gregtechId("americium")) + Americium = Material.builder(3, gregtechId("americium")) .ingot(3) .liquid(new FluidBuilder().temperature(1449)) .plasma() @@ -49,7 +49,7 @@ public static void register() { .itemPipeProperties(64, 64) .build(); - Antimony = new Material.Builder(4, gregtechId("antimony")) + Antimony = Material.builder(4, gregtechId("antimony")) .ingot() .liquid(new FluidBuilder().temperature(904)) .color(0xDCDCF0).iconSet(SHINY) @@ -57,36 +57,36 @@ public static void register() { .element(Elements.Sb) .build(); - Argon = new Material.Builder(5, gregtechId("argon")) + Argon = Material.builder(5, gregtechId("argon")) .gas().plasma() .color(0x00FF00) .element(Elements.Ar) .build(); - Arsenic = new Material.Builder(6, gregtechId("arsenic")) + Arsenic = Material.builder(6, gregtechId("arsenic")) .dust() .gas(new FluidBuilder().temperature(887)) .color(0x676756) .element(Elements.As) .build(); - Astatine = new Material.Builder(7, gregtechId("astatine")) + Astatine = Material.builder(7, gregtechId("astatine")) .color(0x241A24) .element(Elements.At) .build(); - Barium = new Material.Builder(8, gregtechId("barium")) + Barium = Material.builder(8, gregtechId("barium")) .dust() .color(0x83824C).iconSet(METALLIC) .element(Elements.Ba) .build(); - Berkelium = new Material.Builder(9, gregtechId("berkelium")) + Berkelium = Material.builder(9, gregtechId("berkelium")) .color(0x645A88).iconSet(METALLIC) .element(Elements.Bk) .build(); - Beryllium = new Material.Builder(10, gregtechId("beryllium")) + Beryllium = Material.builder(10, gregtechId("beryllium")) .ingot() .liquid(new FluidBuilder().temperature(1560)) .ore() @@ -95,73 +95,73 @@ public static void register() { .element(Elements.Be) .build(); - Bismuth = new Material.Builder(11, gregtechId("bismuth")) + Bismuth = Material.builder(11, gregtechId("bismuth")) .ingot(1) .liquid(new FluidBuilder().temperature(545)) .color(0x64A0A0).iconSet(METALLIC) .element(Elements.Bi) .build(); - Bohrium = new Material.Builder(12, gregtechId("bohrium")) + Bohrium = Material.builder(12, gregtechId("bohrium")) .color(0xDC57FF).iconSet(SHINY) .element(Elements.Bh) .build(); - Boron = new Material.Builder(13, gregtechId("boron")) + Boron = Material.builder(13, gregtechId("boron")) .dust() .color(0xD2FAD2) .element(Elements.B) .build(); - Bromine = new Material.Builder(14, gregtechId("bromine")) + Bromine = Material.builder(14, gregtechId("bromine")) .color(0x500A0A).iconSet(SHINY) .element(Elements.Br) .build(); - Caesium = new Material.Builder(15, gregtechId("caesium")) + Caesium = Material.builder(15, gregtechId("caesium")) .dust() .color(0x80620B).iconSet(METALLIC) .element(Elements.Cs) .build(); - Calcium = new Material.Builder(16, gregtechId("calcium")) + Calcium = Material.builder(16, gregtechId("calcium")) .dust() .color(0xFFF5DE).iconSet(METALLIC) .element(Elements.Ca) .build(); - Californium = new Material.Builder(17, gregtechId("californium")) + Californium = Material.builder(17, gregtechId("californium")) .color(0xA85A12).iconSet(METALLIC) .element(Elements.Cf) .build(); - Carbon = new Material.Builder(18, gregtechId("carbon")) + Carbon = Material.builder(18, gregtechId("carbon")) .dust() .liquid(new FluidBuilder().temperature(4600)) .color(0x141414) .element(Elements.C) .build(); - Cadmium = new Material.Builder(19, gregtechId("cadmium")) + Cadmium = Material.builder(19, gregtechId("cadmium")) .dust() .color(0x32323C).iconSet(SHINY) .element(Elements.Cd) .build(); - Cerium = new Material.Builder(20, gregtechId("cerium")) + Cerium = Material.builder(20, gregtechId("cerium")) .dust() .liquid(new FluidBuilder().temperature(1068)) .color(0x87917D).iconSet(METALLIC) .element(Elements.Ce) .build(); - Chlorine = new Material.Builder(21, gregtechId("chlorine")) + Chlorine = Material.builder(21, gregtechId("chlorine")) .gas(new FluidBuilder().customStill()) .color(0x2D8C8C) .element(Elements.Cl) .build(); - Chrome = new Material.Builder(22, gregtechId("chrome")) + Chrome = Material.builder(22, gregtechId("chrome")) .ingot(3) .liquid(new FluidBuilder().temperature(2180)) .color(0xEAC4D8).iconSet(SHINY) @@ -172,7 +172,7 @@ public static void register() { .blast(1700, GasTier.LOW) .build(); - Cobalt = new Material.Builder(23, gregtechId("cobalt")) + Cobalt = Material.builder(23, gregtechId("cobalt")) .ingot() .liquid(new FluidBuilder().temperature(1768)) .color(0x5050FA).iconSet(METALLIC) @@ -182,12 +182,12 @@ public static void register() { .itemPipeProperties(2560, 2.0f) .build(); - Copernicium = new Material.Builder(24, gregtechId("copernicium")) + Copernicium = Material.builder(24, gregtechId("copernicium")) .color(0xFFFEFF) .element(Elements.Cn) .build(); - Copper = new Material.Builder(25, gregtechId("copper")) + Copper = Material.builder(25, gregtechId("copper")) .ingot(1) .liquid(new FluidBuilder().temperature(1358)) .ore() @@ -199,45 +199,45 @@ public static void register() { .fluidPipeProperties(1696, 6, true) .build(); - Curium = new Material.Builder(26, gregtechId("curium")) + Curium = Material.builder(26, gregtechId("curium")) .color(0x7B544E).iconSet(METALLIC) .element(Elements.Cm) .build(); - Darmstadtium = new Material.Builder(27, gregtechId("darmstadtium")) + Darmstadtium = Material.builder(27, gregtechId("darmstadtium")) .ingot().fluid() .color(0x578062) .flags(EXT2_METAL, GENERATE_DOUBLE_PLATE, GENERATE_ROTOR, GENERATE_DENSE, GENERATE_SMALL_GEAR) .element(Elements.Ds) .build(); - Deuterium = new Material.Builder(28, gregtechId("deuterium")) + Deuterium = Material.builder(28, gregtechId("deuterium")) .gas(new FluidBuilder().customStill()) .color(0xFCFC84) .element(Elements.D) .build(); - Dubnium = new Material.Builder(29, gregtechId("dubnium")) + Dubnium = Material.builder(29, gregtechId("dubnium")) .color(0xD3FDFF).iconSet(SHINY) .element(Elements.Db) .build(); - Dysprosium = new Material.Builder(30, gregtechId("dysprosium")) + Dysprosium = Material.builder(30, gregtechId("dysprosium")) .iconSet(METALLIC) .element(Elements.Dy) .build(); - Einsteinium = new Material.Builder(31, gregtechId("einsteinium")) + Einsteinium = Material.builder(31, gregtechId("einsteinium")) .color(0xCE9F00).iconSet(METALLIC) .element(Elements.Es) .build(); - Erbium = new Material.Builder(32, gregtechId("erbium")) + Erbium = Material.builder(32, gregtechId("erbium")) .iconSet(METALLIC) .element(Elements.Er) .build(); - Europium = new Material.Builder(33, gregtechId("europium")) + Europium = Material.builder(33, gregtechId("europium")) .ingot() .liquid(new FluidBuilder().temperature(1099)) .color(0x20FFFF).iconSet(METALLIC) @@ -252,33 +252,33 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - Fermium = new Material.Builder(34, gregtechId("fermium")) + Fermium = Material.builder(34, gregtechId("fermium")) .color(0x984ACF).iconSet(METALLIC) .element(Elements.Fm) .build(); - Flerovium = new Material.Builder(35, gregtechId("flerovium")) + Flerovium = Material.builder(35, gregtechId("flerovium")) .iconSet(SHINY) .element(Elements.Fl) .build(); - Fluorine = new Material.Builder(36, gregtechId("fluorine")) + Fluorine = Material.builder(36, gregtechId("fluorine")) .gas(new FluidBuilder().customStill()) .color(0x6EA7DC) .element(Elements.F) .build(); - Francium = new Material.Builder(37, gregtechId("francium")) + Francium = Material.builder(37, gregtechId("francium")) .color(0xAAAAAA).iconSet(SHINY) .element(Elements.Fr) .build(); - Gadolinium = new Material.Builder(38, gregtechId("gadolinium")) + Gadolinium = Material.builder(38, gregtechId("gadolinium")) .color(0xDDDDFF).iconSet(METALLIC) .element(Elements.Gd) .build(); - Gallium = new Material.Builder(39, gregtechId("gallium")) + Gallium = Material.builder(39, gregtechId("gallium")) .ingot() .liquid(new FluidBuilder().temperature(303)) .color(0xDCDCFF).iconSet(SHINY) @@ -286,12 +286,12 @@ public static void register() { .element(Elements.Ga) .build(); - Germanium = new Material.Builder(40, gregtechId("germanium")) + Germanium = Material.builder(40, gregtechId("germanium")) .color(0x434343).iconSet(SHINY) .element(Elements.Ge) .build(); - Gold = new Material.Builder(41, gregtechId("gold")) + Gold = Material.builder(41, gregtechId("gold")) .ingot() .liquid(new FluidBuilder().temperature(1337)) .ore() @@ -304,7 +304,7 @@ public static void register() { .fluidPipeProperties(1671, 25, true, true, false, false) .build(); - Hafnium = new Material.Builder(42, gregtechId("hafnium")) + Hafnium = Material.builder(42, gregtechId("hafnium")) .ingot() .color(0x99999A).iconSet(SHINY) .element(Elements.Hf) @@ -312,23 +312,23 @@ public static void register() { .blastStats(GTValues.VA[GTValues.EV], 2000)) .build(); - Hassium = new Material.Builder(43, gregtechId("hassium")) + Hassium = Material.builder(43, gregtechId("hassium")) .color(0xDDDDDD) .element(Elements.Hs) .build(); - Holmium = new Material.Builder(44, gregtechId("holmium")) + Holmium = Material.builder(44, gregtechId("holmium")) .iconSet(METALLIC) .element(Elements.Ho) .build(); - Hydrogen = new Material.Builder(45, gregtechId("hydrogen")) + Hydrogen = Material.builder(45, gregtechId("hydrogen")) .gas() .color(0x0000B5) .element(Elements.H) .build(); - Helium = new Material.Builder(46, gregtechId("helium")) + Helium = Material.builder(46, gregtechId("helium")) .gas(new FluidBuilder().customStill()) .plasma(new FluidBuilder().customStill()) .liquid(new FluidBuilder() @@ -341,7 +341,7 @@ public static void register() { .build(); Helium.getProperty(PropertyKey.FLUID).setPrimaryKey(FluidStorageKeys.GAS); - Helium3 = new Material.Builder(47, gregtechId("helium_3")) + Helium3 = Material.builder(47, gregtechId("helium_3")) .gas(new FluidBuilder() .customStill() .translation("gregtech.fluid.generic")) @@ -349,19 +349,19 @@ public static void register() { .element(Elements.He3) .build(); - Indium = new Material.Builder(48, gregtechId("indium")) + Indium = Material.builder(48, gregtechId("indium")) .ingot() .liquid(new FluidBuilder().temperature(430)) .color(0x400080).iconSet(SHINY) .element(Elements.In) .build(); - Iodine = new Material.Builder(49, gregtechId("iodine")) + Iodine = Material.builder(49, gregtechId("iodine")) .color(0x2C344F).iconSet(SHINY) .element(Elements.I) .build(); - Iridium = new Material.Builder(50, gregtechId("iridium")) + Iridium = Material.builder(50, gregtechId("iridium")) .ingot(3) .liquid(new FluidBuilder().temperature(2719)) .color(0xA1E4E4).iconSet(METALLIC) @@ -375,7 +375,7 @@ public static void register() { .vacuumStats(VA[EV], 250)) .build(); - Iron = new Material.Builder(51, gregtechId("iron")) + Iron = Material.builder(51, gregtechId("iron")) .ingot() .liquid(new FluidBuilder().temperature(1811)) .plasma() @@ -391,26 +391,26 @@ public static void register() { .cableProperties(V[MV], 2, 3) .build(); - Krypton = new Material.Builder(52, gregtechId("krypton")) + Krypton = Material.builder(52, gregtechId("krypton")) .gas(new FluidBuilder() .customStill()) .color(0x80FF80) .element(Elements.Kr) .build(); - Lanthanum = new Material.Builder(53, gregtechId("lanthanum")) + Lanthanum = Material.builder(53, gregtechId("lanthanum")) .dust() .liquid(new FluidBuilder().temperature(1193)) .color(0x5D7575).iconSet(METALLIC) .element(Elements.La) .build(); - Lawrencium = new Material.Builder(54, gregtechId("lawrencium")) + Lawrencium = Material.builder(54, gregtechId("lawrencium")) .iconSet(METALLIC) .element(Elements.Lr) .build(); - Lead = new Material.Builder(55, gregtechId("lead")) + Lead = Material.builder(55, gregtechId("lead")) .ingot(1) .liquid(new FluidBuilder().temperature(600)) .ore() @@ -422,7 +422,7 @@ public static void register() { .fluidPipeProperties(1200, 32, true) .build(); - Lithium = new Material.Builder(56, gregtechId("lithium")) + Lithium = Material.builder(56, gregtechId("lithium")) .dust() .liquid(new FluidBuilder().temperature(454)) .ore() @@ -430,31 +430,31 @@ public static void register() { .element(Elements.Li) .build(); - Livermorium = new Material.Builder(57, gregtechId("livermorium")) + Livermorium = Material.builder(57, gregtechId("livermorium")) .color(0xAAAAAA).iconSet(SHINY) .element(Elements.Lv) .build(); - Lutetium = new Material.Builder(58, gregtechId("lutetium")) + Lutetium = Material.builder(58, gregtechId("lutetium")) .dust() .liquid(new FluidBuilder().temperature(1925)) .color(0x00AAFF).iconSet(METALLIC) .element(Elements.Lu) .build(); - Magnesium = new Material.Builder(59, gregtechId("magnesium")) + Magnesium = Material.builder(59, gregtechId("magnesium")) .dust() .liquid(new FluidBuilder().temperature(923)) .color(0xFFC8C8).iconSet(METALLIC) .element(Elements.Mg) .build(); - Mendelevium = new Material.Builder(60, gregtechId("mendelevium")) + Mendelevium = Material.builder(60, gregtechId("mendelevium")) .color(0x1D4ACF).iconSet(METALLIC) .element(Elements.Md) .build(); - Manganese = new Material.Builder(61, gregtechId("manganese")) + Manganese = Material.builder(61, gregtechId("manganese")) .ingot() .liquid(new FluidBuilder().temperature(1519)) .color(0xCDE1B9) @@ -463,18 +463,18 @@ public static void register() { .rotorStats(7.0f, 2.0f, 512) .build(); - Meitnerium = new Material.Builder(62, gregtechId("meitnerium")) + Meitnerium = Material.builder(62, gregtechId("meitnerium")) .color(0x2246BE).iconSet(SHINY) .element(Elements.Mt) .build(); - Mercury = new Material.Builder(63, gregtechId("mercury")) + Mercury = Material.builder(63, gregtechId("mercury")) .fluid() .color(0xE6DCDC).iconSet(DULL) .element(Elements.Hg) .build(); - Molybdenum = new Material.Builder(64, gregtechId("molybdenum")) + Molybdenum = Material.builder(64, gregtechId("molybdenum")) .ingot() .liquid(new FluidBuilder().temperature(2896)) .ore() @@ -484,12 +484,12 @@ public static void register() { .rotorStats(7.0f, 2.0f, 512) .build(); - Moscovium = new Material.Builder(65, gregtechId("moscovium")) + Moscovium = Material.builder(65, gregtechId("moscovium")) .color(0x7854AD).iconSet(SHINY) .element(Elements.Mc) .build(); - Neodymium = new Material.Builder(66, gregtechId("neodymium")) + Neodymium = Material.builder(66, gregtechId("neodymium")) .ingot().fluid().ore() .color(0x646464).iconSet(METALLIC) .flags(STD_METAL, GENERATE_ROD, GENERATE_BOLT_SCREW) @@ -498,18 +498,18 @@ public static void register() { .blast(1297, GasTier.MID) .build(); - Neon = new Material.Builder(67, gregtechId("neon")) + Neon = Material.builder(67, gregtechId("neon")) .gas() .color(0xFAB4B4) .element(Elements.Ne) .build(); - Neptunium = new Material.Builder(68, gregtechId("neptunium")) + Neptunium = Material.builder(68, gregtechId("neptunium")) .color(0x284D7B).iconSet(METALLIC) .element(Elements.Np) .build(); - Nickel = new Material.Builder(69, gregtechId("nickel")) + Nickel = Material.builder(69, gregtechId("nickel")) .ingot() .liquid(new FluidBuilder().temperature(1728)) .plasma() @@ -521,12 +521,12 @@ public static void register() { .itemPipeProperties(2048, 1.0f) .build(); - Nihonium = new Material.Builder(70, gregtechId("nihonium")) + Nihonium = Material.builder(70, gregtechId("nihonium")) .color(0x08269E).iconSet(SHINY) .element(Elements.Nh) .build(); - Niobium = new Material.Builder(71, gregtechId("niobium")) + Niobium = Material.builder(71, gregtechId("niobium")) .ingot().fluid() .color(0xBEB4C8).iconSet(METALLIC) .element(Elements.Nb) @@ -535,23 +535,23 @@ public static void register() { .blastStats(VA[HV], 900)) .build(); - Nitrogen = new Material.Builder(72, gregtechId("nitrogen")) + Nitrogen = Material.builder(72, gregtechId("nitrogen")) .gas().plasma() .color(0x00BFC1) .element(Elements.N) .build(); - Nobelium = new Material.Builder(73, gregtechId("nobelium")) + Nobelium = Material.builder(73, gregtechId("nobelium")) .iconSet(SHINY) .element(Elements.No) .build(); - Oganesson = new Material.Builder(74, gregtechId("oganesson")) + Oganesson = Material.builder(74, gregtechId("oganesson")) .color(0x142D64).iconSet(METALLIC) .element(Elements.Og) .build(); - Osmium = new Material.Builder(75, gregtechId("osmium")) + Osmium = Material.builder(75, gregtechId("osmium")) .ingot(4) .liquid(new FluidBuilder().temperature(3306)) .color(0x3232FF).iconSet(METALLIC) @@ -566,7 +566,7 @@ public static void register() { .vacuumStats(VA[EV], 300)) .build(); - Oxygen = new Material.Builder(76, gregtechId("oxygen")) + Oxygen = Material.builder(76, gregtechId("oxygen")) .gas() .liquid(new FluidBuilder() .temperature(85) @@ -579,7 +579,7 @@ public static void register() { .build(); Oxygen.getProperty(PropertyKey.FLUID).setPrimaryKey(FluidStorageKeys.GAS); - Palladium = new Material.Builder(77, gregtechId("palladium")) + Palladium = Material.builder(77, gregtechId("palladium")) .ingot().fluid().ore() .color(0x808080).iconSet(SHINY) .flags(EXT_METAL, GENERATE_FOIL, GENERATE_FINE_WIRE) @@ -590,18 +590,18 @@ public static void register() { .vacuumStats(VA[HV], 150)) .build(); - Phosphorus = new Material.Builder(78, gregtechId("phosphorus")) + Phosphorus = Material.builder(78, gregtechId("phosphorus")) .dust() .color(0xFFFF00) .element(Elements.P) .build(); - Polonium = new Material.Builder(79, gregtechId("polonium")) + Polonium = Material.builder(79, gregtechId("polonium")) .color(0xC9D47E) .element(Elements.Po) .build(); - Platinum = new Material.Builder(80, gregtechId("platinum")) + Platinum = Material.builder(80, gregtechId("platinum")) .ingot() .liquid(new FluidBuilder().temperature(2041)) .ore() @@ -612,14 +612,14 @@ public static void register() { .itemPipeProperties(512, 4.0f) .build(); - Plutonium239 = new Material.Builder(81, gregtechId("plutonium_239")) + Plutonium239 = Material.builder(81, gregtechId("plutonium_239")) .ingot(3) .liquid(new FluidBuilder().temperature(913)) .color(0xF03232).iconSet(METALLIC) .element(Elements.Pu239) .build(); - Plutonium241 = new Material.Builder(82, gregtechId("plutonium_241")) + Plutonium241 = Material.builder(82, gregtechId("plutonium_241")) .ingot(3) .liquid(new FluidBuilder().temperature(913)) .color(0xFA4646).iconSet(SHINY) @@ -627,45 +627,45 @@ public static void register() { .element(Elements.Pu241) .build(); - Potassium = new Material.Builder(83, gregtechId("potassium")) + Potassium = Material.builder(83, gregtechId("potassium")) .dust(1) .liquid(new FluidBuilder().temperature(337)) .color(0xBEDCFF).iconSet(METALLIC) .element(Elements.K) .build(); - Praseodymium = new Material.Builder(84, gregtechId("praseodymium")) + Praseodymium = Material.builder(84, gregtechId("praseodymium")) .color(0xCECECE).iconSet(METALLIC) .element(Elements.Pr) .build(); - Promethium = new Material.Builder(85, gregtechId("promethium")) + Promethium = Material.builder(85, gregtechId("promethium")) .iconSet(METALLIC) .element(Elements.Pm) .build(); - Protactinium = new Material.Builder(86, gregtechId("protactinium")) + Protactinium = Material.builder(86, gregtechId("protactinium")) .color(0xA78B6D).iconSet(METALLIC) .element(Elements.Pa) .build(); - Radon = new Material.Builder(87, gregtechId("radon")) + Radon = Material.builder(87, gregtechId("radon")) .gas() .color(0xFF39FF) .element(Elements.Rn) .build(); - Radium = new Material.Builder(88, gregtechId("radium")) + Radium = Material.builder(88, gregtechId("radium")) .color(0xFFFFCD).iconSet(SHINY) .element(Elements.Ra) .build(); - Rhenium = new Material.Builder(89, gregtechId("rhenium")) + Rhenium = Material.builder(89, gregtechId("rhenium")) .color(0xB6BAC3).iconSet(SHINY) .element(Elements.Re) .build(); - Rhodium = new Material.Builder(90, gregtechId("rhodium")) + Rhodium = Material.builder(90, gregtechId("rhodium")) .ingot().fluid() .color(0xDC0C58).iconSet(BRIGHT) .flags(EXT2_METAL, GENERATE_GEAR, GENERATE_FINE_WIRE) @@ -676,17 +676,17 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - Roentgenium = new Material.Builder(91, gregtechId("roentgenium")) + Roentgenium = Material.builder(91, gregtechId("roentgenium")) .color(0xE3FDEC).iconSet(SHINY) .element(Elements.Rg) .build(); - Rubidium = new Material.Builder(92, gregtechId("rubidium")) + Rubidium = Material.builder(92, gregtechId("rubidium")) .color(0xF01E1E).iconSet(SHINY) .element(Elements.Rb) .build(); - Ruthenium = new Material.Builder(93, gregtechId("ruthenium")) + Ruthenium = Material.builder(93, gregtechId("ruthenium")) .ingot().fluid() .color(0x50ACCD).iconSet(SHINY) .flags(GENERATE_FOIL, GENERATE_GEAR) @@ -697,12 +697,12 @@ public static void register() { .vacuumStats(VA[HV], 200)) .build(); - Rutherfordium = new Material.Builder(94, gregtechId("rutherfordium")) + Rutherfordium = Material.builder(94, gregtechId("rutherfordium")) .color(0xFFF6A1).iconSet(SHINY) .element(Elements.Rf) .build(); - Samarium = new Material.Builder(95, gregtechId("samarium")) + Samarium = Material.builder(95, gregtechId("samarium")) .ingot() .liquid(new FluidBuilder().temperature(1345)) .color(0xFFFFCC).iconSet(METALLIC) @@ -714,22 +714,22 @@ public static void register() { .vacuumStats(VA[HV], 200)) .build(); - Scandium = new Material.Builder(96, gregtechId("scandium")) + Scandium = Material.builder(96, gregtechId("scandium")) .iconSet(METALLIC) .element(Elements.Sc) .build(); - Seaborgium = new Material.Builder(97, gregtechId("seaborgium")) + Seaborgium = Material.builder(97, gregtechId("seaborgium")) .color(0x19C5FF).iconSet(SHINY) .element(Elements.Sg) .build(); - Selenium = new Material.Builder(98, gregtechId("selenium")) + Selenium = Material.builder(98, gregtechId("selenium")) .color(0xB6BA6B).iconSet(SHINY) .element(Elements.Se) .build(); - Silicon = new Material.Builder(99, gregtechId("silicon")) + Silicon = Material.builder(99, gregtechId("silicon")) .ingot().fluid() .color(0x3C3C50).iconSet(METALLIC) .flags(GENERATE_FOIL) @@ -737,7 +737,7 @@ public static void register() { .blast(2273) // no gas tier for silicon .build(); - Silver = new Material.Builder(100, gregtechId("silver")) + Silver = Material.builder(100, gregtechId("silver")) .ingot() .liquid(new FluidBuilder().temperature(1235)) .ore() @@ -747,25 +747,25 @@ public static void register() { .cableProperties(V[HV], 1, 1) .build(); - Sodium = new Material.Builder(101, gregtechId("sodium")) + Sodium = Material.builder(101, gregtechId("sodium")) .dust() .color(0x000096).iconSet(METALLIC) .element(Elements.Na) .build(); - Strontium = new Material.Builder(102, gregtechId("strontium")) + Strontium = Material.builder(102, gregtechId("strontium")) .color(0xC8C8C8).iconSet(METALLIC) .element(Elements.Sr) .build(); - Sulfur = new Material.Builder(103, gregtechId("sulfur")) + Sulfur = Material.builder(103, gregtechId("sulfur")) .dust().ore() .color(0xC8C800) .flags(FLAMMABLE) .element(Elements.S) .build(); - Tantalum = new Material.Builder(104, gregtechId("tantalum")) + Tantalum = Material.builder(104, gregtechId("tantalum")) .ingot() .liquid(new FluidBuilder().temperature(3290)) .color(0x69B7FF).iconSet(METALLIC) @@ -773,27 +773,27 @@ public static void register() { .element(Elements.Ta) .build(); - Technetium = new Material.Builder(105, gregtechId("technetium")) + Technetium = Material.builder(105, gregtechId("technetium")) .color(0x545455).iconSet(SHINY) .element(Elements.Tc) .build(); - Tellurium = new Material.Builder(106, gregtechId("tellurium")) + Tellurium = Material.builder(106, gregtechId("tellurium")) .iconSet(METALLIC) .element(Elements.Te) .build(); - Tennessine = new Material.Builder(107, gregtechId("tennessine")) + Tennessine = Material.builder(107, gregtechId("tennessine")) .color(0x977FD6).iconSet(SHINY) .element(Elements.Ts) .build(); - Terbium = new Material.Builder(108, gregtechId("terbium")) + Terbium = Material.builder(108, gregtechId("terbium")) .iconSet(METALLIC) .element(Elements.Tb) .build(); - Thorium = new Material.Builder(109, gregtechId("thorium")) + Thorium = Material.builder(109, gregtechId("thorium")) .ingot() .liquid(new FluidBuilder().temperature(2023)) .ore() @@ -802,17 +802,17 @@ public static void register() { .element(Elements.Th) .build(); - Thallium = new Material.Builder(110, gregtechId("thallium")) + Thallium = Material.builder(110, gregtechId("thallium")) .color(0xC1C1DE).iconSet(SHINY) .element(Elements.Tl) .build(); - Thulium = new Material.Builder(111, gregtechId("thulium")) + Thulium = Material.builder(111, gregtechId("thulium")) .iconSet(METALLIC) .element(Elements.Tm) .build(); - Tin = new Material.Builder(112, gregtechId("tin")) + Tin = Material.builder(112, gregtechId("tin")) .ingot(1) .liquid(new FluidBuilder().temperature(505)) .plasma() @@ -825,8 +825,8 @@ public static void register() { .itemPipeProperties(4096, 0.5f) .build(); - Titanium = new Material.Builder(113, gregtechId("titanium")) // todo Ore? Look at EBF recipe here if we do Ti - // ores + Titanium = Material.builder(113, gregtechId("titanium")) // todo Ore? Look at EBF recipe here if we do Ti + // ores .ingot(3).fluid() .color(0xDCA0F0).iconSet(METALLIC) .flags(EXT2_METAL, GENERATE_DOUBLE_PLATE, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_GEAR, @@ -842,14 +842,14 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - Tritium = new Material.Builder(114, gregtechId("tritium")) + Tritium = Material.builder(114, gregtechId("tritium")) .gas(new FluidBuilder().customStill()) .color(0xFC5C5C) .iconSet(METALLIC) .element(Elements.T) .build(); - Tungsten = new Material.Builder(115, gregtechId("tungsten")) + Tungsten = Material.builder(115, gregtechId("tungsten")) .ingot(3) .liquid(new FluidBuilder().temperature(3695)) .color(0x323232).iconSet(METALLIC) @@ -865,46 +865,46 @@ public static void register() { .vacuumStats(VA[HV], 300)) .build(); - Uranium = new Material.Builder(116, gregtechId("uranium")) + Uranium = Material.builder(116, gregtechId("uranium")) .dust(3) .liquid(new FluidBuilder().temperature(1405)) .color(0x32F032).iconSet(METALLIC) .element(Elements.U) .build(); - Uranium235 = new Material.Builder(117, gregtechId("uranium_235")) + Uranium235 = Material.builder(117, gregtechId("uranium_235")) .dust(3) .liquid(new FluidBuilder().temperature(1405)) .color(0x46FA46).iconSet(SHINY) .element(Elements.U235) .build(); - Vanadium = new Material.Builder(118, gregtechId("vanadium")) + Vanadium = Material.builder(118, gregtechId("vanadium")) .ingot().fluid() .color(0x323232).iconSet(METALLIC) .element(Elements.V) .blast(2183, GasTier.MID) .build(); - Xenon = new Material.Builder(119, gregtechId("xenon")) + Xenon = Material.builder(119, gregtechId("xenon")) .gas() .color(0x00FFFF) .element(Elements.Xe) .build(); - Ytterbium = new Material.Builder(120, gregtechId("ytterbium")) + Ytterbium = Material.builder(120, gregtechId("ytterbium")) .color(0xA7A7A7).iconSet(METALLIC) .element(Elements.Yb) .build(); - Yttrium = new Material.Builder(121, gregtechId("yttrium")) + Yttrium = Material.builder(121, gregtechId("yttrium")) .ingot().fluid() .color(0x76524C).iconSet(METALLIC) .element(Elements.Y) .blast(1799) .build(); - Zinc = new Material.Builder(122, gregtechId("zinc")) + Zinc = Material.builder(122, gregtechId("zinc")) .ingot(1) .liquid(new FluidBuilder().temperature(693)) .color(0xEBEBFA).iconSet(METALLIC) @@ -912,7 +912,7 @@ public static void register() { .element(Elements.Zn) .build(); - Zirconium = new Material.Builder(123, gregtechId("zirconium")) + Zirconium = Material.builder(123, gregtechId("zirconium")) .ingot() .color(0xC8FFFF).iconSet(METALLIC) .element(Elements.Zr) @@ -920,7 +920,7 @@ public static void register() { .blastStats(GTValues.VA[GTValues.EV], 1200)) .build(); - Naquadah = new Material.Builder(124, gregtechId("naquadah")) + Naquadah = Material.builder(124, gregtechId("naquadah")) .ingot(4) .liquid(new FluidBuilder().customStill()) .ore() @@ -937,7 +937,7 @@ public static void register() { .vacuumStats(VA[EV], 150)) .build(); - NaquadahEnriched = new Material.Builder(125, gregtechId("naquadah_enriched")) + NaquadahEnriched = Material.builder(125, gregtechId("naquadah_enriched")) .ingot(4) .liquid(new FluidBuilder().customStill()) .color(0x3C3C3C).iconSet(METALLIC) @@ -949,7 +949,7 @@ public static void register() { .vacuumStats(VA[EV], 150)) .build(); - Naquadria = new Material.Builder(126, gregtechId("naquadria")) + Naquadria = Material.builder(126, gregtechId("naquadria")) .ingot(3) .liquid(new FluidBuilder().customStill()) .color(0x1E1E1E).iconSet(SHINY) @@ -962,7 +962,7 @@ public static void register() { .vacuumStats(VA[LuV], 200)) .build(); - Neutronium = new Material.Builder(127, gregtechId("neutronium")) + Neutronium = Material.builder(127, gregtechId("neutronium")) .ingot(6) .liquid(new FluidBuilder().temperature(100_000)) .color(0xFAFAFA) @@ -975,7 +975,7 @@ public static void register() { .fluidPipeProperties(100_000, 5000, true, true, true, true) .build(); - Tritanium = new Material.Builder(128, gregtechId("tritanium")) + Tritanium = Material.builder(128, gregtechId("tritanium")) .ingot(6) .liquid(new FluidBuilder().temperature(25_000)) .color(0x600000).iconSet(METALLIC) @@ -986,7 +986,7 @@ public static void register() { .rotorStats(20.0f, 6.0f, 10240) .build(); - Duranium = new Material.Builder(129, gregtechId("duranium")) + Duranium = Material.builder(129, gregtechId("duranium")) .ingot(5) .liquid(new FluidBuilder().temperature(7500)) .color(0x4BAFAF).iconSet(BRIGHT) @@ -997,7 +997,7 @@ public static void register() { .fluidPipeProperties(9625, 500, true, true, true, true) .build(); - Trinium = new Material.Builder(130, gregtechId("trinium")) + Trinium = Material.builder(130, gregtechId("trinium")) .ingot(7).fluid() .color(0x9973BD).iconSet(SHINY) .flags(GENERATE_FOIL, GENERATE_BOLT_SCREW, GENERATE_GEAR) @@ -1009,13 +1009,13 @@ public static void register() { .vacuumStats(VA[IV], 300)) .build(); - Uranium238 = new Material.Builder(131, gregtechId("uranium_238")) + Uranium238 = Material.builder(131, gregtechId("uranium_238")) .dust(3) .color(0x46FA46).iconSet(ROUGH) .element(Elements.U238) .build(); - Plutonium = new Material.Builder(132, gregtechId("plutonium")) + Plutonium = Material.builder(132, gregtechId("plutonium")) .color(0xF03232).iconSet(ROUGH) .element(Elements.Pu) .build(); diff --git a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java index 70fc98881fe..ea1bf3e288e 100644 --- a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java @@ -22,19 +22,19 @@ public class FirstDegreeMaterials { public static void register() { - Almandine = new Material.Builder(250, gregtechId("almandine")) + Almandine = Material.builder(250, gregtechId("almandine")) .gem(1).ore(3, 1) .color(0xFF0000) .components(Aluminium, 2, Iron, 3, Silicon, 3, Oxygen, 12) .build(); - Andradite = new Material.Builder(251, gregtechId("andradite")) + Andradite = Material.builder(251, gregtechId("andradite")) .gem(1) .color(0x967800).iconSet(RUBY) .components(Calcium, 3, Iron, 2, Silicon, 3, Oxygen, 12) .build(); - AnnealedCopper = new Material.Builder(252, gregtechId("annealed_copper")) + AnnealedCopper = Material.builder(252, gregtechId("annealed_copper")) .ingot() .liquid(new FluidBuilder().temperature(1358)) .color(0xFF8D3B).iconSet(BRIGHT) @@ -44,26 +44,26 @@ public static void register() { .build(); Copper.getProperty(PropertyKey.INGOT).setArcSmeltingInto(AnnealedCopper); - Asbestos = new Material.Builder(253, gregtechId("asbestos")) + Asbestos = Material.builder(253, gregtechId("asbestos")) .dust(1).ore(3, 1) .color(0xE6E6E6) .components(Magnesium, 3, Silicon, 2, Hydrogen, 4, Oxygen, 9) .build(); - Ash = new Material.Builder(254, gregtechId("ash")) + Ash = Material.builder(254, gregtechId("ash")) .dust(1) .color(0x969696) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 1) .build(); - BandedIron = new Material.Builder(255, gregtechId("banded_iron")) + BandedIron = Material.builder(255, gregtechId("banded_iron")) .dust().ore() .color(0x915A5A) .components(Iron, 2, Oxygen, 3) .build(); - BatteryAlloy = new Material.Builder(256, gregtechId("battery_alloy")) + BatteryAlloy = Material.builder(256, gregtechId("battery_alloy")) .ingot(1) .liquid(new FluidBuilder().temperature(660)) .color(0x9C7CA0) @@ -71,21 +71,21 @@ public static void register() { .components(Lead, 4, Antimony, 1) .build(); - BlueTopaz = new Material.Builder(257, gregtechId("blue_topaz")) + BlueTopaz = Material.builder(257, gregtechId("blue_topaz")) .gem(3).ore(2, 1) .color(0x7B96DC).iconSet(GEM_HORIZONTAL) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT) .components(Aluminium, 2, Silicon, 1, Fluorine, 2, Hydrogen, 2, Oxygen, 6) .build(); - Bone = new Material.Builder(258, gregtechId("bone")) + Bone = Material.builder(258, gregtechId("bone")) .dust(1) .color(0xFAFAFA) .flags(MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES) .components(Calcium, 1) .build(); - Brass = new Material.Builder(259, gregtechId("brass")) + Brass = Material.builder(259, gregtechId("brass")) .ingot(1) .liquid(new FluidBuilder().temperature(1160)) .color(0xFFB400).iconSet(METALLIC) @@ -95,7 +95,7 @@ public static void register() { .itemPipeProperties(2048, 1) .build(); - Bronze = new Material.Builder(260, gregtechId("bronze")) + Bronze = Material.builder(260, gregtechId("bronze")) .ingot() .liquid(new FluidBuilder().temperature(1357)) .color(0xFF8000).iconSet(METALLIC) @@ -108,72 +108,72 @@ public static void register() { .fluidPipeProperties(1696, 20, true) .build(); - BrownLimonite = new Material.Builder(261, gregtechId("brown_limonite")) + BrownLimonite = Material.builder(261, gregtechId("brown_limonite")) .dust(1).ore() .color(0xC86400).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING, BLAST_FURNACE_CALCITE_TRIPLE) .components(Iron, 1, Hydrogen, 1, Oxygen, 2) .build(); - Calcite = new Material.Builder(262, gregtechId("calcite")) + Calcite = Material.builder(262, gregtechId("calcite")) .dust(1).ore() .color(0xFAE6DC) .components(Calcium, 1, Carbon, 1, Oxygen, 3) .build(); - Cassiterite = new Material.Builder(263, gregtechId("cassiterite")) + Cassiterite = Material.builder(263, gregtechId("cassiterite")) .dust(1).ore(2, 1) .color(0xDCDCDC).iconSet(METALLIC) .components(Tin, 1, Oxygen, 2) .build(); - CassiteriteSand = new Material.Builder(264, gregtechId("cassiterite_sand")) + CassiteriteSand = Material.builder(264, gregtechId("cassiterite_sand")) .dust(1).ore(2, 1) .color(0xDCDCDC).iconSet(SAND) .components(Tin, 1, Oxygen, 2) .build(); - Chalcopyrite = new Material.Builder(265, gregtechId("chalcopyrite")) + Chalcopyrite = Material.builder(265, gregtechId("chalcopyrite")) .dust(1).ore() .color(0xA07828) .components(Copper, 1, Iron, 1, Sulfur, 2) .build(); - Charcoal = new Material.Builder(266, gregtechId("charcoal")) + Charcoal = Material.builder(266, gregtechId("charcoal")) .gem(1, 1600) // default charcoal burn time in vanilla .color(0x644646).iconSet(FINE) .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE) .components(Carbon, 1) .build(); - Chromite = new Material.Builder(267, gregtechId("chromite")) + Chromite = Material.builder(267, gregtechId("chromite")) .dust(1).ore() .color(0x23140F).iconSet(METALLIC) .components(Iron, 1, Chrome, 2, Oxygen, 4) .build(); - Cinnabar = new Material.Builder(268, gregtechId("cinnabar")) + Cinnabar = Material.builder(268, gregtechId("cinnabar")) .dust(1).ore() .color(0x960000).iconSet(EMERALD) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Mercury, 1, Sulfur, 1) .build(); - Water = new Material.Builder(269, gregtechId("water")) + Water = Material.builder(269, gregtechId("water")) .fluid(FluidRegistry.WATER, FluidStorageKeys.LIQUID, FluidState.LIQUID) .color(0x0000FF) .flags(DISABLE_DECOMPOSITION) .components(Hydrogen, 2, Oxygen, 1) .build(); - Zircon = new Material.Builder(270, gregtechId("zircon")) + Zircon = Material.builder(270, gregtechId("zircon")) .gem().ore() .color(0xC31313) .flags(DISABLE_DECOMPOSITION) .components(Zirconium, 1, Silicon, 1, Oxygen, 4) .build(); - Coal = new Material.Builder(271, gregtechId("coal")) + Coal = Material.builder(271, gregtechId("coal")) .gem(1, 1600).ore(2, 1) // default coal burn time in vanilla .color(0x464646).iconSet(LIGNITE) .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, @@ -181,19 +181,19 @@ public static void register() { .components(Carbon, 1) .build(); - Cobaltite = new Material.Builder(272, gregtechId("cobaltite")) + Cobaltite = Material.builder(272, gregtechId("cobaltite")) .dust(1).ore() .color(0x5050FA).iconSet(METALLIC) .components(Cobalt, 1, Arsenic, 1, Sulfur, 1) .build(); - Cooperite = new Material.Builder(273, gregtechId("cooperite")) + Cooperite = Material.builder(273, gregtechId("cooperite")) .dust(1).ore() .color(0xFFFFC8).iconSet(METALLIC) .components(Platinum, 3, Nickel, 1, Sulfur, 1, Palladium, 1) .build(); - Cupronickel = new Material.Builder(274, gregtechId("cupronickel")) + Cupronickel = Material.builder(274, gregtechId("cupronickel")) .ingot(1) .liquid(new FluidBuilder().temperature(1542)) .color(0xE39680).iconSet(METALLIC) @@ -203,14 +203,14 @@ public static void register() { .cableProperties(V[MV], 1, 1) .build(); - DarkAsh = new Material.Builder(275, gregtechId("dark_ash")) + DarkAsh = Material.builder(275, gregtechId("dark_ash")) .dust(1) .color(0x323232) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 1) .build(); - Diamond = new Material.Builder(276, gregtechId("diamond")) + Diamond = Material.builder(276, gregtechId("diamond")) .gem(3).ore() .color(0xC8FFFF).iconSet(DIAMOND) .flags(GENERATE_BOLT_SCREW, GENERATE_LENS, GENERATE_GEAR, NO_SMASHING, NO_SMELTING, @@ -220,7 +220,7 @@ public static void register() { .attackSpeed(0.1F).enchantability(18).build()) .build(); - Electrum = new Material.Builder(277, gregtechId("electrum")) + Electrum = Material.builder(277, gregtechId("electrum")) .ingot() .liquid(new FluidBuilder().temperature(1285)) .color(0xFFFF64).iconSet(SHINY) @@ -230,7 +230,7 @@ public static void register() { .cableProperties(V[HV], 2, 2) .build(); - Emerald = new Material.Builder(278, gregtechId("emerald")) + Emerald = Material.builder(278, gregtechId("emerald")) .gem().ore(2, 1) .color(0x50FF50).iconSet(EMERALD) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, @@ -238,32 +238,32 @@ public static void register() { .components(Beryllium, 3, Aluminium, 2, Silicon, 6, Oxygen, 18) .build(); - Galena = new Material.Builder(279, gregtechId("galena")) + Galena = Material.builder(279, gregtechId("galena")) .dust(3).ore() .color(0x643C64) .components(Lead, 1, Sulfur, 1) .build(); - Garnierite = new Material.Builder(280, gregtechId("garnierite")) + Garnierite = Material.builder(280, gregtechId("garnierite")) .dust(3).ore() .color(0x32C846).iconSet(METALLIC) .components(Nickel, 1, Oxygen, 1) .build(); - GreenSapphire = new Material.Builder(281, gregtechId("green_sapphire")) + GreenSapphire = Material.builder(281, gregtechId("green_sapphire")) .gem().ore() .color(0x64C882).iconSet(GEM_HORIZONTAL) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT) .components(Aluminium, 2, Oxygen, 3) .build(); - Grossular = new Material.Builder(282, gregtechId("grossular")) + Grossular = Material.builder(282, gregtechId("grossular")) .gem(1).ore(3, 1) .color(0xC86400).iconSet(RUBY) .components(Calcium, 3, Aluminium, 2, Silicon, 3, Oxygen, 12) .build(); - Ice = new Material.Builder(283, gregtechId("ice")) + Ice = Material.builder(283, gregtechId("ice")) .dust(0) .liquid(new FluidBuilder() .temperature(273) @@ -274,28 +274,28 @@ public static void register() { .components(Hydrogen, 2, Oxygen, 1) .build(); - Ilmenite = new Material.Builder(284, gregtechId("ilmenite")) + Ilmenite = Material.builder(284, gregtechId("ilmenite")) .dust(3).ore() .color(0x463732).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Iron, 1, Titanium, 1, Oxygen, 3) .build(); - Rutile = new Material.Builder(285, gregtechId("rutile")) + Rutile = Material.builder(285, gregtechId("rutile")) .gem() .color(0xD40D5C).iconSet(GEM_HORIZONTAL) .flags(DISABLE_DECOMPOSITION) .components(Titanium, 1, Oxygen, 2) .build(); - Bauxite = new Material.Builder(286, gregtechId("bauxite")) + Bauxite = Material.builder(286, gregtechId("bauxite")) .dust(1).ore() .color(0xC86400) .flags(DISABLE_DECOMPOSITION) .components(Aluminium, 2, Oxygen, 3) .build(); - Invar = new Material.Builder(287, gregtechId("invar")) + Invar = Material.builder(287, gregtechId("invar")) .ingot() .liquid(new FluidBuilder().temperature(1916)) .color(0xB4B478).iconSet(METALLIC) @@ -308,7 +308,7 @@ public static void register() { .rotorStats(7.0f, 3.0f, 512) .build(); - Kanthal = new Material.Builder(288, gregtechId("kanthal")) + Kanthal = Material.builder(288, gregtechId("kanthal")) .ingot() .liquid(new FluidBuilder().temperature(1708)) .color(0xC2D2DF).iconSet(METALLIC) @@ -318,7 +318,7 @@ public static void register() { .blast(b -> b.temp(1800, GasTier.LOW).blastStats(VA[HV], 900)) .build(); - Lazurite = new Material.Builder(289, gregtechId("lazurite")) + Lazurite = Material.builder(289, gregtechId("lazurite")) .gem(1).ore(6, 4) .color(0x6478FF).iconSet(LAPIS) .flags(GENERATE_PLATE, NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, GENERATE_ROD, @@ -326,7 +326,7 @@ public static void register() { .components(Aluminium, 6, Silicon, 6, Calcium, 8, Sodium, 8) .build(); - Magnalium = new Material.Builder(290, gregtechId("magnalium")) + Magnalium = Material.builder(290, gregtechId("magnalium")) .ingot() .liquid(new FluidBuilder().temperature(929)) .color(0xC8BEFF) @@ -336,25 +336,25 @@ public static void register() { .itemPipeProperties(1024, 2) .build(); - Magnesite = new Material.Builder(291, gregtechId("magnesite")) + Magnesite = Material.builder(291, gregtechId("magnesite")) .dust().ore() .color(0xFAFAB4).iconSet(METALLIC) .components(Magnesium, 1, Carbon, 1, Oxygen, 3) .build(); - Magnetite = new Material.Builder(292, gregtechId("magnetite")) + Magnetite = Material.builder(292, gregtechId("magnetite")) .dust().ore() .color(0x1E1E1E).iconSet(METALLIC) .components(Iron, 3, Oxygen, 4) .build(); - Molybdenite = new Material.Builder(293, gregtechId("molybdenite")) + Molybdenite = Material.builder(293, gregtechId("molybdenite")) .dust().ore() .color(0x191919).iconSet(METALLIC) .components(Molybdenum, 1, Sulfur, 2) .build(); - Nichrome = new Material.Builder(294, gregtechId("nichrome")) + Nichrome = Material.builder(294, gregtechId("nichrome")) .ingot() .liquid(new FluidBuilder().temperature(1818)) .color(0xCDCEF6).iconSet(METALLIC) @@ -367,7 +367,7 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - NiobiumNitride = new Material.Builder(295, gregtechId("niobium_nitride")) + NiobiumNitride = Material.builder(295, gregtechId("niobium_nitride")) .ingot().fluid() .color(0x1D291D) .flags(EXT_METAL, GENERATE_FOIL) @@ -376,7 +376,7 @@ public static void register() { .blast(2846, GasTier.MID) .build(); - NiobiumTitanium = new Material.Builder(296, gregtechId("niobium_titanium")) + NiobiumTitanium = Material.builder(296, gregtechId("niobium_titanium")) .ingot() .liquid(new FluidBuilder().temperature(2345)) .color(0x1D1D29) @@ -391,28 +391,28 @@ public static void register() { .vacuumStats(VA[HV], 200)) .build(); - Obsidian = new Material.Builder(297, gregtechId("obsidian")) + Obsidian = Material.builder(297, gregtechId("obsidian")) .dust(3) .color(0x503264) .flags(NO_SMASHING, EXCLUDE_BLOCK_CRAFTING_RECIPES, GENERATE_PLATE, GENERATE_DENSE) .components(Magnesium, 1, Iron, 1, Silicon, 2, Oxygen, 4) .build(); - Phosphate = new Material.Builder(298, gregtechId("phosphate")) + Phosphate = Material.builder(298, gregtechId("phosphate")) .dust(1) .color(0xFFFF00) .flags(NO_SMASHING, NO_SMELTING, FLAMMABLE, EXPLOSIVE) .components(Phosphorus, 1, Oxygen, 4) .build(); - PlatinumRaw = new Material.Builder(299, gregtechId("platinum_raw")) + PlatinumRaw = Material.builder(299, gregtechId("platinum_raw")) .dust() .color(0xFFFFC8).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Platinum, 1, Chlorine, 2) .build(); - SterlingSilver = new Material.Builder(300, gregtechId("sterling_silver")) + SterlingSilver = Material.builder(300, gregtechId("sterling_silver")) .ingot() .liquid(new FluidBuilder().temperature(1258)) .color(0xFADCE1).iconSet(SHINY) @@ -426,7 +426,7 @@ public static void register() { .blast(b -> b.temp(1700, GasTier.LOW).blastStats(VA[MV], 1000)) .build(); - RoseGold = new Material.Builder(301, gregtechId("rose_gold")) + RoseGold = Material.builder(301, gregtechId("rose_gold")) .ingot() .liquid(new FluidBuilder().temperature(1341)) .color(0xFFE61E).iconSet(SHINY) @@ -440,7 +440,7 @@ public static void register() { .blast(b -> b.temp(1600, GasTier.LOW).blastStats(VA[MV], 1000)) .build(); - BlackBronze = new Material.Builder(302, gregtechId("black_bronze")) + BlackBronze = Material.builder(302, gregtechId("black_bronze")) .ingot() .liquid(new FluidBuilder().temperature(1328)) .color(0x64327D) @@ -451,7 +451,7 @@ public static void register() { .blast(b -> b.temp(2000, GasTier.LOW).blastStats(VA[MV], 1000)) .build(); - BismuthBronze = new Material.Builder(303, gregtechId("bismuth_bronze")) + BismuthBronze = Material.builder(303, gregtechId("bismuth_bronze")) .ingot() .liquid(new FluidBuilder().temperature(1036)) .color(0x647D7D) @@ -461,45 +461,45 @@ public static void register() { .blast(b -> b.temp(1100, GasTier.LOW).blastStats(VA[MV], 1000)) .build(); - Biotite = new Material.Builder(304, gregtechId("biotite")) + Biotite = Material.builder(304, gregtechId("biotite")) .dust(1) .color(0x141E14).iconSet(METALLIC) .components(Potassium, 1, Magnesium, 3, Aluminium, 3, Fluorine, 2, Silicon, 3, Oxygen, 10) .build(); - Powellite = new Material.Builder(305, gregtechId("powellite")) + Powellite = Material.builder(305, gregtechId("powellite")) .dust().ore() .color(0xFFFF00) .components(Calcium, 1, Molybdenum, 1, Oxygen, 4) .build(); - Pyrite = new Material.Builder(306, gregtechId("pyrite")) + Pyrite = Material.builder(306, gregtechId("pyrite")) .dust(1).ore() .color(0x967828).iconSet(ROUGH) .flags(BLAST_FURNACE_CALCITE_DOUBLE) .components(Iron, 1, Sulfur, 2) .build(); - Pyrolusite = new Material.Builder(307, gregtechId("pyrolusite")) + Pyrolusite = Material.builder(307, gregtechId("pyrolusite")) .dust().ore() .color(0x9696AA) .components(Manganese, 1, Oxygen, 2) .build(); - Pyrope = new Material.Builder(308, gregtechId("pyrope")) + Pyrope = Material.builder(308, gregtechId("pyrope")) .gem().ore(3, 1) .color(0x783264).iconSet(RUBY) .components(Aluminium, 2, Magnesium, 3, Silicon, 3, Oxygen, 12) .build(); - RockSalt = new Material.Builder(309, gregtechId("rock_salt")) + RockSalt = Material.builder(309, gregtechId("rock_salt")) .gem(1).ore(2, 1) .color(0xF0C8C8).iconSet(FINE) .flags(NO_SMASHING) .components(Potassium, 1, Chlorine, 1) .build(); - Ruridit = new Material.Builder(310, gregtechId("ruridit")) + Ruridit = Material.builder(310, gregtechId("ruridit")) .ingot(3).fluid() .colorAverage().iconSet(BRIGHT) .flags(GENERATE_FINE_WIRE, GENERATE_GEAR, GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_FRAME) @@ -510,35 +510,35 @@ public static void register() { .vacuumStats(VA[HV], 300)) .build(); - Ruby = new Material.Builder(311, gregtechId("ruby")) + Ruby = Material.builder(311, gregtechId("ruby")) .gem().ore() .color(0xFF6464).iconSet(RUBY) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT, GENERATE_LENS) .components(Chrome, 1, Aluminium, 2, Oxygen, 3) .build(); - Salt = new Material.Builder(312, gregtechId("salt")) + Salt = Material.builder(312, gregtechId("salt")) .gem(1).ore(2, 1) .color(0xFAFAFA).iconSet(FINE) .flags(NO_SMASHING) .components(Sodium, 1, Chlorine, 1) .build(); - Saltpeter = new Material.Builder(313, gregtechId("saltpeter")) + Saltpeter = Material.builder(313, gregtechId("saltpeter")) .dust(1).ore(2, 1) .color(0xE6E6E6).iconSet(FINE) .flags(NO_SMASHING, NO_SMELTING, FLAMMABLE) .components(Potassium, 1, Nitrogen, 1, Oxygen, 3) .build(); - Sapphire = new Material.Builder(314, gregtechId("sapphire")) + Sapphire = Material.builder(314, gregtechId("sapphire")) .gem().ore() .color(0x6464C8).iconSet(GEM_VERTICAL) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT, GENERATE_LENS) .components(Aluminium, 2, Oxygen, 3) .build(); - Scheelite = new Material.Builder(315, gregtechId("scheelite")) + Scheelite = Material.builder(315, gregtechId("scheelite")) .dust(3).ore() .color(0xC88C14) .flags(DISABLE_DECOMPOSITION) @@ -546,7 +546,7 @@ public static void register() { .build() .setFormula("Ca(WO3)O", true); - Sodalite = new Material.Builder(316, gregtechId("sodalite")) + Sodalite = Material.builder(316, gregtechId("sodalite")) .gem(1).ore(6, 4) .color(0x1414FF).iconSet(LAPIS) .flags(GENERATE_PLATE, GENERATE_ROD, NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, @@ -554,46 +554,46 @@ public static void register() { .components(Aluminium, 3, Silicon, 3, Sodium, 4, Chlorine, 1) .build(); - AluminiumSulfite = new Material.Builder(317, gregtechId("aluminium_sulfite")) + AluminiumSulfite = Material.builder(317, gregtechId("aluminium_sulfite")) .dust() .color(0xCC4BBB).iconSet(DULL) .components(Aluminium, 2, Sulfur, 3, Oxygen, 9) .build().setFormula("Al2(SO3)3", true); - Tantalite = new Material.Builder(318, gregtechId("tantalite")) + Tantalite = Material.builder(318, gregtechId("tantalite")) .dust(3).ore() .color(0x915028).iconSet(METALLIC) .components(Manganese, 1, Tantalum, 2, Oxygen, 6) .build(); - Coke = new Material.Builder(319, gregtechId("coke")) + Coke = Material.builder(319, gregtechId("coke")) .gem(2, 3200) // 2x burn time of coal .color(0x666666).iconSet(LIGNITE) .flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE) .components(Carbon, 1) .build(); - SolderingAlloy = new Material.Builder(320, gregtechId("soldering_alloy")) + SolderingAlloy = Material.builder(320, gregtechId("soldering_alloy")) .ingot(1) .liquid(new FluidBuilder().temperature(544)) .color(0x9696A0) .components(Tin, 6, Lead, 3, Antimony, 1) .build(); - Spessartine = new Material.Builder(321, gregtechId("spessartine")) + Spessartine = Material.builder(321, gregtechId("spessartine")) .gem().ore(3, 1) .color(0xFF6464).iconSet(RUBY) .components(Aluminium, 2, Manganese, 3, Silicon, 3, Oxygen, 12) .build(); - Sphalerite = new Material.Builder(322, gregtechId("sphalerite")) + Sphalerite = Material.builder(322, gregtechId("sphalerite")) .dust(1).ore() .color(0xFFFFFF) .flags(DISABLE_DECOMPOSITION) .components(Zinc, 1, Sulfur, 1) .build(); - StainlessSteel = new Material.Builder(323, gregtechId("stainless_steel")) + StainlessSteel = Material.builder(323, gregtechId("stainless_steel")) .ingot(3) .liquid(new FluidBuilder().temperature(2011)) .color(0xC8C8DC).iconSet(SHINY) @@ -607,7 +607,7 @@ public static void register() { .blast(b -> b.temp(1700, GasTier.LOW).blastStats(VA[HV], 1100)) .build(); - Steel = new Material.Builder(324, gregtechId("steel")) + Steel = Material.builder(324, gregtechId("steel")) .ingot(3) .liquid(new FluidBuilder().temperature(2046)) .color(0x808080).iconSet(METALLIC) @@ -623,27 +623,27 @@ public static void register() { .blast(b -> b.temp(1000).blastStats(VA[MV], 800)) // no gas tier for steel .build(); - Stibnite = new Material.Builder(325, gregtechId("stibnite")) + Stibnite = Material.builder(325, gregtechId("stibnite")) .dust().ore() .color(0x464646).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Antimony, 2, Sulfur, 3) .build(); - Zirconia = new Material.Builder(326, gregtechId("zirconia")) + Zirconia = Material.builder(326, gregtechId("zirconia")) .dust() .color(0x689F9F).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Zirconium, 1, Oxygen, 2) .build(); - Tetrahedrite = new Material.Builder(327, gregtechId("tetrahedrite")) + Tetrahedrite = Material.builder(327, gregtechId("tetrahedrite")) .dust().ore() .color(0xC82000) .components(Copper, 3, Antimony, 1, Sulfur, 3, Iron, 1) .build(); - TinAlloy = new Material.Builder(328, gregtechId("tin_alloy")) + TinAlloy = Material.builder(328, gregtechId("tin_alloy")) .ingot() .liquid(new FluidBuilder().temperature(1258)) .color(0xC8C8C8).iconSet(METALLIC) @@ -652,14 +652,14 @@ public static void register() { .fluidPipeProperties(1572, 20, true) .build(); - Topaz = new Material.Builder(329, gregtechId("topaz")) + Topaz = Material.builder(329, gregtechId("topaz")) .gem(3).ore() .color(0xFF8000).iconSet(GEM_HORIZONTAL) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT) .components(Aluminium, 2, Silicon, 1, Fluorine, 1, Hydrogen, 2) .build(); - Tungstate = new Material.Builder(330, gregtechId("tungstate")) + Tungstate = Material.builder(330, gregtechId("tungstate")) .dust(3).ore() .color(0x373223) .flags(DISABLE_DECOMPOSITION) @@ -667,7 +667,7 @@ public static void register() { .build() .setFormula("Li2(WO3)O", true); - Ultimet = new Material.Builder(331, gregtechId("ultimet")) + Ultimet = Material.builder(331, gregtechId("ultimet")) .ingot(4) .liquid(new FluidBuilder().temperature(1980)) .color(0xB4B4E6).iconSet(SHINY) @@ -680,20 +680,20 @@ public static void register() { .blast(b -> b.temp(2700, GasTier.MID).blastStats(VA[HV], 1300)) .build(); - Uraninite = new Material.Builder(332, gregtechId("uraninite")) + Uraninite = Material.builder(332, gregtechId("uraninite")) .dust(3).ore(true) .color(0x232323).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Uranium, 1, Oxygen, 2) .build(); - Uvarovite = new Material.Builder(333, gregtechId("uvarovite")) + Uvarovite = Material.builder(333, gregtechId("uvarovite")) .gem() .color(0xB4ffB4).iconSet(RUBY) .components(Calcium, 3, Chrome, 2, Silicon, 3, Oxygen, 12) .build(); - VanadiumGallium = new Material.Builder(334, gregtechId("vanadium_gallium")) + VanadiumGallium = Material.builder(334, gregtechId("vanadium_gallium")) .ingot() .liquid(new FluidBuilder().temperature(1712)) .color(0x80808C).iconSet(SHINY) @@ -706,7 +706,7 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - WroughtIron = new Material.Builder(335, gregtechId("wrought_iron")) + WroughtIron = Material.builder(335, gregtechId("wrought_iron")) .ingot() .liquid(new FluidBuilder().temperature(2011)) .color(0xC8B4B4).iconSet(METALLIC) @@ -720,20 +720,20 @@ public static void register() { Iron.getProperty(PropertyKey.INGOT).setSmeltingInto(WroughtIron); Iron.getProperty(PropertyKey.INGOT).setArcSmeltingInto(WroughtIron); - Wulfenite = new Material.Builder(336, gregtechId("wulfenite")) + Wulfenite = Material.builder(336, gregtechId("wulfenite")) .dust(3).ore() .color(0xFF8000) .components(Lead, 1, Molybdenum, 1, Oxygen, 4) .build(); - YellowLimonite = new Material.Builder(337, gregtechId("yellow_limonite")) + YellowLimonite = Material.builder(337, gregtechId("yellow_limonite")) .dust().ore() .color(0xC8C800).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING, BLAST_FURNACE_CALCITE_DOUBLE) .components(Iron, 1, Hydrogen, 1, Oxygen, 2) .build(); - YttriumBariumCuprate = new Material.Builder(338, gregtechId("yttrium_barium_cuprate")) + YttriumBariumCuprate = Material.builder(338, gregtechId("yttrium_barium_cuprate")) .ingot() .liquid(new FluidBuilder().temperature(1799)) .color(0x504046).iconSet(METALLIC) @@ -747,7 +747,7 @@ public static void register() { .vacuumStats(VA[EV], 150)) .build(); - NetherQuartz = new Material.Builder(339, gregtechId("nether_quartz")) + NetherQuartz = Material.builder(339, gregtechId("nether_quartz")) .gem(1).ore(2, 1) .color(0xE6D2D2).iconSet(QUARTZ) .flags(GENERATE_PLATE, NO_SMELTING, CRYSTALLIZABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, @@ -755,28 +755,28 @@ public static void register() { .components(Silicon, 1, Oxygen, 2) .build(); - CertusQuartz = new Material.Builder(214, gregtechId("certus_quartz")) + CertusQuartz = Material.builder(214, gregtechId("certus_quartz")) .gem(1).ore(2, 1) .color(0xD2D2E6).iconSet(CERTUS) .flags(GENERATE_PLATE, NO_SMELTING, CRYSTALLIZABLE, DISABLE_DECOMPOSITION) .components(Silicon, 1, Oxygen, 2) .build(); - Quartzite = new Material.Builder(340, gregtechId("quartzite")) + Quartzite = Material.builder(340, gregtechId("quartzite")) .gem(1).ore(2, 1) .color(0xD2E6D2).iconSet(QUARTZ) .flags(NO_SMELTING, CRYSTALLIZABLE, DISABLE_DECOMPOSITION, GENERATE_PLATE) .components(Silicon, 1, Oxygen, 2) .build(); - Graphite = new Material.Builder(341, gregtechId("graphite")) + Graphite = Material.builder(341, gregtechId("graphite")) .ore() .color(0x808080) .flags(NO_SMELTING, FLAMMABLE, DISABLE_DECOMPOSITION) .components(Carbon, 1) .build(); - Graphene = new Material.Builder(342, gregtechId("graphene")) + Graphene = Material.builder(342, gregtechId("graphene")) .dust() .color(0x808080).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) @@ -784,14 +784,14 @@ public static void register() { .cableProperties(V[IV], 1, 1) .build(); - TungsticAcid = new Material.Builder(343, gregtechId("tungstic_acid")) + TungsticAcid = Material.builder(343, gregtechId("tungstic_acid")) .dust() .color(0xBCC800).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Hydrogen, 2, Tungsten, 1, Oxygen, 4) .build(); - Osmiridium = new Material.Builder(344, gregtechId("osmiridium")) + Osmiridium = Material.builder(344, gregtechId("osmiridium")) .ingot(3) .liquid(new FluidBuilder().temperature(3012)) .color(0x6464FF).iconSet(METALLIC) @@ -806,45 +806,45 @@ public static void register() { .vacuumStats(VA[EV], 200)) .build(); - LithiumChloride = new Material.Builder(345, gregtechId("lithium_chloride")) + LithiumChloride = Material.builder(345, gregtechId("lithium_chloride")) .dust() .color(0xDEDEFA).iconSet(FINE) .components(Lithium, 1, Chlorine, 1) .build(); - CalciumChloride = new Material.Builder(346, gregtechId("calcium_chloride")) + CalciumChloride = Material.builder(346, gregtechId("calcium_chloride")) .dust() .color(0xEBEBFA).iconSet(FINE) .components(Calcium, 1, Chlorine, 2) .build(); - Bornite = new Material.Builder(347, gregtechId("bornite")) + Bornite = Material.builder(347, gregtechId("bornite")) .dust(1).ore() .color(0x97662B).iconSet(METALLIC) .components(Copper, 5, Iron, 1, Sulfur, 4) .build(); - Chalcocite = new Material.Builder(348, gregtechId("chalcocite")) + Chalcocite = Material.builder(348, gregtechId("chalcocite")) .dust().ore() .color(0x353535).iconSet(GEM_VERTICAL) .components(Copper, 2, Sulfur, 1) .build(); - ZirconiumTetrachloride = new Material.Builder(349, gregtechId("zirconium_tetrachloride")) + ZirconiumTetrachloride = Material.builder(349, gregtechId("zirconium_tetrachloride")) .dust() .color(0x689FBF).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Zirconium, 1, Chlorine, 4) .build(); - Hafnia = new Material.Builder(350, gregtechId("hafnia")) + Hafnia = Material.builder(350, gregtechId("hafnia")) .dust() .color(0x39393A).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Hafnium, 1, Oxygen, 2) .build(); - GalliumArsenide = new Material.Builder(351, gregtechId("gallium_arsenide")) + GalliumArsenide = Material.builder(351, gregtechId("gallium_arsenide")) .ingot(1) .liquid(new FluidBuilder().temperature(1511)) .color(0xA0A0A0) @@ -853,19 +853,19 @@ public static void register() { .blast(b -> b.temp(1200, GasTier.LOW).blastStats(VA[MV], 1200)) .build(); - Potash = new Material.Builder(352, gregtechId("potash")) + Potash = Material.builder(352, gregtechId("potash")) .dust(1) .color(0x784137) .components(Potassium, 2, Oxygen, 1) .build(); - SodaAsh = new Material.Builder(353, gregtechId("soda_ash")) + SodaAsh = Material.builder(353, gregtechId("soda_ash")) .dust(1) .color(0xDCDCFF) .components(Sodium, 2, Carbon, 1, Oxygen, 3) .build(); - IndiumGalliumPhosphide = new Material.Builder(354, gregtechId("indium_gallium_phosphide")) + IndiumGalliumPhosphide = Material.builder(354, gregtechId("indium_gallium_phosphide")) .ingot(1) .liquid(new FluidBuilder().temperature(350)) .color(0xA08CBE) @@ -873,7 +873,7 @@ public static void register() { .components(Indium, 1, Gallium, 1, Phosphorus, 1) .build(); - NickelZincFerrite = new Material.Builder(355, gregtechId("nickel_zinc_ferrite")) + NickelZincFerrite = Material.builder(355, gregtechId("nickel_zinc_ferrite")) .ingot(0) .liquid(new FluidBuilder().temperature(1410)) .color(0x3C3C3C).iconSet(METALLIC) @@ -881,98 +881,98 @@ public static void register() { .components(Nickel, 1, Zinc, 1, Iron, 4, Oxygen, 8) .build(); - SiliconDioxide = new Material.Builder(356, gregtechId("silicon_dioxide")) + SiliconDioxide = Material.builder(356, gregtechId("silicon_dioxide")) .dust(1) .color(0xC8C8C8).iconSet(QUARTZ) .flags(NO_SMASHING, NO_SMELTING) .components(Silicon, 1, Oxygen, 2) .build(); - MagnesiumChloride = new Material.Builder(357, gregtechId("magnesium_chloride")) + MagnesiumChloride = Material.builder(357, gregtechId("magnesium_chloride")) .dust(1) .color(0xD40D5C) .flags(DISABLE_DECOMPOSITION) .components(Magnesium, 1, Chlorine, 2) .build(); - SodiumSulfide = new Material.Builder(358, gregtechId("sodium_sulfide")) + SodiumSulfide = Material.builder(358, gregtechId("sodium_sulfide")) .dust(1) .color(0xFFE680) .components(Sodium, 2, Sulfur, 1) .build(); - PhosphorusPentoxide = new Material.Builder(359, gregtechId("phosphorus_pentoxide")) + PhosphorusPentoxide = Material.builder(359, gregtechId("phosphorus_pentoxide")) .dust(1) .color(0xDCDC00) .flags(DECOMPOSITION_BY_ELECTROLYZING) .components(Phosphorus, 4, Oxygen, 10) .build(); - Quicklime = new Material.Builder(360, gregtechId("quicklime")) + Quicklime = Material.builder(360, gregtechId("quicklime")) .dust(1) .color(0xF0F0F0) .components(Calcium, 1, Oxygen, 1) .build(); - SodiumBisulfate = new Material.Builder(361, gregtechId("sodium_bisulfate")) + SodiumBisulfate = Material.builder(361, gregtechId("sodium_bisulfate")) .dust(1) .color(0x004455) .flags(DISABLE_DECOMPOSITION) .components(Sodium, 1, Hydrogen, 1, Sulfur, 1, Oxygen, 4) .build(); - FerriteMixture = new Material.Builder(362, gregtechId("ferrite_mixture")) + FerriteMixture = Material.builder(362, gregtechId("ferrite_mixture")) .dust(1) .color(0xB4B4B4).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Nickel, 1, Zinc, 1, Iron, 4) .build(); - Magnesia = new Material.Builder(363, gregtechId("magnesia")) + Magnesia = Material.builder(363, gregtechId("magnesia")) .dust(1) .color(0x887878) .components(Magnesium, 1, Oxygen, 1) .build(); - PlatinumGroupSludge = new Material.Builder(364, gregtechId("platinum_group_sludge")) + PlatinumGroupSludge = Material.builder(364, gregtechId("platinum_group_sludge")) .dust(1) .color(0x001E00).iconSet(FINE) .flags(DISABLE_DECOMPOSITION) .build(); - Realgar = new Material.Builder(365, gregtechId("realgar")) + Realgar = Material.builder(365, gregtechId("realgar")) .gem().ore() .color(0x9D2123).iconSet(EMERALD) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Arsenic, 4, Sulfur, 4) .build(); - SodiumBicarbonate = new Material.Builder(366, gregtechId("sodium_bicarbonate")) + SodiumBicarbonate = Material.builder(366, gregtechId("sodium_bicarbonate")) .dust(1) .color(0x565b96).iconSet(ROUGH) .flags(DISABLE_DECOMPOSITION) .components(Sodium, 1, Hydrogen, 1, Carbon, 1, Oxygen, 3) .build(); - PotassiumDichromate = new Material.Builder(367, gregtechId("potassium_dichromate")) + PotassiumDichromate = Material.builder(367, gregtechId("potassium_dichromate")) .dust(1) .color(0xFF084E) .components(Potassium, 2, Chrome, 2, Oxygen, 7) .build(); - ChromiumTrioxide = new Material.Builder(368, gregtechId("chromium_trioxide")) + ChromiumTrioxide = Material.builder(368, gregtechId("chromium_trioxide")) .dust(1) .color(0xFFE4E1) .components(Chrome, 1, Oxygen, 3) .build(); - AntimonyTrioxide = new Material.Builder(369, gregtechId("antimony_trioxide")) + AntimonyTrioxide = Material.builder(369, gregtechId("antimony_trioxide")) .dust(1) .color(0xE6E6F0) .components(Antimony, 2, Oxygen, 3) .build(); - Zincite = new Material.Builder(370, gregtechId("zincite")) + Zincite = Material.builder(370, gregtechId("zincite")) .dust(1) .color(0xFFFFF5) .components(Zinc, 1, Oxygen, 1) @@ -980,19 +980,19 @@ public static void register() { // FREE ID 371 - CobaltOxide = new Material.Builder(372, gregtechId("cobalt_oxide")) + CobaltOxide = Material.builder(372, gregtechId("cobalt_oxide")) .dust(1) .color(0x788000) .components(Cobalt, 1, Oxygen, 1) .build(); - ArsenicTrioxide = new Material.Builder(373, gregtechId("arsenic_trioxide")) + ArsenicTrioxide = Material.builder(373, gregtechId("arsenic_trioxide")) .dust(1) .iconSet(ROUGH) .components(Arsenic, 2, Oxygen, 3) .build(); - Massicot = new Material.Builder(374, gregtechId("massicot")) + Massicot = Material.builder(374, gregtechId("massicot")) .dust(1) .color(0xFFDD55) .components(Lead, 1, Oxygen, 1) @@ -1000,81 +1000,81 @@ public static void register() { // FREE ID 375 - MetalMixture = new Material.Builder(376, gregtechId("metal_mixture")) + MetalMixture = Material.builder(376, gregtechId("metal_mixture")) .dust(1) .color(0x502d16).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .build(); - SodiumHydroxide = new Material.Builder(377, gregtechId("sodium_hydroxide")) + SodiumHydroxide = Material.builder(377, gregtechId("sodium_hydroxide")) .dust(1) .color(0x003380) .flags(DISABLE_DECOMPOSITION) .components(Sodium, 1, Oxygen, 1, Hydrogen, 1) .build(); - SodiumPersulfate = new Material.Builder(378, gregtechId("sodium_persulfate")) + SodiumPersulfate = Material.builder(378, gregtechId("sodium_persulfate")) .liquid(new FluidBuilder().customStill()) .color(0x045C5C) .components(Sodium, 2, Sulfur, 2, Oxygen, 8) .build(); - Bastnasite = new Material.Builder(379, gregtechId("bastnasite")) + Bastnasite = Material.builder(379, gregtechId("bastnasite")) .dust().ore(2, 1) .color(0xC86E2D).iconSet(FINE) .components(Cerium, 1, Carbon, 1, Fluorine, 1, Oxygen, 3) .build(); - Pentlandite = new Material.Builder(380, gregtechId("pentlandite")) + Pentlandite = Material.builder(380, gregtechId("pentlandite")) .dust().ore() .color(0xA59605) .components(Nickel, 9, Sulfur, 8) .build(); - Spodumene = new Material.Builder(381, gregtechId("spodumene")) + Spodumene = Material.builder(381, gregtechId("spodumene")) .dust().ore() .color(0xBEAAAA) .components(Lithium, 1, Aluminium, 1, Silicon, 2, Oxygen, 6) .build(); - Lepidolite = new Material.Builder(382, gregtechId("lepidolite")) + Lepidolite = Material.builder(382, gregtechId("lepidolite")) .dust().ore(2, 1) .color(0xF0328C).iconSet(FINE) .components(Potassium, 1, Lithium, 3, Aluminium, 4, Fluorine, 2, Oxygen, 10) .build(); - HafniumTetrachloride = new Material.Builder(383, gregtechId("hafnium_tetrachloride")) + HafniumTetrachloride = Material.builder(383, gregtechId("hafnium_tetrachloride")) .dust() .color(0x69699A).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Hafnium, 1, Chlorine, 4) .build(); - GlauconiteSand = new Material.Builder(384, gregtechId("glauconite_sand")) + GlauconiteSand = Material.builder(384, gregtechId("glauconite_sand")) .dust().ore(3, 1) .color(0x82B43C).iconSet(SAND) .components(Potassium, 1, Magnesium, 2, Aluminium, 4, Hydrogen, 2, Oxygen, 12) .build(); - Malachite = new Material.Builder(385, gregtechId("malachite")) + Malachite = Material.builder(385, gregtechId("malachite")) .gem().ore() .color(0x055F05).iconSet(LAPIS) .components(Copper, 2, Carbon, 1, Hydrogen, 2, Oxygen, 5) .build(); - Mica = new Material.Builder(386, gregtechId("mica")) + Mica = Material.builder(386, gregtechId("mica")) .dust().ore(2, 1) .color(0xC3C3CD).iconSet(FINE) .components(Potassium, 1, Aluminium, 3, Silicon, 3, Fluorine, 2, Oxygen, 10) .build(); - Barite = new Material.Builder(387, gregtechId("barite")) + Barite = Material.builder(387, gregtechId("barite")) .dust().ore() .color(0xE6EBEB) .components(Barium, 1, Sulfur, 1, Oxygen, 4) .build(); - Alunite = new Material.Builder(388, gregtechId("alunite")) + Alunite = Material.builder(388, gregtechId("alunite")) .dust().ore(3, 1) .color(0xE1B441).iconSet(METALLIC) .components(Potassium, 1, Aluminium, 3, Silicon, 2, Hydrogen, 6, Oxygen, 14) @@ -1082,7 +1082,7 @@ public static void register() { /* Free IDs: 389-390 */ - Zircaloy4 = new Material.Builder(391, gregtechId("zircaloy_4")) + Zircaloy4 = Material.builder(391, gregtechId("zircaloy_4")) .ingot() .color(0x8A6E68).iconSet(METALLIC) .components(Zirconium, 16, Tin, 2, Chrome, 1) @@ -1090,25 +1090,25 @@ public static void register() { .blastStats(GTValues.VA[EV])) .build(); - Talc = new Material.Builder(392, gregtechId("talc")) + Talc = Material.builder(392, gregtechId("talc")) .dust().ore(2, 1) .color(0x5AB45A).iconSet(FINE) .components(Magnesium, 3, Silicon, 4, Hydrogen, 2, Oxygen, 12) .build(); - Soapstone = new Material.Builder(393, gregtechId("soapstone")) + Soapstone = Material.builder(393, gregtechId("soapstone")) .dust(1).ore(3, 1) .color(0x5F915F) .components(Magnesium, 3, Silicon, 4, Hydrogen, 2, Oxygen, 12) .build(); - Kyanite = new Material.Builder(394, gregtechId("kyanite")) + Kyanite = Material.builder(394, gregtechId("kyanite")) .dust().ore() .color(0x6E6EFA).iconSet(FLINT) .components(Aluminium, 2, Silicon, 1, Oxygen, 5) .build(); - IronMagnetic = new Material.Builder(395, gregtechId("iron_magnetic")) + IronMagnetic = Material.builder(395, gregtechId("iron_magnetic")) .ingot() .color(0xC8C8C8).iconSet(MAGNETIC) .flags(GENERATE_BOLT_SCREW, IS_MAGNETIC) @@ -1119,7 +1119,7 @@ public static void register() { .build(); Iron.getProperty(PropertyKey.INGOT).setMagneticMaterial(IronMagnetic); - TungstenCarbide = new Material.Builder(396, gregtechId("tungsten_carbide")) + TungstenCarbide = Material.builder(396, gregtechId("tungsten_carbide")) .ingot(4).fluid() .color(0x330066).iconSet(METALLIC) .flags(EXT2_METAL, GENERATE_FOIL, GENERATE_GEAR, DECOMPOSITION_BY_CENTRIFUGING, GENERATE_DOUBLE_PLATE) @@ -1134,39 +1134,39 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - CarbonDioxide = new Material.Builder(397, gregtechId("carbon_dioxide")) + CarbonDioxide = Material.builder(397, gregtechId("carbon_dioxide")) .gas() .color(0xA9D0F5) .components(Carbon, 1, Oxygen, 2) .build(); - TitaniumTetrachloride = new Material.Builder(398, gregtechId("titanium_tetrachloride")) + TitaniumTetrachloride = Material.builder(398, gregtechId("titanium_tetrachloride")) .liquid(new FluidBuilder().customStill()) .color(0xD40D5C) .flags(DISABLE_DECOMPOSITION) .components(Titanium, 1, Chlorine, 4) .build(); - NitrogenDioxide = new Material.Builder(399, gregtechId("nitrogen_dioxide")) + NitrogenDioxide = Material.builder(399, gregtechId("nitrogen_dioxide")) .gas() .color(0xF05800) .components(Nitrogen, 1, Oxygen, 2) .build(); - HydrogenSulfide = new Material.Builder(400, gregtechId("hydrogen_sulfide")) + HydrogenSulfide = Material.builder(400, gregtechId("hydrogen_sulfide")) .gas(new FluidBuilder().customStill()) .color(0xFC5304) .components(Hydrogen, 2, Sulfur, 1) .build(); - NitricAcid = new Material.Builder(401, gregtechId("nitric_acid")) + NitricAcid = Material.builder(401, gregtechId("nitric_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0xCCCC00) .flags(DISABLE_DECOMPOSITION) .components(Hydrogen, 1, Nitrogen, 1, Oxygen, 3) .build(); - SulfuricAcid = new Material.Builder(402, gregtechId("sulfuric_acid")) + SulfuricAcid = Material.builder(402, gregtechId("sulfuric_acid")) .liquid(new FluidBuilder() .attribute(FluidAttributes.ACID) .customStill()) @@ -1175,70 +1175,70 @@ public static void register() { .components(Hydrogen, 2, Sulfur, 1, Oxygen, 4) .build(); - PhosphoricAcid = new Material.Builder(403, gregtechId("phosphoric_acid")) + PhosphoricAcid = Material.builder(403, gregtechId("phosphoric_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0xDCDC01) .flags(DISABLE_DECOMPOSITION) .components(Hydrogen, 3, Phosphorus, 1, Oxygen, 4) .build(); - SulfurTrioxide = new Material.Builder(404, gregtechId("sulfur_trioxide")) + SulfurTrioxide = Material.builder(404, gregtechId("sulfur_trioxide")) .gas() .color(0xA0A014) .components(Sulfur, 1, Oxygen, 3) .build(); - SulfurDioxide = new Material.Builder(405, gregtechId("sulfur_dioxide")) + SulfurDioxide = Material.builder(405, gregtechId("sulfur_dioxide")) .gas() .color(0xC8C819) .components(Sulfur, 1, Oxygen, 2) .build(); - CarbonMonoxide = new Material.Builder(406, gregtechId("carbon_monoxide")) + CarbonMonoxide = Material.builder(406, gregtechId("carbon_monoxide")) .gas() .color(0x0E4880) .components(Carbon, 1, Oxygen, 1) .build(); - HypochlorousAcid = new Material.Builder(407, gregtechId("hypochlorous_acid")) + HypochlorousAcid = Material.builder(407, gregtechId("hypochlorous_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0x6F8A91) .components(Hydrogen, 1, Chlorine, 1, Oxygen, 1) .build(); - Ammonia = new Material.Builder(408, gregtechId("ammonia")) + Ammonia = Material.builder(408, gregtechId("ammonia")) .gas() .color(0x3F3480) .components(Nitrogen, 1, Hydrogen, 3) .build(); - HydrofluoricAcid = new Material.Builder(409, gregtechId("hydrofluoric_acid")) + HydrofluoricAcid = Material.builder(409, gregtechId("hydrofluoric_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0x0088AA) .components(Hydrogen, 1, Fluorine, 1) .build(); - NitricOxide = new Material.Builder(410, gregtechId("nitric_oxide")) + NitricOxide = Material.builder(410, gregtechId("nitric_oxide")) .gas() .color(0x7DC8F0) .components(Nitrogen, 1, Oxygen, 1) .build(); - Iron3Chloride = new Material.Builder(411, gregtechId("iron_iii_chloride")) + Iron3Chloride = Material.builder(411, gregtechId("iron_iii_chloride")) .liquid() .color(0x060B0B) .flags(DECOMPOSITION_BY_ELECTROLYZING) .components(Iron, 1, Chlorine, 3) .build(); - UraniumHexafluoride = new Material.Builder(412, gregtechId("uranium_hexafluoride")) + UraniumHexafluoride = Material.builder(412, gregtechId("uranium_hexafluoride")) .gas() .color(0x42D126) .flags(DISABLE_DECOMPOSITION) .components(Uranium, 1, Fluorine, 6) .build(); - EnrichedUraniumHexafluoride = new Material.Builder(413, gregtechId("enriched_uranium_hexafluoride")) + EnrichedUraniumHexafluoride = Material.builder(413, gregtechId("enriched_uranium_hexafluoride")) .gas() .color(0x4BF52A) .flags(DISABLE_DECOMPOSITION) @@ -1246,7 +1246,7 @@ public static void register() { .build() .setFormula("(U-235)F6", true); - DepletedUraniumHexafluoride = new Material.Builder(414, gregtechId("depleted_uranium_hexafluoride")) + DepletedUraniumHexafluoride = Material.builder(414, gregtechId("depleted_uranium_hexafluoride")) .gas() .color(0x74BA66) .flags(DISABLE_DECOMPOSITION) @@ -1254,26 +1254,26 @@ public static void register() { .build() .setFormula("(U-238)F6", true); - NitrousOxide = new Material.Builder(415, gregtechId("nitrous_oxide")) + NitrousOxide = Material.builder(415, gregtechId("nitrous_oxide")) .gas() .color(0x7DC8FF) .components(Nitrogen, 2, Oxygen, 1) .build(); - EnderPearl = new Material.Builder(416, gregtechId("ender_pearl")) + EnderPearl = Material.builder(416, gregtechId("ender_pearl")) .gem(1) .color(0x6CDCC8) .flags(NO_SMASHING, NO_SMELTING, GENERATE_PLATE) .components(Beryllium, 1, Potassium, 4, Nitrogen, 5) .build(); - PotassiumFeldspar = new Material.Builder(417, gregtechId("potassium_feldspar")) + PotassiumFeldspar = Material.builder(417, gregtechId("potassium_feldspar")) .dust(1) .color(0x782828).iconSet(FINE) .components(Potassium, 1, Aluminium, 1, Silicon, 1, Oxygen, 8) .build(); - NeodymiumMagnetic = new Material.Builder(418, gregtechId("neodymium_magnetic")) + NeodymiumMagnetic = Material.builder(418, gregtechId("neodymium_magnetic")) .ingot() .color(0x646464).iconSet(MAGNETIC) .flags(GENERATE_ROD, IS_MAGNETIC) @@ -1284,7 +1284,7 @@ public static void register() { .build(); Neodymium.getProperty(PropertyKey.INGOT).setMagneticMaterial(NeodymiumMagnetic); - HydrochloricAcid = new Material.Builder(419, gregtechId("hydrochloric_acid")) + HydrochloricAcid = Material.builder(419, gregtechId("hydrochloric_acid")) .liquid(new FluidBuilder() .attribute(FluidAttributes.ACID) .customStill()) @@ -1292,7 +1292,7 @@ public static void register() { .components(Hydrogen, 1, Chlorine, 1) .build(); - Steam = new Material.Builder(420, gregtechId("steam")) + Steam = Material.builder(420, gregtechId("steam")) .gas(new FluidBuilder() .temperature(373) .customStill()) @@ -1301,21 +1301,21 @@ public static void register() { .components(Hydrogen, 2, Oxygen, 1) .build(); - DistilledWater = new Material.Builder(421, gregtechId("distilled_water")) + DistilledWater = Material.builder(421, gregtechId("distilled_water")) .liquid(new FluidBuilder().alternativeName("fluidDistWater")) .color(0x4A94FF) .flags(DISABLE_DECOMPOSITION) .components(Hydrogen, 2, Oxygen, 1) .build(); - SodiumPotassium = new Material.Builder(422, gregtechId("sodium_potassium")) + SodiumPotassium = Material.builder(422, gregtechId("sodium_potassium")) .fluid() .color(0x64FCB4) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Sodium, 1, Potassium, 1) .build(); - SamariumMagnetic = new Material.Builder(423, gregtechId("samarium_magnetic")) + SamariumMagnetic = Material.builder(423, gregtechId("samarium_magnetic")) .ingot() .color(0xFFFFCD).iconSet(MAGNETIC) .flags(GENERATE_LONG_ROD, IS_MAGNETIC) @@ -1326,7 +1326,7 @@ public static void register() { .build(); Samarium.getProperty(PropertyKey.INGOT).setMagneticMaterial(SamariumMagnetic); - ManganesePhosphide = new Material.Builder(424, gregtechId("manganese_phosphide")) + ManganesePhosphide = Material.builder(424, gregtechId("manganese_phosphide")) .ingot() .liquid(new FluidBuilder().temperature(1368)) .color(0xE1B454).iconSet(METALLIC) @@ -1336,7 +1336,7 @@ public static void register() { .blast(1200, GasTier.LOW) .build(); - MagnesiumDiboride = new Material.Builder(425, gregtechId("magnesium_diboride")) + MagnesiumDiboride = Material.builder(425, gregtechId("magnesium_diboride")) .ingot() .liquid(new FluidBuilder().temperature(1103)) .color(0x331900).iconSet(METALLIC) @@ -1349,7 +1349,7 @@ public static void register() { .vacuumStats(VA[MV], 200)) .build(); - MercuryBariumCalciumCuprate = new Material.Builder(426, gregtechId("mercury_barium_calcium_cuprate")) + MercuryBariumCalciumCuprate = Material.builder(426, gregtechId("mercury_barium_calcium_cuprate")) .ingot() .liquid(new FluidBuilder().temperature(1075)) .color(0x555555).iconSet(SHINY) @@ -1362,7 +1362,7 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - UraniumTriplatinum = new Material.Builder(427, gregtechId("uranium_triplatinum")) + UraniumTriplatinum = Material.builder(427, gregtechId("uranium_triplatinum")) .ingot() .liquid(new FluidBuilder().temperature(1882)) .color(0x008700).iconSet(SHINY) @@ -1375,7 +1375,7 @@ public static void register() { .vacuumStats(VA[EV], 200)) .build(); - SamariumIronArsenicOxide = new Material.Builder(428, gregtechId("samarium_iron_arsenic_oxide")) + SamariumIronArsenicOxide = Material.builder(428, gregtechId("samarium_iron_arsenic_oxide")) .ingot() .liquid(new FluidBuilder().temperature(1347)) .color(0x330033).iconSet(SHINY) @@ -1388,7 +1388,7 @@ public static void register() { .vacuumStats(VA[IV], 200)) .build(); - IndiumTinBariumTitaniumCuprate = new Material.Builder(429, gregtechId("indium_tin_barium_titanium_cuprate")) + IndiumTinBariumTitaniumCuprate = Material.builder(429, gregtechId("indium_tin_barium_titanium_cuprate")) .ingot() .liquid(new FluidBuilder().temperature(1012)) .color(0x994C00).iconSet(METALLIC) @@ -1401,7 +1401,7 @@ public static void register() { .vacuumStats(VA[LuV])) .build(); - UraniumRhodiumDinaquadide = new Material.Builder(430, gregtechId("uranium_rhodium_dinaquadide")) + UraniumRhodiumDinaquadide = Material.builder(430, gregtechId("uranium_rhodium_dinaquadide")) .ingot() .liquid(new FluidBuilder().temperature(3410)) .color(0x0A0A0A) @@ -1414,70 +1414,70 @@ public static void register() { .vacuumStats(VA[ZPM], 200)) .build(); - EnrichedNaquadahTriniumEuropiumDuranide = new Material.Builder(431, + EnrichedNaquadahTriniumEuropiumDuranide = Material.builder(431, gregtechId("enriched_naquadah_trinium_europium_duranide")) - .ingot() - .liquid(new FluidBuilder().temperature(5930)) - .color(0x7D9673).iconSet(METALLIC) - .flags(DECOMPOSITION_BY_CENTRIFUGING, GENERATE_FINE_WIRE) - .components(NaquadahEnriched, 4, Trinium, 3, Europium, 2, Duranium, 1) - .cableProperties(GTValues.V[GTValues.UV], 16, 0, true, 3) - .blast(b -> b - .temp(9900, GasTier.HIGH) - .blastStats(VA[LuV], 1200) - .vacuumStats(VA[UV], 200)) - .build(); - - RutheniumTriniumAmericiumNeutronate = new Material.Builder(432, + .ingot() + .liquid(new FluidBuilder().temperature(5930)) + .color(0x7D9673).iconSet(METALLIC) + .flags(DECOMPOSITION_BY_CENTRIFUGING, GENERATE_FINE_WIRE) + .components(NaquadahEnriched, 4, Trinium, 3, Europium, 2, Duranium, 1) + .cableProperties(GTValues.V[GTValues.UV], 16, 0, true, 3) + .blast(b -> b + .temp(9900, GasTier.HIGH) + .blastStats(VA[LuV], 1200) + .vacuumStats(VA[UV], 200)) + .build(); + + RutheniumTriniumAmericiumNeutronate = Material.builder(432, gregtechId("ruthenium_trinium_americium_neutronate")) - .ingot() - .liquid(new FluidBuilder().temperature(23691)) - .color(0xFFFFFF).iconSet(BRIGHT) - .flags(DECOMPOSITION_BY_ELECTROLYZING) - .components(Ruthenium, 1, Trinium, 2, Americium, 1, Neutronium, 2, Oxygen, 8) - .cableProperties(GTValues.V[GTValues.UHV], 24, 0, true, 3) - .blast(b -> b - .temp(10800, GasTier.HIGHER) - .blastStats(VA[ZPM], 1000) - .vacuumStats(VA[UHV], 200)) - .build(); - - InertMetalMixture = new Material.Builder(433, gregtechId("inert_metal_mixture")) + .ingot() + .liquid(new FluidBuilder().temperature(23691)) + .color(0xFFFFFF).iconSet(BRIGHT) + .flags(DECOMPOSITION_BY_ELECTROLYZING) + .components(Ruthenium, 1, Trinium, 2, Americium, 1, Neutronium, 2, Oxygen, 8) + .cableProperties(GTValues.V[GTValues.UHV], 24, 0, true, 3) + .blast(b -> b + .temp(10800, GasTier.HIGHER) + .blastStats(VA[ZPM], 1000) + .vacuumStats(VA[UHV], 200)) + .build(); + + InertMetalMixture = Material.builder(433, gregtechId("inert_metal_mixture")) .dust() .color(0xE2AE72).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Rhodium, 1, Ruthenium, 1, Oxygen, 4) .build(); - RhodiumSulfate = new Material.Builder(434, gregtechId("rhodium_sulfate")) + RhodiumSulfate = Material.builder(434, gregtechId("rhodium_sulfate")) .liquid(new FluidBuilder().temperature(1128)) .color(0xEEAA55) .flags(DISABLE_DECOMPOSITION) .components(Rhodium, 2, Sulfur, 3, Oxygen, 12) .build().setFormula("Rh2(SO4)3", true); - RutheniumTetroxide = new Material.Builder(435, gregtechId("ruthenium_tetroxide")) + RutheniumTetroxide = Material.builder(435, gregtechId("ruthenium_tetroxide")) .dust() .color(0xC7C7C7) .flags(DISABLE_DECOMPOSITION) .components(Ruthenium, 1, Oxygen, 4) .build(); - OsmiumTetroxide = new Material.Builder(436, gregtechId("osmium_tetroxide")) + OsmiumTetroxide = Material.builder(436, gregtechId("osmium_tetroxide")) .dust() .color(0xACAD71).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Osmium, 1, Oxygen, 4) .build(); - IridiumChloride = new Material.Builder(437, gregtechId("iridium_chloride")) + IridiumChloride = Material.builder(437, gregtechId("iridium_chloride")) .dust() .color(0x013220).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Iridium, 1, Chlorine, 3) .build(); - FluoroantimonicAcid = new Material.Builder(438, gregtechId("fluoroantimonic_acid")) + FluoroantimonicAcid = Material.builder(438, gregtechId("fluoroantimonic_acid")) .liquid(new FluidBuilder() .attribute(FluidAttributes.ACID) .customStill()) @@ -1485,80 +1485,80 @@ public static void register() { .components(Hydrogen, 2, Antimony, 1, Fluorine, 7) .build(); - TitaniumTrifluoride = new Material.Builder(439, gregtechId("titanium_trifluoride")) + TitaniumTrifluoride = Material.builder(439, gregtechId("titanium_trifluoride")) .dust() .color(0x8F00FF).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Titanium, 1, Fluorine, 3) .build(); - CalciumPhosphide = new Material.Builder(440, gregtechId("calcium_phosphide")) + CalciumPhosphide = Material.builder(440, gregtechId("calcium_phosphide")) .dust() .color(0xA52A2A).iconSet(METALLIC) .components(Calcium, 1, Phosphorus, 1) .build(); - IndiumPhosphide = new Material.Builder(441, gregtechId("indium_phosphide")) + IndiumPhosphide = Material.builder(441, gregtechId("indium_phosphide")) .dust() .color(0x582E5C).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Indium, 1, Phosphorus, 1) .build(); - BariumSulfide = new Material.Builder(442, gregtechId("barium_sulfide")) + BariumSulfide = Material.builder(442, gregtechId("barium_sulfide")) .dust() .color(0xF0EAD6).iconSet(METALLIC) .components(Barium, 1, Sulfur, 1) .build(); - TriniumSulfide = new Material.Builder(443, gregtechId("trinium_sulfide")) + TriniumSulfide = Material.builder(443, gregtechId("trinium_sulfide")) .dust() .color(0xE68066).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Trinium, 1, Sulfur, 1) .build(); - ZincSulfide = new Material.Builder(444, gregtechId("zinc_sulfide")) + ZincSulfide = Material.builder(444, gregtechId("zinc_sulfide")) .dust() .color(0xFFFFF6).iconSet(DULL) .components(Zinc, 1, Sulfur, 1) .build(); - GalliumSulfide = new Material.Builder(445, gregtechId("gallium_sulfide")) + GalliumSulfide = Material.builder(445, gregtechId("gallium_sulfide")) .dust() .color(0xFFF59E).iconSet(SHINY) .components(Gallium, 1, Sulfur, 1) .build(); - AntimonyTrifluoride = new Material.Builder(446, gregtechId("antimony_trifluoride")) + AntimonyTrifluoride = Material.builder(446, gregtechId("antimony_trifluoride")) .dust() .color(0xF7EABC).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Antimony, 1, Fluorine, 3) .build(); - EnrichedNaquadahSulfate = new Material.Builder(447, gregtechId("enriched_naquadah_sulfate")) + EnrichedNaquadahSulfate = Material.builder(447, gregtechId("enriched_naquadah_sulfate")) .dust() .color(0x2E2E1C).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(NaquadahEnriched, 1, Sulfur, 1, Oxygen, 4) .build(); - NaquadriaSulfate = new Material.Builder(448, gregtechId("naquadria_sulfate")) + NaquadriaSulfate = Material.builder(448, gregtechId("naquadria_sulfate")) .dust() .color(0x006633).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Naquadria, 1, Sulfur, 1, Oxygen, 4) .build(); - Pyrochlore = new Material.Builder(449, gregtechId("pyrochlore")) + Pyrochlore = Material.builder(449, gregtechId("pyrochlore")) .dust().ore() .color(0x2B1100).iconSet(METALLIC) .flags() .components(Calcium, 2, Niobium, 2, Oxygen, 7) .build(); - Inconel718 = new Material.Builder(450, gregtechId("inconel_718")) + Inconel718 = Material.builder(450, gregtechId("inconel_718")) .ingot() .color(0x566570).iconSet(SHINY) .components(Nickel, 5, Chrome, 2, Iron, 2, Niobium, 1, Molybdenum, 1) @@ -1566,7 +1566,7 @@ public static void register() { .blastStats(GTValues.VA[HV])) .build(); - RTMAlloy = new Material.Builder(451, gregtechId("rtm_alloy")) + RTMAlloy = Material.builder(451, gregtechId("rtm_alloy")) .ingot().fluid() .color(0x30306B).iconSet(SHINY) .components(Ruthenium, 4, Tungsten, 2, Molybdenum, 1) @@ -1578,7 +1578,7 @@ public static void register() { .vacuumStats(VA[HV], 250)) .build(); - IlmeniteSlag = new Material.Builder(452, gregtechId("ilmenite_slag")) + IlmeniteSlag = Material.builder(452, gregtechId("ilmenite_slag")) .dust(1) .color(0x8B0000).iconSet(SAND) .build(); diff --git a/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java index 78b1d4914fe..b641463e4f1 100644 --- a/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/HigherDegreeMaterials.java @@ -15,26 +15,26 @@ public class HigherDegreeMaterials { public static void register() { - Electrotine = new Material.Builder(2507, gregtechId("electrotine")) + Electrotine = Material.builder(2507, gregtechId("electrotine")) .dust().ore(5, 1, true) .color(0x3CB4C8).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Redstone, 1, Electrum, 1) .build(); - EnderEye = new Material.Builder(2508, gregtechId("ender_eye")) + EnderEye = Material.builder(2508, gregtechId("ender_eye")) .gem(1) .color(0x66FF66) .flags(GENERATE_PLATE, NO_SMASHING, NO_SMELTING, DECOMPOSITION_BY_CENTRIFUGING) .build(); - Diatomite = new Material.Builder(2509, gregtechId("diatomite")) + Diatomite = Material.builder(2509, gregtechId("diatomite")) .dust(1).ore() .color(0xE1E1E1) .components(Flint, 8, BandedIron, 1, Sapphire, 1) .build(); - RedSteel = new Material.Builder(2510, gregtechId("red_steel")) + RedSteel = Material.builder(2510, gregtechId("red_steel")) .ingot(3).fluid() .color(0x8C6464).iconSet(METALLIC) .flags(EXT_METAL, GENERATE_GEAR) @@ -44,7 +44,7 @@ public static void register() { .blast(b -> b.temp(1813, GasTier.LOW).blastStats(VA[HV], 1000)) .build(); - BlueSteel = new Material.Builder(2511, gregtechId("blue_steel")) + BlueSteel = Material.builder(2511, gregtechId("blue_steel")) .ingot(3).fluid() .color(0x64648C).iconSet(METALLIC) .flags(EXT_METAL, GENERATE_FRAME, GENERATE_GEAR) @@ -54,35 +54,35 @@ public static void register() { .blast(b -> b.temp(1813, GasTier.LOW).blastStats(VA[HV], 1000)) .build(); - Basalt = new Material.Builder(2512, gregtechId("basalt")) + Basalt = Material.builder(2512, gregtechId("basalt")) .dust(1) .color(0x3C3232).iconSet(ROUGH) .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING) .components(Olivine, 1, Calcite, 3, Flint, 8, DarkAsh, 4) .build(); - GraniticMineralSand = new Material.Builder(2513, gregtechId("granitic_mineral_sand")) + GraniticMineralSand = Material.builder(2513, gregtechId("granitic_mineral_sand")) .dust(1).ore() .color(0x283C3C).iconSet(SAND) .components(Magnetite, 1, GraniteBlack, 1) .flags(BLAST_FURNACE_CALCITE_DOUBLE) .build(); - Redrock = new Material.Builder(2514, gregtechId("redrock")) + Redrock = Material.builder(2514, gregtechId("redrock")) .dust(1) .color(0xFF5032).iconSet(ROUGH) .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING) .components(Calcite, 2, Flint, 1) .build(); - GarnetSand = new Material.Builder(2515, gregtechId("garnet_sand")) + GarnetSand = Material.builder(2515, gregtechId("garnet_sand")) .dust(1).ore() .color(0xC86400).iconSet(SAND) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Almandine, 1, Andradite, 1, Grossular, 1, Pyrope, 1, Spessartine, 1, Uvarovite, 1) .build(); - HSSG = new Material.Builder(2516, gregtechId("hssg")) + HSSG = Material.builder(2516, gregtechId("hssg")) .ingot(3).fluid() .color(0x999900).iconSet(METALLIC) .flags(EXT2_METAL, GENERATE_SMALL_GEAR, GENERATE_FRAME, GENERATE_SPRING, GENERATE_FINE_WIRE, @@ -96,7 +96,7 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - RedAlloy = new Material.Builder(2517, gregtechId("red_alloy")) + RedAlloy = Material.builder(2517, gregtechId("red_alloy")) .ingot(0) .liquid(new FluidBuilder().temperature(1400)) .color(0xC80000) @@ -105,14 +105,14 @@ public static void register() { .cableProperties(V[ULV], 1, 0) .build(); - BasalticMineralSand = new Material.Builder(2518, gregtechId("basaltic_mineral_sand")) + BasalticMineralSand = Material.builder(2518, gregtechId("basaltic_mineral_sand")) .dust(1).ore() .color(0x283228).iconSet(SAND) .components(Magnetite, 1, Basalt, 1) .flags(BLAST_FURNACE_CALCITE_DOUBLE) .build(); - HSSE = new Material.Builder(2519, gregtechId("hsse")) + HSSE = Material.builder(2519, gregtechId("hsse")) .ingot(4).fluid() .color(0x336600).iconSet(METALLIC) .flags(EXT2_METAL, GENERATE_FRAME, GENERATE_RING, GENERATE_GEAR) @@ -126,7 +126,7 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - HSSS = new Material.Builder(2520, gregtechId("hsss")) + HSSS = Material.builder(2520, gregtechId("hsss")) .ingot(4).fluid() .color(0x660033).iconSet(METALLIC) .flags(EXT2_METAL, GENERATE_SMALL_GEAR, GENERATE_RING, GENERATE_FRAME, GENERATE_ROTOR, GENERATE_ROUND, @@ -141,42 +141,42 @@ public static void register() { // FREE ID: 2521 - IridiumMetalResidue = new Material.Builder(2522, gregtechId("iridium_metal_residue")) + IridiumMetalResidue = Material.builder(2522, gregtechId("iridium_metal_residue")) .dust() .color(0x5C5D68).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Iridium, 1, Chlorine, 3, PlatinumSludgeResidue, 1) .build(); - Granite = new Material.Builder(2523, gregtechId("granite")) + Granite = Material.builder(2523, gregtechId("granite")) .dust() .color(0xCFA18C).iconSet(ROUGH) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(SiliconDioxide, 4, Redrock, 1) .build(); - Brick = new Material.Builder(2524, gregtechId("brick")) + Brick = Material.builder(2524, gregtechId("brick")) .dust() .color(0x9B5643).iconSet(ROUGH) .flags(EXCLUDE_BLOCK_CRAFTING_RECIPES, NO_SMELTING, DECOMPOSITION_BY_CENTRIFUGING) .components(Clay, 1) .build(); - Fireclay = new Material.Builder(2525, gregtechId("fireclay")) + Fireclay = Material.builder(2525, gregtechId("fireclay")) .dust() .color(0xADA09B).iconSet(ROUGH) .flags(DECOMPOSITION_BY_CENTRIFUGING, NO_SMELTING) .components(Clay, 1, Brick, 1) .build(); - Diorite = new Material.Builder(2526, gregtechId("diorite")) + Diorite = Material.builder(2526, gregtechId("diorite")) .dust() .iconSet(ROUGH) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Mirabilite, 2, Clay, 7) .build(); - BlueAlloy = new Material.Builder(2527, gregtechId("blue_alloy")) + BlueAlloy = Material.builder(2527, gregtechId("blue_alloy")) .ingot() .liquid(new FluidBuilder().temperature(1400)) .color(0x64B4FF).iconSet(DULL) diff --git a/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java b/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java index 7bc82ca2805..85ad423d593 100644 --- a/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java @@ -15,7 +15,7 @@ public class OrganicChemistryMaterials { * ID RANGE: 1000-1068 (incl.) */ public static void register() { - SiliconeRubber = new Material.Builder(1000, gregtechId("silicone_rubber")) + SiliconeRubber = Material.builder(1000, gregtechId("silicone_rubber")) .polymer() .liquid(new FluidBuilder().temperature(900)) .color(0xDCDCDC) @@ -24,20 +24,20 @@ public static void register() { .build() .setFormula("Si(CH3)2O", true); - Nitrobenzene = new Material.Builder(1001, gregtechId("nitrobenzene")) + Nitrobenzene = Material.builder(1001, gregtechId("nitrobenzene")) .gas() .color(0x704936) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 6, Hydrogen, 5, Nitrogen, 1, Oxygen, 2) .build(); - RawRubber = new Material.Builder(1002, gregtechId("raw_rubber")) + RawRubber = Material.builder(1002, gregtechId("raw_rubber")) .polymer() .color(0xCCC789) .components(Carbon, 5, Hydrogen, 8) .build(); - RawStyreneButadieneRubber = new Material.Builder(1003, gregtechId("raw_styrene_butadiene_rubber")) + RawStyreneButadieneRubber = Material.builder(1003, gregtechId("raw_styrene_butadiene_rubber")) .dust() .color(0x54403D).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION, FLAMMABLE) @@ -45,7 +45,7 @@ public static void register() { .build() .setFormula("(C4H6)3C8H8", true); - StyreneButadieneRubber = new Material.Builder(1004, gregtechId("styrene_butadiene_rubber")) + StyreneButadieneRubber = Material.builder(1004, gregtechId("styrene_butadiene_rubber")) .polymer() .liquid(new FluidBuilder().temperature(1000)) .color(0x211A18).iconSet(SHINY) @@ -54,14 +54,14 @@ public static void register() { .build() .setFormula("(C4H6)3C8H8", true); - PolyvinylAcetate = new Material.Builder(1005, gregtechId("polyvinyl_acetate")) + PolyvinylAcetate = Material.builder(1005, gregtechId("polyvinyl_acetate")) .fluid() .color(0xFF9955) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 4, Hydrogen, 6, Oxygen, 2) .build(); - ReinforcedEpoxyResin = new Material.Builder(1006, gregtechId("reinforced_epoxy_resin")) + ReinforcedEpoxyResin = Material.builder(1006, gregtechId("reinforced_epoxy_resin")) .polymer() .liquid(new FluidBuilder().temperature(600)) .color(0xA07A10) @@ -69,7 +69,7 @@ public static void register() { .components(Carbon, 6, Hydrogen, 4, Oxygen, 1) .build(); - PolyvinylChloride = new Material.Builder(1007, gregtechId("polyvinyl_chloride")) + PolyvinylChloride = Material.builder(1007, gregtechId("polyvinyl_chloride")) .polymer() .liquid(new FluidBuilder().temperature(373)) .color(0xD7E6E6) @@ -78,7 +78,7 @@ public static void register() { .itemPipeProperties(512, 4) .build(); - PolyphenyleneSulfide = new Material.Builder(1008, gregtechId("polyphenylene_sulfide")) + PolyphenyleneSulfide = Material.builder(1008, gregtechId("polyphenylene_sulfide")) .polymer() .liquid(new FluidBuilder().temperature(500)) .color(0xAA8800) @@ -86,14 +86,14 @@ public static void register() { .components(Carbon, 6, Hydrogen, 4, Sulfur, 1) .build(); - GlycerylTrinitrate = new Material.Builder(1009, gregtechId("glyceryl_trinitrate")) + GlycerylTrinitrate = Material.builder(1009, gregtechId("glyceryl_trinitrate")) .liquid(new FluidBuilder().customStill()) .color(0x04443C) .flags(FLAMMABLE, EXPLOSIVE) .components(Carbon, 3, Hydrogen, 5, Nitrogen, 3, Oxygen, 9) .build(); - Polybenzimidazole = new Material.Builder(1010, gregtechId("polybenzimidazole")) + Polybenzimidazole = Material.builder(1010, gregtechId("polybenzimidazole")) .polymer() .liquid(new FluidBuilder().temperature(1450)) .color(0x2D2D2D) @@ -102,7 +102,7 @@ public static void register() { .fluidPipeProperties(1000, 350, true) .build(); - Polydimethylsiloxane = new Material.Builder(1011, gregtechId("polydimethylsiloxane")) + Polydimethylsiloxane = Material.builder(1011, gregtechId("polydimethylsiloxane")) .dust() .color(0xF5F5F5) .flags(DISABLE_DECOMPOSITION, FLAMMABLE) @@ -110,7 +110,7 @@ public static void register() { .build() .setFormula("Si(CH3)2O", true); - Polyethylene = new Material.Builder(1012, gregtechId("plastic")) // todo add polyethylene oredicts + Polyethylene = Material.builder(1012, gregtechId("plastic")) // todo add polyethylene oredicts .polymer(1) .liquid(new FluidBuilder().temperature(408)) .color(0xC8C8C8) @@ -119,7 +119,7 @@ public static void register() { .fluidPipeProperties(370, 60, true) .build(); - Epoxy = new Material.Builder(1013, gregtechId("epoxy")) + Epoxy = Material.builder(1013, gregtechId("epoxy")) .polymer(1) .liquid(new FluidBuilder().temperature(400)) .color(0xC88C14) @@ -129,7 +129,7 @@ public static void register() { // Free ID 1014 - Polycaprolactam = new Material.Builder(1015, gregtechId("polycaprolactam")) + Polycaprolactam = Material.builder(1015, gregtechId("polycaprolactam")) .polymer(1) .liquid(new FluidBuilder().temperature(493)) .color(0x323232) @@ -137,7 +137,7 @@ public static void register() { .components(Carbon, 6, Hydrogen, 11, Nitrogen, 1, Oxygen, 1) .build(); - Polytetrafluoroethylene = new Material.Builder(1016, gregtechId("polytetrafluoroethylene")) + Polytetrafluoroethylene = Material.builder(1016, gregtechId("polytetrafluoroethylene")) .polymer(1) .liquid(new FluidBuilder().temperature(600)) .color(0x646464) @@ -146,160 +146,160 @@ public static void register() { .fluidPipeProperties(600, 100, true, true, false, false) .build(); - Sugar = new Material.Builder(1017, gregtechId("sugar")) + Sugar = Material.builder(1017, gregtechId("sugar")) .gem(1) .color(0xFAFAFA).iconSet(FINE) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 6, Hydrogen, 12, Oxygen, 6) .build(); - Methane = new Material.Builder(1018, gregtechId("methane")) + Methane = Material.builder(1018, gregtechId("methane")) .gas(new FluidBuilder().translation("gregtech.fluid.gas_generic")) .color(0xFF0078) .components(Carbon, 1, Hydrogen, 4) .build(); - Epichlorohydrin = new Material.Builder(1019, gregtechId("epichlorohydrin")) + Epichlorohydrin = Material.builder(1019, gregtechId("epichlorohydrin")) .liquid(new FluidBuilder().customStill()) .color(0x640C04) .components(Carbon, 3, Hydrogen, 5, Chlorine, 1, Oxygen, 1) .build(); - Monochloramine = new Material.Builder(1020, gregtechId("monochloramine")) + Monochloramine = Material.builder(1020, gregtechId("monochloramine")) .gas() .color(0x3F9F80) .components(Nitrogen, 1, Hydrogen, 2, Chlorine, 1) .build(); - Chloroform = new Material.Builder(1021, gregtechId("chloroform")) + Chloroform = Material.builder(1021, gregtechId("chloroform")) .fluid() .color(0x892CA0) .components(Carbon, 1, Hydrogen, 1, Chlorine, 3) .build(); - Cumene = new Material.Builder(1022, gregtechId("cumene")) + Cumene = Material.builder(1022, gregtechId("cumene")) .gas() .color(0x552200) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 9, Hydrogen, 12) .build(); - Tetrafluoroethylene = new Material.Builder(1023, gregtechId("tetrafluoroethylene")) + Tetrafluoroethylene = Material.builder(1023, gregtechId("tetrafluoroethylene")) .gas() .color(0x7D7D7D) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Fluorine, 4) .build(); - Chloromethane = new Material.Builder(1024, gregtechId("chloromethane")) + Chloromethane = Material.builder(1024, gregtechId("chloromethane")) .gas() .color(0xC82CA0) .components(Carbon, 1, Hydrogen, 3, Chlorine, 1) .build(); - AllylChloride = new Material.Builder(1025, gregtechId("allyl_chloride")) + AllylChloride = Material.builder(1025, gregtechId("allyl_chloride")) .fluid() .color(0x87DEAA) .components(Carbon, 2, Methane, 1, HydrochloricAcid, 1) .build() .setFormula("C3H5Cl", true); - Isoprene = new Material.Builder(1026, gregtechId("isoprene")) + Isoprene = Material.builder(1026, gregtechId("isoprene")) .fluid() .color(0x141414) .components(Carbon, 5, Hydrogen, 8) .build(); - Propane = new Material.Builder(1027, gregtechId("propane")) + Propane = Material.builder(1027, gregtechId("propane")) .gas() .color(0xFAE250) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 3, Hydrogen, 8) .build(); - Propene = new Material.Builder(1028, gregtechId("propene")) + Propene = Material.builder(1028, gregtechId("propene")) .gas() .color(0xFFDD55) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 3, Hydrogen, 6) .build(); - Ethane = new Material.Builder(1029, gregtechId("ethane")) + Ethane = Material.builder(1029, gregtechId("ethane")) .gas() .color(0xC8C8FF) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Hydrogen, 6) .build(); - Butene = new Material.Builder(1030, gregtechId("butene")) + Butene = Material.builder(1030, gregtechId("butene")) .gas() .color(0xCF5005) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 4, Hydrogen, 8) .build(); - Butane = new Material.Builder(1031, gregtechId("butane")) + Butane = Material.builder(1031, gregtechId("butane")) .gas() .color(0xB6371E) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 4, Hydrogen, 10) .build(); - DissolvedCalciumAcetate = new Material.Builder(1032, gregtechId("dissolved_calcium_acetate")) + DissolvedCalciumAcetate = Material.builder(1032, gregtechId("dissolved_calcium_acetate")) .fluid() .color(0xDCC8B4) .flags(DISABLE_DECOMPOSITION) .components(Calcium, 1, Carbon, 4, Oxygen, 4, Hydrogen, 6, Water, 1) .build(); - VinylAcetate = new Material.Builder(1033, gregtechId("vinyl_acetate")) + VinylAcetate = Material.builder(1033, gregtechId("vinyl_acetate")) .fluid() .color(0xE1B380) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 4, Hydrogen, 6, Oxygen, 2) .build(); - MethylAcetate = new Material.Builder(1034, gregtechId("methyl_acetate")) + MethylAcetate = Material.builder(1034, gregtechId("methyl_acetate")) .fluid() .color(0xEEC6AF) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 3, Hydrogen, 6, Oxygen, 2) .build(); - Ethenone = new Material.Builder(1035, gregtechId("ethenone")) + Ethenone = Material.builder(1035, gregtechId("ethenone")) .fluid() .color(0x141446) .components(Carbon, 2, Hydrogen, 2, Oxygen, 1) .build(); - Tetranitromethane = new Material.Builder(1036, gregtechId("tetranitromethane")) + Tetranitromethane = Material.builder(1036, gregtechId("tetranitromethane")) .fluid() .color(0x0F2828) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 1, Nitrogen, 4, Oxygen, 8) .build(); - Dimethylamine = new Material.Builder(1037, gregtechId("dimethylamine")) + Dimethylamine = Material.builder(1037, gregtechId("dimethylamine")) .gas() .color(0x554469) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Hydrogen, 7, Nitrogen, 1) .build(); - Dimethylhydrazine = new Material.Builder(1038, gregtechId("dimethylhydrazine")) + Dimethylhydrazine = Material.builder(1038, gregtechId("dimethylhydrazine")) .fluid() .color(0x000055) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Hydrogen, 8, Nitrogen, 2) .build(); - DinitrogenTetroxide = new Material.Builder(1039, gregtechId("dinitrogen_tetroxide")) + DinitrogenTetroxide = Material.builder(1039, gregtechId("dinitrogen_tetroxide")) .gas() .color(0x570C02) .components(Nitrogen, 2, Oxygen, 4) .build(); - Dimethyldichlorosilane = new Material.Builder(1040, gregtechId("dimethyldichlorosilane")) + Dimethyldichlorosilane = Material.builder(1040, gregtechId("dimethyldichlorosilane")) .gas() .color(0x441650) .flags(DISABLE_DECOMPOSITION) @@ -307,81 +307,81 @@ public static void register() { .build() .setFormula("Si(CH3)2Cl2", true); - Styrene = new Material.Builder(1041, gregtechId("styrene")) + Styrene = Material.builder(1041, gregtechId("styrene")) .fluid() .color(0xD2C8BE) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 8, Hydrogen, 8) .build(); - Butadiene = new Material.Builder(1042, gregtechId("butadiene")) + Butadiene = Material.builder(1042, gregtechId("butadiene")) .gas() .color(0xB55A10) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 4, Hydrogen, 6) .build(); - Dichlorobenzene = new Material.Builder(1043, gregtechId("dichlorobenzene")) + Dichlorobenzene = Material.builder(1043, gregtechId("dichlorobenzene")) .fluid() .color(0x004455) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 6, Hydrogen, 4, Chlorine, 2) .build(); - AceticAcid = new Material.Builder(1044, gregtechId("acetic_acid")) + AceticAcid = Material.builder(1044, gregtechId("acetic_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0xC8B4A0) .components(Carbon, 2, Hydrogen, 4, Oxygen, 2) .build(); - Phenol = new Material.Builder(1045, gregtechId("phenol")) + Phenol = Material.builder(1045, gregtechId("phenol")) .fluid() .color(0x784421) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 6, Hydrogen, 6, Oxygen, 1) .build(); - BisphenolA = new Material.Builder(1046, gregtechId("bisphenol_a")) + BisphenolA = Material.builder(1046, gregtechId("bisphenol_a")) .fluid() .color(0xD4AA00) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 15, Hydrogen, 16, Oxygen, 2) .build(); - VinylChloride = new Material.Builder(1047, gregtechId("vinyl_chloride")) + VinylChloride = Material.builder(1047, gregtechId("vinyl_chloride")) .gas() .color(0xE1F0F0) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Hydrogen, 3, Chlorine, 1) .build(); - Ethylene = new Material.Builder(1048, gregtechId("ethylene")) + Ethylene = Material.builder(1048, gregtechId("ethylene")) .gas() .color(0xE1E1E1) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Hydrogen, 4) .build(); - Benzene = new Material.Builder(1049, gregtechId("benzene")) + Benzene = Material.builder(1049, gregtechId("benzene")) .fluid() .color(0x1A1A1A) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 6, Hydrogen, 6) .build(); - Acetone = new Material.Builder(1050, gregtechId("acetone")) + Acetone = Material.builder(1050, gregtechId("acetone")) .fluid() .color(0xAFAFAF) .components(Carbon, 3, Hydrogen, 6, Oxygen, 1) .build(); - Glycerol = new Material.Builder(1051, gregtechId("glycerol")) + Glycerol = Material.builder(1051, gregtechId("glycerol")) .fluid() .color(0x87DE87) .components(Carbon, 3, Hydrogen, 8, Oxygen, 3) .build(); - Methanol = new Material.Builder(1052, gregtechId("methanol")) + Methanol = Material.builder(1052, gregtechId("methanol")) .fluid() .color(0xAA8800) .components(Carbon, 1, Hydrogen, 4, Oxygen, 1) @@ -389,28 +389,28 @@ public static void register() { // FREE ID 1053 - Ethanol = new Material.Builder(1054, gregtechId("ethanol")) + Ethanol = Material.builder(1054, gregtechId("ethanol")) .liquid(new FluidBuilder().customStill().alternativeName("bio.ethanol")) .color(0xFC4C04) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Hydrogen, 6, Oxygen, 1) .build(); - Toluene = new Material.Builder(1055, gregtechId("toluene")) + Toluene = Material.builder(1055, gregtechId("toluene")) .liquid(new FluidBuilder().customStill()) .color(0x712400) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 7, Hydrogen, 8) .build(); - DiphenylIsophtalate = new Material.Builder(1056, gregtechId("diphenyl_isophthalate")) + DiphenylIsophtalate = Material.builder(1056, gregtechId("diphenyl_isophthalate")) .fluid() .color(0x246E57) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 20, Hydrogen, 14, Oxygen, 4) .build(); - PhthalicAcid = new Material.Builder(1057, gregtechId("phthalic_acid")) + PhthalicAcid = Material.builder(1057, gregtechId("phthalic_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0xD1D1D1) .flags(DISABLE_DECOMPOSITION) @@ -418,7 +418,7 @@ public static void register() { .build() .setFormula("C6H4(CO2H)2", true); - Dimethylbenzene = new Material.Builder(1058, gregtechId("dimethylbenzene")) + Dimethylbenzene = Material.builder(1058, gregtechId("dimethylbenzene")) .fluid() .color(0x669C40) .flags(DISABLE_DECOMPOSITION) @@ -426,7 +426,7 @@ public static void register() { .build() .setFormula("C6H4(CH3)2", true); - Diaminobenzidine = new Material.Builder(1059, gregtechId("diaminobenzidine")) + Diaminobenzidine = Material.builder(1059, gregtechId("diaminobenzidine")) .fluid() .color(0x337D59) .flags(DISABLE_DECOMPOSITION) @@ -434,7 +434,7 @@ public static void register() { .build() .setFormula("(C6H3(NH2)2)2", true); - Dichlorobenzidine = new Material.Builder(1060, gregtechId("dichlorobenzidine")) + Dichlorobenzidine = Material.builder(1060, gregtechId("dichlorobenzidine")) .fluid() .color(0xA1DEA6) .flags(DISABLE_DECOMPOSITION) @@ -442,48 +442,48 @@ public static void register() { .build() .setFormula("(C6H3Cl(NH2))2", true); - Nitrochlorobenzene = new Material.Builder(1061, gregtechId("nitrochlorobenzene")) + Nitrochlorobenzene = Material.builder(1061, gregtechId("nitrochlorobenzene")) .fluid() .color(0x8FB51A) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 6, Hydrogen, 4, Chlorine, 1, Nitrogen, 1, Oxygen, 2) .build(); - Chlorobenzene = new Material.Builder(1062, gregtechId("chlorobenzene")) + Chlorobenzene = Material.builder(1062, gregtechId("chlorobenzene")) .fluid() .color(0x326A3E) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 6, Hydrogen, 5, Chlorine, 1) .build(); - Octane = new Material.Builder(1063, gregtechId("octane")) + Octane = Material.builder(1063, gregtechId("octane")) .fluid() .flags(DISABLE_DECOMPOSITION) .color(0x8A0A09) .components(Carbon, 8, Hydrogen, 18) .build(); - EthylTertButylEther = new Material.Builder(1064, gregtechId("ethyl_tertbutyl_ether")) + EthylTertButylEther = Material.builder(1064, gregtechId("ethyl_tertbutyl_ether")) .fluid() .flags(DISABLE_DECOMPOSITION) .color(0xB15C06) .components(Carbon, 6, Hydrogen, 14, Oxygen, 1) .build(); - Ethylbenzene = new Material.Builder(1066, gregtechId("ethylbenzene")) + Ethylbenzene = Material.builder(1066, gregtechId("ethylbenzene")) .fluid() .flags(DISABLE_DECOMPOSITION) .components(Carbon, 8, Hydrogen, 10) .build(); - Naphthalene = new Material.Builder(1067, gregtechId("naphthalene")) + Naphthalene = Material.builder(1067, gregtechId("naphthalene")) .fluid() .flags(DISABLE_DECOMPOSITION) .color(0xF4F4D7) .components(Carbon, 10, Hydrogen, 8) .build(); - Rubber = new Material.Builder(1068, gregtechId("rubber")) + Rubber = Material.builder(1068, gregtechId("rubber")) .polymer(0) .liquid(new FluidBuilder().temperature(400)) .color(0x000000).iconSet(SHINY) @@ -491,20 +491,20 @@ public static void register() { .components(Carbon, 5, Hydrogen, 8) .build(); - Cyclohexane = new Material.Builder(1069, gregtechId("cyclohexane")) + Cyclohexane = Material.builder(1069, gregtechId("cyclohexane")) .fluid() .color(0xF2F2F2E7) .components(Carbon, 6, Hydrogen, 12) .build(); - NitrosylChloride = new Material.Builder(1070, gregtechId("nitrosyl_chloride")) + NitrosylChloride = Material.builder(1070, gregtechId("nitrosyl_chloride")) .gas() .flags(FLAMMABLE) .color(0xF3F100) .components(Nitrogen, 1, Oxygen, 1, Chlorine, 1) .build(); - CyclohexanoneOxime = new Material.Builder(1071, gregtechId("cyclohexanone_oxime")) + CyclohexanoneOxime = Material.builder(1071, gregtechId("cyclohexanone_oxime")) .dust() .flags(DISABLE_DECOMPOSITION, FLAMMABLE) .color(0xEBEBF0).iconSet(ROUGH) @@ -512,7 +512,7 @@ public static void register() { .build() .setFormula("C6H11NO", true); - Caprolactam = new Material.Builder(1072, gregtechId("caprolactam")) + Caprolactam = Material.builder(1072, gregtechId("caprolactam")) .dust() .flags(DISABLE_DECOMPOSITION, FLAMMABLE) .color(0x676768) @@ -520,21 +520,21 @@ public static void register() { .build() .setFormula("(CH2)5C(O)NH", true); - Butyraldehyde = new Material.Builder(1073, gregtechId("butyraldehyde")) + Butyraldehyde = Material.builder(1073, gregtechId("butyraldehyde")) .fluid() .color(0x554A3F) .flags(DISABLE_DECOMPOSITION) .components(Carbon, 4, Hydrogen, 8, Oxygen, 1) .build(); - PolyvinylButyral = new Material.Builder(1074, gregtechId("polyvinyl_butyral")) + PolyvinylButyral = Material.builder(1074, gregtechId("polyvinyl_butyral")) .ingot().fluid() .color(0x347D41) .flags(GENERATE_PLATE, DISABLE_DECOMPOSITION, NO_SMASHING) .components(Butyraldehyde, 1, PolyvinylAcetate, 1) .build(); - Biphenyl = new Material.Builder(1075, gregtechId("biphenyl")) + Biphenyl = Material.builder(1075, gregtechId("biphenyl")) .dust() .color(0x8B8C4F).iconSet(FINE) .flags(DISABLE_DECOMPOSITION) @@ -542,7 +542,7 @@ public static void register() { .build() .setFormula("(C6H5)2", true); - PolychlorinatedBiphenyl = new Material.Builder(1076, gregtechId("polychlorinated_biphenyl")) + PolychlorinatedBiphenyl = Material.builder(1076, gregtechId("polychlorinated_biphenyl")) .fluid() .color(0xCACC0E) .flags(DISABLE_DECOMPOSITION) diff --git a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java index 33a597b6084..3b8995b7962 100644 --- a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java @@ -18,7 +18,7 @@ public class SecondDegreeMaterials { public static void register() { - Glass = new Material.Builder(2000, gregtechId("glass")) + Glass = Material.builder(2000, gregtechId("glass")) .gem(0) .liquid(new FluidBuilder().temperature(1200).customStill()) .color(0xFAFAFA).iconSet(GLASS) @@ -28,41 +28,41 @@ public static void register() { // FREE ID 2001 - Borax = new Material.Builder(2002, gregtechId("borax")) + Borax = Material.builder(2002, gregtechId("borax")) .dust(1) .color(0xFAFAFA).iconSet(FINE) .components(Sodium, 2, Boron, 4, Water, 10, Oxygen, 7) .build(); - SaltWater = new Material.Builder(2003, gregtechId("salt_water")) + SaltWater = Material.builder(2003, gregtechId("salt_water")) .fluid() .color(0x0000C8) .flags(DISABLE_DECOMPOSITION) .components(Salt, 1, Water, 1) .build(); - Olivine = new Material.Builder(2004, gregtechId("olivine")) + Olivine = Material.builder(2004, gregtechId("olivine")) .gem().ore(2, 1) .color(0x96FF96).iconSet(RUBY) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT) .components(Magnesium, 2, Iron, 1, SiliconDioxide, 2) .build(); - Opal = new Material.Builder(2005, gregtechId("opal")) + Opal = Material.builder(2005, gregtechId("opal")) .gem().ore() .color(0x0000FF).iconSet(OPAL) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT, DECOMPOSITION_BY_CENTRIFUGING) .components(SiliconDioxide, 1) .build(); - Amethyst = new Material.Builder(2006, gregtechId("amethyst")) + Amethyst = Material.builder(2006, gregtechId("amethyst")) .gem(3).ore() .color(0xD232D2).iconSet(RUBY) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT) .components(SiliconDioxide, 4, Iron, 1) .build(); - Lapis = new Material.Builder(2007, gregtechId("lapis")) + Lapis = Material.builder(2007, gregtechId("lapis")) .gem(1).ore(6, 4) .color(0x4646DC).iconSet(LAPIS) .flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, NO_WORKING, DECOMPOSITION_BY_ELECTROLYZING, @@ -71,7 +71,7 @@ public static void register() { .components(Lazurite, 12, Sodalite, 2, Pyrite, 1, Calcite, 1) .build(); - Blaze = new Material.Builder(2008, gregtechId("blaze")) + Blaze = Material.builder(2008, gregtechId("blaze")) .dust(1) .liquid(new FluidBuilder().temperature(4000).customStill()) .color(0xFFC800).iconSet(FINE) @@ -81,7 +81,7 @@ public static void register() { // Free ID 2009 - Apatite = new Material.Builder(2010, gregtechId("apatite")) + Apatite = Material.builder(2010, gregtechId("apatite")) .gem(1).ore(2, 2) .color(0xC8C8FF).iconSet(DIAMOND) .flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, GENERATE_BOLT_SCREW) @@ -89,7 +89,7 @@ public static void register() { .build() .setFormula("Ca5(PO4)3Cl", true); - BlackSteel = new Material.Builder(2011, gregtechId("black_steel")) + BlackSteel = Material.builder(2011, gregtechId("black_steel")) .ingot().fluid() .color(0x646464).iconSet(METALLIC) .flags(EXT_METAL, GENERATE_FINE_WIRE, GENERATE_GEAR, GENERATE_FRAME) @@ -98,7 +98,7 @@ public static void register() { .blast(1758, GasTier.LOW) .build(); - DamascusSteel = new Material.Builder(2012, gregtechId("damascus_steel")) + DamascusSteel = Material.builder(2012, gregtechId("damascus_steel")) .ingot(3).fluid() .color(0x6E6E6E).iconSet(METALLIC) .flags(EXT_METAL, GENERATE_GEAR) @@ -110,7 +110,7 @@ public static void register() { .blast(1500, GasTier.LOW) .build(); - TungstenSteel = new Material.Builder(2013, gregtechId("tungsten_steel")) + TungstenSteel = Material.builder(2013, gregtechId("tungsten_steel")) .ingot(4).fluid() .color(0x6464A0).iconSet(METALLIC) .flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_SMALL_GEAR, GENERATE_DENSE, GENERATE_FRAME, @@ -127,7 +127,7 @@ public static void register() { .vacuumStats(VA[HV])) .build(); - CobaltBrass = new Material.Builder(2014, gregtechId("cobalt_brass")) + CobaltBrass = Material.builder(2014, gregtechId("cobalt_brass")) .ingot() .liquid(new FluidBuilder().temperature(1202)) .color(0xB4B4A0).iconSet(METALLIC) @@ -139,7 +139,7 @@ public static void register() { .itemPipeProperties(2048, 1) .build(); - TricalciumPhosphate = new Material.Builder(2015, gregtechId("tricalcium_phosphate")) + TricalciumPhosphate = Material.builder(2015, gregtechId("tricalcium_phosphate")) .dust().ore(3, 1) .color(0xFFFF00).iconSet(FLINT) .flags(NO_SMASHING, NO_SMELTING, FLAMMABLE, EXPLOSIVE) @@ -147,35 +147,35 @@ public static void register() { .build() .setFormula("Ca3(PO4)2", true); - GarnetRed = new Material.Builder(2016, gregtechId("garnet_red")) + GarnetRed = Material.builder(2016, gregtechId("garnet_red")) .gem().ore(4, 1) .color(0xC85050).iconSet(RUBY) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT, DECOMPOSITION_BY_CENTRIFUGING) .components(Pyrope, 3, Almandine, 5, Spessartine, 8) .build(); - GarnetYellow = new Material.Builder(2017, gregtechId("garnet_yellow")) + GarnetYellow = Material.builder(2017, gregtechId("garnet_yellow")) .gem().ore(4, 1) .color(0xC8C850).iconSet(RUBY) .flags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT, DECOMPOSITION_BY_CENTRIFUGING) .components(Andradite, 5, Grossular, 8, Uvarovite, 3) .build(); - Marble = new Material.Builder(2018, gregtechId("marble")) + Marble = Material.builder(2018, gregtechId("marble")) .dust() .color(0xC8C8C8).iconSet(ROUGH) .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING) .components(Magnesium, 1, Calcite, 7) .build(); - GraniteBlack = new Material.Builder(2019, gregtechId("granite_black")) + GraniteBlack = Material.builder(2019, gregtechId("granite_black")) .dust() .color(0x0A0A0A).iconSet(ROUGH) .flags(NO_SMASHING, DECOMPOSITION_BY_CENTRIFUGING) .components(SiliconDioxide, 4, Biotite, 1) .build(); - GraniteRed = new Material.Builder(2020, gregtechId("granite_red")) + GraniteRed = Material.builder(2020, gregtechId("granite_red")) .dust() .color(0xFF0080).iconSet(ROUGH) .flags(NO_SMASHING) @@ -184,21 +184,21 @@ public static void register() { // Free ID 2021 - VanadiumMagnetite = new Material.Builder(2022, gregtechId("vanadium_magnetite")) + VanadiumMagnetite = Material.builder(2022, gregtechId("vanadium_magnetite")) .dust().ore() .color(0x23233C).iconSet(METALLIC) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Magnetite, 1, Vanadium, 1) .build(); - QuartzSand = new Material.Builder(2023, gregtechId("quartz_sand")) + QuartzSand = Material.builder(2023, gregtechId("quartz_sand")) .dust(1) .color(0xC8C8C8).iconSet(SAND) .flags(DISABLE_DECOMPOSITION) .components(CertusQuartz, 1, Quartzite, 1) .build(); - Pollucite = new Material.Builder(2024, gregtechId("pollucite")) + Pollucite = Material.builder(2024, gregtechId("pollucite")) .dust().ore() .color(0xF0D2D2) .components(Caesium, 2, Aluminium, 2, Silicon, 4, Water, 2, Oxygen, 12) @@ -206,20 +206,20 @@ public static void register() { // Free ID 2025 - Bentonite = new Material.Builder(2026, gregtechId("bentonite")) + Bentonite = Material.builder(2026, gregtechId("bentonite")) .dust().ore(3, 1) .color(0xF5D7D2).iconSet(ROUGH) .flags(DISABLE_DECOMPOSITION) .components(Sodium, 1, Magnesium, 6, Silicon, 12, Hydrogen, 4, Water, 5, Oxygen, 36) .build(); - FullersEarth = new Material.Builder(2027, gregtechId("fullers_earth")) + FullersEarth = Material.builder(2027, gregtechId("fullers_earth")) .dust().ore(2, 1) .color(0xA0A078).iconSet(FINE) .components(Magnesium, 1, Silicon, 4, Hydrogen, 1, Water, 4, Oxygen, 11) .build(); - Pitchblende = new Material.Builder(2028, gregtechId("pitchblende")) + Pitchblende = Material.builder(2028, gregtechId("pitchblende")) .dust(3).ore(true) .color(0xC8D200) .flags(DECOMPOSITION_BY_CENTRIFUGING) @@ -227,40 +227,40 @@ public static void register() { .build() .setFormula("(UO2)3ThPb", true); - Monazite = new Material.Builder(2029, gregtechId("monazite")) + Monazite = Material.builder(2029, gregtechId("monazite")) .gem(1).ore(4, 2, true) .color(0x324632).iconSet(DIAMOND) .flags(NO_SMASHING, NO_SMELTING, CRYSTALLIZABLE, DECOMPOSITION_BY_CENTRIFUGING) .components(RareEarth, 1, Phosphorus, 1) .build(); - Mirabilite = new Material.Builder(2030, gregtechId("mirabilite")) + Mirabilite = Material.builder(2030, gregtechId("mirabilite")) .dust() .color(0xF0FAD2) .components(Sodium, 2, Sulfur, 1, Water, 10, Oxygen, 4) .build(); - Trona = new Material.Builder(2031, gregtechId("trona")) + Trona = Material.builder(2031, gregtechId("trona")) .dust(1).ore(2, 1) .color(0x87875F).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Sodium, 3, Carbon, 2, Hydrogen, 1, Water, 2, Oxygen, 6) .build(); - Gypsum = new Material.Builder(2032, gregtechId("gypsum")) + Gypsum = Material.builder(2032, gregtechId("gypsum")) .dust(1).ore() .color(0xE6E6FA) .components(Calcium, 1, Sulfur, 1, Water, 2, Oxygen, 4) .build(); - Zeolite = new Material.Builder(2033, gregtechId("zeolite")) + Zeolite = Material.builder(2033, gregtechId("zeolite")) .dust().ore(3, 1) .color(0xF0E6E6) .flags(DISABLE_DECOMPOSITION) .components(Sodium, 1, Calcium, 4, Silicon, 27, Aluminium, 9, Water, 28, Oxygen, 72) .build(); - Concrete = new Material.Builder(2034, gregtechId("concrete")) + Concrete = Material.builder(2034, gregtechId("concrete")) .dust() .liquid(new FluidBuilder().temperature(286)) .color(0x646464).iconSet(ROUGH) @@ -268,7 +268,7 @@ public static void register() { .components(Stone, 1) .build(); - SteelMagnetic = new Material.Builder(2035, gregtechId("steel_magnetic")) + SteelMagnetic = Material.builder(2035, gregtechId("steel_magnetic")) .ingot() .color(0x808080).iconSet(MAGNETIC) .flags(GENERATE_ROD, IS_MAGNETIC) @@ -279,7 +279,7 @@ public static void register() { .build(); Steel.getProperty(PropertyKey.INGOT).setMagneticMaterial(SteelMagnetic); - VanadiumSteel = new Material.Builder(2036, gregtechId("vanadium_steel")) + VanadiumSteel = Material.builder(2036, gregtechId("vanadium_steel")) .ingot(3) .liquid(new FluidBuilder().temperature(2073)) .color(0xc0c0c0).iconSet(METALLIC) @@ -292,7 +292,7 @@ public static void register() { .blast(1453, GasTier.LOW) .build(); - Potin = new Material.Builder(2037, gregtechId("potin")) + Potin = Material.builder(2037, gregtechId("potin")) .ingot() .liquid(new FluidBuilder().temperature(1084)) .color(0xc99781).iconSet(METALLIC) @@ -301,7 +301,7 @@ public static void register() { .fluidPipeProperties(1456, 40, true) .build(); - BorosilicateGlass = new Material.Builder(2038, gregtechId("borosilicate_glass")) + BorosilicateGlass = Material.builder(2038, gregtechId("borosilicate_glass")) .ingot(1) .liquid(new FluidBuilder().temperature(1921)) .color(0xE6F3E6).iconSet(SHINY) @@ -309,7 +309,7 @@ public static void register() { .components(Boron, 1, SiliconDioxide, 7) .build(); - Andesite = new Material.Builder(2039, gregtechId("andesite")) + Andesite = Material.builder(2039, gregtechId("andesite")) .dust() .color(0xBEBEBE).iconSet(ROUGH) .flags(DECOMPOSITION_BY_CENTRIFUGING) @@ -320,7 +320,7 @@ public static void register() { // FREE ID 2041 - NaquadahAlloy = new Material.Builder(2042, gregtechId("naquadah_alloy")) + NaquadahAlloy = Material.builder(2042, gregtechId("naquadah_alloy")) .ingot(5).fluid() .color(0x282828).iconSet(METALLIC) .flags(EXT2_METAL, GENERATE_SPRING, GENERATE_RING, GENERATE_ROTOR, GENERATE_SMALL_GEAR, @@ -336,47 +336,47 @@ public static void register() { .vacuumStats(VA[IV], 300)) .build(); - SulfuricNickelSolution = new Material.Builder(2043, gregtechId("sulfuric_nickel_solution")) + SulfuricNickelSolution = Material.builder(2043, gregtechId("sulfuric_nickel_solution")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0x3EB640) .components(Nickel, 1, Oxygen, 1, SulfuricAcid, 1) .build(); - SulfuricCopperSolution = new Material.Builder(2044, gregtechId("sulfuric_copper_solution")) + SulfuricCopperSolution = Material.builder(2044, gregtechId("sulfuric_copper_solution")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0x48A5C0) .components(Copper, 1, Oxygen, 1, SulfuricAcid, 1) .build(); - LeadZincSolution = new Material.Builder(2045, gregtechId("lead_zinc_solution")) + LeadZincSolution = Material.builder(2045, gregtechId("lead_zinc_solution")) .liquid(new FluidBuilder().customStill()) .color(0x3C0404) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(Lead, 1, Silver, 1, Zinc, 1, Sulfur, 3, Water, 1) .build(); - NitrationMixture = new Material.Builder(2046, gregtechId("nitration_mixture")) + NitrationMixture = Material.builder(2046, gregtechId("nitration_mixture")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0xE6E2AB) .flags(DISABLE_DECOMPOSITION) .components(NitricAcid, 1, SulfuricAcid, 1) .build(); - DilutedSulfuricAcid = new Material.Builder(2047, gregtechId("diluted_sulfuric_acid")) + DilutedSulfuricAcid = Material.builder(2047, gregtechId("diluted_sulfuric_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0xC07820) .flags(DISABLE_DECOMPOSITION) .components(SulfuricAcid, 2, Water, 1) .build(); - DilutedHydrochloricAcid = new Material.Builder(2048, gregtechId("diluted_hydrochloric_acid")) + DilutedHydrochloricAcid = Material.builder(2048, gregtechId("diluted_hydrochloric_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0x99A7A3) .flags(DISABLE_DECOMPOSITION) .components(HydrochloricAcid, 1, Water, 1) .build(); - Flint = new Material.Builder(2049, gregtechId("flint")) + Flint = Material.builder(2049, gregtechId("flint")) .gem(1) .color(0x002040).iconSet(FLINT) .flags(NO_SMASHING, MORTAR_GRINDABLE, DECOMPOSITION_BY_CENTRIFUGING) @@ -386,14 +386,14 @@ public static void register() { .enchantment(Enchantments.FIRE_ASPECT, 2).build()) .build(); - Air = new Material.Builder(2050, gregtechId("air")) + Air = Material.builder(2050, gregtechId("air")) .gas(new FluidBuilder().customStill()) .color(0xA9D0F5) .flags(DISABLE_DECOMPOSITION) .components(Nitrogen, 78, Oxygen, 21, Argon, 9) .build(); - LiquidAir = new Material.Builder(2051, gregtechId("liquid_air")) + LiquidAir = Material.builder(2051, gregtechId("liquid_air")) .liquid(new FluidBuilder() .temperature(79) .customStill()) @@ -402,14 +402,14 @@ public static void register() { .components(Nitrogen, 70, Oxygen, 22, CarbonDioxide, 5, Helium, 2, Argon, 1, Ice, 1) .build(); - NetherAir = new Material.Builder(2052, gregtechId("nether_air")) + NetherAir = Material.builder(2052, gregtechId("nether_air")) .gas() .color(0x4C3434) .flags(DISABLE_DECOMPOSITION) .components(CarbonMonoxide, 78, HydrogenSulfide, 21, Neon, 9) .build(); - LiquidNetherAir = new Material.Builder(2053, gregtechId("liquid_nether_air")) + LiquidNetherAir = Material.builder(2053, gregtechId("liquid_nether_air")) .liquid(new FluidBuilder().temperature(58)) .color(0x4C3434) .flags(DISABLE_DECOMPOSITION) @@ -417,14 +417,14 @@ public static void register() { 1, Ash, 1) .build(); - EnderAir = new Material.Builder(2054, gregtechId("ender_air")) + EnderAir = Material.builder(2054, gregtechId("ender_air")) .gas() .color(0x283454) .flags(DISABLE_DECOMPOSITION) .components(NitrogenDioxide, 78, Deuterium, 21, Xenon, 9) .build(); - LiquidEnderAir = new Material.Builder(2055, gregtechId("liquid_ender_air")) + LiquidEnderAir = Material.builder(2055, gregtechId("liquid_ender_air")) .liquid(new FluidBuilder().temperature(36)) .color(0x283454) .flags(DISABLE_DECOMPOSITION) @@ -432,49 +432,49 @@ public static void register() { 1, EnderPearl, 1) .build(); - AquaRegia = new Material.Builder(2056, gregtechId("aqua_regia")) + AquaRegia = Material.builder(2056, gregtechId("aqua_regia")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0xFFB132) .flags(DISABLE_DECOMPOSITION) .components(NitricAcid, 1, HydrochloricAcid, 2) .build(); - PlatinumSludgeResidue = new Material.Builder(2057, gregtechId("platinum_sludge_residue")) + PlatinumSludgeResidue = Material.builder(2057, gregtechId("platinum_sludge_residue")) .dust() .color(0x827951) .flags(DECOMPOSITION_BY_CENTRIFUGING) .components(SiliconDioxide, 2, Gold, 3) .build(); - PalladiumRaw = new Material.Builder(2058, gregtechId("palladium_raw")) + PalladiumRaw = Material.builder(2058, gregtechId("palladium_raw")) .dust() .color(Palladium.getMaterialRGB()).iconSet(METALLIC) .flags(DISABLE_DECOMPOSITION) .components(Palladium, 1, Ammonia, 1) .build(); - RarestMetalMixture = new Material.Builder(2059, gregtechId("rarest_metal_mixture")) + RarestMetalMixture = Material.builder(2059, gregtechId("rarest_metal_mixture")) .dust() .color(0x832E11).iconSet(SHINY) .flags(DISABLE_DECOMPOSITION) .components(Iridium, 1, Osmium, 1, Oxygen, 4, Water, 1) .build(); - AmmoniumChloride = new Material.Builder(2060, gregtechId("ammonium_chloride")) + AmmoniumChloride = Material.builder(2060, gregtechId("ammonium_chloride")) .dust() .color(0x9711A6) .components(Ammonia, 1, HydrochloricAcid, 1) .build() .setFormula("NH4Cl", true); - AcidicOsmiumSolution = new Material.Builder(2061, gregtechId("acidic_osmium_solution")) + AcidicOsmiumSolution = Material.builder(2061, gregtechId("acidic_osmium_solution")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0xA3AA8A) .flags(DISABLE_DECOMPOSITION) .components(Osmium, 1, Oxygen, 4, Water, 1, HydrochloricAcid, 1) .build(); - RhodiumPlatedPalladium = new Material.Builder(2062, gregtechId("rhodium_plated_palladium")) + RhodiumPlatedPalladium = Material.builder(2062, gregtechId("rhodium_plated_palladium")) .ingot().fluid() .color(0xDAC5C5).iconSet(SHINY) .flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_DENSE, GENERATE_SMALL_GEAR, GENERATE_DOUBLE_PLATE) @@ -486,14 +486,14 @@ public static void register() { .vacuumStats(VA[EV], 300)) .build(); - Clay = new Material.Builder(2063, gregtechId("clay")) + Clay = Material.builder(2063, gregtechId("clay")) .dust(1) .color(0xC8C8DC).iconSet(ROUGH) .flags(MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES) .components(Sodium, 2, Lithium, 1, Aluminium, 2, Silicon, 2, Water, 6) .build(); - Redstone = new Material.Builder(2064, gregtechId("redstone")) + Redstone = Material.builder(2064, gregtechId("redstone")) .dust().ore(5, 1, true) .liquid(new FluidBuilder().temperature(500)) .color(0xC80000).iconSet(ROUGH) diff --git a/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java b/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java index e4b76816d63..76aeb69d3e7 100644 --- a/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/UnknownCompositionMaterials.java @@ -16,85 +16,85 @@ public class UnknownCompositionMaterials { public static void register() { - WoodGas = new Material.Builder(1500, gregtechId("wood_gas")) + WoodGas = Material.builder(1500, gregtechId("wood_gas")) .gas().color(0xDECD87).build(); - WoodVinegar = new Material.Builder(1501, gregtechId("wood_vinegar")) + WoodVinegar = Material.builder(1501, gregtechId("wood_vinegar")) .fluid().color(0xD45500).build(); - WoodTar = new Material.Builder(1502, gregtechId("wood_tar")) + WoodTar = Material.builder(1502, gregtechId("wood_tar")) .fluid().color(0x28170B) .flags(STICKY, FLAMMABLE).build(); - CharcoalByproducts = new Material.Builder(1503, gregtechId("charcoal_byproducts")) + CharcoalByproducts = Material.builder(1503, gregtechId("charcoal_byproducts")) .fluid().color(0x784421).build(); - Biomass = new Material.Builder(1504, gregtechId("biomass")) + Biomass = Material.builder(1504, gregtechId("biomass")) .liquid(new FluidBuilder().customStill()) .color(0x14CC04).build(); - BioDiesel = new Material.Builder(1505, gregtechId("bio_diesel")) + BioDiesel = Material.builder(1505, gregtechId("bio_diesel")) .fluid().color(0xFF8000) .flags(FLAMMABLE, EXPLOSIVE).build(); - FermentedBiomass = new Material.Builder(1506, gregtechId("fermented_biomass")) + FermentedBiomass = Material.builder(1506, gregtechId("fermented_biomass")) .liquid(new FluidBuilder().temperature(300)) .color(0x445500) .build(); - Creosote = new Material.Builder(1507, gregtechId("creosote")) + Creosote = Material.builder(1507, gregtechId("creosote")) .liquid(new FluidBuilder().customStill()) .color(0x804000) .flags(STICKY).build(); - Diesel = new Material.Builder(1508, gregtechId("diesel")) + Diesel = Material.builder(1508, gregtechId("diesel")) .liquid(new FluidBuilder().customStill().alternativeName("fuel")) .color(0xFCF404) .flags(FLAMMABLE, EXPLOSIVE).build(); - RocketFuel = new Material.Builder(1509, gregtechId("rocket_fuel")) + RocketFuel = Material.builder(1509, gregtechId("rocket_fuel")) .fluid().flags(FLAMMABLE, EXPLOSIVE).color(0xBDB78C).build(); - Glue = new Material.Builder(1510, gregtechId("glue")) + Glue = Material.builder(1510, gregtechId("glue")) .liquid(new FluidBuilder().customStill()) .color(0xFCCC8C).flags(STICKY).build(); - Lubricant = new Material.Builder(1511, gregtechId("lubricant")) + Lubricant = Material.builder(1511, gregtechId("lubricant")) .liquid(new FluidBuilder().customStill()) .color(0xFEEDAF).build(); - McGuffium239 = new Material.Builder(1512, gregtechId("mc_guffium_239")) + McGuffium239 = Material.builder(1512, gregtechId("mc_guffium_239")) .liquid(new FluidBuilder().customStill()) .color(0xFC04FC).build(); - IndiumConcentrate = new Material.Builder(1513, gregtechId("indium_concentrate")) + IndiumConcentrate = Material.builder(1513, gregtechId("indium_concentrate")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0x0E2950).build(); - SeedOil = new Material.Builder(1514, gregtechId("seed_oil")) + SeedOil = Material.builder(1514, gregtechId("seed_oil")) .liquid(new FluidBuilder().customStill().alternativeName("seed.oil")) .color(0xE4FC8C) .flags(STICKY, FLAMMABLE).build(); - DrillingFluid = new Material.Builder(1515, gregtechId("drilling_fluid")) + DrillingFluid = Material.builder(1515, gregtechId("drilling_fluid")) .fluid().color(0xFFFFAA).build(); - ConstructionFoam = new Material.Builder(1516, gregtechId("construction_foam")) + ConstructionFoam = Material.builder(1516, gregtechId("construction_foam")) .fluid().color(0x808080).build(); // Free IDs 1517-1521 - SulfuricHeavyFuel = new Material.Builder(1522, gregtechId("sulfuric_heavy_fuel")) + SulfuricHeavyFuel = Material.builder(1522, gregtechId("sulfuric_heavy_fuel")) .liquid(new FluidBuilder().customStill()) .color(0xFCEC94) .flags(FLAMMABLE).build(); - HeavyFuel = new Material.Builder(1523, gregtechId("heavy_fuel")) + HeavyFuel = Material.builder(1523, gregtechId("heavy_fuel")) .liquid(new FluidBuilder().customStill()) .color(0xFCECAC) .flags(FLAMMABLE).build(); - LightlyHydroCrackedHeavyFuel = new Material.Builder(1524, gregtechId("lightly_hydrocracked_heavy_fuel")) + LightlyHydroCrackedHeavyFuel = Material.builder(1524, gregtechId("lightly_hydrocracked_heavy_fuel")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -102,7 +102,7 @@ public static void register() { .flags(FLAMMABLE) .build(); - SeverelyHydroCrackedHeavyFuel = new Material.Builder(1525, gregtechId("severely_hydrocracked_heavy_fuel")) + SeverelyHydroCrackedHeavyFuel = Material.builder(1525, gregtechId("severely_hydrocracked_heavy_fuel")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -110,7 +110,7 @@ public static void register() { .flags(FLAMMABLE) .build(); - LightlySteamCrackedHeavyFuel = new Material.Builder(1526, gregtechId("lightly_steamcracked_heavy_fuel")) + LightlySteamCrackedHeavyFuel = Material.builder(1526, gregtechId("lightly_steamcracked_heavy_fuel")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -118,7 +118,7 @@ public static void register() { .flags(FLAMMABLE) .build(); - SeverelySteamCrackedHeavyFuel = new Material.Builder(1527, gregtechId("severely_steamcracked_heavy_fuel")) + SeverelySteamCrackedHeavyFuel = Material.builder(1527, gregtechId("severely_steamcracked_heavy_fuel")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -126,19 +126,19 @@ public static void register() { .flags(FLAMMABLE) .build(); - SulfuricLightFuel = new Material.Builder(1528, gregtechId("sulfuric_light_fuel")) + SulfuricLightFuel = Material.builder(1528, gregtechId("sulfuric_light_fuel")) .liquid(new FluidBuilder() .temperature(775) .customStill()) .color(0xFCCC04) .flags(FLAMMABLE).build(); - LightFuel = new Material.Builder(1529, gregtechId("light_fuel")) + LightFuel = Material.builder(1529, gregtechId("light_fuel")) .liquid(new FluidBuilder().customStill()) .color(0xFCF404) .flags(FLAMMABLE).build(); - LightlyHydroCrackedLightFuel = new Material.Builder(1530, gregtechId("lightly_hydrocracked_light_fuel")) + LightlyHydroCrackedLightFuel = Material.builder(1530, gregtechId("lightly_hydrocracked_light_fuel")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -146,7 +146,7 @@ public static void register() { .flags(FLAMMABLE) .build(); - SeverelyHydroCrackedLightFuel = new Material.Builder(1531, gregtechId("severely_hydrocracked_light_fuel")) + SeverelyHydroCrackedLightFuel = Material.builder(1531, gregtechId("severely_hydrocracked_light_fuel")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -154,7 +154,7 @@ public static void register() { .flags(FLAMMABLE) .build(); - LightlySteamCrackedLightFuel = new Material.Builder(1532, gregtechId("lightly_steamcracked_light_fuel")) + LightlySteamCrackedLightFuel = Material.builder(1532, gregtechId("lightly_steamcracked_light_fuel")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -162,7 +162,7 @@ public static void register() { .flags(FLAMMABLE) .build(); - SeverelySteamCrackedLightFuel = new Material.Builder(1533, gregtechId("severely_steamcracked_light_fuel")) + SeverelySteamCrackedLightFuel = Material.builder(1533, gregtechId("severely_steamcracked_light_fuel")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -170,19 +170,19 @@ public static void register() { .flags(FLAMMABLE) .build(); - SulfuricNaphtha = new Material.Builder(1534, gregtechId("sulfuric_naphtha")) + SulfuricNaphtha = Material.builder(1534, gregtechId("sulfuric_naphtha")) .liquid(new FluidBuilder().customStill()) .color(0xFCF404) .flags(FLAMMABLE) .build(); - Naphtha = new Material.Builder(1535, gregtechId("naphtha")) + Naphtha = Material.builder(1535, gregtechId("naphtha")) .liquid(new FluidBuilder().customStill()) .color(0xFFF404) .flags(FLAMMABLE) .build(); - LightlyHydroCrackedNaphtha = new Material.Builder(1536, gregtechId("lightly_hydrocracked_naphtha")) + LightlyHydroCrackedNaphtha = Material.builder(1536, gregtechId("lightly_hydrocracked_naphtha")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -190,7 +190,7 @@ public static void register() { .flags(FLAMMABLE) .build(); - SeverelyHydroCrackedNaphtha = new Material.Builder(1537, gregtechId("severely_hydrocracked_naphtha")) + SeverelyHydroCrackedNaphtha = Material.builder(1537, gregtechId("severely_hydrocracked_naphtha")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -198,7 +198,7 @@ public static void register() { .flags(FLAMMABLE) .build(); - LightlySteamCrackedNaphtha = new Material.Builder(1538, gregtechId("lightly_steamcracked_naphtha")) + LightlySteamCrackedNaphtha = Material.builder(1538, gregtechId("lightly_steamcracked_naphtha")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -206,7 +206,7 @@ public static void register() { .flags(FLAMMABLE) .build(); - SeverelySteamCrackedNaphtha = new Material.Builder(1539, gregtechId("severely_steamcracked_naphtha")) + SeverelySteamCrackedNaphtha = Material.builder(1539, gregtechId("severely_steamcracked_naphtha")) .liquid(new FluidBuilder() .temperature(775) .customStill()) @@ -214,118 +214,118 @@ public static void register() { .flags(FLAMMABLE) .build(); - SulfuricGas = new Material.Builder(1540, gregtechId("sulfuric_gas")) + SulfuricGas = Material.builder(1540, gregtechId("sulfuric_gas")) .gas(new FluidBuilder().customStill()) .color(0xECDCCC).build(); - RefineryGas = new Material.Builder(1541, gregtechId("refinery_gas")) + RefineryGas = Material.builder(1541, gregtechId("refinery_gas")) .gas(new FluidBuilder().customStill()) .color(0xB4B4B4) .flags(FLAMMABLE).build(); - LightlyHydroCrackedGas = new Material.Builder(1542, gregtechId("lightly_hydrocracked_gas")) + LightlyHydroCrackedGas = Material.builder(1542, gregtechId("lightly_hydrocracked_gas")) .gas(new FluidBuilder().temperature(775)) .color(0xA0A0A0) .flags(FLAMMABLE) .build(); - SeverelyHydroCrackedGas = new Material.Builder(1543, gregtechId("severely_hydrocracked_gas")) + SeverelyHydroCrackedGas = Material.builder(1543, gregtechId("severely_hydrocracked_gas")) .gas(new FluidBuilder().temperature(775)) .color(0x919191) .flags(FLAMMABLE) .build(); - LightlySteamCrackedGas = new Material.Builder(1544, gregtechId("lightly_steamcracked_gas")) + LightlySteamCrackedGas = Material.builder(1544, gregtechId("lightly_steamcracked_gas")) .gas(new FluidBuilder().temperature(775)) .color(0xC8C8C8) .flags(FLAMMABLE) .build(); - SeverelySteamCrackedGas = new Material.Builder(1545, gregtechId("severely_steamcracked_gas")) + SeverelySteamCrackedGas = Material.builder(1545, gregtechId("severely_steamcracked_gas")) .gas(new FluidBuilder().temperature(775)) .color(0xE0E0E0) .flags(FLAMMABLE) .build(); - HydroCrackedEthane = new Material.Builder(1546, gregtechId("hydrocracked_ethane")) + HydroCrackedEthane = Material.builder(1546, gregtechId("hydrocracked_ethane")) .gas(new FluidBuilder().temperature(775)) .color(0x9696BC) .flags(FLAMMABLE) .build(); - HydroCrackedEthylene = new Material.Builder(1547, gregtechId("hydrocracked_ethylene")) + HydroCrackedEthylene = Material.builder(1547, gregtechId("hydrocracked_ethylene")) .gas(new FluidBuilder().temperature(775)) .color(0xA3A3A0) .flags(FLAMMABLE) .build(); - HydroCrackedPropene = new Material.Builder(1548, gregtechId("hydrocracked_propene")) + HydroCrackedPropene = Material.builder(1548, gregtechId("hydrocracked_propene")) .gas(new FluidBuilder().temperature(775)) .color(0xBEA540) .flags(FLAMMABLE) .build(); - HydroCrackedPropane = new Material.Builder(1549, gregtechId("hydrocracked_propane")) + HydroCrackedPropane = Material.builder(1549, gregtechId("hydrocracked_propane")) .gas(new FluidBuilder().temperature(775)) .color(0xBEA540) .flags(FLAMMABLE) .build(); - HydroCrackedButane = new Material.Builder(1550, gregtechId("hydrocracked_butane")) + HydroCrackedButane = Material.builder(1550, gregtechId("hydrocracked_butane")) .gas(new FluidBuilder().temperature(775)) .color(0x852C18) .flags(FLAMMABLE) .build(); - HydroCrackedButene = new Material.Builder(1551, gregtechId("hydrocracked_butene")) + HydroCrackedButene = Material.builder(1551, gregtechId("hydrocracked_butene")) .gas(new FluidBuilder().temperature(775)) .color(0x993E05) .flags(FLAMMABLE) .build(); - HydroCrackedButadiene = new Material.Builder(1552, gregtechId("hydrocracked_butadiene")) + HydroCrackedButadiene = Material.builder(1552, gregtechId("hydrocracked_butadiene")) .gas(new FluidBuilder().temperature(775)) .color(0xAD5203) .flags(FLAMMABLE) .build(); - SteamCrackedEthane = new Material.Builder(1553, gregtechId("steamcracked_ethane")) + SteamCrackedEthane = Material.builder(1553, gregtechId("steamcracked_ethane")) .gas(new FluidBuilder().temperature(775)) .color(0x9696BC) .flags(FLAMMABLE) .build(); - SteamCrackedEthylene = new Material.Builder(1554, gregtechId("steamcracked_ethylene")) + SteamCrackedEthylene = Material.builder(1554, gregtechId("steamcracked_ethylene")) .gas(new FluidBuilder().temperature(775)) .color(0xA3A3A0) .flags(FLAMMABLE) .build(); - SteamCrackedPropene = new Material.Builder(1555, gregtechId("steamcracked_propene")) + SteamCrackedPropene = Material.builder(1555, gregtechId("steamcracked_propene")) .gas(new FluidBuilder().temperature(775)) .color(0xBEA540) .flags(FLAMMABLE) .build(); - SteamCrackedPropane = new Material.Builder(1556, gregtechId("steamcracked_propane")) + SteamCrackedPropane = Material.builder(1556, gregtechId("steamcracked_propane")) .gas(new FluidBuilder().temperature(775)) .color(0xBEA540) .flags(FLAMMABLE) .build(); - SteamCrackedButane = new Material.Builder(1557, gregtechId("steamcracked_butane")) + SteamCrackedButane = Material.builder(1557, gregtechId("steamcracked_butane")) .gas(new FluidBuilder().temperature(775)) .color(0x852C18) .flags(FLAMMABLE) .build(); - SteamCrackedButene = new Material.Builder(1558, gregtechId("steamcracked_butene")) + SteamCrackedButene = Material.builder(1558, gregtechId("steamcracked_butene")) .gas(new FluidBuilder().temperature(775)) .color(0x993E05) .flags(FLAMMABLE) .build(); - SteamCrackedButadiene = new Material.Builder(1559, gregtechId("steamcracked_butadiene")) + SteamCrackedButadiene = Material.builder(1559, gregtechId("steamcracked_butadiene")) .gas(new FluidBuilder().temperature(775)) .color(0xAD5203) .flags(FLAMMABLE) @@ -333,110 +333,110 @@ public static void register() { // Free IDs 1560-1575 - LPG = new Material.Builder(1576, gregtechId("lpg")) + LPG = Material.builder(1576, gregtechId("lpg")) .liquid(new FluidBuilder().customStill()) .color(0xFCFCAC) .flags(FLAMMABLE, EXPLOSIVE).build(); - RawGrowthMedium = new Material.Builder(1577, gregtechId("raw_growth_medium")) + RawGrowthMedium = Material.builder(1577, gregtechId("raw_growth_medium")) .fluid().color(0xA47351).build(); - SterileGrowthMedium = new Material.Builder(1578, gregtechId("sterilized_growth_medium")) + SterileGrowthMedium = Material.builder(1578, gregtechId("sterilized_growth_medium")) .fluid().color(0xAC876E).build(); - Oil = new Material.Builder(1579, gregtechId("oil")) + Oil = Material.builder(1579, gregtechId("oil")) .liquid(new FluidBuilder().block().customStill()) .color(0x0A0A0A) .flags(STICKY, FLAMMABLE) .build(); - OilHeavy = new Material.Builder(1580, gregtechId("oil_heavy")) + OilHeavy = Material.builder(1580, gregtechId("oil_heavy")) .liquid(new FluidBuilder().block().customStill()) .color(0x0A0A0A) .flags(STICKY, FLAMMABLE) .build(); - RawOil = new Material.Builder(1581, gregtechId("oil_medium")) + RawOil = Material.builder(1581, gregtechId("oil_medium")) .liquid(new FluidBuilder().block().customStill()) .color(0x0A0A0A) .flags(STICKY, FLAMMABLE) .build(); - OilLight = new Material.Builder(1582, gregtechId("oil_light")) + OilLight = Material.builder(1582, gregtechId("oil_light")) .liquid(new FluidBuilder().block().customStill()) .color(0x0A0A0A) .flags(STICKY, FLAMMABLE) .build(); - NaturalGas = new Material.Builder(1583, gregtechId("natural_gas")) + NaturalGas = Material.builder(1583, gregtechId("natural_gas")) .gas(new FluidBuilder().block().customStill()) .color(0xDCDCDC) .flags(FLAMMABLE, EXPLOSIVE).build(); - Bacteria = new Material.Builder(1584, gregtechId("bacteria")) + Bacteria = Material.builder(1584, gregtechId("bacteria")) .fluid().color(0x808000).build(); - BacterialSludge = new Material.Builder(1585, gregtechId("bacterial_sludge")) + BacterialSludge = Material.builder(1585, gregtechId("bacterial_sludge")) .fluid().color(0x355E3B).build(); - EnrichedBacterialSludge = new Material.Builder(1586, gregtechId("enriched_bacterial_sludge")) + EnrichedBacterialSludge = Material.builder(1586, gregtechId("enriched_bacterial_sludge")) .fluid().color(0x7FFF00).build(); // free id: 1587 - Mutagen = new Material.Builder(1588, gregtechId("mutagen")) + Mutagen = Material.builder(1588, gregtechId("mutagen")) .fluid().color(0x00FF7F).build(); - GelatinMixture = new Material.Builder(1589, gregtechId("gelatin_mixture")) + GelatinMixture = Material.builder(1589, gregtechId("gelatin_mixture")) .fluid().color(0x588BAE).build(); - RawGasoline = new Material.Builder(1590, gregtechId("raw_gasoline")) + RawGasoline = Material.builder(1590, gregtechId("raw_gasoline")) .fluid().color(0xFF6400).flags(FLAMMABLE).build(); - Gasoline = new Material.Builder(1591, gregtechId("gasoline")) + Gasoline = Material.builder(1591, gregtechId("gasoline")) .fluid().color(0xFAA500).flags(FLAMMABLE, EXPLOSIVE).build(); - HighOctaneGasoline = new Material.Builder(1592, gregtechId("gasoline_premium")) + HighOctaneGasoline = Material.builder(1592, gregtechId("gasoline_premium")) .fluid().color(0xFFA500).flags(FLAMMABLE, EXPLOSIVE).build(); // free id: 1593 - CoalGas = new Material.Builder(1594, gregtechId("coal_gas")) + CoalGas = Material.builder(1594, gregtechId("coal_gas")) .gas().color(0x333333).build(); - CoalTar = new Material.Builder(1595, gregtechId("coal_tar")) + CoalTar = Material.builder(1595, gregtechId("coal_tar")) .fluid().color(0x1A1A1A).flags(STICKY, FLAMMABLE).build(); - Gunpowder = new Material.Builder(1596, gregtechId("gunpowder")) + Gunpowder = Material.builder(1596, gregtechId("gunpowder")) .dust(0) .color(0x808080).iconSet(ROUGH) .flags(FLAMMABLE, EXPLOSIVE, NO_SMELTING, NO_SMASHING) .build(); - Oilsands = new Material.Builder(1597, gregtechId("oilsands")) + Oilsands = Material.builder(1597, gregtechId("oilsands")) .dust(1).ore() .color(0x0A0A0A).iconSet(SAND) .flags(FLAMMABLE) .build(); - RareEarth = new Material.Builder(1598, gregtechId("rare_earth")) + RareEarth = Material.builder(1598, gregtechId("rare_earth")) .dust(0) .color(0x808064).iconSet(FINE) .build(); - Stone = new Material.Builder(1599, gregtechId("stone")) + Stone = Material.builder(1599, gregtechId("stone")) .dust(2) .color(0xCDCDCD).iconSet(ROUGH) .flags(MORTAR_GRINDABLE, GENERATE_GEAR, NO_SMASHING, NO_SMELTING) .build(); - Lava = new Material.Builder(1600, gregtechId("lava")) + Lava = Material.builder(1600, gregtechId("lava")) .fluid(FluidRegistry.LAVA, FluidStorageKeys.LIQUID, FluidState.LIQUID) .color(0xFF4000) .flags(GLOWING) .build(); - Glowstone = new Material.Builder(1601, gregtechId("glowstone")) + Glowstone = Material.builder(1601, gregtechId("glowstone")) .dust(1) .liquid(new FluidBuilder().temperature(500)) .color(0xFFFF00).iconSet(SHINY) @@ -444,41 +444,41 @@ public static void register() { EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, GLOWING) .build(); - NetherStar = new Material.Builder(1602, gregtechId("nether_star")) + NetherStar = Material.builder(1602, gregtechId("nether_star")) .gem(4) .iconSet(NETHERSTAR) .flags(NO_SMASHING, NO_SMELTING, GENERATE_LENS) .build(); - Endstone = new Material.Builder(1603, gregtechId("endstone")) + Endstone = Material.builder(1603, gregtechId("endstone")) .dust(1) .color(0xD9DE9E) .flags(NO_SMASHING) .build(); - Netherrack = new Material.Builder(1604, gregtechId("netherrack")) + Netherrack = Material.builder(1604, gregtechId("netherrack")) .dust(1) .color(0xC80000) .flags(NO_SMASHING, FLAMMABLE) .build(); - CetaneBoostedDiesel = new Material.Builder(1605, gregtechId("nitro_fuel")) + CetaneBoostedDiesel = Material.builder(1605, gregtechId("nitro_fuel")) .liquid(new FluidBuilder().customStill()) .color(0xC8FF00) .flags(FLAMMABLE, EXPLOSIVE) .build(); - Collagen = new Material.Builder(1606, gregtechId("collagen")) + Collagen = Material.builder(1606, gregtechId("collagen")) .dust(1) .color(0x80471C).iconSet(ROUGH) .build(); - Gelatin = new Material.Builder(1607, gregtechId("gelatin")) + Gelatin = Material.builder(1607, gregtechId("gelatin")) .dust(1) .color(0x588BAE).iconSet(ROUGH) .build(); - Agar = new Material.Builder(1608, gregtechId("agar")) + Agar = Material.builder(1608, gregtechId("agar")) .dust(1) .color(0x4F7942).iconSet(ROUGH) .build(); @@ -491,29 +491,29 @@ public static void register() { // Free ID 1612 - Milk = new Material.Builder(1613, gregtechId("milk")) + Milk = Material.builder(1613, gregtechId("milk")) .liquid(new FluidBuilder() .temperature(295) .customStill()) .color(0xFEFEFE).iconSet(FINE) .build(); - Cocoa = new Material.Builder(1614, gregtechId("cocoa")) + Cocoa = Material.builder(1614, gregtechId("cocoa")) .dust(0) .color(0x643200).iconSet(FINE) .build(); - Wheat = new Material.Builder(1615, gregtechId("wheat")) + Wheat = Material.builder(1615, gregtechId("wheat")) .dust(0) .color(0xFFFFC4).iconSet(FINE) .build(); - Meat = new Material.Builder(1616, gregtechId("meat")) + Meat = Material.builder(1616, gregtechId("meat")) .dust(1) .color(0xC14C4C).iconSet(SAND) .build(); - Wood = new Material.Builder(1617, gregtechId("wood")) + Wood = Material.builder(1617, gregtechId("wood")) .wood() .color(0x896727).iconSet(WOOD) .flags(GENERATE_PLATE, GENERATE_ROD, GENERATE_BOLT_SCREW, GENERATE_LONG_ROD, GENERATE_GEAR, @@ -521,139 +521,139 @@ public static void register() { .fluidPipeProperties(340, 5, false) .build(); - Paper = new Material.Builder(1618, gregtechId("paper")) + Paper = Material.builder(1618, gregtechId("paper")) .dust(0) .color(0xFAFAFA).iconSet(FINE) .flags(GENERATE_PLATE, FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE, EXCLUDE_PLATE_COMPRESSOR_RECIPE) .build(); - FishOil = new Material.Builder(1619, gregtechId("fish_oil")) + FishOil = Material.builder(1619, gregtechId("fish_oil")) .fluid() .color(0xDCC15D) .flags(STICKY, FLAMMABLE) .build(); - RubySlurry = new Material.Builder(1620, gregtechId("ruby_slurry")) + RubySlurry = Material.builder(1620, gregtechId("ruby_slurry")) .fluid().color(0xff6464).build(); - SapphireSlurry = new Material.Builder(1621, gregtechId("sapphire_slurry")) + SapphireSlurry = Material.builder(1621, gregtechId("sapphire_slurry")) .fluid().color(0x6464c8).build(); - GreenSapphireSlurry = new Material.Builder(1622, gregtechId("green_sapphire_slurry")) + GreenSapphireSlurry = Material.builder(1622, gregtechId("green_sapphire_slurry")) .fluid().color(0x64c882).build(); // These colors are much nicer looking than those in MC's EnumDyeColor - DyeBlack = new Material.Builder(1623, gregtechId("dye_black")) + DyeBlack = Material.builder(1623, gregtechId("dye_black")) .fluid().color(0x202020).build(); - DyeRed = new Material.Builder(1624, gregtechId("dye_red")) + DyeRed = Material.builder(1624, gregtechId("dye_red")) .fluid().color(0xFF0000).build(); - DyeGreen = new Material.Builder(1625, gregtechId("dye_green")) + DyeGreen = Material.builder(1625, gregtechId("dye_green")) .fluid().color(0x00FF00).build(); - DyeBrown = new Material.Builder(1626, gregtechId("dye_brown")) + DyeBrown = Material.builder(1626, gregtechId("dye_brown")) .fluid().color(0x604000).build(); - DyeBlue = new Material.Builder(1627, gregtechId("dye_blue")) + DyeBlue = Material.builder(1627, gregtechId("dye_blue")) .fluid().color(0x0020FF).build(); - DyePurple = new Material.Builder(1628, gregtechId("dye_purple")) + DyePurple = Material.builder(1628, gregtechId("dye_purple")) .fluid().color(0x800080).build(); - DyeCyan = new Material.Builder(1629, gregtechId("dye_cyan")) + DyeCyan = Material.builder(1629, gregtechId("dye_cyan")) .fluid().color(0x00FFFF).build(); - DyeLightGray = new Material.Builder(1630, gregtechId("dye_light_gray")) + DyeLightGray = Material.builder(1630, gregtechId("dye_light_gray")) .fluid().color(0xC0C0C0).build(); - DyeGray = new Material.Builder(1631, gregtechId("dye_gray")) + DyeGray = Material.builder(1631, gregtechId("dye_gray")) .fluid().color(0x808080).build(); - DyePink = new Material.Builder(1632, gregtechId("dye_pink")) + DyePink = Material.builder(1632, gregtechId("dye_pink")) .fluid().color(0xFFC0C0).build(); - DyeLime = new Material.Builder(1633, gregtechId("dye_lime")) + DyeLime = Material.builder(1633, gregtechId("dye_lime")) .fluid().color(0x80FF80).build(); - DyeYellow = new Material.Builder(1634, gregtechId("dye_yellow")) + DyeYellow = Material.builder(1634, gregtechId("dye_yellow")) .fluid().color(0xFFFF00).build(); - DyeLightBlue = new Material.Builder(1635, gregtechId("dye_light_blue")) + DyeLightBlue = Material.builder(1635, gregtechId("dye_light_blue")) .fluid().color(0x6080FF).build(); - DyeMagenta = new Material.Builder(1636, gregtechId("dye_magenta")) + DyeMagenta = Material.builder(1636, gregtechId("dye_magenta")) .fluid().color(0xFF00FF).build(); - DyeOrange = new Material.Builder(1637, gregtechId("dye_orange")) + DyeOrange = Material.builder(1637, gregtechId("dye_orange")) .fluid().color(0xFF8000).build(); - DyeWhite = new Material.Builder(1638, gregtechId("dye_white")) + DyeWhite = Material.builder(1638, gregtechId("dye_white")) .fluid().color(0xFFFFFF).build(); - ImpureEnrichedNaquadahSolution = new Material.Builder(1639, gregtechId("impure_enriched_naquadah_solution")) + ImpureEnrichedNaquadahSolution = Material.builder(1639, gregtechId("impure_enriched_naquadah_solution")) .fluid().color(0x388438).build(); - EnrichedNaquadahSolution = new Material.Builder(1640, gregtechId("enriched_naquadah_solution")) + EnrichedNaquadahSolution = Material.builder(1640, gregtechId("enriched_naquadah_solution")) .fluid().color(0x3AAD3A).build(); - AcidicEnrichedNaquadahSolution = new Material.Builder(1641, gregtechId("acidic_enriched_naquadah_solution")) + AcidicEnrichedNaquadahSolution = Material.builder(1641, gregtechId("acidic_enriched_naquadah_solution")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0x3DD63D).build(); - EnrichedNaquadahWaste = new Material.Builder(1642, gregtechId("enriched_naquadah_waste")) + EnrichedNaquadahWaste = Material.builder(1642, gregtechId("enriched_naquadah_waste")) .fluid().color(0x355B35).build(); - ImpureNaquadriaSolution = new Material.Builder(1643, gregtechId("impure_naquadria_solution")) + ImpureNaquadriaSolution = Material.builder(1643, gregtechId("impure_naquadria_solution")) .fluid().color(0x518451).build(); - NaquadriaSolution = new Material.Builder(1644, gregtechId("naquadria_solution")) + NaquadriaSolution = Material.builder(1644, gregtechId("naquadria_solution")) .fluid().color(0x61AD61).build(); - AcidicNaquadriaSolution = new Material.Builder(1645, gregtechId("acidic_naquadria_solution")) + AcidicNaquadriaSolution = Material.builder(1645, gregtechId("acidic_naquadria_solution")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0x70D670).build(); - NaquadriaWaste = new Material.Builder(1646, gregtechId("naquadria_waste")) + NaquadriaWaste = Material.builder(1646, gregtechId("naquadria_waste")) .fluid().color(0x425B42).build(); - Lapotron = new Material.Builder(1647, gregtechId("lapotron")) + Lapotron = Material.builder(1647, gregtechId("lapotron")) .gem() .color(0x2C39B1).iconSet(DIAMOND) .flags(NO_UNIFICATION) .build(); - TreatedWood = new Material.Builder(1648, gregtechId("treated_wood")) + TreatedWood = Material.builder(1648, gregtechId("treated_wood")) .wood() .color(0x674A28).iconSet(WOOD) .flags(GENERATE_PLATE, GENERATE_ROD, GENERATE_FRAME) .fluidPipeProperties(340, 10, false) .build(); - UUMatter = new Material.Builder(1649, gregtechId("uu_matter")) + UUMatter = Material.builder(1649, gregtechId("uu_matter")) .liquid(new FluidBuilder() .temperature(300) .customStill()) .color(0x36042C) .build(); - PCBCoolant = new Material.Builder(1650, gregtechId("pcb_coolant")) + PCBCoolant = Material.builder(1650, gregtechId("pcb_coolant")) .fluid().color(0xD5D69C).build(); - BauxiteSlurry = new Material.Builder(1651, gregtechId("bauxite_slurry")) + BauxiteSlurry = Material.builder(1651, gregtechId("bauxite_slurry")) .fluid().color(0x051650).build(); - CrackedBauxiteSlurry = new Material.Builder(1652, gregtechId("cracked_bauxite_slurry")) + CrackedBauxiteSlurry = Material.builder(1652, gregtechId("cracked_bauxite_slurry")) .liquid(new FluidBuilder().temperature(775)).color(0x052C50).build(); - BauxiteSludge = new Material.Builder(1653, gregtechId("bauxite_sludge")) + BauxiteSludge = Material.builder(1653, gregtechId("bauxite_sludge")) .fluid().color(0x563D2D).build(); - DecalcifiedBauxiteSludge = new Material.Builder(1654, gregtechId("decalcified_bauxite_sludge")) + DecalcifiedBauxiteSludge = Material.builder(1654, gregtechId("decalcified_bauxite_sludge")) .fluid().color(0x6F2DA8).build(); - BauxiteSlag = new Material.Builder(1655, gregtechId("bauxite_slag")) + BauxiteSlag = Material.builder(1655, gregtechId("bauxite_slag")) .dust(1) .color(0x0C0550).iconSet(SAND) .build(); diff --git a/src/main/java/gregtech/integration/crafttweaker/material/CTMaterialBuilder.java b/src/main/java/gregtech/integration/crafttweaker/material/CTMaterialBuilder.java index 17dcb2ec6ba..7799aa6f204 100644 --- a/src/main/java/gregtech/integration/crafttweaker/material/CTMaterialBuilder.java +++ b/src/main/java/gregtech/integration/crafttweaker/material/CTMaterialBuilder.java @@ -38,7 +38,7 @@ public class CTMaterialBuilder { @ZenConstructor public CTMaterialBuilder(int id, String name) { - this.backingBuilder = new Material.Builder(id, GTUtility.gregtechId(name)); + this.backingBuilder = Material.builder(id, GTUtility.gregtechId(name)); } @ZenConstructor diff --git a/src/main/java/gregtech/integration/groovy/GroovyExpansions.java b/src/main/java/gregtech/integration/groovy/GroovyExpansions.java index 16d52ec056c..497a87140ea 100644 --- a/src/main/java/gregtech/integration/groovy/GroovyExpansions.java +++ b/src/main/java/gregtech/integration/groovy/GroovyExpansions.java @@ -26,7 +26,7 @@ public static > RecipeBuilder property(RecipeBuild } public static Material.Builder materialBuilder(MaterialEvent event, int id, ResourceLocation resourceLocation) { - return new Material.Builder(id, resourceLocation); + return Material.builder(id, resourceLocation); } public static Material.Builder materialBuilder(MaterialEvent event, int id, String domain, String path) {