diff --git a/Essentials/pom.xml b/Essentials/pom.xml
index b6c41cbbb..f3fd665ff 100644
--- a/Essentials/pom.xml
+++ b/Essentials/pom.xml
@@ -12,21 +12,18 @@
Essentials
-
- com.platymuus.bukkit
- BukkitPermissions
- 1.2
-
-
+
${project.groupId}
EssentialsGroupManager
${project.version}
+
+ org.projectlombok
+ lombok
+ 0.11.4
+
+
junit
junit
@@ -34,38 +31,17 @@
test
- org.projectlombok
- lombok
- 0.11.4
+ org.mockito
+ mockito-core
+ 1.9.5
+ test
-
- ru.tehkode
- PermissionsEx
- 1.15
-
-
+
cosine
BOSEconomy
0.7
-
- de.bananaco
- bPermissions
- 1.7.3
-
-
- de.bananaco
- bPermissions2
- 2.8.6
-
-
- com.nijiko.coelho
- iConomy
- 4.65
-
com.iConomy
iConomy
@@ -81,21 +57,10 @@
MultiCurrency
0.05
-
- net.krinsoft
- Privileges
- 1.3
-
net.milkbowl
Vault
1.2
-
- org.mockito
- mockito-all
- 1.9.0
- test
-
diff --git a/Essentials/src/net/ess3/economy/register/Methods.java b/Essentials/src/net/ess3/economy/register/Methods.java
index 04208b4cb..7f5acfa3f 100644
--- a/Essentials/src/net/ess3/economy/register/Methods.java
+++ b/Essentials/src/net/ess3/economy/register/Methods.java
@@ -47,7 +47,6 @@ public class Methods
{
addMethod("iConomy", new net.ess3.economy.register.methods.iCo6());
addMethod("iConomy", new net.ess3.economy.register.methods.iCo5());
- addMethod("iConomy", new net.ess3.economy.register.methods.iCo4());
addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE6());
addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE7());
addMethod("Currency", new net.ess3.economy.register.methods.MCUR());
diff --git a/Essentials/src/net/ess3/economy/register/methods/iCo4.java b/Essentials/src/net/ess3/economy/register/methods/iCo4.java
deleted file mode 100644
index cf365d322..000000000
--- a/Essentials/src/net/ess3/economy/register/methods/iCo4.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package net.ess3.economy.register.methods;
-
-import com.nijiko.coelho.iConomy.iConomy;
-import com.nijiko.coelho.iConomy.system.Account;
-import net.ess3.economy.register.Method;
-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;
- }
- }
-}
diff --git a/pom.xml b/pom.xml
index 066ee5827..5f6a6b90f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
UTF-8
- 1.3.2-R2.1-SNAPSHOT
+ 1.3.2-R1.1-SNAPSHOT
Unknown
true
2