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

Fullness detection when crafting (#462)

Browse Source 
* Fullness detection when crafting

* Var renaming and use player position...

* Ups
This commit is contained in:
InusualZ
2016-10-13 12:59:47 -04:00
committed by Raoul
parent 6807e780c2
commit 22e07a725a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,10 +3,7 @@ package refinedstorage.tile.grid;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.InventoryCraftResult;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.inventory.*;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.nbt.NBTTagCompound;
@@ -257,7 +254,10 @@ public class TileGrid extends TileNode implements IGrid {
if (i < remainder.length && remainder[i] != null) {
if (slot != null && slot.stackSize > 1) {
if (!player.inventory.addItemStackToInventory(remainder[i].copy())) {
network.insertItem(remainder[i].copy(), remainder[i].stackSize, false);
ItemStack remainderStack = network.insertItem(remainder[i].copy(), remainder[i].stackSize, false);
if (remainderStack != null) {
InventoryHelper.spawnItemStack(player.worldObj, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), remainderStack);
}
}
matrix.decrStackSize(i, 1);
@@ -297,7 +297,10 @@ public class TileGrid extends TileNode implements IGrid {
for (ItemStack craftedItem : craftedItemsList) {
if (!player.inventory.addItemStackToInventory(craftedItem.copy())) {
network.insertItem(craftedItem, craftedItem.stackSize, false);
ItemStack remainder = network.insertItem(craftedItem, craftedItem.stackSize, false);
if (remainder != null) {
InventoryHelper.spawnItemStack(player.worldObj, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), remainder);
}
}
}