From a237829c3adad42629f93ec569b9a8240f6d08d6 Mon Sep 17 00:00:00 2001 From: Flow86 Date: Wed, 22 May 2013 08:11:05 +0200 Subject: [PATCH] cleaned up format and var names as requested by @CovertJaguar at #872 --- .../core/triggers/TriggerInventory.java | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/common/buildcraft/core/triggers/TriggerInventory.java b/common/buildcraft/core/triggers/TriggerInventory.java index 60f4f6c6..a07ed244 100644 --- a/common/buildcraft/core/triggers/TriggerInventory.java +++ b/common/buildcraft/core/triggers/TriggerInventory.java @@ -9,7 +9,8 @@ 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.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -60,30 +61,27 @@ public class TriggerInventory extends BCTrigger { if (parameter != null) { 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: + + if (tile instanceof ISpecialInventory) { + ISpecialInventory specialInventory = (ISpecialInventory) tile; + ItemStack[] itemStacks; + switch (state) { + case Contains: + 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 Empty: + itemStacks = specialInventory.extractItem(false, side, 1); + return itemStacks == null || itemStacks.length == 0 || itemStacks[0] == null || itemStacks[0].stackSize == 0; + case Full: + break; + case Space: + if (searchedStack == null) break; - case Space: - if (searchedStack == null) break; - n = special.addItem(searchedStack, false, side); - return n > 0; + int added = specialInventory.addItem(searchedStack, false, side); + return added > 0; } } - + if (tile instanceof IInventory) { ISidedInventory inv = InventoryWrapper.getWrappedInventory(tile); int invSize = inv.getSizeInventory();