Fix some more issues
This commit is contained in:
@@ -26,6 +26,7 @@ import refinedstorage.block.EnumControllerType;
|
|||||||
import refinedstorage.container.ContainerGrid;
|
import refinedstorage.container.ContainerGrid;
|
||||||
import refinedstorage.item.ItemPattern;
|
import refinedstorage.item.ItemPattern;
|
||||||
import refinedstorage.network.MessageGridItems;
|
import refinedstorage.network.MessageGridItems;
|
||||||
|
import refinedstorage.tile.TileCable;
|
||||||
import refinedstorage.tile.TileCrafter;
|
import refinedstorage.tile.TileCrafter;
|
||||||
import refinedstorage.tile.TileWirelessTransmitter;
|
import refinedstorage.tile.TileWirelessTransmitter;
|
||||||
import refinedstorage.tile.config.RedstoneMode;
|
import refinedstorage.tile.config.RedstoneMode;
|
||||||
@@ -289,7 +290,9 @@ public class NetworkMaster {
|
|||||||
|
|
||||||
slave.forceConnect(this);
|
slave.forceConnect(this);
|
||||||
|
|
||||||
slaves.add(slavePos);
|
if (!(slave instanceof TileCable)) {
|
||||||
|
slaves.add(slavePos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.slavesToLoad.clear();
|
this.slavesToLoad.clear();
|
||||||
@@ -668,6 +671,8 @@ public class NetworkMaster {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void markDirty() {
|
public void markDirty() {
|
||||||
NetworkMasterSavedData.getOrLoad(world).markDirty();
|
if (world != null) {
|
||||||
|
NetworkMasterSavedData.getOrLoad(world).markDirty();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,9 @@ public abstract class TileSlave extends TileBase implements ISynchronizedContain
|
|||||||
this.network = network;
|
this.network = network;
|
||||||
this.connected = true;
|
this.connected = true;
|
||||||
|
|
||||||
this.network.addSlave(pos);
|
if (!(this instanceof TileCable)) {
|
||||||
|
this.network.addSlave(pos);
|
||||||
|
}
|
||||||
|
|
||||||
world.notifyNeighborsOfStateChange(pos, getBlockType());
|
world.notifyNeighborsOfStateChange(pos, getBlockType());
|
||||||
|
|
||||||
|
|||||||
@@ -94,16 +94,12 @@ public class StorageHandler {
|
|||||||
|
|
||||||
int quantityPerRequest = 0;
|
int quantityPerRequest = 0;
|
||||||
|
|
||||||
System.out.println("stack:"+stack);
|
|
||||||
CraftingPattern pattern = network.getPatternWithBestScore(stack);
|
CraftingPattern pattern = network.getPatternWithBestScore(stack);
|
||||||
System.out.println("pattern: " +pattern);
|
|
||||||
|
|
||||||
if (pattern != null) {
|
if (pattern != null) {
|
||||||
for (ItemStack output : pattern.getOutputs()) {
|
for (ItemStack output : pattern.getOutputs()) {
|
||||||
System.out.println("output:"+output);
|
|
||||||
if (RefinedStorageUtils.compareStackNoQuantity(stack, output)) {
|
if (RefinedStorageUtils.compareStackNoQuantity(stack, output)) {
|
||||||
quantityPerRequest += output.stackSize;
|
quantityPerRequest += output.stackSize;
|
||||||
System.out.println("QPR:"+quantityPerRequest);
|
|
||||||
|
|
||||||
if (!pattern.isProcessing()) {
|
if (!pattern.isProcessing()) {
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getEnergyStored(EnumFacing from) {
|
public int getEnergyStored(EnumFacing from) {
|
||||||
return getNetwork().getEnergy().getEnergyStored();
|
return getNetwork() != null ? getNetwork().getEnergy().getEnergyStored() : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getEnergyScaled(int i) {
|
public int getEnergyScaled(int i) {
|
||||||
|
|||||||
Reference in New Issue
Block a user