Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #872 from viliml/patch-1

Browse source 
Add ISpecialInventory support to gate triggers
This commit is contained in:
Flow86 2013-05-21 12:10:06 -07:00
commit bece4fb77f
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
common/buildcraft/core/triggers/TriggerInventory.java
View file

@ -9,12 +9,12 @@
package buildcraft.core.triggers; package buildcraft.core.triggers;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.*;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import buildcraft.api.gates.ITriggerParameter; import buildcraft.api.gates.ITriggerParameter;
import buildcraft.api.inventory.ISpecialInventory;
import buildcraft.core.inventory.InventoryWrapper; import buildcraft.core.inventory.InventoryWrapper;
public class TriggerInventory extends BCTrigger { public class TriggerInventory extends BCTrigger {
@ -61,6 +61,29 @@ public class TriggerInventory extends BCTrigger {
searchedStack = parameter.getItem(); searchedStack = parameter.getItem();
} }
if (tile instanceof ISpecialInventory)
{
ISpecialInventory special = (ISpecialInventory) tile;
ItemStack[] arr;
int n;
switch (state)
{
case Contains:
arr = special.extractItem(false, side, 1);
return arr != null && arr.length > 0 && arr[0] != null && arr[0].stackSize > 0
&& (searchedStack == null || arr[0].isItemEqual(searchedStack));
case Empty:
arr = special.extractItem(false, side, 1);
return arr == null || arr.length == 0 || arr[0] == null || arr[0].stackSize == 0;
case Full:
break;
case Space:
if (searchedStack == null) break;
n = special.addItem(searchedStack, false, side);
return n > 0;
}
}
if (tile instanceof IInventory) { if (tile instanceof IInventory) {
ISidedInventory inv = InventoryWrapper.getWrappedInventory(tile); ISidedInventory inv = InventoryWrapper.getWrappedInventory(tile);
int invSize = inv.getSizeInventory(); int invSize = inv.getSizeInventory();