From e491670ca5e2d5f3de4dc0b0371170295ebd9e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Sun, 18 Jul 2021 02:54:48 +0200 Subject: [PATCH] More use of send method taking tile entity. --- .../cil/oc2/common/tileentity/ComputerTileEntity.java | 2 +- .../oc2/common/tileentity/DiskDriveTileEntity.java | 2 +- .../common/tileentity/NetworkConnectorTileEntity.java | 11 ++++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java index fe8002a5..4114269b 100644 --- a/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java +++ b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java @@ -454,7 +454,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic super.stopRunnerAndReset(); TerminalUtils.resetTerminal(terminal, output -> Network.sendToClientsTrackingChunk( - new ComputerTerminalOutputMessage(ComputerTileEntity.this, output), virtualMachine.chunk)); + new ComputerTerminalOutputMessage(ComputerTileEntity.this, output), chunk)); } @Override diff --git a/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java index 147ce352..cbc37271 100644 --- a/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java +++ b/src/main/java/li/cil/oc2/common/tileentity/DiskDriveTileEntity.java @@ -185,7 +185,7 @@ public final class DiskDriveTileEntity extends AbstractTileEntity { device.updateBlockDevice(tag); } - Network.sendToClientsTrackingChunk(new DiskDriveFloppyMessage(DiskDriveTileEntity.this), level.getChunkAt(getBlockPos())); + Network.sendToClientsTrackingTileEntity(new DiskDriveFloppyMessage(DiskDriveTileEntity.this), DiskDriveTileEntity.this); } private void exportDeviceDataToItemStack(final ItemStack stack) { diff --git a/src/main/java/li/cil/oc2/common/tileentity/NetworkConnectorTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/NetworkConnectorTileEntity.java index 3e3c0474..f1e16317 100644 --- a/src/main/java/li/cil/oc2/common/tileentity/NetworkConnectorTileEntity.java +++ b/src/main/java/li/cil/oc2/common/tileentity/NetworkConnectorTileEntity.java @@ -23,7 +23,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.*; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.LazyOptional; @@ -294,8 +293,8 @@ public final class NetworkConnectorTileEntity extends AbstractTileEntity impleme public AxisAlignedBB getRenderBoundingBox() { if (Minecraft.useShaderTransparency()) { return new AxisAlignedBB( - getBlockPos().offset(-MAX_CONNECTION_DISTANCE, -MAX_CONNECTION_DISTANCE, -MAX_CONNECTION_DISTANCE), - getBlockPos().offset(1 + MAX_CONNECTION_DISTANCE, 1 + MAX_CONNECTION_DISTANCE, 1 + MAX_CONNECTION_DISTANCE) + getBlockPos().offset(-MAX_CONNECTION_DISTANCE, -MAX_CONNECTION_DISTANCE, -MAX_CONNECTION_DISTANCE), + getBlockPos().offset(1 + MAX_CONNECTION_DISTANCE, 1 + MAX_CONNECTION_DISTANCE, 1 + MAX_CONNECTION_DISTANCE) ); } else { return super.getRenderBoundingBox(); @@ -412,11 +411,9 @@ public final class NetworkConnectorTileEntity extends AbstractTileEntity impleme } private void onConnectedPositionsChanged() { - - if (level != null && !level.isClientSide) { + if (!getLevel().isClientSide()) { final NetworkConnectorConnectionsMessage message = new NetworkConnectorConnectionsMessage(this); - final Chunk chunk = level.getChunkAt(getBlockPos()); - Network.sendToClientsTrackingChunk(message, chunk); + Network.sendToClientsTrackingTileEntity(message, this); } }