From 1e7b8c759f23c0e45066fdc29d0eae4c99211160 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sun, 8 Jan 2023 16:51:00 +0100 Subject: [PATCH] fix: storage monitor correctly sends data packet --- src/main/java/appeng/tile/legacy/TileLegacyDisplay.java | 6 ++---- src/main/java/appeng/tile/legacy/TileStorageMonitor.java | 9 +++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/appeng/tile/legacy/TileLegacyDisplay.java b/src/main/java/appeng/tile/legacy/TileLegacyDisplay.java index 08ab0619..01bef81f 100644 --- a/src/main/java/appeng/tile/legacy/TileLegacyDisplay.java +++ b/src/main/java/appeng/tile/legacy/TileLegacyDisplay.java @@ -15,19 +15,17 @@ public class TileLegacyDisplay extends AENetworkTile { } @TileEvent(TileEventType.NETWORK_WRITE) - public boolean writeToStreamTileLegacyDisplay(ByteBuf data) { + public void writeToStreamTileLegacyDisplay(ByteBuf data) { data.writeBoolean(this.displayPowered); - return true; } @TileEvent(TileEventType.NETWORK_READ) - public boolean readFromStreamTileLegacyDisplay(ByteBuf data) { + public void readFromStreamTileLegacyDisplay(ByteBuf data) { this.displayPowered = data.readBoolean(); this.worldObj.func_147451_t(this.xCoord, this.yCoord, this.zCoord); this.worldObj.markBlockRangeForRenderUpdate( this.xCoord, this.yCoord, this.zCoord, this.xCoord, this.yCoord, this.zCoord ); - return true; } @MENetworkEventSubscribe diff --git a/src/main/java/appeng/tile/legacy/TileStorageMonitor.java b/src/main/java/appeng/tile/legacy/TileStorageMonitor.java index d7b10738..ed2faae0 100644 --- a/src/main/java/appeng/tile/legacy/TileStorageMonitor.java +++ b/src/main/java/appeng/tile/legacy/TileStorageMonitor.java @@ -56,23 +56,22 @@ public class TileStorageMonitor extends TileLegacyDisplay implements IStackWatch } @TileEvent(TileEventType.NETWORK_WRITE) - public boolean writeToStreamTileStorageMonitor(ByteBuf data) { + public void writeToStreamTileStorageMonitor(ByteBuf data) { try { + super.writeToStreamTileLegacyDisplay(data); int flags = (this.isLocked ? 1 : 0) | (this.upgraded ? 0b10 : 0) | (this.myItem != null ? 0b100 : 0); data.writeByte(flags); if (this.myItem != null) this.myItem.writeToPacket(data); - - return true; } catch (IOException kek) { throw new RuntimeException(kek); } } @TileEvent(TileEventType.NETWORK_READ) - public boolean readFromStreamTileStorageMonitor(ByteBuf data) { + public void readFromStreamTileStorageMonitor(ByteBuf data) { try { super.readFromStreamTileLegacyDisplay(data); byte flags = data.readByte(); @@ -85,8 +84,6 @@ public class TileStorageMonitor extends TileLegacyDisplay implements IStackWatch } this.updateDisplayList = true; - - return true; } catch (IOException kek) { throw new RuntimeException(kek); }