Extract method getting registration message

2 files changed, 44 insertions, 13 deletions

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
index 5a21038b..1eb02c77 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java
@@ -493,7 +493,7 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
             });
 
             // Register task types with even more weird requirements
-            if (Bukkit.getPluginManager().isPluginEnabled("BentoBox")) {
+            if (CompatUtils.isPluginEnabled("BentoBox")) {
                 BentoBoxLevelTaskType.register(this, taskTypeManager);
             }
 
@@ -501,18 +501,8 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
             taskTypeManager.closeRegistrations();
 
             // Inform about registered task types
-            String registrationMessage = taskTypeManager.getTaskTypes().size() + " task types have been registered";
-            int skipped = taskTypeManager.getSkipped();
-            int unsupported = taskTypeManager.getUnsupported();
-            if (skipped + unsupported > 0) {
-                registrationMessage += " (";
-                if (skipped > 0) registrationMessage += skipped + " skipped due to exclusions or conflicting names";
-                if (skipped * unsupported > 0) registrationMessage += ", ";
-                if (unsupported > 0) registrationMessage += unsupported + " not supported";
-                registrationMessage += ")";
-            }
-            registrationMessage += ".";
-            questsLogger.info(registrationMessage);
+            final String registrationMessage = this.getRegistrationMessage();
+            this.questsLogger.info(registrationMessage);
 
             if (playerBlockTrackerHook != null) {
                 this.playerBlockTrackerHook.fixPlayerBlockTracker();
@@ -531,6 +521,36 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
         });
     }
 
+    private @NotNull String getRegistrationMessage() {
+        final int registered = this.taskTypeManager.getRegistered();
+        final int skipped = taskTypeManager.getSkipped();
+        final int unsupported = taskTypeManager.getUnsupported();
+
+        final StringBuilder sb = new StringBuilder();
+        sb.append(registered).append(" task types have been registered");
+
+        if (skipped + unsupported > 0) {
+            sb.append(' ').append(')');
+
+            if (skipped > 0) {
+                sb.append(skipped).append(" skipped due to exclusions or conflicting names");
+            }
+
+            if (skipped * unsupported > 0) {
+                sb.append(',').append(' ');
+            }
+
+            if (unsupported > 0) {
+                sb.append(unsupported).append(" not supported");
+            }
+
+            sb.append(')');
+        }
+
+        sb.append('.');
+        return sb.toString();
+    }
+
     @Override
     public void onDisable() {
         if (!validConfiguration) return;
diff --git a/common/src/main/java/com/leonardobishop/quests/common/tasktype/TaskTypeManager.java b/common/src/main/java/com/leonardobishop/quests/common/tasktype/TaskTypeManager.java
index 84cf5367..d5ee9687 100644
--- a/common/src/main/java/com/leonardobishop/quests/common/tasktype/TaskTypeManager.java
+++ b/common/src/main/java/com/leonardobishop/quests/common/tasktype/TaskTypeManager.java
@@ -25,6 +25,7 @@ public abstract class TaskTypeManager {
     private final Map<String, TaskType> taskTypes = new HashMap<>();
     private final Map<String, String> aliases = new HashMap<>();
     private final Set<String> exclusions;
+    private int registered;
     private int skipped;
     private int unsupported;
     private boolean registrationsOpen;
@@ -102,6 +103,7 @@ public abstract class TaskTypeManager {
             this.aliases.put(alias, type);
         }
 
+        this.registered++;
         return true;
     }
 
@@ -196,6 +198,15 @@ public abstract class TaskTypeManager {
     }
 
     /**
+     * Returns the number of task types registered.
+     *
+     * @return number of task types registered
+     */
+    public int getRegistered() {
+        return this.registered;
+    }
+
+    /**
      * Returns the number of task types skipped due to exclusions or name conflicts.
      *
      * @return number of task types skipped