Future Java versions may not support _ as identifier.

This commit is contained in:
FearFree 2014-03-20 10:54:07 -05:00 committed by Chris Ward
parent 0b5718f7ff
commit 5724c0c8df
176 changed files with 1032 additions and 1028 deletions

View file

@ -1,6 +1,6 @@
package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._;
import static com.earth2me.essentials.I18n.tl;
import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.StringUtil;
import java.util.*;
@ -143,20 +143,20 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
}
catch (Throwable throwable)
{
throw new Exception(_("unknownItemName", itemname), throwable);
throw new Exception(tl("unknownItemName", itemname), throwable);
}
}
}
if (itemid < 1)
{
throw new Exception(_("unknownItemName", itemname));
throw new Exception(tl("unknownItemName", itemname));
}
final Material mat = Material.getMaterial(itemid);
if (mat == null)
{
throw new Exception(_("unknownItemId", itemid));
throw new Exception(tl("unknownItemId", itemid));
}
final ItemStack retval = new ItemStack(mat);
retval.setAmount(mat.getMaxStackSize());
@ -206,7 +206,7 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb
if (is.isEmpty() || is.get(0).getType() == Material.AIR)
{
throw new Exception(_("itemSellAir"));
throw new Exception(tl("itemSellAir"));
}
return is;