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

Fixes #132

Browse Source
This commit is contained in:
raoulvdberge
2016-12-26 02:31:59 +01:00
parent 800bbb814b
commit 4526c1a25f
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,22 +68,20 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
if (craftOnly) { if (craftOnly) {
if (craftOnlyTask[i] == null) { if (craftOnlyTask[i] == null) {
craftOnlyTask[i] = network.getCraftingManager().schedule(slot, upgrades.getItemInteractCount(), compare); craftOnlyTask[i] = network.getCraftingManager().schedule(slot, 1, compare);
if (craftOnlyTask[i] != null) { if (craftOnlyTask[i] != null) {
craftOnlyToExtract[i] = craftOnlyTask[i].getPattern().getQuantityPerRequest(slot, compare); craftOnlyToExtract[i] = craftOnlyTask[i].getPattern().getQuantityPerRequest(slot, compare);
} }
} else if (craftOnlyTask[i].isFinished() && craftOnlyTask[i].getMissing().isEmpty()) { } else if (craftOnlyTask[i].isFinished() && craftOnlyTask[i].getMissing().isEmpty()) {
int toExtract = Math.min(upgrades.getItemInteractCount(), craftOnlyToExtract[i]); ItemStack took = network.extractItem(slot, 1, compare, true);
ItemStack took = network.extractItem(slot, toExtract, compare, true);
if (took != null && ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) { if (took != null && ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) {
took = network.extractItem(slot, toExtract, compare, false); took = network.extractItem(slot, 1, compare, false);
ItemHandlerHelper.insertItem(handler, took, false); ItemHandlerHelper.insertItem(handler, took, false);
craftOnlyToExtract[i] -= toExtract; craftOnlyToExtract[i]--;
if (craftOnlyToExtract[i] <= 0) { if (craftOnlyToExtract[i] <= 0) {
craftOnlyToExtract[i] = null; craftOnlyToExtract[i] = null;

3
src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingTransfer.java
View File

@@ -4,7 +4,6 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid;
import com.raoulvdberge.refinedstorage.block.EnumGridType; import com.raoulvdberge.refinedstorage.block.EnumGridType;
import com.raoulvdberge.refinedstorage.container.ContainerGrid; import com.raoulvdberge.refinedstorage.container.ContainerGrid;
import com.raoulvdberge.refinedstorage.tile.grid.IGrid; import com.raoulvdberge.refinedstorage.tile.grid.IGrid;
import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@@ -54,7 +53,7 @@ public class MessageGridCraftingTransfer extends MessageHandlerPlayerToServer<Me
} }
} }
((NetworkNodeGrid) ((TileGrid) grid).getNode()).onRecipeTransfer(player, actualRecipe); ((NetworkNodeGrid) grid).onRecipeTransfer(player, actualRecipe);
} }
} }
} }