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

cleaned up format and var names as requested by @CovertJaguar at #872

Browse source
This commit is contained in:
Flow86 2013-05-22 08:11:05 +02:00
parent bece4fb77f
commit a237829c3a
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,8 @@
package buildcraft.core.triggers; package buildcraft.core.triggers;
import net.minecraft.inventory.*; import net.minecraft.inventory.IInventory;
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;
@ -60,30 +61,27 @@ public class TriggerInventory extends BCTrigger {
if (parameter != null) { if (parameter != null) {
searchedStack = parameter.getItem(); searchedStack = parameter.getItem();
} }
if (tile instanceof ISpecialInventory) if (tile instanceof ISpecialInventory) {
{ ISpecialInventory specialInventory = (ISpecialInventory) tile;
ISpecialInventory special = (ISpecialInventory) tile; ItemStack[] itemStacks;
ItemStack[] arr; switch (state) {
int n; case Contains:
switch (state) itemStacks = specialInventory.extractItem(false, side, 1);
{ return itemStacks != null && itemStacks.length > 0 && itemStacks[0] != null && itemStacks[0].stackSize > 0 && (searchedStack == null || itemStacks[0].isItemEqual(searchedStack));
case Contains: case Empty:
arr = special.extractItem(false, side, 1); itemStacks = specialInventory.extractItem(false, side, 1);
return arr != null && arr.length > 0 && arr[0] != null && arr[0].stackSize > 0 return itemStacks == null || itemStacks.length == 0 || itemStacks[0] == null || itemStacks[0].stackSize == 0;
&& (searchedStack == null || arr[0].isItemEqual(searchedStack)); case Full:
case Empty: break;
arr = special.extractItem(false, side, 1); case Space:
return arr == null || arr.length == 0 || arr[0] == null || arr[0].stackSize == 0; if (searchedStack == null)
case Full:
break; break;
case Space: int added = specialInventory.addItem(searchedStack, false, side);
if (searchedStack == null) break; return added > 0;
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();