From 6e833826ced5ef2c56ce327c79181b52ed8015a6 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 30 Jan 2025 19:49:57 +0700 Subject: [PATCH 1/2] register corium seperately --- .../api/unification/material/SCMaterials.java | 2 ++ .../common/materials/CoriumMaterials.java | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 src/main/java/supercritical/common/materials/CoriumMaterials.java diff --git a/src/main/java/supercritical/api/unification/material/SCMaterials.java b/src/main/java/supercritical/api/unification/material/SCMaterials.java index 3d3de56..03b01e2 100644 --- a/src/main/java/supercritical/api/unification/material/SCMaterials.java +++ b/src/main/java/supercritical/api/unification/material/SCMaterials.java @@ -2,6 +2,7 @@ import gregtech.api.unification.material.Material; import supercritical.common.SCConfigHolder; +import supercritical.common.materials.CoriumMaterials; import supercritical.common.materials.ElementMaterials; import supercritical.common.materials.FirstDegreeMaterials; import supercritical.common.materials.SecondDegreeMaterials; @@ -59,6 +60,7 @@ public class SCMaterials { public static Material HighGradeMOX; public static void register() { + CoriumMaterials.register(); if (SCConfigHolder.misc.disableAllMaterials) return; /* diff --git a/src/main/java/supercritical/common/materials/CoriumMaterials.java b/src/main/java/supercritical/common/materials/CoriumMaterials.java new file mode 100644 index 0000000..2b58f34 --- /dev/null +++ b/src/main/java/supercritical/common/materials/CoriumMaterials.java @@ -0,0 +1,24 @@ +package supercritical.common.materials; + +import static gregtech.api.unification.material.info.MaterialFlags.*; +import static gregtech.api.unification.material.info.MaterialIconSet.DULL; +import static supercritical.api.unification.material.SCMaterials.*; +import static supercritical.api.util.SCUtility.scId; + +import gregtech.api.fluids.FluidBuilder; +import gregtech.api.unification.material.Material; + +/* + * Ranges 10001-10999 + */ +public class CoriumMaterials { + + public static void register() { + Corium = new Material.Builder(10001, scId("corium")) + .liquid(new FluidBuilder().temperature(2500).block().density(8.0D).viscosity(10000)) + .color(0x7A6B50) + .iconSet(DULL) + .flags(NO_UNIFICATION, STICKY, GLOWING) + .build(); + } +} From 03eafbf737f8575ba0dd7c46b726a1a937681b0c Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 30 Jan 2025 19:50:39 +0700 Subject: [PATCH 2/2] Update UnknownCompositionMaterials.java --- .../common/materials/UnknownCompositionMaterials.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/supercritical/common/materials/UnknownCompositionMaterials.java b/src/main/java/supercritical/common/materials/UnknownCompositionMaterials.java index 5d81812..eb88b6c 100644 --- a/src/main/java/supercritical/common/materials/UnknownCompositionMaterials.java +++ b/src/main/java/supercritical/common/materials/UnknownCompositionMaterials.java @@ -14,18 +14,12 @@ public class UnknownCompositionMaterials { public static void register() { - Corium = new Material.Builder(1501, scId("corium")) - .liquid(new FluidBuilder().temperature(2500).block().density(8.0D).viscosity(10000)) - .color(0x7A6B50) - .iconSet(DULL) - .flags(NO_UNIFICATION, STICKY, GLOWING) - .build(); - SpentUraniumFuelSolution = new Material.Builder(1502, scId("spent_uranium_fuel_solution")) + SpentUraniumFuelSolution = new Material.Builder(1501, scId("spent_uranium_fuel_solution")) .liquid() .color(0x384536).build(); - RadonRichGasMixture = new Material.Builder(1503, scId("radon_rich_gas_mixture")) + RadonRichGasMixture = new Material.Builder(1502, scId("radon_rich_gas_mixture")) .gas() .color(0xd78dd9).build(); }