From caeb1ed3b9079f7b008ef9b3c53cda59bd4f1d27 Mon Sep 17 00:00:00 2001
From: Des Herriott <des.herriott@gmail.com>
Date: Sat, 28 Dec 2024 09:27:57 +0000
Subject: [PATCH] don't allow Mekanism fluid tanks into fluid container slots

seems to lead to a lockup

#1386
---
 .../common/inventory/slot/FluidContainerSlot.java           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/me/desht/pneumaticcraft/common/inventory/slot/FluidContainerSlot.java b/src/main/java/me/desht/pneumaticcraft/common/inventory/slot/FluidContainerSlot.java
index 7fab29ee6..a13c87bcc 100644
--- a/src/main/java/me/desht/pneumaticcraft/common/inventory/slot/FluidContainerSlot.java
+++ b/src/main/java/me/desht/pneumaticcraft/common/inventory/slot/FluidContainerSlot.java
@@ -17,6 +17,8 @@
 
 package me.desht.pneumaticcraft.common.inventory.slot;
 
+import me.desht.pneumaticcraft.common.util.PneumaticCraftUtils;
+import me.desht.pneumaticcraft.lib.ModIds;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.fluids.FluidUtil;
 import net.neoforged.neoforge.items.IItemHandler;
@@ -41,6 +43,10 @@ public FluidContainerSlot(IItemHandler handler, int index, int x, int y) {
 
     @Override
     public boolean mayPlace(@Nonnull ItemStack stack) {
+        if (PneumaticCraftUtils.getRegistryName(stack.getItem()).orElseThrow().getNamespace().equals(ModIds.MEKANISM)) {
+            // no Mek tanks, they cause a client lockup
+            return false;
+        }
         if (FluidUtil.getFluidHandler(stack).isPresent()) {
             return FluidUtil.getFluidContained(stack).map(fluidStack -> fluidStack.getAmount() >= minFluid).orElse(minFluid == 0);
         } else {