Improve output formatting of /beast-loot info.

NerdNu · Sep 19, 2019 · cebf0ae · cebf0ae
1 parent 0e181dd
commit cebf0ae
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/nu/nerd/beastmaster/DropSet.java b/src/nu/nerd/beastmaster/DropSet.java
@@ -246,6 +246,22 @@ public void save(ConfigurationSection parentSection, Logger logger) {
         }
     }
 
+    // --------------------------------------------------------------------------
+    /**
+     * Return a short description of this set of drops that can be presented to
+     * the user.
+     * 
+     * @return a short description of this set of drops that can be presented to
+     *         the user.
+     */
+    public String getShortDescription() {
+        StringBuilder s = new StringBuilder();
+        s.append(ChatColor.YELLOW).append(_id);
+        s.append(ChatColor.WHITE).append(": ");
+        s.append(ChatColor.YELLOW).append(isSingle() ? "single" : "multiple");
+        return s.toString();
+    }
+
     // --------------------------------------------------------------------------
     /**
      * Return a description of this set of drops that can be presented to the
@@ -256,9 +272,7 @@ public void save(ConfigurationSection parentSection, Logger logger) {
      */
     public String getDescription() {
         StringBuilder s = new StringBuilder();
-        s.append(ChatColor.YELLOW).append(_id);
-        s.append(ChatColor.WHITE).append(": ");
-        s.append(ChatColor.YELLOW).append(isSingle() ? "single" : "multiple");
+        s.append(getShortDescription());
         s.append(ChatColor.WHITE).append(" {");
         s.append(getAllDrops().stream().map(drop -> drop.getShortDescription())
         .collect(Collectors.joining(ChatColor.WHITE + ", ")));

diff --git a/src/nu/nerd/beastmaster/commands/BeastLootExecutor.java b/src/nu/nerd/beastmaster/commands/BeastLootExecutor.java
@@ -99,7 +99,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                     return true;
                 }
 
-                sender.sendMessage(ChatColor.GOLD + "Loot table: " + dropSet.getDescription());
+                sender.sendMessage(ChatColor.GOLD + "Loot table: " + dropSet.getShortDescription());
                 Collection<Drop> allDrops = dropSet.getAllDrops();
                 sender.sendMessage(ChatColor.GOLD + (allDrops.isEmpty() ? "No drops defined." : "Drops:"));
                 for (Drop drop : allDrops) {