From 837a83b46959ae8c766970b4d202cf230e604687 Mon Sep 17 00:00:00 2001
From: tier940 <tier940@protonmail.com>
Date: Sat, 17 Jan 2026 17:35:32 +0900
Subject: [PATCH] Re: Improve the VOM UI

---
 .../multi/MetaTileEntityVoidOreMiner.java     | 52 +++++++------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java
index d2b6ab83..97f0e163 100644
--- a/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java
+++ b/src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidOreMiner.java
@@ -11,18 +11,19 @@
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidTank;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import gregtech.api.capability.IMultipleTankHandler;
 import gregtech.api.gui.resources.TextureArea;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
 import gregtech.api.metatileentity.multiblock.IMultiblockPart;
 import gregtech.api.metatileentity.multiblock.IProgressBarMultiblock;
+import gregtech.api.metatileentity.multiblock.MultiblockAbility;
 import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
 import gregtech.api.pattern.BlockPattern;
 import gregtech.api.pattern.FactoryBlockPattern;
@@ -135,11 +136,6 @@ protected ICubeRenderer getFrontOverlay() {
     }
 
     // IProgressBarMultiblock implementation
-    @Override
-    public boolean showProgressBar() {
-        return true;
-    }
-
     @Override
     public int getNumProgressBars() {
         return 2;
@@ -147,19 +143,13 @@ public int getNumProgressBars() {
 
     @Override
     public double getFillPercentage(int index) {
-        if (!isStructureFormed() || getInputFluidInventory() == null) {
-            return 0;
-        }
-
         if (index == 0) {
             // EnderPearl fluid
-            int[] amount = getTotalFluidAmount(Materials.EnderPearl.getFluid(Integer.MAX_VALUE),
-                    getInputFluidInventory());
+            int[] amount = getTotalFluidAmount(Materials.EnderPearl.getFluid(Integer.MAX_VALUE));
             return amount[1] != 0 ? 1.0 * amount[0] / amount[1] : 0;
         } else {
             // Drilling Fluid
-            int[] amount = getTotalFluidAmount(Materials.DrillingFluid.getFluid(Integer.MAX_VALUE),
-                    getInputFluidInventory());
+            int[] amount = getTotalFluidAmount(Materials.DrillingFluid.getFluid(Integer.MAX_VALUE));
             return amount[1] != 0 ? 1.0 * amount[0] / amount[1] : 0;
         }
     }
@@ -175,14 +165,9 @@ public TextureArea getProgressBarTexture(int index) {
 
     @Override
     public void addBarHoverText(List<ITextComponent> hoverList, int index) {
-        if (!isStructureFormed() || getInputFluidInventory() == null) {
-            return;
-        }
-
         if (index == 0) {
             // EnderPearl fluid
-            int[] amount = getTotalFluidAmount(Materials.EnderPearl.getFluid(Integer.MAX_VALUE),
-                    getInputFluidInventory());
+            int[] amount = getTotalFluidAmount(Materials.EnderPearl.getFluid(Integer.MAX_VALUE));
             ITextComponent fluidInfo = TextComponentUtil.stringWithColor(
                     TextFormatting.GREEN,
                     TextFormattingUtil.formatNumbers(amount[0]) + " / " +
@@ -193,8 +178,7 @@ public void addBarHoverText(List<ITextComponent> hoverList, int index) {
                     fluidInfo));
         } else {
             // Drilling Fluid
-            int[] amount = getTotalFluidAmount(Materials.DrillingFluid.getFluid(Integer.MAX_VALUE),
-                    getInputFluidInventory());
+            int[] amount = getTotalFluidAmount(Materials.DrillingFluid.getFluid(Integer.MAX_VALUE));
             ITextComponent fluidInfo = TextComponentUtil.stringWithColor(
                     TextFormatting.GOLD,
                     TextFormattingUtil.formatNumbers(amount[0]) + " / " +
@@ -206,19 +190,19 @@ public void addBarHoverText(List<ITextComponent> hoverList, int index) {
         }
     }
 
-    private int[] getTotalFluidAmount(FluidStack testStack, IMultipleTankHandler tanks) {
-        int stored = 0;
-        int capacity = 0;
-        for (var tank : tanks.getFluidTanks()) {
-            FluidStack contained = tank.getFluid();
-            if (contained != null && contained.isFluidEqual(testStack)) {
-                stored += contained.amount;
-                capacity += tank.getCapacity();
-            } else if (contained == null) {
-                // Empty tank that could hold this fluid
-                capacity += tank.getCapacity();
+    private int[] getTotalFluidAmount(FluidStack testStack) {
+        if (!isStructureFormed()) return new int[] { 0, 0 };
+        List<IFluidTank> tanks = getAbilities(MultiblockAbility.IMPORT_FLUIDS);
+        int fluidAmount = 0;
+        int fluidCapacity = 0;
+        for (IFluidTank tank : tanks) {
+            if (tank == null || tank.getFluid() == null) continue;
+            if (tank.getFluid().isFluidEqual(testStack)) {
+                fluidAmount += tank.getFluidAmount();
+                int capacity = tank.getCapacity();
+                fluidCapacity += capacity > 0 ? capacity : tank.getFluidAmount();
             }
         }
-        return new int[] { stored, capacity };
+        return new int[] { fluidAmount, fluidCapacity };
     }
 }