diff --git a/CHANGELOG.md b/CHANGELOG.md index bb55e1073..030dbc420 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Refined Storage Changelog +### 1.4.1 +- Fixed Processing Pattern Encoder and Reader recipes not supporting oredict workbench and chest (VT-14) +- Fixed network nodes not saving correctly (raoulvdberge) +- Fixed network nodes not respecting redstone mode (raoulvdberge) + ### 1.4 - Added Security Manager (raoulvdberge) - Added Security Card (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java index 3da869cea..e7174f5f5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java @@ -84,7 +84,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, public void update() { super.update(); - if (network != null && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0) { + if (network != null && canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0) { if (type == IType.ITEMS) { if (block != null) { if (drop && item != null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java index d89875594..bbbdbf84b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java @@ -72,7 +72,7 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I public void update() { super.update(); - if (network != null && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0) { + if (network != null && canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0) { BlockPos front = holder.pos().offset(holder.getDirection()); if (pickupItem && type == IType.ITEMS) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java index 81228c269..8c8539163 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java @@ -66,7 +66,7 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy RSUtils.updateBlock(holder.world(), holder.pos()); } - if (network != null && ticks % SPEED == 0) { + if (network != null && canUpdate() && ticks % SPEED == 0) { if (type == IType.ITEMS) { ItemStack slot = itemFilters.getStackInSlot(0); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java index c1ce47744..625295ff7 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java @@ -57,7 +57,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy public void update() { super.update(); - if (network != null && ticks % upgrades.getSpeed() == 0) { + if (network != null && canUpdate() && ticks % upgrades.getSpeed() == 0) { if (type == IType.ITEMS) { IItemHandler handler = RSUtils.getItemHandler(getFacingTile(), holder.getDirection().getOpposite()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java index f623d1490..027dbea0f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java @@ -86,7 +86,7 @@ public class NetworkNodeFluidInterface extends NetworkNode implements IComparabl } } - if (network != null && ticks % upgrades.getSpeed() == 0) { + if (network != null && canUpdate() && ticks % upgrades.getSpeed() == 0) { FluidStack drained = tankIn.drainInternal(Fluid.BUCKET_VOLUME * upgrades.getItemInteractCount(), true); // Drain in tank diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java index 0ca52b7cf..9e70c9a25 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java @@ -49,7 +49,7 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi public void update() { super.update(); - if (network == null) { + if (network == null || !canUpdate()) { return; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java index b13b28482..01eda19ad 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java @@ -45,7 +45,7 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable { public void update() { super.update(); - if (network == null) { + if (network == null || !canUpdate()) { return; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java index 3cfeb2c5d..89ccbbd76 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java @@ -70,7 +70,7 @@ public class NetworkNodeSolderer extends NetworkNode { RSUtils.updateBlock(holder.world(), holder.pos()); } - if (network == null) { + if (network == null || !canUpdate()) { return; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java index 02b9e80ad..f9bd5290c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java @@ -118,7 +118,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab public void update() { super.update(); - if (network == null || ticks % upgrades.getSpeed() != 0) { + if (network == null || !canUpdate() || ticks % upgrades.getSpeed() != 0) { return; }