Modified loan accpeting and denying

Flibio · Jan 22, 2017 · d12800e · d12800e
1 parent c87c311
commit d12800e
Show file tree

Hide file tree

Showing 55 changed files with 235 additions and 89 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 name=EconomyLite
 owner=Flibio
 inceptionYear=2015
-currentYear=2016
-version=2.7.0
+currentYear=2017
+version=2.8.0
 apiVersion=5.0.0-SNAPSHOT
diff --git a/src/main/java/io/github/flibio/economylite/CauseFactory.java b/src/main/java/io/github/flibio/economylite/CauseFactory.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/EconomyLite.java b/src/main/java/io/github/flibio/economylite/EconomyLite.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/PluginInfo.java b/src/main/java/io/github/flibio/economylite/PluginInfo.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/api/CurrencyEconService.java b/src/main/java/io/github/flibio/economylite/api/CurrencyEconService.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/api/PlayerEconService.java b/src/main/java/io/github/flibio/economylite/api/PlayerEconService.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/api/VirtualEconService.java b/src/main/java/io/github/flibio/economylite/api/VirtualEconService.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/bstats/Metrics.java b/src/main/java/io/github/flibio/economylite/bstats/Metrics.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/MigrateCommand.java b/src/main/java/io/github/flibio/economylite/commands/MigrateCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/PayCommand.java b/src/main/java/io/github/flibio/economylite/commands/PayCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -76,12 +76,13 @@ public void run(Player src, CommandContext args) {
                         if (uOpt.get()
                                 .transfer(tOpt.get(), ecoService.getDefaultCurrency(), amount, Cause.of(NamedCause.owner(EconomyLite.getInstance())))
                                 .getResult().equals(ResultType.SUCCESS)) {
-                            src.sendMessage(messageStorage.getMessage("command.pay.success", "target", targetName));
+                            Text label = ecoService.getDefaultCurrency().getPluralDisplayName();
+                            if (amount.equals(BigDecimal.ONE)) {
+                                label = ecoService.getDefaultCurrency().getDisplayName();
+                            }
+                            src.sendMessage(messageStorage.getMessage("command.pay.success", "target", Text.of(targetName), "amountandlabel",
+                                    Text.of(String.format(Locale.ENGLISH, "%,.2f", amount) + " ").toBuilder().append(label).build()));
                             if (target instanceof Player) {
-                                Text label = ecoService.getDefaultCurrency().getPluralDisplayName();
-                                if (amount.equals(BigDecimal.ONE)) {
-                                    label = ecoService.getDefaultCurrency().getDisplayName();
-                                }
                                 ((Player) target).sendMessage(messageStorage.getMessage("command.pay.target", "amountandlabel",
                                         Text.of(String.format(Locale.ENGLISH, "%,.2f", amount) + " ").toBuilder().append(label).build(), "sender",
                                         uOpt.get().getDisplayName()));

diff --git a/src/main/java/io/github/flibio/economylite/commands/admin/AddCommand.java b/src/main/java/io/github/flibio/economylite/commands/admin/AddCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/admin/EconCommand.java b/src/main/java/io/github/flibio/economylite/commands/admin/EconCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/admin/RemoveCommand.java b/src/main/java/io/github/flibio/economylite/commands/admin/RemoveCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/admin/SetCommand.java b/src/main/java/io/github/flibio/economylite/commands/admin/SetCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/balance/BalTopCommand.java b/src/main/java/io/github/flibio/economylite/commands/balance/BalTopCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/balance/BalanceCommand.java b/src/main/java/io/github/flibio/economylite/commands/balance/BalanceCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/currency/CurrencyCommand.java b/src/main/java/io/github/flibio/economylite/commands/currency/CurrencyCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/currency/CurrencyCreateCommand.java b/src/main/java/io/github/flibio/economylite/commands/currency/CurrencyCreateCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/currency/CurrencyDeleteCommand.java b/src/main/java/io/github/flibio/economylite/commands/currency/CurrencyDeleteCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/currency/CurrencySetCommand.java b/src/main/java/io/github/flibio/economylite/commands/currency/CurrencySetCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/virtual/PayVirtualCommand.java b/src/main/java/io/github/flibio/economylite/commands/virtual/PayVirtualCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualAddCommand.java b/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualAddCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualBalanceCommand.java b/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualBalanceCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualEconCommand.java b/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualEconCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualPayCommand.java b/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualPayCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualRemoveCommand.java b/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualRemoveCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualSetCommand.java b/src/main/java/io/github/flibio/economylite/commands/virtual/VirtualSetCommand.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/CurrencyService.java b/src/main/java/io/github/flibio/economylite/impl/CurrencyService.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/PlayerDataService.java b/src/main/java/io/github/flibio/economylite/impl/PlayerDataService.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/PlayerServiceCommon.java b/src/main/java/io/github/flibio/economylite/impl/PlayerServiceCommon.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/VirtualDataService.java b/src/main/java/io/github/flibio/economylite/impl/VirtualDataService.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/VirtualServiceCommon.java b/src/main/java/io/github/flibio/economylite/impl/VirtualServiceCommon.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/economy/LiteCurrency.java b/src/main/java/io/github/flibio/economylite/impl/economy/LiteCurrency.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/economy/LiteEconomyService.java b/src/main/java/io/github/flibio/economylite/impl/economy/LiteEconomyService.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/economy/account/LiteUniqueAccount.java b/src/main/java/io/github/flibio/economylite/impl/economy/account/LiteUniqueAccount.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/economy/account/LiteVirtualAccount.java b/src/main/java/io/github/flibio/economylite/impl/economy/account/LiteVirtualAccount.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/...ain/java/io/github/flibio/economylite/impl/economy/event/LiteEconomyTransactionEvent.java b/...ain/java/io/github/flibio/economylite/impl/economy/event/LiteEconomyTransactionEvent.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/economy/registry/CurrencyRegistryModule.java b/src/main/java/io/github/flibio/economylite/impl/economy/registry/CurrencyRegistryModule.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/economy/result/LiteTransactionResult.java b/src/main/java/io/github/flibio/economylite/impl/economy/result/LiteTransactionResult.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/impl/economy/result/LiteTransferResult.java b/src/main/java/io/github/flibio/economylite/impl/economy/result/LiteTransferResult.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/modules/Module.java b/src/main/java/io/github/flibio/economylite/modules/Module.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

diff --git a/src/main/java/io/github/flibio/economylite/modules/business/BusinessModule.java b/src/main/java/io/github/flibio/economylite/modules/business/BusinessModule.java
@@ -1,7 +1,7 @@
 /*
  * This file is part of EconomyLite, licensed under the MIT License (MIT).
  *
- * Copyright (c) 2015 - 2016 Flibio
+ * Copyright (c) 2015 - 2017 Flibio
  * Copyright (c) Contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy