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

Updated Gringotts version

Browse Source
This commit is contained in:
jast 2012-08-08 23:45:38 +02:00
parent ff6cd32630
commit 70d627266e
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/Gringotts.jar
View File

Binary file not shown.

0
lib/Starburst.jar Executable file → Normal file
View File

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

@ -219,6 +219,9 @@ public class Vault extends JavaPlugin {
// Try to load CurrencyCore // Try to load CurrencyCore
hookEconomy("CurrencyCore", Economy_CurrencyCore.class, ServicePriority.Normal, "is.currency.Currency"); hookEconomy("CurrencyCore", Economy_CurrencyCore.class, ServicePriority.Normal, "is.currency.Currency");
// Try to load Gringotts
hookEconomy("Gringotts", Economy_Gringotts.class, ServicePriority.Normal, "org.gestern.gringotts.Gringotts");
// Try to load Essentials Economy // Try to load Essentials Economy
hookEconomy("Essentials Economy", Economy_Essentials.class, ServicePriority.Low, "com.earth2me.essentials.api.Economy", "com.earth2me.essentials.api.NoLoanPermittedException", "com.earth2me.essentials.api.UserDoesNotExistException"); hookEconomy("Essentials Economy", Economy_Essentials.class, ServicePriority.Low, "com.earth2me.essentials.api.Economy", "com.earth2me.essentials.api.NoLoanPermittedException", "com.earth2me.essentials.api.UserDoesNotExistException");
@ -237,8 +240,7 @@ public class Vault extends JavaPlugin {
// Try to load GoldIsMoney // Try to load GoldIsMoney
hookEconomy("GoldIsMoney", Economy_GoldIsMoney.class, ServicePriority.Normal, "com.flobi.GoldIsMoney.GoldIsMoney"); hookEconomy("GoldIsMoney", Economy_GoldIsMoney.class, ServicePriority.Normal, "com.flobi.GoldIsMoney.GoldIsMoney");
// Try to load Gringotts
hookEconomy("Gringotts", Economy_Gringotts.class, ServicePriority.Normal, "net.mcw.gringotts.Gringotts");
} }
/** /**

15
src/net/milkbowl/vault/economy/plugins/Economy_Gringotts.java
View File

@ -19,9 +19,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.mcw.gringotts.Account;
import net.mcw.gringotts.Gringotts;
import net.mcw.gringotts.PlayerAccountHolder;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse;
import net.milkbowl.vault.economy.EconomyResponse.ResponseType; import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
@ -33,6 +30,9 @@ import org.bukkit.event.Listener;
import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.event.server.PluginEnableEvent; import org.bukkit.event.server.PluginEnableEvent;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.gestern.gringotts.Account;
import org.gestern.gringotts.Gringotts;
import org.gestern.gringotts.PlayerAccountHolder;
public class Economy_Gringotts implements Economy { public class Economy_Gringotts implements Economy {
@ -141,7 +141,7 @@ public class Economy_Gringotts implements Economy {
* @return name of the currency (plural) * @return name of the currency (plural)
*/ */
public String currencyNamePlural(){ public String currencyNamePlural(){
return ""; return org.gestern.gringotts.Configuration.config.currencyNamePlural;
} }
@ -152,7 +152,7 @@ public class Economy_Gringotts implements Economy {
* @return name of the currency (singular) * @return name of the currency (singular)
*/ */
public String currencyNameSingular(){ public String currencyNameSingular(){
return ""; return org.gestern.gringotts.Configuration.config.currencyNameSingular;
} }
/** /**
@ -215,9 +215,8 @@ public class Economy_Gringotts implements Economy {
Account account = gringotts.accounting.getAccount( accountHolder ); Account account = gringotts.accounting.getAccount( accountHolder );
if(account.balance() >= amount) { if(account.balance() >= amount && account.remove(amount)) {
//We has mulah! //We has mulah!
account.remove(amount);
return new EconomyResponse(amount, account.balance(), ResponseType.SUCCESS, null); return new EconomyResponse(amount, account.balance(), ResponseType.SUCCESS, null);
} else { } else {
//Not enough money to withdraw this much. //Not enough money to withdraw this much.
@ -244,7 +243,7 @@ public class Economy_Gringotts implements Economy {
if (account.add(amount)) if (account.add(amount))
return new EconomyResponse( amount, account.balance(), ResponseType.SUCCESS, null); return new EconomyResponse( amount, account.balance(), ResponseType.SUCCESS, null);
else else
return new EconomyResponse( 0, account.balance(), ResponseType.FAILURE, "Not enough capacity to store that many funds!"); return new EconomyResponse( 0, account.balance(), ResponseType.FAILURE, "Not enough capacity to store that amount!");
} }