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

This should fix things

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-23 23:01:02 +02:00
parent 1e418c6a2f
commit b8f4a9570c
22 changed files with 315 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/refinedstorage/RefinedStorageUtils.java
View File

@@ -26,7 +26,7 @@ public class RefinedStorageUtils {
public static final int COMPARE_NBT = 2; public static final int COMPARE_NBT = 2;
public static final int COMPARE_QUANTITY = 4; public static final int COMPARE_QUANTITY = 4;
public static void saveItems(IItemHandler handler, int id, NBTTagCompound nbt) { public static void writeItems(IItemHandler handler, int id, NBTTagCompound nbt) {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
for (int i = 0; i < handler.getSlots(); i++) { for (int i = 0; i < handler.getSlots(); i++) {
@@ -44,7 +44,7 @@ public class RefinedStorageUtils {
nbt.setTag(String.format(NBT_INVENTORY, id), tagList); nbt.setTag(String.format(NBT_INVENTORY, id), tagList);
} }
public static void restoreItems(IItemHandler handler, int id, NBTTagCompound nbt) { public static void readItems(IItemHandler handler, int id, NBTTagCompound nbt) {
String name = String.format(NBT_INVENTORY, id); String name = String.format(NBT_INVENTORY, id);
if (nbt.hasKey(name)) { if (nbt.hasKey(name)) {
@@ -60,7 +60,7 @@ public class RefinedStorageUtils {
} }
} }
public static void saveItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) { public static void writeItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) {
NBTTagList tagList = new NBTTagList(); NBTTagList tagList = new NBTTagList();
for (int i = 0; i < inventory.getSizeInventory(); i++) { for (int i = 0; i < inventory.getSizeInventory(); i++) {
@@ -78,7 +78,7 @@ public class RefinedStorageUtils {
nbt.setTag(String.format(NBT_INVENTORY, id), tagList); nbt.setTag(String.format(NBT_INVENTORY, id), tagList);
} }
public static void restoreItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) { public static void readItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) {
String name = String.format(NBT_INVENTORY, id); String name = String.format(NBT_INVENTORY, id);
if (nbt.hasKey(name)) { if (nbt.hasKey(name)) {

4
src/main/java/refinedstorage/network/MessageTileContainerUpdate.java
View File

@@ -33,7 +33,7 @@ public class MessageTileContainerUpdate implements IMessage, IMessageHandler<Mes
tile = ClientProxy.getWorld().getTileEntity(new BlockPos(x, y, z)); tile = ClientProxy.getWorld().getTileEntity(new BlockPos(x, y, z));
if (tile instanceof ISynchronizedContainer) { if (tile instanceof ISynchronizedContainer) {
((ISynchronizedContainer) tile).receiveContainerData(buf); ((ISynchronizedContainer) tile).readContainerData(buf);
} }
} }
} }
@@ -45,7 +45,7 @@ public class MessageTileContainerUpdate implements IMessage, IMessageHandler<Mes
buf.writeInt(tile.getPos().getZ()); buf.writeInt(tile.getPos().getZ());
if (tile instanceof ISynchronizedContainer) { if (tile instanceof ISynchronizedContainer) {
((ISynchronizedContainer) tile).sendContainerData(buf); ((ISynchronizedContainer) tile).writeContainerData(buf);
} }
} }

2
src/main/java/refinedstorage/tile/CraftingTaskScheduler.java
View File

@@ -39,7 +39,7 @@ public class CraftingTaskScheduler {
} }
} }
public void readFromNBT(NBTTagCompound tag) { public void read(NBTTagCompound tag) {
if (tag.hasKey(NBT_SCHEDULED)) { if (tag.hasKey(NBT_SCHEDULED)) {
scheduledFor = ItemStack.loadItemStackFromNBT(tag.getCompoundTag(NBT_SCHEDULED)); scheduledFor = ItemStack.loadItemStackFromNBT(tag.getCompoundTag(NBT_SCHEDULED));
} }

4
src/main/java/refinedstorage/tile/ISynchronizedContainer.java
View File

@@ -4,9 +4,9 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
public interface ISynchronizedContainer { public interface ISynchronizedContainer {
void receiveContainerData(ByteBuf buf); void readContainerData(ByteBuf buf);
void sendContainerData(ByteBuf buf); void writeContainerData(ByteBuf buf);
Class<? extends Container> getContainer(); Class<? extends Container> getContainer();
} }

55
src/main/java/refinedstorage/tile/TileBase.java
View File

@@ -49,40 +49,53 @@ public abstract class TileBase extends TileEntity implements ITickable {
return direction; return direction;
} }
@Override public NBTTagCompound write(NBTTagCompound tag) {
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
direction = EnumFacing.getFront(nbt.getInteger(NBT_DIRECTION));
}
@Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
nbt.setInteger(NBT_DIRECTION, direction.ordinal());
return super.writeToNBT(nbt);
}
public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) {
tag.setInteger(NBT_DIRECTION, direction.ordinal()); tag.setInteger(NBT_DIRECTION, direction.ordinal());
return tag; return tag;
} }
public void readFromUpdatePacketNBT(NBTTagCompound tag) { public NBTTagCompound writeUpdate(NBTTagCompound tag) {
tag.setByte("U", (byte) 1);
tag.setInteger(NBT_DIRECTION, direction.ordinal());
return tag;
}
public void read(NBTTagCompound tag) {
direction = EnumFacing.getFront(tag.getInteger(NBT_DIRECTION)); direction = EnumFacing.getFront(tag.getInteger(NBT_DIRECTION));
} }
public void readUpdate(NBTTagCompound tag) {
direction = EnumFacing.getFront(tag.getInteger(NBT_DIRECTION));
RefinedStorageUtils.updateBlock(worldObj, pos);
}
@Override @Override
public SPacketUpdateTileEntity getUpdatePacket() { public void readFromNBT(NBTTagCompound nbt) {
return new SPacketUpdateTileEntity(pos, 1, writeToUpdatePacketNBT(new NBTTagCompound())); super.readFromNBT(nbt);
if (nbt.hasKey("U")) {
readUpdate(nbt);
} else {
read(nbt);
}
}
@Override
public NBTTagCompound writeToNBT(NBTTagCompound tag) {
return write(super.writeToNBT(tag));
}
@Override
public NBTTagCompound getUpdateTag() {
return writeUpdate(super.getUpdateTag());
} }
@Override @Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
readFromUpdatePacketNBT(packet.getNbtCompound()); readUpdate(packet.getNbtCompound());
RefinedStorageUtils.updateBlock(worldObj, pos);
} }
@Override @Override

36
src/main/java/refinedstorage/tile/TileConstructor.java
View File

@@ -83,41 +83,43 @@ public class TileConstructor extends TileMachine implements ICompareConfig {
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound tag) {
super.readFromNBT(nbt); super.read(tag);
if (nbt.hasKey(NBT_COMPARE)) { if (tag.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE); compare = tag.getInteger(NBT_COMPARE);
} }
RefinedStorageUtils.restoreItems(filter, 0, nbt); RefinedStorageUtils.readItems(filter, 0, tag);
RefinedStorageUtils.restoreItems(upgrades, 1, nbt); RefinedStorageUtils.readItems(upgrades, 1, tag);
scheduler.readFromNBT(nbt); scheduler.read(tag);
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
nbt.setInteger(NBT_COMPARE, compare); super.write(tag);
RefinedStorageUtils.saveItems(filter, 0, nbt); tag.setInteger(NBT_COMPARE, compare);
RefinedStorageUtils.saveItems(upgrades, 1, nbt);
scheduler.writeToNBT(nbt); RefinedStorageUtils.writeItems(filter, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
return super.writeToNBT(nbt); scheduler.writeToNBT(tag);
return tag;
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
compare = buf.readInt(); compare = buf.readInt();
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(compare); buf.writeInt(compare);
} }

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

@@ -494,8 +494,30 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
super.readFromNBT(nbt); super.write(tag);
energy.writeToNBT(tag);
tag.setInteger(RedstoneMode.NBT, redstoneMode.id);
NBTTagList list = new NBTTagList();
for (ICraftingTask task : craftingTasks) {
NBTTagCompound taskTag = new NBTTagCompound();
task.writeToNBT(taskTag);
list.appendTag(taskTag);
}
tag.setTag(NBT_CRAFTING_TASKS, list);
return tag;
}
@Override
public void read(NBTTagCompound nbt) {
super.read(nbt);
energy.readFromNBT(nbt); energy.readFromNBT(nbt);
@@ -526,34 +548,17 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound writeUpdate(NBTTagCompound tag) {
energy.writeToNBT(nbt); super.writeUpdate(tag);
nbt.setInteger(RedstoneMode.NBT, redstoneMode.id);
NBTTagList list = new NBTTagList();
for (ICraftingTask task : craftingTasks) {
NBTTagCompound taskTag = new NBTTagCompound();
task.writeToNBT(taskTag);
list.appendTag(taskTag);
}
nbt.setTag(NBT_CRAFTING_TASKS, list);
return super.writeToNBT(nbt);
}
@Override
public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) {
tag.setInteger(NBT_DESC_ENERGY, getEnergyStored(null)); tag.setInteger(NBT_DESC_ENERGY, getEnergyStored(null));
return super.writeToUpdatePacketNBT(tag); return tag;
} }
@Override @Override
public void readFromUpdatePacketNBT(NBTTagCompound tag) { public void readUpdate(NBTTagCompound tag) {
super.readFromUpdatePacketNBT(tag); super.readUpdate(tag);
setEnergyStored(tag.getInteger(NBT_DESC_ENERGY)); setEnergyStored(tag.getInteger(NBT_DESC_ENERGY));
} }
@@ -612,7 +617,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
setEnergyStored(buf.readInt()); setEnergyStored(buf.readInt());
energyUsage = buf.readInt(); energyUsage = buf.readInt();
@@ -637,7 +642,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
buf.writeInt(getEnergyStored(null)); buf.writeInt(getEnergyStored(null));
buf.writeInt(energyUsage); buf.writeInt(energyUsage);

30
src/main/java/refinedstorage/tile/TileDestructor.java
View File

@@ -100,8 +100,8 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
if (nbt.hasKey(NBT_COMPARE)) { if (nbt.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE); compare = nbt.getInteger(NBT_COMPARE);
@@ -111,32 +111,34 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode
mode = nbt.getInteger(NBT_MODE); mode = nbt.getInteger(NBT_MODE);
} }
RefinedStorageUtils.restoreItems(filters, 0, nbt); RefinedStorageUtils.readItems(filters, 0, nbt);
RefinedStorageUtils.restoreItems(upgrades, 1, nbt); RefinedStorageUtils.readItems(upgrades, 1, nbt);
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
nbt.setInteger(NBT_COMPARE, compare); super.write(tag);
nbt.setInteger(NBT_MODE, mode);
RefinedStorageUtils.saveItems(filters, 0, nbt); tag.setInteger(NBT_COMPARE, compare);
RefinedStorageUtils.saveItems(upgrades, 1, nbt); tag.setInteger(NBT_MODE, mode);
return super.writeToNBT(nbt); RefinedStorageUtils.writeItems(filters, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
return tag;
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
compare = buf.readInt(); compare = buf.readInt();
mode = buf.readInt(); mode = buf.readInt();
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(compare); buf.writeInt(compare);
buf.writeInt(mode); buf.writeInt(mode);

38
src/main/java/refinedstorage/tile/TileDetector.java
View File

@@ -136,8 +136,8 @@ public class TileDetector extends TileMachine implements ICompareConfig {
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
if (nbt.hasKey(NBT_COMPARE)) { if (nbt.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE); compare = nbt.getInteger(NBT_COMPARE);
@@ -151,37 +151,41 @@ public class TileDetector extends TileMachine implements ICompareConfig {
amount = nbt.getInteger(NBT_AMOUNT); amount = nbt.getInteger(NBT_AMOUNT);
} }
RefinedStorageUtils.restoreItems(filter, 0, nbt); RefinedStorageUtils.readItems(filter, 0, nbt);
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
nbt.setInteger(NBT_COMPARE, compare); super.write(tag);
nbt.setInteger(NBT_MODE, mode);
nbt.setInteger(NBT_AMOUNT, amount);
RefinedStorageUtils.saveItems(filter, 0, nbt); tag.setInteger(NBT_COMPARE, compare);
tag.setInteger(NBT_MODE, mode);
tag.setInteger(NBT_AMOUNT, amount);
return super.writeToNBT(nbt); RefinedStorageUtils.writeItems(filter, 0, tag);
return tag;
} }
@Override @Override
public void readFromUpdatePacketNBT(NBTTagCompound tag) { public void readUpdate(NBTTagCompound tag) {
super.readFromUpdatePacketNBT(tag); super.readUpdate(tag);
powered = tag.getBoolean(NBT_DESC_POWERED); powered = tag.getBoolean(NBT_DESC_POWERED);
} }
@Override @Override
public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) { public NBTTagCompound writeUpdate(NBTTagCompound tag) {
super.writeUpdate(tag);
tag.setBoolean(NBT_DESC_POWERED, powered); tag.setBoolean(NBT_DESC_POWERED, powered);
return super.writeToUpdatePacketNBT(tag); return tag;
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(compare); buf.writeInt(compare);
buf.writeInt(mode); buf.writeInt(mode);
@@ -189,8 +193,8 @@ public class TileDetector extends TileMachine implements ICompareConfig {
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
compare = buf.readInt(); compare = buf.readInt();
mode = buf.readInt(); mode = buf.readInt();

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

@@ -85,11 +85,11 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
RefinedStorageUtils.restoreItems(disks, 0, nbt); RefinedStorageUtils.readItems(disks, 0, nbt);
RefinedStorageUtils.restoreItems(filters, 1, nbt); RefinedStorageUtils.readItems(filters, 1, nbt);
if (nbt.hasKey(NBT_PRIORITY)) { if (nbt.hasKey(NBT_PRIORITY)) {
priority = nbt.getInteger(NBT_PRIORITY); priority = nbt.getInteger(NBT_PRIORITY);
@@ -105,20 +105,22 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
RefinedStorageUtils.saveItems(disks, 0, nbt); super.write(tag);
RefinedStorageUtils.saveItems(filters, 1, nbt);
nbt.setInteger(NBT_PRIORITY, priority); RefinedStorageUtils.writeItems(disks, 0, tag);
nbt.setInteger(NBT_COMPARE, compare); RefinedStorageUtils.writeItems(filters, 1, tag);
nbt.setInteger(NBT_MODE, mode);
return super.writeToNBT(nbt); tag.setInteger(NBT_PRIORITY, priority);
tag.setInteger(NBT_COMPARE, compare);
tag.setInteger(NBT_MODE, mode);
return tag;
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(priority); buf.writeInt(priority);
buf.writeInt(compare); buf.writeInt(compare);
@@ -126,8 +128,8 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
priority = buf.readInt(); priority = buf.readInt();
compare = buf.readInt(); compare = buf.readInt();

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

@@ -81,41 +81,43 @@ public class TileExporter extends TileMachine implements ICompareConfig {
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
if (nbt.hasKey(NBT_COMPARE)) { if (nbt.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE); compare = nbt.getInteger(NBT_COMPARE);
} }
RefinedStorageUtils.restoreItems(filters, 0, nbt); RefinedStorageUtils.readItems(filters, 0, nbt);
RefinedStorageUtils.restoreItems(upgrades, 1, nbt); RefinedStorageUtils.readItems(upgrades, 1, nbt);
scheduler.readFromNBT(nbt); scheduler.read(nbt);
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
nbt.setInteger(NBT_COMPARE, compare); super.write(tag);
RefinedStorageUtils.saveItems(filters, 0, nbt); tag.setInteger(NBT_COMPARE, compare);
RefinedStorageUtils.saveItems(upgrades, 1, nbt);
scheduler.writeToNBT(nbt); RefinedStorageUtils.writeItems(filters, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
return super.writeToNBT(nbt); scheduler.writeToNBT(tag);
return tag;
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
compare = buf.readInt(); compare = buf.readInt();
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(compare); buf.writeInt(compare);
} }

28
src/main/java/refinedstorage/tile/TileExternalStorage.java
View File

@@ -156,8 +156,8 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(priority); buf.writeInt(priority);
@@ -188,8 +188,8 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
priority = buf.readInt(); priority = buf.readInt();
stored = buf.readInt(); stored = buf.readInt();
@@ -203,10 +203,10 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
RefinedStorageUtils.restoreItems(filters, 0, nbt); RefinedStorageUtils.readItems(filters, 0, nbt);
if (nbt.hasKey(NBT_PRIORITY)) { if (nbt.hasKey(NBT_PRIORITY)) {
priority = nbt.getInteger(NBT_PRIORITY); priority = nbt.getInteger(NBT_PRIORITY);
@@ -222,14 +222,16 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
RefinedStorageUtils.saveItems(filters, 0, nbt); super.write(tag);
nbt.setInteger(NBT_PRIORITY, priority); RefinedStorageUtils.writeItems(filters, 0, tag);
nbt.setInteger(NBT_COMPARE, compare);
nbt.setInteger(NBT_MODE, mode);
return super.writeToNBT(nbt); tag.setInteger(NBT_PRIORITY, priority);
tag.setInteger(NBT_COMPARE, compare);
tag.setInteger(NBT_MODE, mode);
return tag;
} }
@Override @Override

30
src/main/java/refinedstorage/tile/TileImporter.java
View File

@@ -88,8 +88,8 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
if (nbt.hasKey(NBT_COMPARE)) { if (nbt.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE); compare = nbt.getInteger(NBT_COMPARE);
@@ -99,32 +99,34 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
mode = nbt.getInteger(NBT_MODE); mode = nbt.getInteger(NBT_MODE);
} }
RefinedStorageUtils.restoreItems(filters, 0, nbt); RefinedStorageUtils.readItems(filters, 0, nbt);
RefinedStorageUtils.restoreItems(upgrades, 1, nbt); RefinedStorageUtils.readItems(upgrades, 1, nbt);
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
nbt.setInteger(NBT_COMPARE, compare); super.write(tag);
nbt.setInteger(NBT_MODE, mode);
RefinedStorageUtils.saveItems(filters, 0, nbt); tag.setInteger(NBT_COMPARE, compare);
RefinedStorageUtils.saveItems(upgrades, 1, nbt); tag.setInteger(NBT_MODE, mode);
return super.writeToNBT(nbt); RefinedStorageUtils.writeItems(filters, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
return tag;
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
compare = buf.readInt(); compare = buf.readInt();
mode = buf.readInt(); mode = buf.readInt();
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(compare); buf.writeInt(compare);
buf.writeInt(mode); buf.writeInt(mode);

28
src/main/java/refinedstorage/tile/TileInterface.java
View File

@@ -108,11 +108,11 @@ public class TileInterface extends TileMachine implements ICompareConfig {
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
RefinedStorageUtils.restoreItems(items, 0, nbt); RefinedStorageUtils.readItems(items, 0, nbt);
RefinedStorageUtils.restoreItems(upgrades, 1, nbt); RefinedStorageUtils.readItems(upgrades, 1, nbt);
if (nbt.hasKey(NBT_COMPARE)) { if (nbt.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE); compare = nbt.getInteger(NBT_COMPARE);
@@ -120,26 +120,28 @@ public class TileInterface extends TileMachine implements ICompareConfig {
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
RefinedStorageUtils.saveItems(items, 0, nbt); super.write(tag);
RefinedStorageUtils.saveItems(upgrades, 1, nbt);
nbt.setInteger(NBT_COMPARE, compare); RefinedStorageUtils.writeItems(items, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
return super.writeToNBT(nbt); tag.setInteger(NBT_COMPARE, compare);
return tag;
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
compare = buf.readInt(); compare = buf.readInt();
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(compare); buf.writeInt(compare);
} }

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

@@ -13,7 +13,7 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
public abstract class TileMachine extends TileBase implements ISynchronizedContainer, IRedstoneModeConfig { public abstract class TileMachine extends TileBase implements ISynchronizedContainer, IRedstoneModeConfig {
public static final String NBT_DESC_CONNECTED = "Connected"; public static final String NBT_CONNECTED = "Connected";
protected boolean connected; protected boolean connected;
protected boolean wasConnected; protected boolean wasConnected;
@@ -131,18 +131,18 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
redstoneMode = RedstoneMode.getById(buf.readInt()); redstoneMode = RedstoneMode.getById(buf.readInt());
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
buf.writeInt(redstoneMode.id); buf.writeInt(redstoneMode.id);
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
if (nbt.hasKey(RedstoneMode.NBT)) { if (nbt.hasKey(RedstoneMode.NBT)) {
redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT)); redstoneMode = RedstoneMode.getById(nbt.getInteger(RedstoneMode.NBT));
@@ -150,22 +150,26 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
nbt.setInteger(RedstoneMode.NBT, redstoneMode.id); super.write(tag);
return super.writeToNBT(nbt); tag.setInteger(RedstoneMode.NBT, redstoneMode.id);
return tag;
} }
public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) { public NBTTagCompound writeUpdate(NBTTagCompound tag) {
tag.setBoolean(NBT_DESC_CONNECTED, isActive()); super.writeUpdate(tag);
return super.writeToUpdatePacketNBT(tag); tag.setBoolean(NBT_CONNECTED, isActive());
return tag;
} }
public void readFromUpdatePacketNBT(NBTTagCompound tag) { public void readUpdate(NBTTagCompound tag) {
super.readFromUpdatePacketNBT(tag); super.readUpdate(tag);
connected = tag.getBoolean(NBT_DESC_CONNECTED); connected = tag.getBoolean(NBT_CONNECTED);
} }
public abstract int getEnergyUsage(); public abstract int getEnergyUsage();

30
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -64,10 +64,10 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
RefinedStorageUtils.restoreItems(filters, 0, nbt); RefinedStorageUtils.readItems(filters, 0, nbt);
if (nbt.hasKey(NBT_PRIORITY)) { if (nbt.hasKey(NBT_PRIORITY)) {
priority = nbt.getInteger(NBT_PRIORITY); priority = nbt.getInteger(NBT_PRIORITY);
@@ -87,15 +87,17 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
RefinedStorageUtils.saveItems(filters, 0, nbt); super.write(tag);
nbt.setInteger(NBT_PRIORITY, priority); RefinedStorageUtils.writeItems(filters, 0, tag);
nbt.setTag(NBT_STORAGE, storageTag);
nbt.setInteger(NBT_COMPARE, compare);
nbt.setInteger(NBT_MODE, mode);
return super.writeToNBT(nbt); tag.setInteger(NBT_PRIORITY, priority);
tag.setTag(NBT_STORAGE, storageTag);
tag.setInteger(NBT_COMPARE, compare);
tag.setInteger(NBT_MODE, mode);
return tag;
} }
public EnumStorageType getType() { public EnumStorageType getType() {
@@ -107,8 +109,8 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(NBTStorage.getStored(storageTag)); buf.writeInt(NBTStorage.getStored(storageTag));
buf.writeInt(priority); buf.writeInt(priority);
@@ -117,8 +119,8 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
stored = buf.readInt(); stored = buf.readInt();
priority = buf.readInt(); priority = buf.readInt();

14
src/main/java/refinedstorage/tile/TileWirelessTransmitter.java
View File

@@ -28,17 +28,19 @@ public class TileWirelessTransmitter extends TileMachine {
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
RefinedStorageUtils.restoreItems(upgrades, 0, nbt); RefinedStorageUtils.readItems(upgrades, 0, nbt);
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
RefinedStorageUtils.saveItems(upgrades, 0, nbt); super.write(tag);
return super.writeToNBT(nbt); RefinedStorageUtils.writeItems(upgrades, 0, tag);
return tag;
} }
public int getRange() { public int getRange() {

18
src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java
View File

@@ -55,19 +55,21 @@ public class TileCrafter extends TileMachine {
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
RefinedStorageUtils.restoreItems(patterns, 0, nbt); RefinedStorageUtils.readItems(patterns, 0, nbt);
RefinedStorageUtils.restoreItems(upgrades, 1, nbt); RefinedStorageUtils.readItems(upgrades, 1, nbt);
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
RefinedStorageUtils.saveItems(patterns, 0, nbt); super.write(tag);
RefinedStorageUtils.saveItems(upgrades, 1, nbt);
return super.writeToNBT(nbt); RefinedStorageUtils.writeItems(patterns, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
return tag;
} }
public int getSpeed() { public int getSpeed() {

8
src/main/java/refinedstorage/tile/autocrafting/TileCraftingMonitor.java
View File

@@ -30,8 +30,8 @@ public class TileCraftingMonitor extends TileMachine {
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
if (connected) { if (connected) {
buf.writeInt(controller.getCraftingTasks().size()); buf.writeInt(controller.getCraftingTasks().size());
@@ -51,8 +51,8 @@ public class TileCraftingMonitor extends TileMachine {
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
int size = buf.readInt(); int size = buf.readInt();

18
src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java
View File

@@ -18,19 +18,21 @@ public class TileProcessingPatternEncoder extends TileBase {
private BasicItemHandler configuration = new BasicItemHandler(9 * 2, this); private BasicItemHandler configuration = new BasicItemHandler(9 * 2, this);
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
RefinedStorageUtils.saveItems(patterns, 0, nbt); super.write(tag);
RefinedStorageUtils.saveItems(configuration, 1, nbt);
return super.writeToNBT(nbt); RefinedStorageUtils.writeItems(patterns, 0, tag);
RefinedStorageUtils.writeItems(configuration, 1, tag);
return tag;
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
RefinedStorageUtils.restoreItems(patterns, 0, nbt); RefinedStorageUtils.readItems(patterns, 0, nbt);
RefinedStorageUtils.restoreItems(configuration, 1, nbt); RefinedStorageUtils.readItems(configuration, 1, nbt);
} }
public void onCreatePattern() { public void onCreatePattern() {

32
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -293,11 +293,11 @@ public class TileGrid extends TileMachine implements IGrid {
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
RefinedStorageUtils.restoreItemsLegacy(matrix, 0, nbt); RefinedStorageUtils.readItemsLegacy(matrix, 0, nbt);
RefinedStorageUtils.restoreItems(patterns, 1, nbt); RefinedStorageUtils.readItems(patterns, 1, nbt);
if (nbt.hasKey(NBT_SORTING_DIRECTION)) { if (nbt.hasKey(NBT_SORTING_DIRECTION)) {
sortingDirection = nbt.getInteger(NBT_SORTING_DIRECTION); sortingDirection = nbt.getInteger(NBT_SORTING_DIRECTION);
@@ -313,20 +313,22 @@ public class TileGrid extends TileMachine implements IGrid {
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
RefinedStorageUtils.saveItemsLegacy(matrix, 0, nbt); super.write(tag);
RefinedStorageUtils.saveItems(patterns, 1, nbt);
nbt.setInteger(NBT_SORTING_DIRECTION, sortingDirection); RefinedStorageUtils.writeItemsLegacy(matrix, 0, tag);
nbt.setInteger(NBT_SORTING_TYPE, sortingType); RefinedStorageUtils.writeItems(patterns, 1, tag);
nbt.setInteger(NBT_SEARCH_BOX_MODE, searchBoxMode);
return super.writeToNBT(nbt); tag.setInteger(NBT_SORTING_DIRECTION, sortingDirection);
tag.setInteger(NBT_SORTING_TYPE, sortingType);
tag.setInteger(NBT_SEARCH_BOX_MODE, searchBoxMode);
return tag;
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(sortingDirection); buf.writeInt(sortingDirection);
buf.writeInt(sortingType); buf.writeInt(sortingType);
@@ -340,8 +342,8 @@ public class TileGrid extends TileMachine implements IGrid {
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
sortingDirection = buf.readInt(); sortingDirection = buf.readInt();
sortingType = buf.readInt(); sortingType = buf.readInt();

40
src/main/java/refinedstorage/tile/solderer/TileSolderer.java
View File

@@ -95,11 +95,11 @@ public class TileSolderer extends TileMachine {
} }
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void read(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.read(nbt);
RefinedStorageUtils.restoreItems(items, 0, nbt); RefinedStorageUtils.readItems(items, 0, nbt);
RefinedStorageUtils.restoreItems(upgrades, 1, nbt); RefinedStorageUtils.readItems(upgrades, 1, nbt);
recipe = SoldererRegistry.getRecipe(items); recipe = SoldererRegistry.getRecipe(items);
@@ -113,41 +113,45 @@ public class TileSolderer extends TileMachine {
} }
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound nbt) { public NBTTagCompound write(NBTTagCompound tag) {
RefinedStorageUtils.saveItems(items, 0, nbt); super.write(tag);
RefinedStorageUtils.saveItems(upgrades, 1, nbt);
nbt.setBoolean(NBT_WORKING, working); RefinedStorageUtils.writeItems(items, 0, tag);
nbt.setInteger(NBT_PROGRESS, progress); RefinedStorageUtils.writeItems(upgrades, 1, tag);
return super.writeToNBT(nbt); tag.setBoolean(NBT_WORKING, working);
tag.setInteger(NBT_PROGRESS, progress);
return tag;
} }
@Override @Override
public NBTTagCompound writeToUpdatePacketNBT(NBTTagCompound tag) { public NBTTagCompound writeUpdate(NBTTagCompound tag) {
super.writeUpdate(tag);
tag.setBoolean(NBT_WORKING, working); tag.setBoolean(NBT_WORKING, working);
return super.writeToUpdatePacketNBT(tag); return tag;
} }
@Override @Override
public void readFromUpdatePacketNBT(NBTTagCompound tag) { public void readUpdate(NBTTagCompound tag) {
super.readFromUpdatePacketNBT(tag); super.readUpdate(tag);
working = tag.getBoolean(NBT_WORKING); working = tag.getBoolean(NBT_WORKING);
} }
@Override @Override
public void receiveContainerData(ByteBuf buf) { public void readContainerData(ByteBuf buf) {
super.receiveContainerData(buf); super.readContainerData(buf);
progress = buf.readInt(); progress = buf.readInt();
duration = buf.readInt(); duration = buf.readInt();
} }
@Override @Override
public void sendContainerData(ByteBuf buf) { public void writeContainerData(ByteBuf buf) {
super.sendContainerData(buf); super.writeContainerData(buf);
buf.writeInt(progress); buf.writeInt(progress);
buf.writeInt(recipe != null ? recipe.getDuration() : 0); buf.writeInt(recipe != null ? recipe.getDuration() : 0);