diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java index 84200fa65..580069c9d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java @@ -277,28 +277,28 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, @Override public int getTanks() { - throw new RuntimeException("Cannot be called"); + throw new UnsupportedOperationException(); } @Nonnull @Override public FluidStack getFluidInTank(int tank) { - throw new RuntimeException("Cannot be called"); + throw new UnsupportedOperationException(); } @Override public int getTankCapacity(int tank) { - throw new RuntimeException("Cannot be called"); + throw new UnsupportedOperationException(); } @Override public boolean isFluidValid(int tank, @Nonnull FluidStack stack) { - throw new RuntimeException("Cannot be called"); + throw new UnsupportedOperationException(); } @Override public int fill(FluidStack resource, FluidAction action) { - throw new RuntimeException("Cannot be called"); + throw new UnsupportedOperationException(); } @Nonnull diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java index 3b06f9b0d..d4f45fa25 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java @@ -366,10 +366,6 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC this.markDirty(); } - public IItemHandler getPatternItems() { - return patternsInventory; - } - public IItemHandler getUpgrades() { return upgrades; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java index d67bb50e8..eb5ec319a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java @@ -5,6 +5,7 @@ import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager; import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask; import com.refinedmods.refinedstorage.block.CraftingMonitorBlock; import com.refinedmods.refinedstorage.block.NetworkNodeBlock; +import com.refinedmods.refinedstorage.tile.NetworkNodeTile; import com.refinedmods.refinedstorage.tile.craftingmonitor.CraftingMonitorTile; import com.refinedmods.refinedstorage.tile.craftingmonitor.ICraftingMonitor; import com.refinedmods.refinedstorage.tile.data.TileDataManager; @@ -62,7 +63,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting @Override public TileDataParameter getRedstoneModeParameter() { - return CraftingMonitorTile.REDSTONE_MODE; + return NetworkNodeTile.REDSTONE_MODE; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java index 5c5f2cac0..e42d6aa67 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java @@ -296,7 +296,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy @Override public IItemHandler getDrops() { - return upgrades; + return getUpgrades(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java index 8f4575881..125b47f91 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java @@ -34,7 +34,7 @@ public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void setOwner(@Nullable UUID owner) { - + // NO OP } @Nullable @@ -61,10 +61,12 @@ public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void onConnected(INetwork network) { + // NO OP } @Override public void onDisconnected(INetwork network) { + // NO OP } @Override @@ -79,7 +81,7 @@ public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void update() { - + // NO OP } @Override @@ -99,7 +101,7 @@ public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void markDirty() { - + // NO OP } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java index eb4f97937..a4add404f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java @@ -10,7 +10,7 @@ public class CrafterContainer extends BaseContainer { super(RSContainers.CRAFTER, crafter, player, windowId); for (int i = 0; i < 9; ++i) { - addSlot(new SlotItemHandler(crafter.getNode().getPatternItems(), i, 8 + (18 * i), 20)); + addSlot(new SlotItemHandler(crafter.getNode().getPatternInventory(), i, 8 + (18 * i), 20)); } for (int i = 0; i < 4; ++i) { @@ -20,6 +20,6 @@ public class CrafterContainer extends BaseContainer { addPlayerInventory(8, 55); transferManager.addBiTransfer(player.inventory, crafter.getNode().getUpgrades()); - transferManager.addBiTransfer(player.inventory, crafter.getNode().getPatternItems()); + transferManager.addBiTransfer(player.inventory, crafter.getNode().getPatternInventory()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java index f52146296..2c29240b5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java @@ -20,7 +20,7 @@ public class CrafterTile extends NetworkNodeTile { public static final TileDataParameter MODE = new TileDataParameter<>(DataSerializers.VARINT, CrafterNetworkNode.CrafterMode.IGNORE.ordinal(), t -> t.getNode().getMode().ordinal(), (t, v) -> t.getNode().setMode(CrafterNetworkNode.CrafterMode.getById(v))); private static final TileDataParameter HAS_ROOT = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().getRootContainerNotSelf().isPresent(), null, (t, v) -> new CrafterTileDataParameterClientListener().onChanged(t, v)); - private final LazyOptional patternsCapability = LazyOptional.of(() -> getNode().getPatternItems()); + private final LazyOptional patternsCapability = LazyOptional.of(() -> getNode().getPatternInventory()); public CrafterTile() { super(RSTiles.CRAFTER);