From e59d7eee991f334023ca72efe60ab598577b8e4d Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 11 Nov 2016 11:49:36 +0100 Subject: [PATCH] Fix errors --- .../java/com/raoulvdberge/refinedstorage/api/IRSAPI.java | 3 ++- .../java/com/raoulvdberge/refinedstorage/apiimpl/API.java | 5 +++-- .../network/readerwriter/ReaderWriterHandlerItems.java | 5 +++++ .../com/raoulvdberge/refinedstorage/tile/TileController.java | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java index 6f377d7ae..85c20bb88 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java @@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftin import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandlerRegistry; import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRegistry; @@ -60,7 +61,7 @@ public interface IRSAPI { * @return a new reader writer channel */ @Nonnull - IReaderWriterChannel createReaderWriterChannel(); + IReaderWriterChannel createReaderWriterChannel(INetworkMaster network); /** * @return an empty item stack list diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java index 39e001fd3..5757e208a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java @@ -6,6 +6,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftin import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; import com.raoulvdberge.refinedstorage.api.autocrafting.preview.ICraftingPreviewElementRegistry; import com.raoulvdberge.refinedstorage.api.autocrafting.registry.ICraftingTaskRegistry; +import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterChannel; import com.raoulvdberge.refinedstorage.api.network.readerwriter.IReaderWriterHandlerRegistry; import com.raoulvdberge.refinedstorage.api.solderer.ISoldererRegistry; @@ -78,8 +79,8 @@ public class API implements IRSAPI { @Nonnull @Override - public IReaderWriterChannel createReaderWriterChannel() { - return new ReaderWriterChannel(); + public IReaderWriterChannel createReaderWriterChannel(INetworkMaster network) { + return new ReaderWriterChannel(network); } @Nonnull diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java index 2baee4c3d..5ad091554 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/readerwriter/ReaderWriterHandlerItems.java @@ -57,6 +57,11 @@ public class ReaderWriterHandlerItems implements IReaderWriterHandler { } } + @Override + public void onConnectionChange(boolean state) { + // NO OP + } + @Override public NBTTagCompound writeToNBT(NBTTagCompound tag) { RSUtils.writeItems(internalInv, 0, tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java index 6d0afbd2c..02d5b0612 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java @@ -827,7 +827,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR for (int i = 0; i < readerWriterChannelsList.tagCount(); ++i) { NBTTagCompound channelTag = readerWriterChannelsList.getCompoundTagAt(i); - IReaderWriterChannel channel = API.instance().createReaderWriterChannel(); + IReaderWriterChannel channel = API.instance().createReaderWriterChannel(this); channel.readFromNBT(channelTag);