diff options
| author | Keuin <[email protected]> | 2020-12-29 15:33:01 +0800 |
|---|---|---|
| committer | Keuin <[email protected]> | 2020-12-29 15:33:01 +0800 |
| commit | 6c483b454805c17581cdb6105d0885daf4661795 (patch) | |
| tree | 637534fb34e0ff9da6fbafc5979414cde0063ce3 | |
| parent | 1f35af7789671d0f71fd0991a280ba7799d09338 (diff) | |
1.3.1: improve print of `/blame stat`
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | src/main/java/com/keuin/blame/command/BlameStatCommand.java | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/gradle.properties b/gradle.properties index d8618fe..5e02fdc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ minecraft_version=1.16.4 yarn_mappings=1.16.4+build.6 loader_version=0.10.6+build.214 # Mod Properties -mod_version=1.3.0-alpha +mod_version=1.3.1-alpha maven_group=com.keuin.blame archives_base_name=blame-fabric # Dependencies diff --git a/src/main/java/com/keuin/blame/command/BlameStatCommand.java b/src/main/java/com/keuin/blame/command/BlameStatCommand.java index 677ea88..fade0a1 100644 --- a/src/main/java/com/keuin/blame/command/BlameStatCommand.java +++ b/src/main/java/com/keuin/blame/command/BlameStatCommand.java @@ -1,5 +1,6 @@ package com.keuin.blame.command; +import com.google.common.base.Strings; import com.keuin.blame.data.entry.LogEntry; import com.keuin.blame.data.helper.VersionedLogEntryHelper; import com.keuin.blame.util.DatabaseUtil; @@ -21,22 +22,23 @@ public class BlameStatCommand { private static final Logger logger = Logger.getLogger(BlameStatCommand.class.getName()); public static int showStat(CommandContext<ServerCommandSource> context) { + PrintUtil.msgInfo(context, "Collecting statistics. This may take a few seconds..."); showStat(new ShowStatCallback() { @Override public void showStat(@Nullable BlameStat stat) { StringBuilder sb = new StringBuilder(); if (stat != null) { - sb.append("Data statistics\n"); - sb.append("===============\n"); - sb.append("\n"); + sb.append("Statistics\n"); + sb.append("====\n"); sb.append("# Count by subjects\n"); stat.getCountMap().forEach((subjectId, count) -> { - sb.append(subjectId).append(": ").append(count).append("\n"); + sb.append("<").append( + Optional.ofNullable(Strings.emptyToNull(subjectId)).orElse("null") + ).append(">: ").append(count).append("\n"); }); - sb.append("\n"); - sb.append("=== END ===\n"); + sb.append("=== END ==="); } else { - sb.append("Failed to get statistics. Please refer to server log for more information.\n"); + sb.append("Failed to get statistics. Please refer to server log for more information."); } PrintUtil.msgInfo(context, sb.toString()); } @@ -74,7 +76,7 @@ public class BlameStatCommand { callback.showStat(null); } } - }).start(); + }, "BlameStatCommandThread").start(); } public static class BlameStat { |