feat: show oxygen overlay whenever player is wearing both an oxygen m…

…ask and oxygen gear
TeamGalacticraft · Jan 9, 2025 · 07d8db1 · 07d8db1
1 parent 423b65d
commit 07d8db1
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/src/main/java/dev/galacticraft/api/accessor/GearInventoryProvider.java b/src/main/java/dev/galacticraft/api/accessor/GearInventoryProvider.java
@@ -22,8 +22,11 @@
 
 package dev.galacticraft.api.accessor;
 
+import dev.galacticraft.api.item.OxygenGear;
+import dev.galacticraft.api.item.OxygenMask;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.Container;
+import net.minecraft.world.item.Item;
 
 public interface GearInventoryProvider {
     default Container galacticraft$getGearInv() {
@@ -42,6 +45,22 @@ public interface GearInventoryProvider {
         throw new RuntimeException("This should be overridden by mixin!");
     }
 
+    default boolean galacticraft$hasMaskAndGear() {
+        boolean mask = false;
+        boolean gear = false;
+        for (int i = 0; i < this.galacticraft$getAccessories().getContainerSize(); i++) {
+            Item item = this.galacticraft$getAccessories().getItem(i).getItem();
+            if (!mask && item instanceof OxygenMask) {
+                mask = true;
+                if (gear) break;
+            } else if (!gear && item instanceof OxygenGear) {
+                gear = true;
+                if (mask) break;
+            }
+        }
+        return mask && gear;
+    }
+
     default void galacticraft$writeGearToNbt(CompoundTag tag) {
         throw new RuntimeException("This should be overridden by mixin!");
     }

diff --git a/src/main/java/dev/galacticraft/impl/internal/mixin/gear/LivingEntityMixin.java b/src/main/java/dev/galacticraft/impl/internal/mixin/gear/LivingEntityMixin.java
@@ -120,20 +120,20 @@ private void galacticraft_modifyAirLevel(int air, CallbackInfoReturnable<Integer
             ci.setReturnValue(this.increaseAirSupply(air));
         }
 
-        boolean mask = false;
-        boolean gear = false;
-        for (int i = 0; i < this.galacticraft$getAccessories().getContainerSize(); i++) {
-            Item item = this.galacticraft$getAccessories().getItem(i).getItem();
-            if (!mask && item instanceof OxygenMask) {
-                mask = true;
-                if (gear) break;
-            } else if (!gear && item instanceof OxygenGear) {
-                gear = true;
-                if (mask) break;
-            }
-        }
-
-        if (mask && gear) {
+        // boolean mask = false;
+        // boolean gear = false;
+        // for (int i = 0; i < this.galacticraft$getAccessories().getContainerSize(); i++) {
+        //     Item item = this.galacticraft$getAccessories().getItem(i).getItem();
+        //     if (!mask && item instanceof OxygenMask) {
+        //         mask = true;
+        //         if (gear) break;
+        //     } else if (!gear && item instanceof OxygenGear) {
+        //         gear = true;
+        //         if (mask) break;
+        //     }
+        // }
+
+        if (this.galacticraft$hasMaskAndGear()) {
             InventoryStorage tankInv = InventoryStorage.of(galacticraft$getOxygenTanks(), null);
             for (int i = 0; i < tankInv.getSlotCount(); i++) {
                 Storage<FluidVariant> storage = ContainerItemContext.ofSingleSlot(tankInv.getSlot(i)).find(FluidStorage.ITEM);

diff --git a/src/main/java/dev/galacticraft/mod/client/gui/overlay/OxygenOverlay.java b/src/main/java/dev/galacticraft/mod/client/gui/overlay/OxygenOverlay.java
@@ -35,23 +35,24 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.core.Holder;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.world.Container;
 
 public class OxygenOverlay {
     public static void onHudRender(GuiGraphics graphics, DeltaTracker delta) {
         Minecraft mc = Minecraft.getInstance();
         if (mc.level != null && mc.player != null && !mc.player.isSpectator()) {
             Holder<CelestialBody<?, ?>> body = mc.level.galacticraft$getCelestialBody();
-            if (body != null && !body.value().atmosphere().breathable()) {
+            boolean nonBreathable = body != null && !body.value().atmosphere().breathable();
+            if (mc.player.galacticraft$hasMaskAndGear() || nonBreathable) {
                 Container inv = mc.player.galacticraft$getOxygenTanks();
+                final int outline = 0x99FFFFFF;
                 final int y = 4;
                 final int n = inv.getContainerSize();
                 for (int i = n; i > 0; i--) {
                     Storage<FluidVariant> storage = ContainerItemContext.withConstant(inv.getItem(n - i)).find(FluidStorage.ITEM);
                     int x = mc.getWindow().getGuiScaledWidth() - ((Constant.TextureCoordinate.OVERLAY_WIDTH + y) * i);
 
-                    int outline = 0x99FFFFFF;
-
                     long amount = 0;
                     long capacity = 1;