From 86990c7c934b5c67a2527fe03230d4446108ec21 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Fri, 6 Dec 2024 15:03:32 -0500 Subject: [PATCH] added ender and nether air --- .../main/java/org/gtreimagined/gt5r/cover/CoverAirVent.java | 4 ++++ .../java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java | 2 ++ .../src/main/java/org/gtreimagined/gt5r/data/Materials.java | 2 ++ .../gt5r/loader/multi/DistillationTowerLoader.java | 2 ++ 4 files changed, 10 insertions(+) diff --git a/common/src/main/java/org/gtreimagined/gt5r/cover/CoverAirVent.java b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverAirVent.java index f25f2e104..1bec4d451 100644 --- a/common/src/main/java/org/gtreimagined/gt5r/cover/CoverAirVent.java +++ b/common/src/main/java/org/gtreimagined/gt5r/cover/CoverAirVent.java @@ -49,6 +49,10 @@ public void onUpdate() { if (level.getGameTime() % 360 == (30 + (60L * side.get3DDataValue()))){ if (level.dimension() == Level.OVERWORLD){ cap.get().insertFluid(Materials.Air.getGas(64000), false); + } else if (level.dimension() == Level.NETHER){ + cap.get().insertFluid(Materials.NetherAir.getGas(64000), false); + } else if (level.dimension() == Level.END){ + cap.get().insertFluid(Materials.EnderAir.getGas(64000), false); } } } diff --git a/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java index 3799a1954..24b1c42e3 100644 --- a/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/GT5RMaterialEvents.java @@ -570,8 +570,10 @@ public static void onMaterialEvent(GregTechMaterialEvent event){ **/ event.setMaterial(Materials.Air).asGas().fluidDensity(0); event.setMaterial(Materials.Ammonia).asGas().flags(ACID).fluidDensity(-263); + event.setMaterial(Materials.EnderAir).asGas().fluidDensity(0); event.setMaterial(Materials.DinitrogenTetroxide).asGas(); event.setMaterial(Materials.HydrogenSulfide).asGas(); + event.setMaterial(Materials.NetherAir).asGas().fluidDensity(0); event.setMaterial(Materials.NitrogenMonoxide).asGas(); event.setMaterial(Materials.NitrogenDioxide).asGas(); event.setMaterial(Materials.NobleGases).asGas(0,790); diff --git a/common/src/main/java/org/gtreimagined/gt5r/data/Materials.java b/common/src/main/java/org/gtreimagined/gt5r/data/Materials.java index 441baf1de..e9bed560c 100644 --- a/common/src/main/java/org/gtreimagined/gt5r/data/Materials.java +++ b/common/src/main/java/org/gtreimagined/gt5r/data/Materials.java @@ -612,7 +612,9 @@ public class Materials { public static Material Air = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "air", 0xc9e3fc, NONE)); public static Material Ammonia = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "ammonia", 0x3f3480, NONE)); public static Material DinitrogenTetroxide = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "dinitrogen_tetroxide", 0x004184, NONE)); + public static Material EnderAir = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "ender_air", 0x556fbc, NONE)); public static Material HydrogenSulfide = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "hydrogen_sulfide", 0xffffff, NONE)); + public static Material NetherAir = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "nether_air", 0xad7070, NONE)); public static Material NitrogenMonoxide = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "nitrogen_monoxide", 0x7dc8f0, NONE)); public static Material NitrogenDioxide = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "nitrogen_dioxide", 0x64afff, NONE)); public static Material NobleGases = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "noble_gases", 0xc9e3fc, NONE)); diff --git a/common/src/main/java/org/gtreimagined/gt5r/loader/multi/DistillationTowerLoader.java b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/DistillationTowerLoader.java index b0109057a..07b8ffe0d 100644 --- a/common/src/main/java/org/gtreimagined/gt5r/loader/multi/DistillationTowerLoader.java +++ b/common/src/main/java/org/gtreimagined/gt5r/loader/multi/DistillationTowerLoader.java @@ -61,6 +61,8 @@ public static void init() { new FluidProduct(Methane, 750), new FluidProduct(Helium, 20)); CRYO_DISTILLATION.RB().fi(Air.getGas(200)).fo(Helium.getGas(1), Neon.getGas(1), Argon.getGas(1), Nitrogen.getGas(143), Oxygen.getGas(50), CarbonDioxide.getGas(10)).add("air_distillation", 64, 64); + CRYO_DISTILLATION.RB().fi(EnderAir.getGas(200)).fo(Krypton.getGas(1), Xenon.getGas(1), Radon.getGas(1), Nitrogen.getGas(143), Oxygen.getGas(50), CarbonDioxide.getGas(10)).add("ender_air_distillation", 64, 64); + CRYO_DISTILLATION.RB().fi(NetherAir.getGas(200)).fo(Helium.getGas(1), Neon.getGas(1), Argon.getGas(1), Nitrogen.getGas(143), Oxygen.getGas(50), SulfurDioxide.getGas(10)).add("nether_air_distillation", 64, 64); } private static void initCracked(){