From 62b6fc8498d754ae388f92b933b656da5f38dee0 Mon Sep 17 00:00:00 2001
From: Maya <10861407+serenibyss@users.noreply.github.com>
Date: Mon, 2 Dec 2024 08:12:05 -0600
Subject: Fix ME output hatch void protection again (#3594)

---
 .../common/tileentities/machines/MTEHatchOutputME.java         | 10 ----------
 .../tileentities/machines/multi/MTEDistillationTower.java      | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/gregtech/common/tileentities/machines')

diff --git a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java
index b502ad54d3..7ddf136a72 100644
--- a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java
+++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java
@@ -160,16 +160,6 @@ public class MTEHatchOutputME extends MTEHatchOutput implements IPowerChannelSta
         return getCachedAmount() < getCacheCapacity();
     }
 
-    /**
-     * Get the available fluid space, up to max int.
-     */
-    @Override
-    public int getAvailableSpace() {
-        long availableSpace = getCacheCapacity() - getCachedAmount();
-        if (availableSpace > Integer.MAX_VALUE) availableSpace = Integer.MAX_VALUE;
-        return (int) availableSpace;
-    }
-
     /**
      * Attempt to store fluid in connected ME network. Returns how much fluid is accepted (if the network was down e.g.)
      *
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java
index bbba029449..93b64c16a8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEDistillationTower.java
@@ -47,6 +47,7 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.MultiblockTooltipBuilder;
+import gregtech.common.tileentities.machines.MTEHatchOutputME;
 
 public class MTEDistillationTower extends MTEEnhancedMultiBlockBase<MTEDistillationTower>
     implements ISurvivalConstructable {
@@ -292,6 +293,15 @@ public class MTEDistillationTower extends MTEEnhancedMultiBlockBase<MTEDistillat
         }
     }
 
+    @Override
+    public boolean canDumpFluidToME() {
+        // All fluids can be dumped to ME only if each layer contains a ME Output Hatch.
+        return this.mOutputHatchesByLayer.stream()
+            .allMatch(
+                tLayerOutputHatches -> tLayerOutputHatches.stream()
+                    .anyMatch(tHatch -> (tHatch instanceof MTEHatchOutputME tMEHatch) && (tMEHatch.canAcceptFluid())));
+    }
+
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
         buildPiece(STRUCTURE_PIECE_BASE, stackSize, hintsOnly, 1, 0, 0);
-- 
cgit