upstream/Applied-Energistics-2-Unofficial
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Applied-Energistics-2-Unofficial.git synced 2026-10-25 20:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminal performance fixes (#1128)

Browse Source
This commit is contained in:
lc-1337 authored and GitHub committed 2026-03-12 23:07:19 +01:00
1 parent 9f84d19965
commit 6f1e82e581
2 files changed
+41 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/appeng/container/implementations/ContainerMEMonitorable.java
+35 -27
View File
@@ -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
src/main/java/appeng/util/item/AEFluidStack.java
+6 -1
View File
@@ -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;