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

Fixed bug where Grid doesn't handle remainder sometimes, fixes #185

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-10 19:02:58 +02:00
parent 45cfb8c06a
commit d4a9d46e1a
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/container/slot/SlotGridCraftingResult.java
View File

@@ -25,7 +25,7 @@ public class SlotGridCraftingResult extends SlotCrafting {
onCrafting(stack);
if (!player.worldObj.isRemote) {
grid.onCrafted();
grid.onCrafted(player);
container.sendCraftingSlots();
}

20
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -126,15 +126,23 @@ public class TileGrid extends TileNode implements IGrid {
result.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(matrix, worldObj));
}
public void onCrafted() {
public void onCrafted(EntityPlayer player) {
ItemStack[] remainder = CraftingManager.getInstance().getRemainingItems(matrix, worldObj);
for (int i = 0; i < matrix.getSizeInventory(); ++i) {
if (i < remainder.length && remainder[i] != null) {
matrix.setInventorySlotContents(i, remainder[i].copy());
} else {
ItemStack slot = matrix.getStackInSlot(i);
ItemStack slot = matrix.getStackInSlot(i);
if (i < remainder.length && remainder[i] != null) {
if (slot != null && slot.stackSize > 1) {
if (!player.inventory.addItemStackToInventory(remainder[i].copy())) {
InventoryHelper.spawnItemStack(player.worldObj, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), remainder[i].copy());
}
matrix.decrStackSize(i, 1);
} else {
matrix.setInventorySlotContents(i, remainder[i].copy());
}
} else {
if (slot != null) {
if (slot.stackSize == 1 && isConnected()) {
matrix.setInventorySlotContents(i, RefinedStorageUtils.extractItem(network, slot, 1));
@@ -154,7 +162,7 @@ public class TileGrid extends TileNode implements IGrid {
ItemStack crafted = result.getStackInSlot(0);
while (true) {
onCrafted();
onCrafted(player);
craftedItemsList.add(crafted.copy());