From ec0d6651b07caae6ac56ae78378c669b93a88572 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Tue, 17 Jan 2012 03:13:44 +0000 Subject: [PATCH] Removing 2 dead classes. --- Essentials/nbproject/project.properties | 2 +- .../src/com/earth2me/essentials/Kit.java | 119 ------------------ .../api/IAlternativeCommandsHandler.java | 14 --- .../essentials/api/IEssentialsEconomy.java | 2 +- 4 files changed, 2 insertions(+), 135 deletions(-) delete mode 100644 Essentials/src/com/earth2me/essentials/Kit.java delete mode 100644 Essentials/src/com/earth2me/essentials/api/IAlternativeCommandsHandler.java diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties index 87e522254..7aac1ae1a 100644 --- a/Essentials/nbproject/project.properties +++ b/Essentials/nbproject/project.properties @@ -118,7 +118,7 @@ javadoc.reference.PermissionsEx.jar=../lib/PermissionsEx-javadoc.jar javadoc.splitindex=true javadoc.use=true javadoc.version=false -javadoc.windowtitle= +javadoc.windowtitle=Essentials Docs. jnlp.codebase.type=no.codebase jnlp.descriptor=application jnlp.enabled=false diff --git a/Essentials/src/com/earth2me/essentials/Kit.java b/Essentials/src/com/earth2me/essentials/Kit.java deleted file mode 100644 index 2e6111e8a..000000000 --- a/Essentials/src/com/earth2me/essentials/Kit.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.earth2me.essentials; - -import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.api.IEssentials; -import com.earth2me.essentials.api.IUser; -import com.earth2me.essentials.commands.NoChargeException; -import com.earth2me.essentials.craftbukkit.InventoryWorkaround; -import java.util.*; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; - -/* -public class Kit -{ - //TODO: Convert this to use one of the new text classes? - public static String listKits(final IEssentials ess, final IUser user) throws Exception - { - try - { - final Map kits = ess.getSettings().getKits(); - final StringBuilder list = new StringBuilder(); - for (String kiteItem : kits.keySet()) - { - if (user.isAuthorized("essentials.kit." + kiteItem.toLowerCase(Locale.ENGLISH))) - { - list.append(" ").append(kiteItem); - } - } - return list.toString(); - } - catch (Exception ex) - { - throw new Exception(_("kitError")); - } - - } - - - - public static List getItems(final IUser user, final Map els) throws Exception - { - try - { - return (List)els.get("items"); - } - catch (Exception e) - { - user.sendMessage(_("kitError2")); - throw new Exception(_("kitErrorHelp")); - } - } - - public static void expandItems(final IEssentials ess, final IUser user, final List items) throws Exception - { - try - { - boolean spew = false; - for (String d : items) - { - final String[] parts = d.split("[^0-9]+", 3); - final int id = Material.getMaterial(Integer.parseInt(parts[0])).getId(); - final int amount = parts.length > 1 ? Integer.parseInt(parts[parts.length > 2 ? 2 : 1]) : 1; - final short data = parts.length > 2 ? Short.parseShort(parts[1]) : 0; - final Map overfilled; - if (user.isAuthorized("essentials.oversizedstacks")) - { - overfilled = InventoryWorkaround.addItem(user.getInventory(), true, ess.getSettings().getOversizedStackSize(), new ItemStack(id, amount, data)); - } - else - { - overfilled = InventoryWorkaround.addItem(user.getInventory(), true, new ItemStack(id, amount, data)); - } - for (ItemStack itemStack : overfilled.values()) - { - user.getWorld().dropItemNaturally(user.getLocation(), itemStack); - spew = true; - } - } - user.updateInventory(); - if (spew) - { - user.sendMessage(_("kitInvFull")); - } - } - catch (Exception e) - { - user.updateInventory(); - throw new Exception(_("kitError2")); - } - } - - - public static void checkTime(final IUser user, final String kitName, final Map els) throws NoChargeException - { - final double delay = els.containsKey("delay") ? ((Number)els.get("delay")).doubleValue() : 0L; - final Calendar c = new GregorianCalendar(); - c.add(Calendar.SECOND, -(int)delay); - c.add(Calendar.MILLISECOND, -(int)((delay * 1000.0) % 1000.0)); - - final long mintime = c.getTimeInMillis(); - - final Long lastTime = user.getKitTimestamp(kitName); - if (lastTime == null || lastTime < mintime) - { - final Calendar now = new GregorianCalendar(); - user.setKitTimestamp(kitName, now.getTimeInMillis()); - } - else - { - final Calendar future = new GregorianCalendar(); - future.setTimeInMillis(lastTime); - future.add(Calendar.SECOND, (int)delay); - future.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0)); - user.sendMessage(_("kitTimed", Util.formatDateDiff(future.getTimeInMillis()))); - throw new NoChargeException(); - } - } -} -*/ \ No newline at end of file diff --git a/Essentials/src/com/earth2me/essentials/api/IAlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/api/IAlternativeCommandsHandler.java deleted file mode 100644 index 2c176de6b..000000000 --- a/Essentials/src/com/earth2me/essentials/api/IAlternativeCommandsHandler.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.earth2me.essentials.api; - -import java.util.Map; -import org.bukkit.plugin.Plugin; - - -public interface IAlternativeCommandsHandler -{ - Map disabledCommands(); - - public void removePlugin(Plugin plugin); - - public void addPlugin(Plugin plugin); -} diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentialsEconomy.java b/Essentials/src/com/earth2me/essentials/api/IEssentialsEconomy.java index 72fb89d26..f94a150de 100644 --- a/Essentials/src/com/earth2me/essentials/api/IEssentialsEconomy.java +++ b/Essentials/src/com/earth2me/essentials/api/IEssentialsEconomy.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.api; - +//TODO: Decide on this files fate public interface IEssentialsEconomy { double getMoney(String name) throws UserDoesNotExistException;