From 2b2d9d69b31def6a4620705afb69d6c82dfe225a Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sun, 22 Mar 2015 16:13:06 -0400 Subject: [PATCH] Fixed transition crashes --- src/main/java/mekanism/common/item/ItemClump.java | 7 ++++++- src/main/java/mekanism/common/item/ItemCrystal.java | 7 ++++++- src/main/java/mekanism/common/item/ItemDirtyDust.java | 7 ++++++- src/main/java/mekanism/common/item/ItemShard.java | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java index 5aa894aec..ff03f16b1 100644 --- a/src/main/java/mekanism/common/item/ItemClump.java +++ b/src/main/java/mekanism/common/item/ItemClump.java @@ -46,6 +46,11 @@ public class ItemClump extends ItemMekanism @Override public String getUnlocalizedName(ItemStack item) { - return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Clump"; + if(item.getItemDamage() <= Resource.values().length-1) + { + return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Clump"; + } + + return "Invalid"; } } diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java index b16066a51..b271c9c26 100644 --- a/src/main/java/mekanism/common/item/ItemCrystal.java +++ b/src/main/java/mekanism/common/item/ItemCrystal.java @@ -46,6 +46,11 @@ public class ItemCrystal extends ItemMekanism @Override public String getUnlocalizedName(ItemStack item) { - return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Crystal"; + if(item.getItemDamage() <= Resource.values().length-1) + { + return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Crystal"; + } + + return "Invalid"; } } diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java index 8805a6854..19a4c5085 100644 --- a/src/main/java/mekanism/common/item/ItemDirtyDust.java +++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java @@ -49,6 +49,11 @@ public class ItemDirtyDust extends ItemMekanism @Override public String getUnlocalizedName(ItemStack item) { - return "item.dirty" + Resource.values()[item.getItemDamage()].getName() + "Dust"; + if(item.getItemDamage() <= Resource.values().length-1) + { + return "item.dirty" + Resource.values()[item.getItemDamage()].getName() + "Dust"; + } + + return "Invalid"; } } diff --git a/src/main/java/mekanism/common/item/ItemShard.java b/src/main/java/mekanism/common/item/ItemShard.java index 575f86e52..71d379c33 100644 --- a/src/main/java/mekanism/common/item/ItemShard.java +++ b/src/main/java/mekanism/common/item/ItemShard.java @@ -46,6 +46,11 @@ public class ItemShard extends ItemMekanism @Override public String getUnlocalizedName(ItemStack item) { - return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Shard"; + if(item.getItemDamage() <= Resource.values().length-1) + { + return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "Shard"; + } + + return "Invalid"; } }