diff options
-rw-r--r-- | Essentials/pom.xml | 59 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/Methods.java | 1 | ||||
-rw-r--r-- | Essentials/src/net/ess3/economy/register/methods/iCo4.java | 256 | ||||
-rw-r--r-- | pom.xml | 2 |
4 files changed, 13 insertions, 305 deletions
diff --git a/Essentials/pom.xml b/Essentials/pom.xml index b6c41cbbb..f3fd665ff 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -12,61 +12,37 @@ <artifactId>Essentials</artifactId> <dependencies> - <dependency> - <groupId>com.platymuus.bukkit</groupId> - <artifactId>BukkitPermissions</artifactId> - <version>1.2</version> - </dependency> - <!--<dependency> - <groupId>org.bukkit</groupId> - <artifactId>craftbukkit</artifactId> - <version>${bukkit.version}</version> - </dependency>--> + <!-- Internal Depends --> <dependency> <groupId>${project.groupId}</groupId> <artifactId>EssentialsGroupManager</artifactId> <version>${project.version}</version> </dependency> <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>0.11.4</version> + </dependency> + <!-- Test Depends --> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.10</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <version>0.11.4</version> - </dependency> - <dependency> - <groupId>ru.tehkode</groupId> - <artifactId>PermissionsEx</artifactId> - <version>1.15</version> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>1.9.5</version> + <scope>test</scope> </dependency> - <!-- - Note: these jars are manually added to our maven repo - --> + <!-- External Plugin Depends --> <dependency> <groupId>cosine</groupId> <artifactId>BOSEconomy</artifactId> <version>0.7</version> </dependency> <dependency> - <groupId>de.bananaco</groupId> - <artifactId>bPermissions</artifactId> - <version>1.7.3</version> - </dependency> - <dependency> - <groupId>de.bananaco</groupId> - <artifactId>bPermissions2</artifactId> - <version>2.8.6</version> - </dependency> - <dependency> - <groupId>com.nijiko.coelho</groupId> - <artifactId>iConomy</artifactId> - <version>4.65</version> - </dependency> - <dependency> <groupId>com.iConomy</groupId> <artifactId>iConomy</artifactId> <version>5.0</version> @@ -82,20 +58,9 @@ <version>0.05</version> </dependency> <dependency> - <groupId>net.krinsoft</groupId> - <artifactId>Privileges</artifactId> - <version>1.3</version> - </dependency> - <dependency> <groupId>net.milkbowl</groupId> <artifactId>Vault</artifactId> <version>1.2</version> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.0</version> - <scope>test</scope> - </dependency> </dependencies> </project> 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@shortmail.com> (@nijikokun) @copyright (c) 2011 @license AOL license - * <http://aol.nexua.org> - */ -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; - } - } -} @@ -76,7 +76,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <bukkit.version>1.3.2-R2.1-SNAPSHOT</bukkit.version> + <bukkit.version>1.3.2-R1.1-SNAPSHOT</bukkit.version> <build.number>Unknown</build.number> <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs> <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width> |