dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused function, cleaned up NBT read write

Browse Source
This commit is contained in:
Tom Erik
2016-04-05 18:39:20 +02:00
parent 7f1fba678e
commit e094ceaf10
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -365,7 +365,15 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.readFromNBT(nbt);
readNBT(nbt);
}
public void readItemFromNBT(NBTTagCompound nbt) {
readNBT(nbt);
}
private void readNBT(NBTTagCompound nbt)
{
energy.readFromNBT(nbt); energy.readFromNBT(nbt);
if (nbt.hasKey(RedstoneMode.NBT)) { if (nbt.hasKey(RedstoneMode.NBT)) {
@@ -376,23 +384,16 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
@Override @Override
public void writeToNBT(NBTTagCompound nbt) { public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt); super.writeToNBT(nbt);
writeNBT(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));
}
} }
public void writeItemToNBT(NBTTagCompound 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); nbt.setInteger(RedstoneMode.NBT, redstoneMode.id);
} }
@@ -597,9 +598,4 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_PUSH); drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_PUSH);
} }
} }
public void setEnergyStored(int energyStored) {
if (energyStored > 0) this.energy.setEnergyStored(energyStored);
}
} }