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

Fix some more issues

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-22 20:37:29 +02:00
parent 5f24e1cd9f
commit d47aac44ba
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/refinedstorage/api/network/NetworkMaster.java
View File

@@ -26,6 +26,7 @@ import refinedstorage.block.EnumControllerType;
import refinedstorage.container.ContainerGrid;
import refinedstorage.item.ItemPattern;
import refinedstorage.network.MessageGridItems;
import refinedstorage.tile.TileCable;
import refinedstorage.tile.TileCrafter;
import refinedstorage.tile.TileWirelessTransmitter;
import refinedstorage.tile.config.RedstoneMode;
@@ -289,7 +290,9 @@ public class NetworkMaster {
slave.forceConnect(this);
slaves.add(slavePos);
if (!(slave instanceof TileCable)) {
slaves.add(slavePos);
}
}
this.slavesToLoad.clear();
@@ -668,6 +671,8 @@ public class NetworkMaster {
}
public void markDirty() {
NetworkMasterSavedData.getOrLoad(world).markDirty();
if (world != null) {
NetworkMasterSavedData.getOrLoad(world).markDirty();
}
}
}

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

@@ -48,7 +48,9 @@ public abstract class TileSlave extends TileBase implements ISynchronizedContain
this.network = network;
this.connected = true;
this.network.addSlave(pos);
if (!(this instanceof TileCable)) {
this.network.addSlave(pos);
}
world.notifyNeighborsOfStateChange(pos, getBlockType());

4
src/main/java/refinedstorage/tile/controller/StorageHandler.java
View File

@@ -94,16 +94,12 @@ public class StorageHandler {
int quantityPerRequest = 0;
System.out.println("stack:"+stack);
CraftingPattern pattern = network.getPatternWithBestScore(stack);
System.out.println("pattern: " +pattern);
if (pattern != null) {
for (ItemStack output : pattern.getOutputs()) {
System.out.println("output:"+output);
if (RefinedStorageUtils.compareStackNoQuantity(stack, output)) {
quantityPerRequest += output.stackSize;
System.out.println("QPR:"+quantityPerRequest);
if (!pattern.isProcessing()) {
break;

2
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -65,7 +65,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
@Override
public int getEnergyStored(EnumFacing from) {
return getNetwork().getEnergy().getEnergyStored();
return getNetwork() != null ? getNetwork().getEnergy().getEnergyStored() : 0;
}
public int getEnergyScaled(int i) {