Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

NPE protection in the charge/tool modes

Browse source
This commit is contained in:
Pahimar 2016-05-28 08:53:01 -04:00
parent 7966625965
commit 9e7f1cc910
5 changed files with 40 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/pahimar/ee3/item/ItemDarkMatterAxe.java
View file

@ -47,9 +47,13 @@ public class ItemDarkMatterAxe extends ItemToolModalEE implements IKeyBound, ICh
@Override @Override
public short getChargeLevel(ItemStack itemStack) public short getChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) != null) {
return NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL); return NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL);
} }
return 0;
}
@Override @Override
public void setChargeLevel(ItemStack itemStack, short chargeLevel) public void setChargeLevel(ItemStack itemStack, short chargeLevel)
{ {
@ -62,18 +66,18 @@ public class ItemDarkMatterAxe extends ItemToolModalEE implements IKeyBound, ICh
@Override @Override
public void increaseChargeLevel(ItemStack itemStack) public void increaseChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) < this.getMaxChargeLevel()) if (getChargeLevel(itemStack) < this.getMaxChargeLevel())
{ {
NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) + 1)); NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (getChargeLevel(itemStack) + 1));
} }
} }
@Override @Override
public void decreaseChargeLevel(ItemStack itemStack) public void decreaseChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) > 0) if (getChargeLevel(itemStack)> 0)
{ {
NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) - 1)); NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (getChargeLevel(itemStack) - 1));
} }
} }

14
src/main/java/com/pahimar/ee3/item/ItemDarkMatterHoe.java
View file

@ -85,9 +85,13 @@ public class ItemDarkMatterHoe extends ItemHoe implements IKeyBound, IChargeable
@Override @Override
public short getChargeLevel(ItemStack itemStack) public short getChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) != null) {
return NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL); return NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL);
} }
return 0;
}
@Override @Override
public void setChargeLevel(ItemStack itemStack, short chargeLevel) public void setChargeLevel(ItemStack itemStack, short chargeLevel)
{ {
@ -100,18 +104,18 @@ public class ItemDarkMatterHoe extends ItemHoe implements IKeyBound, IChargeable
@Override @Override
public void increaseChargeLevel(ItemStack itemStack) public void increaseChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) < this.getMaxChargeLevel()) if (getChargeLevel(itemStack) < this.getMaxChargeLevel())
{ {
NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) + 1)); NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (getChargeLevel(itemStack) + 1));
} }
} }
@Override @Override
public void decreaseChargeLevel(ItemStack itemStack) public void decreaseChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) > 0) if (getChargeLevel(itemStack) > 0)
{ {
NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) - 1)); NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (getChargeLevel(itemStack) - 1));
} }
} }
@ -162,7 +166,7 @@ public class ItemDarkMatterHoe extends ItemHoe implements IKeyBound, IChargeable
@Override @Override
public ToolMode getCurrentToolMode(ItemStack itemStack) public ToolMode getCurrentToolMode(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.MODE) < ToolMode.TYPES.length) if (NBTHelper.getShort(itemStack, Names.NBT.MODE) != null && NBTHelper.getShort(itemStack, Names.NBT.MODE) < ToolMode.TYPES.length)
{ {
return ToolMode.TYPES[NBTHelper.getShort(itemStack, Names.NBT.MODE)]; return ToolMode.TYPES[NBTHelper.getShort(itemStack, Names.NBT.MODE)];
} }

12
src/main/java/com/pahimar/ee3/item/ItemDarkMatterPickAxe.java
View file

@ -78,9 +78,13 @@ public class ItemDarkMatterPickAxe extends ItemToolModalEE implements IKeyBound,
@Override @Override
public short getChargeLevel(ItemStack itemStack) public short getChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) != null) {
return NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL); return NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL);
} }
return 0;
}
@Override @Override
public void setChargeLevel(ItemStack itemStack, short chargeLevel) public void setChargeLevel(ItemStack itemStack, short chargeLevel)
{ {
@ -93,18 +97,18 @@ public class ItemDarkMatterPickAxe extends ItemToolModalEE implements IKeyBound,
@Override @Override
public void increaseChargeLevel(ItemStack itemStack) public void increaseChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) < this.getMaxChargeLevel()) if (getChargeLevel(itemStack) < this.getMaxChargeLevel())
{ {
NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) + 1)); NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (getChargeLevel(itemStack) + 1));
} }
} }
@Override @Override
public void decreaseChargeLevel(ItemStack itemStack) public void decreaseChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) > 0) if (getChargeLevel(itemStack) > 0)
{ {
NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) - 1)); NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (getChargeLevel(itemStack) - 1));
} }
} }

16
src/main/java/com/pahimar/ee3/item/ItemDarkMatterShovel.java
View file

@ -45,11 +45,15 @@ public class ItemDarkMatterShovel extends ItemToolModalEE implements IKeyBound,
} }
@Override @Override
public short getChargeLevel(ItemStack itemStack) public short getChargeLevel(ItemStack itemStack) {
{
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) != null) {
return NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL); return NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL);
} }
return 0;
}
@Override @Override
public void setChargeLevel(ItemStack itemStack, short chargeLevel) public void setChargeLevel(ItemStack itemStack, short chargeLevel)
{ {
@ -62,18 +66,18 @@ public class ItemDarkMatterShovel extends ItemToolModalEE implements IKeyBound,
@Override @Override
public void increaseChargeLevel(ItemStack itemStack) public void increaseChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) < this.getMaxChargeLevel()) if (getChargeLevel(itemStack) < this.getMaxChargeLevel())
{ {
NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) + 1)); NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (getChargeLevel(itemStack) + 1));
} }
} }
@Override @Override
public void decreaseChargeLevel(ItemStack itemStack) public void decreaseChargeLevel(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) > 0) if (getChargeLevel(itemStack) > 0)
{ {
NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (NBTHelper.getShort(itemStack, Names.NBT.CHARGE_LEVEL) - 1)); NBTHelper.setShort(itemStack, Names.NBT.CHARGE_LEVEL, (short) (getChargeLevel(itemStack) - 1));
} }
} }

2
src/main/java/com/pahimar/ee3/item/ItemToolModalEE.java
View file

@ -26,7 +26,7 @@ public class ItemToolModalEE extends ItemToolEE implements IModalTool
@Override @Override
public ToolMode getCurrentToolMode(ItemStack itemStack) public ToolMode getCurrentToolMode(ItemStack itemStack)
{ {
if (NBTHelper.getShort(itemStack, Names.NBT.MODE) < ToolMode.TYPES.length) if (NBTHelper.getShort(itemStack, Names.NBT.MODE) != null && NBTHelper.getShort(itemStack, Names.NBT.MODE) < ToolMode.TYPES.length)
{ {
return ToolMode.TYPES[NBTHelper.getShort(itemStack, Names.NBT.MODE)]; return ToolMode.TYPES[NBTHelper.getShort(itemStack, Names.NBT.MODE)];
} }