minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-18 20:41:37 +02:00
Code Issues Releases Wiki Activity

Clean up use of libraries

Browse Source
This commit is contained in:
md_5
2012-10-19 19:54:56 +11:00
parent b41f3bdef6
commit 215e093c3f
4 changed files with 13 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Essentials/pom.xml
View File

@@ -12,21 +12,18 @@
<artifactId>Essentials</artifactId> <artifactId>Essentials</artifactId>
<dependencies> <dependencies>
<dependency> <!-- Internal Depends -->
<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>-->
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>EssentialsGroupManager</artifactId> <artifactId>EssentialsGroupManager</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>0.11.4</version>
</dependency>
<!-- Test Depends -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
@@ -34,38 +31,17 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.mockito</groupId>
<artifactId>lombok</artifactId> <artifactId>mockito-core</artifactId>
<version>0.11.4</version> <version>1.9.5</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <!-- External Plugin Depends -->
<groupId>ru.tehkode</groupId>
<artifactId>PermissionsEx</artifactId>
<version>1.15</version>
</dependency>
<!--
Note: these jars are manually added to our maven repo
-->
<dependency> <dependency>
<groupId>cosine</groupId> <groupId>cosine</groupId>
<artifactId>BOSEconomy</artifactId> <artifactId>BOSEconomy</artifactId>
<version>0.7</version> <version>0.7</version>
</dependency> </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> <dependency>
<groupId>com.iConomy</groupId> <groupId>com.iConomy</groupId>
<artifactId>iConomy</artifactId> <artifactId>iConomy</artifactId>
@@ -81,21 +57,10 @@
<artifactId>MultiCurrency</artifactId> <artifactId>MultiCurrency</artifactId>
<version>0.05</version> <version>0.05</version>
</dependency> </dependency>
<dependency>
<groupId>net.krinsoft</groupId>
<artifactId>Privileges</artifactId>
<version>1.3</version>
</dependency>
<dependency> <dependency>
<groupId>net.milkbowl</groupId> <groupId>net.milkbowl</groupId>
<artifactId>Vault</artifactId> <artifactId>Vault</artifactId>
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.0</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

1
Essentials/src/net/ess3/economy/register/Methods.java
View File

@@ -47,7 +47,6 @@ public class Methods
{ {
addMethod("iConomy", new net.ess3.economy.register.methods.iCo6()); 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.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.BOSE6());
addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE7()); addMethod("BOSEconomy", new net.ess3.economy.register.methods.BOSE7());
addMethod("Currency", new net.ess3.economy.register.methods.MCUR()); addMethod("Currency", new net.ess3.economy.register.methods.MCUR());

256
Essentials/src/net/ess3/economy/register/methods/iCo4.java
View File

@@ -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;
}
}
}

2
pom.xml
View File

@@ -76,7 +76,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <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> <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.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> <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>