From 1e418c6a2f5bd83be9efe61145201f15fed1452e Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 23 May 2016 22:15:26 +0200 Subject: [PATCH] Fixes --- src/main/java/refinedstorage/tile/TileBase.java | 14 ++++++-------- .../java/refinedstorage/tile/TileController.java | 10 +++++----- .../java/refinedstorage/tile/TileDetector.java | 10 +++++----- src/main/java/refinedstorage/tile/TileMachine.java | 10 +++++----- .../refinedstorage/tile/solderer/TileSolderer.java | 10 +++++----- 5 files changed, 26 insertions(+), 28 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileBase.java b/src/main/java/refinedstorage/tile/TileBase.java index ba1db6c46..86f8a9c49 100755 --- a/src/main/java/refinedstorage/tile/TileBase.java +++ b/src/main/java/refinedstorage/tile/TileBase.java @@ -63,26 +63,24 @@ public abstract class TileBase extends TileEntity implements ITickable { return super.writeToNBT(nbt); } - public void writeToDescriptionPacketNBT(NBTTagCompound tag) { + public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) { tag.setInteger(NBT_DIRECTION, direction.ordinal()); + + return tag; } - public void readFromDescriptionPacketNBT(NBTTagCompound tag) { + public void readFromUpdatePacketNBT(NBTTagCompound tag) { direction = EnumFacing.getFront(tag.getInteger(NBT_DIRECTION)); } @Override public SPacketUpdateTileEntity getUpdatePacket() { - NBTTagCompound nbt = new NBTTagCompound(); - - writeToDescriptionPacketNBT(nbt); - - return new SPacketUpdateTileEntity(pos, 1, nbt); + return new SPacketUpdateTileEntity(pos, 1, writeToUpdatePacketNBT(new NBTTagCompound())); } @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { - readFromDescriptionPacketNBT(packet.getNbtCompound()); + readFromUpdatePacketNBT(packet.getNbtCompound()); RefinedStorageUtils.updateBlock(worldObj, pos); } diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index a39bce4aa..a5097d426 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -545,15 +545,15 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr } @Override - public void writeToDescriptionPacketNBT(NBTTagCompound tag) { - super.writeToDescriptionPacketNBT(tag); - + public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) { tag.setInteger(NBT_DESC_ENERGY, getEnergyStored(null)); + + return super.writeToUpdatePacketNBT(tag); } @Override - public void readFromDescriptionPacketNBT(NBTTagCompound tag) { - super.readFromDescriptionPacketNBT(tag); + public void readFromUpdatePacketNBT(NBTTagCompound tag) { + super.readFromUpdatePacketNBT(tag); setEnergyStored(tag.getInteger(NBT_DESC_ENERGY)); } diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index 319e2f96e..d84d3fed9 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -166,17 +166,17 @@ public class TileDetector extends TileMachine implements ICompareConfig { } @Override - public void readFromDescriptionPacketNBT(NBTTagCompound tag) { - super.readFromDescriptionPacketNBT(tag); + public void readFromUpdatePacketNBT(NBTTagCompound tag) { + super.readFromUpdatePacketNBT(tag); powered = tag.getBoolean(NBT_DESC_POWERED); } @Override - public void writeToDescriptionPacketNBT(NBTTagCompound tag) { - super.writeToDescriptionPacketNBT(tag); - + public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) { tag.setBoolean(NBT_DESC_POWERED, powered); + + return super.writeToUpdatePacketNBT(tag); } @Override diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java index 3e9db5c3c..1f43ffd39 100755 --- a/src/main/java/refinedstorage/tile/TileMachine.java +++ b/src/main/java/refinedstorage/tile/TileMachine.java @@ -156,14 +156,14 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta return super.writeToNBT(nbt); } - public void writeToDescriptionPacketNBT(NBTTagCompound tag) { - super.writeToDescriptionPacketNBT(tag); - + public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) { tag.setBoolean(NBT_DESC_CONNECTED, isActive()); + + return super.writeToUpdatePacketNBT(tag); } - public void readFromDescriptionPacketNBT(NBTTagCompound tag) { - super.readFromDescriptionPacketNBT(tag); + public void readFromUpdatePacketNBT(NBTTagCompound tag) { + super.readFromUpdatePacketNBT(tag); connected = tag.getBoolean(NBT_DESC_CONNECTED); } diff --git a/src/main/java/refinedstorage/tile/solderer/TileSolderer.java b/src/main/java/refinedstorage/tile/solderer/TileSolderer.java index a6229797c..7456222ed 100755 --- a/src/main/java/refinedstorage/tile/solderer/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/solderer/TileSolderer.java @@ -124,15 +124,15 @@ public class TileSolderer extends TileMachine { } @Override - public void writeToDescriptionPacketNBT(NBTTagCompound tag) { - super.writeToDescriptionPacketNBT(tag); - + public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) { tag.setBoolean(NBT_WORKING, working); + + return super.writeToUpdatePacketNBT(tag); } @Override - public void readFromDescriptionPacketNBT(NBTTagCompound tag) { - super.readFromDescriptionPacketNBT(tag); + public void readFromUpdatePacketNBT(NBTTagCompound tag) { + super.readFromUpdatePacketNBT(tag); working = tag.getBoolean(NBT_WORKING); }