From c9c1c30d3b830fb5a3375116b64e6aed1b3370ef Mon Sep 17 00:00:00 2001 From: alexbegt Date: Thu, 4 Oct 2018 23:08:41 -0400 Subject: [PATCH] Check for valid metadata before looking up name. Closes #135 --- .../ironchest/common/items/chest/ItemIronChest.java | 11 ++++++++++- .../common/items/shulker/ItemIronShulkerBox.java | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/cpw/mods/ironchest/common/items/chest/ItemIronChest.java b/src/main/java/cpw/mods/ironchest/common/items/chest/ItemIronChest.java index 4d35ba8..06acc4f 100755 --- a/src/main/java/cpw/mods/ironchest/common/items/chest/ItemIronChest.java +++ b/src/main/java/cpw/mods/ironchest/common/items/chest/ItemIronChest.java @@ -37,6 +37,15 @@ public class ItemIronChest extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemstack) { - return "tile.ironchest.chest." + IronChestType.VALUES[itemstack.getMetadata()].name().toLowerCase(Locale.US); + int meta = itemstack.getMetadata(); + + if (meta < IronChestType.VALUES.length) + { + return "tile.ironchest.chest." + IronChestType.VALUES[itemstack.getMetadata()].name().toLowerCase(Locale.US); + } + else + { + return super.getUnlocalizedName(itemstack); + } } } diff --git a/src/main/java/cpw/mods/ironchest/common/items/shulker/ItemIronShulkerBox.java b/src/main/java/cpw/mods/ironchest/common/items/shulker/ItemIronShulkerBox.java index c5a5351..193afc2 100644 --- a/src/main/java/cpw/mods/ironchest/common/items/shulker/ItemIronShulkerBox.java +++ b/src/main/java/cpw/mods/ironchest/common/items/shulker/ItemIronShulkerBox.java @@ -42,6 +42,15 @@ public class ItemIronShulkerBox extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemstack) { - return "tile.ironchest.shulker_box." + IronShulkerBoxType.VALUES[itemstack.getMetadata()].name().toLowerCase(Locale.US) + "." + this.colorName; + int meta = itemstack.getMetadata(); + + if (meta < IronShulkerBoxType.VALUES.length) + { + return "tile.ironchest.shulker_box." + IronShulkerBoxType.VALUES[itemstack.getMetadata()].name().toLowerCase(Locale.US) + "." + this.colorName; + } + else + { + return super.getUnlocalizedName(itemstack); + } } }