diff --git a/CHANGELOG.md b/CHANGELOG.md index 6832545c9..a1b882748 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Refined Storage Changelog +### 0.7.4 +**Bugfixes** +- Updated to Forge 1922 + ### 0.7.3 **Bugfixes** - Fixed grid performance by not sending grid data so often diff --git a/build.gradle b/build.gradle index ac5e667dd..8dc6c288e 100755 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ group = "refinedstorage" archivesBaseName = "refinedstorage" minecraft { - version = "1.9.4-12.17.0.1910-1.9.4" + version = "1.9.4-12.17.0.1922-1.9.4" runDir = "run" useDepAts = true mappings = "snapshot_20160518" diff --git a/src/main/java/refinedstorage/tile/TileBase.java b/src/main/java/refinedstorage/tile/TileBase.java index e53868e2c..215f20cb6 100755 --- a/src/main/java/refinedstorage/tile/TileBase.java +++ b/src/main/java/refinedstorage/tile/TileBase.java @@ -19,7 +19,6 @@ import refinedstorage.network.MessageTileContainerUpdate; import javax.annotation.Nullable; public abstract class TileBase extends TileEntity implements ITickable { - public static final String NBT_UPDATE = "U"; public static final String NBT_DIRECTION = "Direction"; private EnumFacing direction = EnumFacing.NORTH; @@ -58,7 +57,6 @@ public abstract class TileBase extends TileEntity implements ITickable { } public NBTTagCompound writeUpdate(NBTTagCompound tag) { - tag.setByte(NBT_UPDATE, (byte) 1); tag.setInteger(NBT_DIRECTION, direction.ordinal()); return tag; @@ -74,22 +72,6 @@ public abstract class TileBase extends TileEntity implements ITickable { RefinedStorageUtils.updateBlock(worldObj, pos); } - @Override - public void readFromNBT(NBTTagCompound tag) { - super.readFromNBT(tag); - - if (tag.hasKey(NBT_UPDATE)) { - readUpdate(tag); - } else { - read(tag); - } - } - - @Override - public NBTTagCompound writeToNBT(NBTTagCompound tag) { - return write(super.writeToNBT(tag)); - } - @Override public NBTTagCompound getUpdateTag() { return writeUpdate(super.getUpdateTag()); @@ -106,6 +88,25 @@ public abstract class TileBase extends TileEntity implements ITickable { readUpdate(packet.getNbtCompound()); } + @Override + public void handleUpdateTag(NBTTagCompound tag) { + super.readFromNBT(tag); + + readUpdate(tag); + } + + @Override + public void readFromNBT(NBTTagCompound tag) { + super.readFromNBT(tag); + + read(tag); + } + + @Override + public NBTTagCompound writeToNBT(NBTTagCompound tag) { + return write(super.writeToNBT(tag)); + } + @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newState) { return oldState.getBlock() != newState.getBlock(); diff --git a/src/main/resources/assets/refinedstorage/textures/gui/processing_pattern_encoder.png b/src/main/resources/assets/refinedstorage/textures/gui/processing_pattern_encoder.png index 20c3f2319..d24f82b4d 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/gui/processing_pattern_encoder.png and b/src/main/resources/assets/refinedstorage/textures/gui/processing_pattern_encoder.png differ