From afbcadd0c315a49c945633860b96b888ef808c39 Mon Sep 17 00:00:00 2001 From: Iaccidentally Date: Fri, 28 Jun 2013 14:58:45 -0400 Subject: [API] Remove some unneeded dependencies --- .../earth2me/essentials/commands/Commandgod.java | 25 +- .../essentials/register/payment/Methods.java | 1 - .../essentials/register/payment/methods/iCo4.java | 256 --------------------- 3 files changed, 16 insertions(+), 266 deletions(-) delete mode 100644 Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java index 8da670ca8..6fa4cacd4 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java @@ -53,20 +53,27 @@ public class Commandgod extends EssentialsToggleCommand enabled = !user.isGodModeEnabled(); } - user.setGodModeEnabled(enabled); UserToggleGodmodeEvent event = new UserToggleGodmodeEvent(user, enabled); ess.getServer().getPluginManager().callEvent(event); - - if (enabled && user.getHealth() != 0) + if (!event.isCancelled()) { - user.setHealth(user.getMaxHealth()); - user.setFoodLevel(20); - } + user.setGodModeEnabled(enabled); + + if (enabled && user.getHealth() != 0) + { + user.setHealth(user.getMaxHealth()); + user.setFoodLevel(20); + } - user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled"))); - if (!sender.equals(user)) + user.sendMessage(_("godMode", enabled ? _("enabled") : _("disabled"))); + if (!sender.equals(user)) + { + sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName()))); + } + } + else { - sender.sendMessage(_("godMode", _(enabled ? "godEnabledFor" : "godDisabledFor", user.getDisplayName()))); + sender.sendMessage("Could not enable godmode, UserToggleGodmodeEvent was cancelled"); //TODO: a better message } } } diff --git a/Essentials/src/com/earth2me/essentials/register/payment/Methods.java b/Essentials/src/com/earth2me/essentials/register/payment/Methods.java index f8729923e..c3285ed89 100644 --- a/Essentials/src/com/earth2me/essentials/register/payment/Methods.java +++ b/Essentials/src/com/earth2me/essentials/register/payment/Methods.java @@ -47,7 +47,6 @@ public class Methods { addMethod("iConomy", new com.earth2me.essentials.register.payment.methods.iCo6()); addMethod("iConomy", new com.earth2me.essentials.register.payment.methods.iCo5()); - addMethod("iConomy", new com.earth2me.essentials.register.payment.methods.iCo4()); addMethod("BOSEconomy", new com.earth2me.essentials.register.payment.methods.BOSE6()); addMethod("BOSEconomy", new com.earth2me.essentials.register.payment.methods.BOSE7()); addMethod("Currency", new com.earth2me.essentials.register.payment.methods.MCUR()); diff --git a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java b/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java deleted file mode 100644 index 4542f6743..000000000 --- a/Essentials/src/com/earth2me/essentials/register/payment/methods/iCo4.java +++ /dev/null @@ -1,256 +0,0 @@ -package com.earth2me.essentials.register.payment.methods; - -import com.earth2me.essentials.register.payment.Method; -import com.nijiko.coelho.iConomy.iConomy; -import com.nijiko.coelho.iConomy.system.Account; -import org.bukkit.plugin.Plugin; - - -/** - * iConomy 4 Implementation of Method - * - * @author Nijikokun (@nijikokun) @copyright (c) 2011 @license AOL license - * - */ -public class iCo4 implements Method -{ - private iConomy iConomy; - - @Override - public iConomy getPlugin() - { - return this.iConomy; - } - - @Override - public String getName() - { - return "iConomy"; - } - - @Override - public String getLongName() - { - return getName(); - } - - @Override - public String getVersion() - { - return "4"; - } - - @Override - public int fractionalDigits() - { - return 2; - } - - @Override - public String format(double amount) - { - return com.nijiko.coelho.iConomy.iConomy.getBank().format(amount); - } - - @Override - public boolean hasBanks() - { - return false; - } - - @Override - public boolean hasBank(String bank) - { - return false; - } - - @Override - public boolean hasAccount(String name) - { - return com.nijiko.coelho.iConomy.iConomy.getBank().hasAccount(name); - } - - @Override - public boolean hasBankAccount(String bank, String name) - { - return false; - } - - @Override - public boolean createAccount(String name) - { - if (hasAccount(name)) - { - return false; - } - - try - { - com.nijiko.coelho.iConomy.iConomy.getBank().addAccount(name); - } - catch (Exception E) - { - return false; - } - - return true; - } - - @Override - public boolean createAccount(String name, Double balance) - { - if (hasAccount(name)) - { - return false; - } - - try - { - com.nijiko.coelho.iConomy.iConomy.getBank().addAccount(name, balance); - } - catch (Exception E) - { - return false; - } - - return true; - } - - @Override - public MethodAccount getAccount(String name) - { - return new iCoAccount(com.nijiko.coelho.iConomy.iConomy.getBank().getAccount(name)); - } - - @Override - public MethodBankAccount getBankAccount(String bank, String name) - { - return null; - } - - @Override - public boolean isCompatible(Plugin plugin) - { - return plugin.getDescription().getName().equalsIgnoreCase("iconomy") - && plugin.getClass().getName().equals("com.nijiko.coelho.iConomy.iConomy") - && plugin instanceof iConomy; - } - - @Override - public void setPlugin(Plugin plugin) - { - iConomy = (iConomy)plugin; - } - - - public class iCoAccount implements MethodAccount - { - private Account account; - - public iCoAccount(Account account) - { - this.account = account; - } - - public Account getiCoAccount() - { - return account; - } - - @Override - public double balance() - { - return this.account.getBalance(); - } - - @Override - public boolean set(double amount) - { - if (this.account == null) - { - return false; - } - this.account.setBalance(amount); - return true; - } - - @Override - public boolean add(double amount) - { - if (this.account == null) - { - return false; - } - this.account.add(amount); - return true; - } - - @Override - public boolean subtract(double amount) - { - if (this.account == null) - { - return false; - } - this.account.subtract(amount); - return true; - } - - @Override - public boolean multiply(double amount) - { - if (this.account == null) - { - return false; - } - this.account.multiply(amount); - return true; - } - - @Override - public boolean divide(double amount) - { - if (this.account == null) - { - return false; - } - this.account.divide(amount); - return true; - } - - @Override - public boolean hasEnough(double amount) - { - return this.account.hasEnough(amount); - } - - @Override - public boolean hasOver(double amount) - { - return this.account.hasOver(amount); - } - - @Override - public boolean hasUnder(double amount) - { - return (this.balance() < amount); - } - - @Override - public boolean isNegative() - { - return this.account.isNegative(); - } - - @Override - public boolean remove() - { - if (this.account == null) - { - return false; - } - this.account.remove(); - return true; - } - } -} -- cgit v1.2.3