aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-08-30 21:13:26 +0200
committerGitHub <noreply@github.com>2024-08-30 19:13:26 +0000
commite7d74441f6410a265da4af0e58c284bfe40306ff (patch)
tree37aef8c2c46a55d1d79344a14e3a0d5740c691e2 /src/main/java/gregtech
parent23fd19da49fa910a93b3120b4d1362b3dd585004 (diff)
downloadGT5-Unofficial-e7d74441f6410a265da4af0e58c284bfe40306ff.tar.gz
GT5-Unofficial-e7d74441f6410a265da4af0e58c284bfe40306ff.tar.bz2
GT5-Unofficial-e7d74441f6410a265da4af0e58c284bfe40306ff.zip
Move Radox materials to GT5u (#3001)
Add radox to GT5u to prepare removing it from coremod Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java13
-rw-r--r--src/main/java/gregtech/loaders/materials/MaterialsInit1.java51
2 files changed, 64 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index f048dd11cd..2dada8dfb0 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -953,6 +953,19 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials PolyAluminiumChloride;
public static Materials Ozone;
public static Materials StableBaryonicMatter;
+
+ public static Materials RawRadox;
+ public static Materials RadoxSuperLight;
+ public static Materials RadoxLight;
+ public static Materials RadoxHeavy;
+ public static Materials RadoxSuperHeavy;
+ public static Materials Xenoxene;
+ public static Materials DilutedXenoxene;
+ public static Materials RadoxCracked;
+ public static Materials RadoxGas;
+ public static Materials RadoxPolymer;
+
+
// spotless:on
static {
diff --git a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
index 066fca569a..964fcc5c8f 100644
--- a/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
+++ b/src/main/java/gregtech/loaders/materials/MaterialsInit1.java
@@ -990,6 +990,57 @@ public class MaterialsInit1 {
.constructMaterial()
.setHasCorrespondingFluid(true);
+ Materials.RawRadox = new MaterialBuilder(-1, TextureSet.SET_DULL, "Raw Radox").setRGB(80, 30, 80)
+ .addFluid().constructMaterial();
+ Materials.RadoxSuperLight = new MaterialBuilder(-1, TextureSet.SET_DULL, "Super Light Radox")
+ .setRGB(155, 0, 155).addGas().constructMaterial();
+ Materials.RadoxLight = new MaterialBuilder(-1, TextureSet.SET_DULL, "Light Radox").setRGB(140, 0, 140)
+ .addGas().constructMaterial();
+ Materials.RadoxHeavy = new MaterialBuilder(-1, TextureSet.SET_DULL, "Heavy Radox").setRGB(115, 0, 115)
+ .addFluid().constructMaterial();
+ Materials.RadoxSuperHeavy = new MaterialBuilder(-1, TextureSet.SET_DULL, "Super Heavy Radox")
+ .setRGB(100, 0, 100).addFluid().constructMaterial();
+ Materials.Xenoxene = new MaterialBuilder(-1, TextureSet.SET_DULL, "Xenoxene").setRGB(133, 130, 128)
+ .addFluid().constructMaterial();
+ Materials.DilutedXenoxene = new MaterialBuilder(-1, TextureSet.SET_DULL, "Diluted Xenoxene")
+ .setRGB(206, 200, 196).addFluid().constructMaterial();
+ Materials.RadoxCracked = new MaterialBuilder(-1, TextureSet.SET_DULL, "Cracked Radox")
+ .setRGB(180, 130, 180).addGas().constructMaterial();
+ Materials.RadoxGas = new MaterialBuilder(-1, TextureSet.SET_DULL, "Radox Gas").setRGB(255, 130, 255)
+ .addGas().constructMaterial();
+
+ Materials.RadoxPolymer = new Materials(
+ 979, // Material ID was choosen randomly
+ TextureSet.SET_DULL,
+ 8.0F,
+ 346,
+ 3,
+ 1 | 2 | 16,
+ 133,
+ 0,
+ 128,
+ 0,
+ "RadoxPoly",
+ "Radox Polymer",
+ 0,
+ 0,
+ 6203,
+ 0,
+ true,
+ false,
+ 1,
+ 1,
+ 1,
+ Dyes.dyePurple,
+ 0,
+ Arrays.asList(
+ new MaterialStack(Materials.Carbon, 14),
+ new MaterialStack(Materials.Osmium, 11),
+ new MaterialStack(Materials.Oxygen, 7),
+ new MaterialStack(Materials.Silver, 3),
+ new MaterialStack(Materials.CallistoIce, 1)),
+ Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.HUMANUS, 2))).setHasCorrespondingGas(true)
+ .setGasTemperature(12406);
// spotless:on
}