From 48c3c983a336b794a926f3f69a5e5b9712424620 Mon Sep 17 00:00:00 2001 From: Nick Minkler Date: Thu, 9 Jan 2014 17:31:13 -0800 Subject: [PATCH] Add DigiCoin support, thanks @minizbot2012 --- lib/DigiCoin.jar | Bin 0 -> 8536 bytes pom.xml | 23 +- src/net/milkbowl/vault/Vault.java | 5 + .../economy/plugins/Economy_DigiCoin.java | 250 ++++++++++++++++++ 4 files changed, 270 insertions(+), 8 deletions(-) create mode 100644 lib/DigiCoin.jar create mode 100644 src/net/milkbowl/vault/economy/plugins/Economy_DigiCoin.java diff --git a/lib/DigiCoin.jar b/lib/DigiCoin.jar new file mode 100644 index 0000000000000000000000000000000000000000..89a9f1cdab74ec43137f3ab8277b663d73f10b99 GIT binary patch literal 8536 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 literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index 1df8741..31e2fc7 100644 --- a/pom.xml +++ b/pom.xml @@ -41,12 +41,12 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms - - pub-repo - Public Releases - http://nexus.theyeticave.net/content/repositories/pub_releases/ - - + + pub-repo + Public Releases + http://nexus.theyeticave.net/content/repositories/pub_releases/ + + @@ -68,7 +68,7 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms escapecraft-repo http://dev.escapecraft.com/maven - + @@ -377,13 +377,20 @@ Vault currently supports the following: Permissions 3, PEX, GroupManager, bPerms system ${project.basedir}/lib/TAEcon.jar - + KPerms KPerms 1.0 system ${project.basedir}/lib/KPerms.jar + + co.uk.silvania.cities.digicoin + DigiCoin + 0.1 + system + ${project.basedir}/lib/DigiCoin.jar + diff --git a/src/net/milkbowl/vault/Vault.java b/src/net/milkbowl/vault/Vault.java index 8b6cbb5..43cf97d 100644 --- a/src/net/milkbowl/vault/Vault.java +++ b/src/net/milkbowl/vault/Vault.java @@ -48,6 +48,7 @@ import net.milkbowl.vault.economy.plugins.Economy_CommandsEX; import net.milkbowl.vault.economy.plugins.Economy_Craftconomy; import net.milkbowl.vault.economy.plugins.Economy_Craftconomy3; import net.milkbowl.vault.economy.plugins.Economy_CurrencyCore; +import net.milkbowl.vault.economy.plugins.Economy_DigiCoin; import net.milkbowl.vault.economy.plugins.Economy_Dosh; import net.milkbowl.vault.economy.plugins.Economy_EconXP; import net.milkbowl.vault.economy.plugins.Economy_Essentials; @@ -105,6 +106,7 @@ import org.json.simple.JSONObject; import org.json.simple.JSONValue; import com.nijikokun.register.payment.Methods; + import net.milkbowl.vault.chat.plugins.Chat_TotalPermissions; import net.milkbowl.vault.economy.plugins.Economy_MiConomy; @@ -329,6 +331,9 @@ public class Vault extends JavaPlugin { // Try to load TAEcon hookEconomy("TAEcon", Economy_TAEcon.class, ServicePriority.Normal, "net.teamalpha.taecon.TAEcon"); + + // Try to load DigiCoin + hookEconomy("DigiCoin", Economy_DigiCoin.class, ServicePriority.Normal, "co.uk.silvania.cities.digicoin.DigiCoin"); } /** diff --git a/src/net/milkbowl/vault/economy/plugins/Economy_DigiCoin.java b/src/net/milkbowl/vault/economy/plugins/Economy_DigiCoin.java new file mode 100644 index 0000000..cf5f6ea --- /dev/null +++ b/src/net/milkbowl/vault/economy/plugins/Economy_DigiCoin.java @@ -0,0 +1,250 @@ +/* This file is part of Vault. + + Vault is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Vault 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with Vault. If not, see . + */ +package net.milkbowl.vault.economy.plugins; + +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Logger; + +import org.bukkit.Bukkit; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.server.PluginDisableEvent; +import org.bukkit.event.server.PluginEnableEvent; +import org.bukkit.plugin.Plugin; + +import co.uk.silvania.cities.digicoin.DigiCoin; +import net.milkbowl.vault.economy.EconomyResponse; +import net.milkbowl.vault.economy.EconomyResponse.ResponseType; + +public class Economy_DigiCoin implements net.milkbowl.vault.economy.Economy { + private static final Logger log = Logger.getLogger("Minecraft"); + + private final String name = "DigiCoin"; + private Plugin plugin = null; + private DigiCoin economy = null; + + public Economy_DigiCoin(Plugin plugin){ + this.plugin = plugin; + Bukkit.getServer().getPluginManager().registerEvents(new EconomyServerListener(this), plugin); + + if (economy == null) { + Plugin digicoin = plugin.getServer().getPluginManager().getPlugin(name); + + if (digicoin != null && digicoin.isEnabled()) { + economy = (DigiCoin) digicoin; + log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), name)); + } + } + } + + public class EconomyServerListener implements Listener { + Economy_DigiCoin economy = null; + + public EconomyServerListener(Economy_DigiCoin economy) { + this.economy = economy; + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onPluginEnable(PluginEnableEvent event) { + if (economy.economy == null) { + Plugin digicoin = event.getPlugin(); + + if (digicoin.getDescription().getName().equals(economy.name)) { + economy.economy = (DigiCoin) digicoin; + log.info(String.format("[%s][Economy] %s hooked.", plugin.getDescription().getName(), economy.name)); + } + } + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onPluginDisable(PluginDisableEvent event) { + if (economy.economy != null) { + if (event.getPlugin().getDescription().getName().equals(economy.name)) { + economy.economy = null; + log.info(String.format("[%s][Economy] %s unhooked.", plugin.getDescription().getName(), economy.name)); + } + } + } + } + + @Override + public boolean isEnabled() { + return economy != null; + } + + @Override + public String getName() { + return name; + } + + @Override + public boolean hasBankSupport() { + return false; + } + + @Override + public int fractionalDigits() { + return -1; + } + + @Override + public String format(double amount) { + if (amount == 1.0) { + return String.format("%d %s", amount, currencyNameSingular()); + } else { + return String.format("%d %s", amount, currencyNamePlural()); + } + } + + @Override + public String currencyNamePlural() { + return "coins"; + } + + @Override + public String currencyNameSingular() { + return "coin"; + } + + @Override + public boolean hasAccount(String playerName) { + return true; + } + + @Override + public double getBalance(String playerName) { + return economy.getBalance(playerName); + } + + @Override + public boolean has(String playerName, double amount) { + return getBalance(playerName) >= amount; + } + + @Override + public EconomyResponse withdrawPlayer(String playerName, double amount) { + ResponseType rt; + String message; + + if (economy.removeBalance(playerName, amount)) { + rt = ResponseType.SUCCESS; + message = null; + } else { + rt = ResponseType.FAILURE; + message = "Not enough money."; + } + + return new EconomyResponse(amount, getBalance(playerName), rt, message); + } + + @Override + public EconomyResponse depositPlayer(String playerName, double amount) { + ResponseType rt; + String message; + + if (economy.addBalance(playerName, amount)) { + rt = ResponseType.SUCCESS; + message = null; + } else { + rt = ResponseType.FAILURE; + message = "Failed to deposit balance."; + } + + return new EconomyResponse(amount, getBalance(playerName), rt, message); + } + + @Override + public EconomyResponse createBank(String name, String player) { + return new EconomyResponse(0, 0, ResponseType.NOT_IMPLEMENTED, "DigiCoin does not support bank accounts"); + } + + @Override + public EconomyResponse deleteBank(String name) { + return new EconomyResponse(0, 0, ResponseType.NOT_IMPLEMENTED, "DigiCoin does not support bank accounts"); + } + + @Override + public EconomyResponse bankBalance(String name) { + return new EconomyResponse(0, 0, ResponseType.NOT_IMPLEMENTED, "DigiCoin does not support bank accounts"); + } + + @Override + public EconomyResponse bankHas(String name, double amount) { + return new EconomyResponse(0, 0, ResponseType.NOT_IMPLEMENTED, "DigiCoin does not support bank accounts"); + } + + @Override + public EconomyResponse bankWithdraw(String name, double amount) { + return new EconomyResponse(0, 0, ResponseType.NOT_IMPLEMENTED, "DigiCoin does not support bank accounts"); + } + + @Override + public EconomyResponse bankDeposit(String name, double amount) { + return new EconomyResponse(0, 0, ResponseType.NOT_IMPLEMENTED, "DigiCoin does not support bank accounts"); + } + + @Override + public EconomyResponse isBankOwner(String name, String playerName) { + return new EconomyResponse(0, 0, ResponseType.NOT_IMPLEMENTED, "DigiCoin does not support bank accounts"); + } + + @Override + public EconomyResponse isBankMember(String name, String playerName) { + return new EconomyResponse(0, 0, ResponseType.NOT_IMPLEMENTED, "DigiCoin does not support bank accounts"); + } + + @Override + public List getBanks() { + return new ArrayList(); + } + + @Override + public boolean createPlayerAccount(String playerName) { + return false; + } + + @Override + public boolean hasAccount(String playerName, String worldName) { + return true; + } + + @Override + public double getBalance(String playerName, String world) { + return getBalance(playerName); + } + + @Override + public boolean has(String playerName, String worldName, double amount) { + return has(playerName, amount); + } + + @Override + public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) { + return withdrawPlayer(playerName, amount); + } + + @Override + public EconomyResponse depositPlayer(String playerName, String worldName, double amount) { + return depositPlayer(playerName, amount); + } + + @Override + public boolean createPlayerAccount(String playerName, String worldName) { + return false; + } +} \ No newline at end of file