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

New scheduling system for exporter too

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-09 18:32:04 +02:00
parent fd252330d8
commit 7dcb77eabc
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/refinedstorage/tile/TileExporter.java
View File

@@ -11,7 +11,6 @@ import refinedstorage.RefinedStorageUtils;
import refinedstorage.container.ContainerExporter;
import refinedstorage.inventory.InventorySimple;
import refinedstorage.item.ItemUpgrade;
import refinedstorage.tile.autocrafting.CraftingPattern;
import refinedstorage.tile.config.ICompareConfig;
public class TileExporter extends TileMachine implements ICompareConfig {
@@ -22,6 +21,8 @@ public class TileExporter extends TileMachine implements ICompareConfig {
private int compare = 0;
private CraftingTaskScheduler scheduler = new CraftingTaskScheduler();
@Override
public int getEnergyUsage() {
return 2;
@@ -45,16 +46,16 @@ public class TileExporter extends TileMachine implements ICompareConfig {
ItemStack took = controller.take(toTake, compare);
if (took != null) {
scheduler.resetSchedule();
ItemStack remaining = TileEntityHopper.putStackInInventoryAllSlots(connectedInventory, took, getDirection().getOpposite());
if (remaining != null) {
controller.push(remaining);
}
} else if (RefinedStorageUtils.hasUpgrade(upgradesInventory, ItemUpgrade.TYPE_CRAFTING)) {
CraftingPattern pattern = controller.getPattern(slot, compare);
if (pattern != null && !controller.hasCraftingTask(pattern, compare)) {
controller.addCraftingTask(pattern);
if (scheduler.canSchedule(compare, slot)) {
scheduler.schedule(controller, compare, slot);
}
}
}
@@ -85,6 +86,8 @@ public class TileExporter extends TileMachine implements ICompareConfig {
RefinedStorageUtils.restoreInventory(inventory, 0, nbt);
RefinedStorageUtils.restoreInventory(upgradesInventory, 1, nbt);
scheduler.readFromNBT(nbt);
}
@Override
@@ -95,6 +98,8 @@ public class TileExporter extends TileMachine implements ICompareConfig {
RefinedStorageUtils.saveInventory(inventory, 0, nbt);
RefinedStorageUtils.saveInventory(upgradesInventory, 1, nbt);
scheduler.writeToNBT(nbt);
}
@Override