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

Fixed network nodes not respecting redstone mode, fixes #980

Browse Source
This commit is contained in:
raoulvdberge
2017-02-11 15:39:14 +01:00
parent 76b27b520d
commit db160364bb
10 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -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)

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java
View File

@@ -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) {

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java
View File

@@ -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) {

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java
View File

@@ -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);

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java
View File

@@ -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());

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java
View File

@@ -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

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java
View File

@@ -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;
}

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java
View File

@@ -45,7 +45,7 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable {
public void update() {
super.update();
if (network == null) {
if (network == null || !canUpdate()) {
return;
}

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSolderer.java
View File

@@ -70,7 +70,7 @@ public class NetworkNodeSolderer extends NetworkNode {
RSUtils.updateBlock(holder.world(), holder.pos());
}
if (network == null) {
if (network == null || !canUpdate()) {
return;
}

2
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
View File

@@ -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;
}