diff --git a/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java b/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java index 54b140b211f..3fca0e612e1 100644 --- a/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java +++ b/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java @@ -27,7 +27,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; -import org.jetbrains.annotations.MustBeInvokedByOverriders; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -588,19 +587,6 @@ public boolean shouldRefresh(@NotNull World world, @NotNull BlockPos pos, @NotNu return true; } - @MustBeInvokedByOverriders - @Override - public void onChunkUnload() { - super.onChunkUnload(); - if (!world.isRemote) { - WorldPipeNet worldPipeNet = getPipeBlock().getWorldPipeNet(getWorld()); - PipeNet net = worldPipeNet.getNetFromPos(pos); - if (net != null) { - net.onChunkUnload(); - } - } - } - public void doExplosion(float explosionPower) { getWorld().setBlockToAir(getPos()); if (!getWorld().isRemote) { diff --git a/src/main/java/gregtech/common/pipelike/cable/tile/TileEntityCable.java b/src/main/java/gregtech/common/pipelike/cable/tile/TileEntityCable.java index c8ee74ca3a2..e8af710b987 100644 --- a/src/main/java/gregtech/common/pipelike/cable/tile/TileEntityCable.java +++ b/src/main/java/gregtech/common/pipelike/cable/tile/TileEntityCable.java @@ -259,12 +259,6 @@ public T getCapabilityInternal(Capability capability, @Nullable EnumFacin return super.getCapabilityInternal(capability, facing); } - @Override - public void onChunkUnload() { - super.onChunkUnload(); - this.handlers.clear(); - } - @Override public int getDefaultPaintingColor() { return 0x404040; diff --git a/src/main/java/gregtech/common/pipelike/itempipe/tile/TileEntityItemPipe.java b/src/main/java/gregtech/common/pipelike/itempipe/tile/TileEntityItemPipe.java index b19f71551ad..53eac210e24 100644 --- a/src/main/java/gregtech/common/pipelike/itempipe/tile/TileEntityItemPipe.java +++ b/src/main/java/gregtech/common/pipelike/itempipe/tile/TileEntityItemPipe.java @@ -119,10 +119,4 @@ public int getTransferredItems() { updateTransferredState(); return this.transferredItems; } - - @Override - public void onChunkUnload() { - super.onChunkUnload(); - this.handlers.clear(); - } } diff --git a/src/main/java/gregtech/common/pipelike/laser/tile/TileEntityLaserPipe.java b/src/main/java/gregtech/common/pipelike/laser/tile/TileEntityLaserPipe.java index 2b9db7313fd..533ca3cef92 100644 --- a/src/main/java/gregtech/common/pipelike/laser/tile/TileEntityLaserPipe.java +++ b/src/main/java/gregtech/common/pipelike/laser/tile/TileEntityLaserPipe.java @@ -191,12 +191,6 @@ public void readFromNBT(@NotNull NBTTagCompound compound) { } } - @Override - public void onChunkUnload() { - super.onChunkUnload(); - this.handlers.clear(); - } - private static class DefaultLaserContainer implements ILaserContainer { @Override diff --git a/src/main/java/gregtech/common/pipelike/optical/tile/TileEntityOpticalPipe.java b/src/main/java/gregtech/common/pipelike/optical/tile/TileEntityOpticalPipe.java index 27de8ac31e8..3a730e2e81f 100644 --- a/src/main/java/gregtech/common/pipelike/optical/tile/TileEntityOpticalPipe.java +++ b/src/main/java/gregtech/common/pipelike/optical/tile/TileEntityOpticalPipe.java @@ -159,12 +159,6 @@ public void receiveCustomData(int discriminator, PacketBuffer buf) { } } - @Override - public void onChunkUnload() { - super.onChunkUnload(); - this.handlers.clear(); - } - private static class DefaultDataHandler implements IDataAccessHatch { @Override