diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/BaseEuItem.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java index 57e183f998..b4988136c0 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseEuItem.java @@ -572,7 +572,11 @@ public class BaseEuItem extends Item implements ISpecialElectricItem, IElectricI @Override public String getItemStackDisplayName(final ItemStack par1ItemStack) { - return this.itemName.get(par1ItemStack.getItemDamage()-this.mOffset).getValue(); + int keyValue = (par1ItemStack.getItemDamage() - this.mOffset); + if (keyValue < 0 || keyValue > 3) { + keyValue = 0; + } + return this.itemName.get(keyValue).getValue(); } } diff --git a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java index bdddd26255..2943951734 100644 --- a/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/Java/gtPlusPlus/core/item/tool/misc/GregtechPump.java @@ -686,7 +686,11 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri @Override public String getItemStackDisplayName(final ItemStack par1ItemStack) { - return this.itemName.get(par1ItemStack.getItemDamage() - this.mOffset).getValue(); + int keyValue = (par1ItemStack.getItemDamage() - this.mOffset); + if (keyValue < 0 || keyValue > 3) { + keyValue = 0; + } + return this.itemName.get(keyValue).getValue(); } /** @@ -938,12 +942,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri return false; } else { double aCharge = this.getCharge(aStack); - boolean didDrain; + boolean didDrain = false; if (aTier > 0 && aCharge > 0) { if (discharge(aStack, removal, aTier, true, true, false) > 0) { didDrain = true; - } else { - didDrain = false; } } else if (aTier == 0) { didDrain = true; @@ -954,9 +956,10 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri if (didDrain) { if ((tTileEntity instanceof IGregTechTileEntity)) { return this.drainTankGT(tTileEntity, aStack, aWorld, aPlayer, aX, aY, aZ); - } else if ((tTileEntity instanceof IFluidTank || tTileEntity instanceof IFluidHandler)) { + } + /*else if ((tTileEntity instanceof IFluidTank || tTileEntity instanceof IFluidHandler)) { return this.drainIFluidTank(tTileEntity, aStack, aWorld, aPlayer, aX, aY, aZ); - } + }*/ } } } @@ -1211,7 +1214,6 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri return false; } final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - ; if (aMetaTileEntity == null) { return false; } |