From 6f1e82e581f89c92cff99ff6eaa0c11f76078f54 Mon Sep 17 00:00:00 2001
From: lc-1337 <62835225+lc-1337@users.noreply.github.com>
Date: Fri, 13 Mar 2026 00:07:19 +0200
Subject: [PATCH] terminal performance fixes (#1128)

---
 .../ContainerMEMonitorable.java               | 62 +++++++++++--------
 .../java/appeng/util/item/AEFluidStack.java   |  7 ++-
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java
index 465e7eaf4..96b665a65 100644
--- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java
+++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java
@@ -126,6 +126,8 @@ public class ContainerMEMonitorable extends AEBaseContainer
     private IConfigManager serverCM;
     private IGridNode networkNode;
 
+    private boolean needListUpdate = false;
+
     public ContainerMEMonitorable(final InventoryPlayer ip, final ITerminalHost monitorable) {
         this(ip, monitorable, true);
     }
@@ -243,35 +245,45 @@ public class ContainerMEMonitorable extends AEBaseContainer
                 }
             }
 
-            try {
-                final PacketMEInventoryUpdate piu = new PacketMEInventoryUpdate();
+            if (this.needListUpdate) {
+                this.needListUpdate = false;
 
-                for (var entry : this.updateQueue.entrySet()) {
-                    IItemList list = this.monitors.get(entry.getKey()).getStorageList();
-                    for (IAEStack<?> aes : entry.getValue()) {
-                        final IAEStack<?> send = list.findPrecise(aes);
-                        if (send == null) {
-                            aes.setStackSize(0);
-                            piu.appendItem(aes);
-                        } else {
-                            piu.appendItem(send);
-                        }
+                for (final Object c : this.crafters) {
+                    if (c instanceof EntityPlayerMP player) {
+                        this.queueInventory(player);
                     }
                 }
+            } else {
+                try {
+                    final PacketMEInventoryUpdate piu = new PacketMEInventoryUpdate();
 
-                if (!piu.isEmpty()) {
-                    for (var list : this.updateQueue.values()) {
-                        list.clear();
-                    }
-
-                    for (final Object c : this.crafters) {
-                        if (c instanceof EntityPlayer) {
-                            NetworkHandler.instance.sendTo(piu, (EntityPlayerMP) c);
+                    for (var entry : this.updateQueue.entrySet()) {
+                        IItemList list = this.monitors.get(entry.getKey()).getStorageList();
+                        for (IAEStack<?> aes : entry.getValue()) {
+                            final IAEStack<?> send = list.findPrecise(aes);
+                            if (send == null) {
+                                aes.setStackSize(0);
+                                piu.appendItem(aes);
+                            } else {
+                                piu.appendItem(send);
+                            }
                         }
                     }
+
+                    if (!piu.isEmpty()) {
+                        for (var list : this.updateQueue.values()) {
+                            list.clear();
+                        }
+
+                        for (final Object c : this.crafters) {
+                            if (c instanceof EntityPlayer) {
+                                NetworkHandler.instance.sendTo(piu, (EntityPlayerMP) c);
+                            }
+                        }
+                    }
+                } catch (final IOException e) {
+                    AELog.debug(e);
                 }
-            } catch (final IOException e) {
-                AELog.debug(e);
             }
 
             this.updatePowerStatus();
@@ -404,11 +416,7 @@ public class ContainerMEMonitorable extends AEBaseContainer
 
     @Override
     public void onListUpdate() {
-        for (final Object c : this.crafters) {
-            if (c instanceof EntityPlayerMP player) {
-                this.queueInventory(player);
-            }
-        }
+        this.needListUpdate = true;
     }
 
     @Override
diff --git a/src/main/java/appeng/util/item/AEFluidStack.java b/src/main/java/appeng/util/item/AEFluidStack.java
index e81d3c9d9..ae90ecb42 100644
--- a/src/main/java/appeng/util/item/AEFluidStack.java
+++ b/src/main/java/appeng/util/item/AEFluidStack.java
@@ -425,7 +425,12 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
             if (fluidStack.amount <= 0) fluidStack.amount = 1;
 
             ItemStack packet = ItemFluidPacket.newStack(fluidStack);
-            return StackInfo.loadFromNBT(StackInfo.itemStackToNBT(packet), this.getStackSize());
+            ItemStack view = StackInfo.loadFromNBT(StackInfo.itemStackToNBT(packet));
+            if (view != null) {
+                view.getTagCompound().setLong("mFluidDisplayAmount", this.getStackSize());
+            }
+
+            return view;
         }
 
         return null;