diff options
Diffstat (limited to 'src/main/java/gtnhlanth/common/item/ItemParticle.java')
| -rw-r--r-- | src/main/java/gtnhlanth/common/item/ItemParticle.java | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/src/main/java/gtnhlanth/common/item/ItemParticle.java b/src/main/java/gtnhlanth/common/item/ItemParticle.java index 07286e8f45..00a6477978 100644 --- a/src/main/java/gtnhlanth/common/item/ItemParticle.java +++ b/src/main/java/gtnhlanth/common/item/ItemParticle.java @@ -18,21 +18,21 @@ import gtnhlanth.common.beamline.Particle; public class ItemParticle extends Item { public static final int NUMBER_OF_SUBTYPES = Particle.values().length; - - private static String[] names = new String[NUMBER_OF_SUBTYPES]; + private static final String[] names = new String[NUMBER_OF_SUBTYPES]; static { - populateNamesArray(); + for (int i = 0; i < NUMBER_OF_SUBTYPES; i++) { + Particle particle = Particle.values()[i]; + names[i] = particle.getName(); + } } @SideOnly(Side.CLIENT) private IIcon[] iconArray; public ItemParticle() { - this.setHasSubtypes(true); this.setMaxDamage(0); - } @SideOnly(Side.CLIENT) @@ -60,7 +60,6 @@ public class ItemParticle extends Item { @Override public void registerIcons(IIconRegister register) { this.iconArray = new IIcon[NUMBER_OF_SUBTYPES]; - for (int i = 0; i < NUMBER_OF_SUBTYPES; ++i) { this.iconArray[i] = register.registerIcon(Tags.MODID + ":" + "particle/" + names[i]); } @@ -69,11 +68,8 @@ public class ItemParticle extends Item { @SideOnly(Side.CLIENT) @Override public String getItemStackDisplayName(ItemStack stack) { - int i = MathHelper.clamp_int(stack.getItemDamage(), 0, NUMBER_OF_SUBTYPES - 1); - Particle particle = Particle.values()[i]; - return particle.getLocalisedName(); } @@ -81,43 +77,20 @@ public class ItemParticle extends Item { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { - int i = MathHelper.clamp_int(stack.getItemDamage(), 0, NUMBER_OF_SUBTYPES - 1); - Particle particle = Particle.values()[i]; - float restMass = particle.getMass(); - float charge = particle.getCharge(); - String chargeSpecial = particle.getChargeSpecial(); - String chargeStringToAppend; if (chargeSpecial != null) { - chargeStringToAppend = chargeSpecial; - } else { - if (charge > 0) chargeStringToAppend = "+" + charge; else chargeStringToAppend = "" + charge; } - list.add("Rest Mass: " + restMass + " MeV"); list.add("Charge: " + chargeStringToAppend + "e"); - - } - - private static void populateNamesArray() { - - for (int i = 0; i < NUMBER_OF_SUBTYPES; i++) { - - Particle particle = Particle.values()[i]; - - names[i] = particle.getName(); - - } - } } |