diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/LabsMaterials.java b/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/LabsMaterials.java index df490df3..a21143db 100644 --- a/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/LabsMaterials.java +++ b/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/LabsMaterials.java @@ -122,6 +122,17 @@ public class LabsMaterials { public static Material FormicAcid; // ID: 92; HM only public static Material SodiumMethoxide; // ID: 93; HM only + /** + * Rare Earth Line Materials + */ + public static Material RareEarthOxideConcentrate; // ID: 118; HM only + public static Material RoastedRareEarthOxideConcentrate; // ID: 119; HM only + public static Material LeachedRareEarthOxide; // ID: 120; HM only + public static Material TrivalentRareEarths; // ID: 121; HM only + public static Material CeriumConcentrate; // ID: 122; HM only + public static Material DissolvedCeriumConcentrate; // ID: 123; HM only + public static Material VaporousNitricAcid; // ID: 124 + /** * Microverse Materials */ @@ -193,6 +204,9 @@ public static void init() { /* Platinum Line Materials */ LabsPlatLine.initPlatLine(); + /* Rare Earth Line Materials */ + LabsRareEarthLine.initRareEarthLine(); + /* Microverse Materials */ LabsMicroverse.initMicroverse(); diff --git a/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsRareEarthLine.java b/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsRareEarthLine.java new file mode 100644 index 00000000..dcee7f10 --- /dev/null +++ b/src/main/java/com/nomiceu/nomilabs/gregtech/material/registry/register/LabsRareEarthLine.java @@ -0,0 +1,55 @@ +package com.nomiceu.nomilabs.gregtech.material.registry.register; + +import static com.nomiceu.nomilabs.gregtech.material.registry.LabsMaterials.*; +import static com.nomiceu.nomilabs.util.LabsNames.makeLabsName; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.material.info.MaterialFlags.*; +import static gregtech.api.unification.material.info.MaterialIconSet.*; + +import gregtech.api.fluids.FluidBuilder; +import gregtech.api.unification.material.Material; + +public class LabsRareEarthLine { + + public static void initRareEarthLine() { + RareEarthOxideConcentrate = new Material.Builder(118, makeLabsName("rare_earth_oxide_concentrate")) // Hardmode + // Material + .dust() + .color(0x394c04).iconSet(FINE) + .flags(DISABLE_DECOMPOSITION) + .build(); + RoastedRareEarthOxideConcentrate = new Material.Builder(119, + makeLabsName("roasted_rare_earth_oxide_concentrate")) // Hardmode Material + .dust() + .color(0x182100).iconSet(ROUGH) + .flags(DISABLE_DECOMPOSITION) + .build(); + LeachedRareEarthOxide = new Material.Builder(120, makeLabsName("leached_rare_earth_oxide")) // Hardmode + // Material + .dust() + .color(0x4c5632).iconSet(DULL) + .flags(DISABLE_DECOMPOSITION) + .build(); + TrivalentRareEarths = new Material.Builder(121, makeLabsName("trivalent_rare_earths")) // Hardmode Material + .dust() + .color(0xa7ea8c).iconSet(METALLIC) + .flags(DISABLE_DECOMPOSITION) + .build(); + CeriumConcentrate = new Material.Builder(122, makeLabsName("cerium_concentrate")) // Hardmode Material + .dust() + .color(0xef654c).iconSet(DULL) + .flags(DISABLE_DECOMPOSITION) + .build(); + DissolvedCeriumConcentrate = new Material.Builder(123, makeLabsName("dissolved_cerium_concentrate")) // Hardmode + // Material + .liquid() + .color(0xc1796c) + .flags(DISABLE_DECOMPOSITION) + .build(); + VaporousNitricAcid = new Material.Builder(124, makeLabsName("vaporous_nitric_acid")) + .liquid(new FluidBuilder().temperature(356)) + .color(0xeaf293) + .components(Hydrogen, 1, Nitrogen, 1, Oxygen, 3) + .build(); + } +} diff --git a/src/main/resources/assets/nomilabs/lang/en_us.lang b/src/main/resources/assets/nomilabs/lang/en_us.lang index 00359254..2a8a040e 100644 --- a/src/main/resources/assets/nomilabs/lang/en_us.lang +++ b/src/main/resources/assets/nomilabs/lang/en_us.lang @@ -332,6 +332,29 @@ nomilabs.material.methyl_formate=Methyl Formate nomilabs.material.formic_acid=Formic Acid nomilabs.material.sodium_methoxide=Sodium Methoxide +nomilabs.material.vaporous_nitric_acid=Vaporous Nitric Acid +nomilabs.material.rare_earth_oxide_concentrate Dust=Rare Earth Oxide Concentrate +item.nomilabs.material.rare_earth_oxide_concentrate.dust=Rare Earth Oxide Concentrate +item.nomilabs.material.rare_earth_oxide_concentrate.dustSmall=Small Pile of Rare Earth Oxide Concentrate +item.nomilabs.material.rare_earth_oxide_concentrate.dustTiny=Tiny Pile of Rare Earth Oxide Concentrate +nomilabs.material.roasted_rare_earth_oxide_concentrate=Roasted Rare Earth Oxide Concentrate +item.nomilabs.material.roasted_rare_earth_oxide_concentrate.dust=Roasted Rare Earth Oxide Concentrate +item.nomilabs.material.roasted_rare_earth_oxide_concentrate.dustSmall=Small Pile of Roasted Rare Earth Oxide Concentrate +item.nomilabs.material.roasted_rare_earth_oxide_concentrate.dustTiny=Tiny Pile of Roasted Rare Earth Oxide Concentrate +nomilabs.material.leached_rare_earth_oxide=Leached Rare Earth Oxide +item.nomilabs.material.leached_rare_earth_oxide.dust=Leached Rare Earth Oxide +item.nomilabs.material.leached_rare_earth_oxide.dustSmall=Tiny Pile of Leached Rare Earth Oxide +item.nomilabs.material.leached_rare_earth_oxide.dustTiny=Tiny Pile of Leached Rare Earth Oxide +nomilabs.material.trivalent_rare_earths=Trivalent Rare Earths +item.nomilabs.material.trivalent_rare_earths.dust=Trivalent Rare Earths +item.nomilabs.material.trivalent_rare_earths.dustSmall=Small Pile of Trivalent Rare Earths +item.nomilabs.material.trivalent_rare_earths.dustTiny=Tiny Pile of Trivalent Rare Earths +nomilabs.material.cerium_concentrate=Cerium Concentrate +item.nomilabs.material.cerium_concentrate.dust=Cerium Concentrate +item.nomilabs.material.cerium_concentrate.dustSmall=Small Pile of Cerium Concentrate +item.nomilabs.material.cerium_concentrate.dustTiny=Tiny Pile of Cerium Concentrate +nomilabs.material.dissolved_cerium_concentrate=Dissolved Cerium Concentrate + nomilabs.material.hexafluorosilicic_acid=Hexafluorosilicic Acid nomilabs.material.dirty_hexafluorosilicic_acid=Dirty Hexafluorosilicic Acid nomilabs.material.stone_residue=Stone Residue