small update

Author: angushushu

src/main/java/org/cubexmc/ecobalancer/EcoBalancer.java

@@ -26,6 +26,8 @@
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 
+import static java.lang.Math.min;
+
 import java.util.zip.GZIPOutputStream;
 
 import org.cubexmc.ecobalancer.metrics.Metrics;
@@ -211,7 +213,6 @@ public static Economy getEconomy() {
     }
 
     public void checkBalance(CommandSender sender, long currentTime, OfflinePlayer player, boolean log) {
-        UUID playerId = player.getUniqueId();
         long lastPlayed = player.getLastPlayed();
         long daysOffline = (currentTime - lastPlayed) / (1000 * 60 * 60 * 24);
         double balance = econ.hasAccount(player) ? econ.getBalance(player) : 0;
@@ -231,19 +232,19 @@ public void checkBalance(CommandSender sender, long currentTime, OfflinePlayer p
         placeholders.put("balance", String.format("%.2f", balance));
         placeholders.put("days_offline", String.valueOf(daysOffline));
 
-
-        if (deductBasedOnTime) {
-            // 计算玩家离线天数
-            if (balance < 0) {
-                econ.depositPlayer(player, -1 * balance);
-                placeholders.put("new_balance", String.format("%.2f", econ.getBalance(player)));
-                if (sender != null) {
-                    sender.sendMessage(getFormattedMessage("messages.set_balance.reason", placeholders));
-                    sender.sendMessage(getFormattedMessage("messages.set_balance.balance_set", placeholders));
-                }
-                if (log)
-                    fileLogger.info(getFormattedMessage("logs.negative_balance", placeholders));
-            } else {
+        // fix all negative balance
+        if (balance < 0.0) {
+            econ.depositPlayer(player, -1 * balance);
+            placeholders.put("new_balance", String.format("%.2f", econ.getBalance(player)));
+            if (sender != null) {
+                sender.sendMessage(getFormattedMessage("messages.set_balance.reason", placeholders));
+                sender.sendMessage(getFormattedMessage("messages.set_balance.balance_set", placeholders));
+            }
+            if (log)
+                fileLogger.info(getFormattedMessage("logs.negative_balance", placeholders));
+        } else if (deductionRate > 0.0) {
+            if (deductBasedOnTime) {
+                // 计算玩家离线天数
                 if (daysOffline > inactiveDaysToClear) {
                     // 清除超过inactiveDaysToClear天未上线的玩家
                     econ.withdrawPlayer(player, balance);
@@ -253,32 +254,37 @@ public void checkBalance(CommandSender sender, long currentTime, OfflinePlayer p
                         sender.sendMessage(getFormattedMessage("messages.offline_extreme.balance_set", placeholders));
                     }
                     if (log)
-                        fileLogger.info(getFormattedMessage("logs.inactive_extreme", placeholders));
+                        fileLogger.info(getFormattedMessage("logs.offline_extreme", placeholders));
                 } else if (daysOffline > inactiveDaysToDeduct) {
                     // 对于超过50天未上线的玩家，按税率扣除
-                    double deduction = balance * deductionRate;
+                    double deduction = min(balance, balance * deductionRate); // in case deductionRate is greater than 1
                     placeholders.put("deduction", String.format("%.2f", deduction));
                     econ.withdrawPlayer(player, deduction);
                     if (sender != null) {
                         sender.sendMessage(getFormattedMessage("messages.offline_moderate.reason", placeholders));
                         sender.sendMessage(getFormattedMessage("messages.offline_moderate.deduction_made", placeholders));
                     }
                     if (log)
-                        fileLogger.info(getFormattedMessage("logs.inactive_moderate", placeholders));
+                        fileLogger.info(getFormattedMessage("logs.offline_moderate", placeholders));
                 } else {
                     if (sender != null) {
                         sender.sendMessage(getFormattedMessage("messages.offline_active", placeholders));
                     }
                 }
+            } else {
+                double deduction = min(balance, balance * deductionRate); // in case deductionRate is greater than 1
+                placeholders.put("deduction", String.format("%.2f", deduction));
+                econ.withdrawPlayer(player, deduction);
+                if (sender != null)
+                    sender.sendMessage(getFormattedMessage("messages.deduction_made", placeholders));
+                if (log)
+                    fileLogger.info(getFormattedMessage("logs.deduction_made", placeholders));
             }
         } else {
-            double deduction = balance * deductionRate;
-            placeholders.put("deduction", String.format("%.2f", deduction));
-            econ.withdrawPlayer(player, deduction);
             if (sender != null)
-                sender.sendMessage(getFormattedMessage("messages.deduction_made", placeholders));
+                sender.sendMessage(getFormattedMessage("messages.zero_balance", placeholders));
             if (log)
-                fileLogger.info(getFormattedMessage("logs.deduction_made", placeholders));
+                fileLogger.info(getFormattedMessage("logs.zero_balance", placeholders));
         }
     }
 

src/main/java/org/cubexmc/ecobalancer/commands/CheckPlayerCommand.java

@@ -1,17 +1,13 @@
 package org.cubexmc.ecobalancer.commands;
 
-import net.milkbowl.vault.economy.Economy;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.cubexmc.ecobalancer.EcoBalancer;
 
-import java.util.UUID;
-
 public class CheckPlayerCommand implements CommandExecutor {
     EcoBalancer plugin;
 
@@ -44,8 +40,12 @@ public boolean onCommand(CommandSender sender, Command command, String s, String
     }
 
     private void checkPlayer(CommandSender sender, String playerName) {
-        long currentTime = System.currentTimeMillis();
         OfflinePlayer target = Bukkit.getOfflinePlayer(playerName);
-        plugin.checkBalance(sender, currentTime, target, true);
+        if (target.hasPlayedBefore()) {
+            long currentTime = System.currentTimeMillis();
+            plugin.checkBalance(sender, currentTime, target, true);
+        } else {
+            sender.sendMessage(plugin.getFormattedMessage("messages.player_not_found", null));
+        }
     }
 }

src/main/resources/config.yml

@@ -1,7 +1,7 @@
 check-time: "20:00"  # 格式为 HH:mm # Time format is HH:mm
 check-schedule:
 type: 'weekly' # 选项: 'daily', 'weekly', 'monthly' # Options: 'daily', 'weekly', 'monthly'
-days-of-week: [1, 3, 5] # 周一, 周三, 周五 (1 = 周六, 7 = 周日) # Monday, Wednesday, Friday (1 = Saturday, 7 = Sunday)
+days-of-week: [1, 3, 5] # 周一, 周三, 周五 (6 = 周六, 7 = 周日) # Monday, Wednesday, Friday (6 = Saturday, 7 = Sunday)
 dates-of-month: [1] # 每月一号 # 1st day of each month
 deduct-based-on-time: true
 # 下面两个选项仅在 deduct-based-on-time 为 true 时生效 # The following two options only take effect when deduct-based-on-time is true

src/main/resources/lang.yml

@@ -28,11 +28,14 @@ messages:
   players_processing: "&7处理了 &6%batch% &7个玩家，共处理：&6%end%"
   players_processed: "&7共&6%end% &7个玩家，处理总数：&6%end%"
   all_players_processed: "&a所有玩家都已被洗劫。"
+  zero_balance: "&e玩家 &6%player% &e的余额为 &60&e。"
+  player_not_found: "&c没找到该玩家 (大小写敏感)。"
 logs:
   negative_balance: "[负额度] 已将 %player% 的余额置为%balance%。"
-  inactive_extreme: "[及不活跃] 已将 %player% 的余额置为%new_balance%。"
-  inactive_moderate: "[较不活跃] 已从 %player% 的余额中扣除 %deduction%。"
+  offline_extreme: "[及不活跃] 已将 %player% 的余额置为%new_balance%。"
+  offline_moderate: "[较不活跃] 已从 %player% 的余额中扣除 %deduction%。"
   deduction_made: "已从 %player% 的余额中扣除 %deduction%。"
   players_processed: "处理了 %start% 个玩家，共处理：%end%"
   all_players_processed: "所有玩家都已被洗劫。"
   batch_processed: "处理了 %total_players% 个玩家，共处理：%end%"
+  zero_balance: "&e玩家 &6%player% &e的余额为 &60&e。"

src/main/resources/lang_en.yml

@@ -29,11 +29,14 @@ messages:
   players_processing: "&7Processed &6%batch% &7players, total processed: &6%end%"
   players_processed: "&7Total &6%end% &7players, total processed: &6%end%"
   all_players_processed: "&aAll players have been cleaned."
+  zero_balance: "&ePlayer &6%player% &e's balance is &60&e."
+  player_not_found: "&cPlayer not found (case sensitive)."
 logs:
   negative_balance: "[Negative Balance] Set %player%'s balance to %balance%."
-  inactive_extreme: "[Extremely Inactive] Set %player%'s balance to %new_balance%."
-  inactive_moderate: "[Moderately Inactive] Deducted %deduction% from %player%'s balance."
+  offline_extreme: "[Extremely Inactive] Set %player%'s balance to %new_balance%."
+  offline_moderate: "[Moderately Inactive] Deducted %deduction% from %player%'s balance."
   deduction_made: "Deducted %deduction% from %player%'s balance."
   players_processed: "Processed %start% players, total processed: %end%"
   all_players_processed: "All players have been cleaned."
-  batch_processed: "Processed %total_players% players, total processed: %end%"
+  batch_processed: "Processed %total_players% players, total processed: %end%"
+  zero_balance: "&ePlayer &6%player% &e's balance is &60&e."

target/EcoBalancer-0.0.1-beta.jar renamed to target/EcoBalancer-1.0.1-beta.jar

@@ -1,7 +1,7 @@
 check-time: "20:00"  # 格式为 HH:mm # Time format is HH:mm
 check-schedule:
 type: 'weekly' # 选项: 'daily', 'weekly', 'monthly' # Options: 'daily', 'weekly', 'monthly'
-days-of-week: [1, 3, 5] # 周一, 周三, 周五 (1 = 周六, 7 = 周日) # Monday, Wednesday, Friday (1 = Saturday, 7 = Sunday)
+days-of-week: [1, 3, 5] # 周一, 周三, 周五 (6 = 周六, 7 = 周日) # Monday, Wednesday, Friday (6 = Saturday, 7 = Sunday)
 dates-of-month: [1] # 每月一号 # 1st day of each month
 deduct-based-on-time: true
 # 下面两个选项仅在 deduct-based-on-time 为 true 时生效 # The following two options only take effect when deduct-based-on-time is true

target/classes/config.yml

@@ -28,11 +28,14 @@ messages:
   players_processing: "&7处理了 &6%batch% &7个玩家，共处理：&6%end%"
   players_processed: "&7共&6%end% &7个玩家，处理总数：&6%end%"
   all_players_processed: "&a所有玩家都已被洗劫。"
+  zero_balance: "&e玩家 &6%player% &e的余额为 &60&e。"
+  player_not_found: "&c没找到该玩家 (大小写敏感)。"
 logs:
   negative_balance: "[负额度] 已将 %player% 的余额置为%balance%。"
-  inactive_extreme: "[及不活跃] 已将 %player% 的余额置为%new_balance%。"
-  inactive_moderate: "[较不活跃] 已从 %player% 的余额中扣除 %deduction%。"
+  offline_extreme: "[及不活跃] 已将 %player% 的余额置为%new_balance%。"
+  offline_moderate: "[较不活跃] 已从 %player% 的余额中扣除 %deduction%。"
   deduction_made: "已从 %player% 的余额中扣除 %deduction%。"
   players_processed: "处理了 %start% 个玩家，共处理：%end%"
   all_players_processed: "所有玩家都已被洗劫。"
   batch_processed: "处理了 %total_players% 个玩家，共处理：%end%"
+  zero_balance: "&e玩家 &6%player% &e的余额为 &60&e。"

target/classes/lang.yml

@@ -29,11 +29,14 @@ messages:
   players_processing: "&7Processed &6%batch% &7players, total processed: &6%end%"
   players_processed: "&7Total &6%end% &7players, total processed: &6%end%"
   all_players_processed: "&aAll players have been cleaned."
+  zero_balance: "&ePlayer &6%player% &e's balance is &60&e."
+  player_not_found: "&cPlayer not found (case sensitive)."
 logs:
   negative_balance: "[Negative Balance] Set %player%'s balance to %balance%."
-  inactive_extreme: "[Extremely Inactive] Set %player%'s balance to %new_balance%."
-  inactive_moderate: "[Moderately Inactive] Deducted %deduction% from %player%'s balance."
+  offline_extreme: "[Extremely Inactive] Set %player%'s balance to %new_balance%."
+  offline_moderate: "[Moderately Inactive] Deducted %deduction% from %player%'s balance."
   deduction_made: "Deducted %deduction% from %player%'s balance."
   players_processed: "Processed %start% players, total processed: %end%"
   all_players_processed: "All players have been cleaned."
-  batch_processed: "Processed %total_players% players, total processed: %end%"
+  batch_processed: "Processed %total_players% players, total processed: %end%"
+  zero_balance: "&ePlayer &6%player% &e's balance is &60&e."