From e094ceaf1027c7fb3506d948bf6fdb3a7b53ba00 Mon Sep 17 00:00:00 2001 From: Tom Erik Date: Tue, 5 Apr 2016 18:39:20 +0200 Subject: [PATCH] Removed unused function, cleaned up NBT read write --- .../refinedstorage/tile/TileController.java | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 92b604a77..c4a60514c 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -365,7 +365,15 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); + readNBT(nbt); + } + public void readItemFromNBT(NBTTagCompound nbt) { + readNBT(nbt); + } + + private void readNBT(NBTTagCompound nbt) + { energy.readFromNBT(nbt); if (nbt.hasKey(RedstoneMode.NBT)) { @@ -376,23 +384,16 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - - energy.writeToNBT(nbt); - - nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); - } - - public void readItemFromNBT(NBTTagCompound nbt) { - energy.readFromNBT(nbt); - - if (nbt.hasKey(RedstoneMode.NBT)) { - redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); - } + writeNBT(nbt); } public void writeItemToNBT(NBTTagCompound nbt) { - energy.writeToNBT(nbt); + writeNBT(nbt); + } + private void writeNBT(NBTTagCompound nbt) + { + energy.writeToNBT(nbt); nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); } @@ -597,9 +598,4 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_PUSH); } } - - public void setEnergyStored(int energyStored) { - if (energyStored > 0) this.energy.setEnergyStored(energyStored); - } - }