Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-14 06:36:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from mung3r/master

Browse Source 
Pulled fixes for Bose/3co + MultiCurrency support from mung3r
This commit is contained in:
Nick Minkler 2011-09-23 08:28:27 -07:00
commit fa162b3099
5 changed files with 203 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/currency.jar Normal file
View File

Binary file not shown.

10
src/net/milkbowl/vault/Vault.java
View File

@ -26,6 +26,7 @@ import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.plugins.Economy_3co;
import net.milkbowl.vault.economy.plugins.Economy_BOSE;
import net.milkbowl.vault.economy.plugins.Economy_Essentials;
import net.milkbowl.vault.economy.plugins.Economy_MultiCurrency;
import net.milkbowl.vault.economy.plugins.Economy_iConomy4;
import net.milkbowl.vault.economy.plugins.Economy_iConomy5;
import net.milkbowl.vault.economy.plugins.Economy_iConomy6;
@ -72,6 +73,15 @@ public class Vault extends JavaPlugin {
* Attempts to load Economy Addons
*/
private void loadEconomy() {
// Try to load MultiCurrency
if (packageExists(new String[] { "me.ashtheking.currency.Currency", "me.ashtheking.currency.CurrencyList" })) {
Economy econ = new Economy_MultiCurrency(this);
getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, econ, this, ServicePriority.Normal);
log.info(String.format("[%s][Economy] MultiCurrency found: %s", getDescription().getName(), econ.isEnabled() ? "Loaded" : "Waiting"));
} else {
log.info(String.format("[%s][Economy] MultiCurrency not found.", getDescription().getName()));
}
// Try to load 3co
if (packageExists(new String[] { "me.ic3d.eco.ECO" })) {
Economy econ = new Economy_3co(this);

2
src/net/milkbowl/vault/economy/plugins/Economy_3co.java
View File

@ -168,7 +168,7 @@ public class Economy_3co implements Economy {
public void onPluginDisable(PluginDisableEvent event) {
if (economy.economy != null) {
if (event.getPlugin().getDescription().getName().equals("Essentials")) {
if (event.getPlugin().getDescription().getName().equals("3co")) {
economy.economy = null;
log.info(String.format("[%s][Economy] %s unhooked.", plugin.getDescription().getName(), economy.name));
}

2
src/net/milkbowl/vault/economy/plugins/Economy_BOSE.java
View File

@ -185,7 +185,7 @@ public class Economy_BOSE implements Economy {
public void onPluginDisable(PluginDisableEvent event) {
if (economy.economy != null) {
if (event.getPlugin().getDescription().getName().equals("Essentials")) {
if (event.getPlugin().getDescription().getName().equals("BOSEconomy")) {
economy.economy = null;
log.info(String.format("[%s][Economy] %s unhooked.", plugin.getDescription().getName(), economy.name));
}

191
src/net/milkbowl/vault/economy/plugins/Economy_MultiCurrency.java Normal file
View File

@ -0,0 +1,191 @@
/**
* Copyright (C) 2011 Morgan Humes <morgan@lanaddict.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
package net.milkbowl.vault.economy.plugins;
import java.util.logging.Logger;
import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.EconomyResponse;
import org.bukkit.event.Event.Priority;
import org.bukkit.event.Event.Type;
import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.event.server.ServerListener;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import me.ashtheking.currency.Currency;
import me.ashtheking.currency.CurrencyList;
public class Economy_MultiCurrency implements Economy {
private static final Logger log = Logger.getLogger("Minecraft");
private String name = "MultiCurrency";
private Plugin plugin = null;
private PluginManager pluginManager = null;
private Currency economy = null;
private EconomyServerListener economyServerListener = null;
public Economy_MultiCurrency(Plugin plugin) {
this.plugin = plugin;
pluginManager = this.plugin.getServer().getPluginManager();
economyServerListener = new EconomyServerListener(this);
this.pluginManager.registerEvent(Type.PLUGIN_ENABLE, economyServerListener, Priority.Monitor, plugin);
this.pluginManager.registerEvent(Type.PLUGIN_DISABLE, economyServerListener, Priority.Monitor, plugin);
// Load Plugin in case it was loaded before
if (economy == null) {
Plugin multiCurrency = plugin.getServer().getPluginManager().getPlugin("MultiCurrency");
if (multiCurrency != null && multiCurrency.isEnabled()) {
economy = (Currency) multiCurrency;
log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), name));
}
}
}
@Override
public String getName() {
return name;
}
@Override
public boolean isEnabled() {
if (economy == null) {
return false;
} else {
return economy.isEnabled();
}
}
@Override
public double getBalance(String playerName) {
final double balance;
balance = CurrencyList.getValue((String) CurrencyList.maxCurrency(playerName)[0], playerName);
final double fBalance = balance;
return fBalance;
}
@Override
public EconomyResponse withdrawPlayer(String playerName, double amount) {
double balance;
EconomyResponse.ResponseType type;
String errorMessage = null;
if (amount < 0) {
errorMessage = "Cannot withdraw negative funds";
type = EconomyResponse.ResponseType.FAILURE;
amount = 0;
balance = CurrencyList.getValue((String) CurrencyList.maxCurrency(playerName)[0], playerName);
return new EconomyResponse(balance, balance, type, errorMessage);
}
if (!CurrencyList.hasEnough(playerName, amount)) {
errorMessage = "Insufficient funds";
type = EconomyResponse.ResponseType.FAILURE;
amount = 0;
balance = CurrencyList.getValue((String) CurrencyList.maxCurrency(playerName)[0], playerName);
return new EconomyResponse(balance, balance, type, errorMessage);
}
if (CurrencyList.subtract(playerName, amount)) {
type = EconomyResponse.ResponseType.SUCCESS;
balance = CurrencyList.getValue((String) CurrencyList.maxCurrency(playerName)[0], playerName);
return new EconomyResponse(amount, balance, type, errorMessage);
} else {
errorMessage = "Error withdrawing funds";
type = EconomyResponse.ResponseType.FAILURE;
amount = 0;
balance = CurrencyList.getValue((String) CurrencyList.maxCurrency(playerName)[0], playerName);
return new EconomyResponse(amount, balance, type, errorMessage);
}
}
@Override
public EconomyResponse depositPlayer(String playerName, double amount) {
double balance;
EconomyResponse.ResponseType type;
String errorMessage = null;
if (amount < 0) {
errorMessage = "Cannot deposit negative funds";
type = EconomyResponse.ResponseType.FAILURE;
amount = 0;
balance = CurrencyList.getValue((String) CurrencyList.maxCurrency(playerName)[0], playerName);
return new EconomyResponse(balance, balance, type, errorMessage);
}
if (CurrencyList.add(playerName, amount)) {
type = EconomyResponse.ResponseType.SUCCESS;
balance = CurrencyList.getValue((String) CurrencyList.maxCurrency(playerName)[0], playerName);
return new EconomyResponse(amount, balance, type, errorMessage);
} else {
errorMessage = "Error withdrawing funds";
type = EconomyResponse.ResponseType.FAILURE;
amount = 0;
balance = CurrencyList.getValue((String) CurrencyList.maxCurrency(playerName)[0], playerName);
return new EconomyResponse(balance, balance, type, errorMessage);
}
}
private class EconomyServerListener extends ServerListener {
Economy_MultiCurrency economy = null;
public EconomyServerListener(Economy_MultiCurrency economy) {
this.economy = economy;
}
public void onPluginEnable(PluginEnableEvent event) {
if (economy.economy == null) {
Plugin mcur = plugin.getServer().getPluginManager().getPlugin("MultiCurrency");
if (mcur != null && mcur.isEnabled()) {
economy.economy = (Currency) mcur;
log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name));
}
}
}
public void onPluginDisable(PluginDisableEvent event) {
if (economy.economy != null) {
if (event.getPlugin().getDescription().getName().equals("MultiCurrency")) {
economy.economy = null;
log.info(String.format("[%s][Economy] %s unhooked.", plugin.getDescription().getName(), economy.name));
}
}
}
}
@Override
public String format(double amount) {
return String.format("%.2f %s", amount, "Currency");
}
}