From a7a8f774ac6a9a7c228b5138e46ebb0dfa946f8b Mon Sep 17 00:00:00 2001 From: LMBishop <13875753+LMBishop@users.noreply.github.com> Date: Mon, 5 Jul 2021 11:27:13 +0100 Subject: Change quest registration logging --- .../com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java | 5 ++++- .../leonardobishop/quests/bukkit/command/QuestsCommand.java | 10 +++++++++- .../quests/bukkit/config/BukkitQuestsLoader.java | 5 ++--- .../quests/bukkit/tasktype/BukkitTaskTypeManager.java | 3 +-- bukkit/src/main/resources/resources/bukkit/config.yml | 2 -- .../leonardobishop/quests/common/tasktype/TaskTypeManager.java | 6 +----- 6 files changed, 17 insertions(+), 14 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 9ce5b0b0..19626893 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/BukkitQuestsPlugin.java @@ -315,7 +315,8 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { BentoBoxLevelTaskType.register(this, taskTypeManager); } //TODO FIX - if (Bukkit.getPluginManager().isPluginEnabled("IridiumSkyblock")) { + if (Bukkit.getPluginManager().isPluginEnabled("IridiumSkyblock") + && Bukkit.getPluginManager().getPlugin("IridiumSkyblock").getDescription().getVersion().startsWith("2")) { taskTypeManager.registerTaskType(new IridiumSkyblockValueTaskType(this)); } if (Bukkit.getPluginManager().isPluginEnabled("uSkyBlock")) { @@ -342,6 +343,8 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { } taskTypeManager.closeRegistrations(); + questsLogger.info(taskTypeManager.getTaskTypes().size() + " task types have been registered."); + reloadQuests(); // Load players who were present during startup (i.e some idiot reloaded the server instead of restarted) diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestsCommand.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestsCommand.java index b9f02909..0a6f6868 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestsCommand.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestsCommand.java @@ -114,14 +114,22 @@ public class QuestsCommand implements TabExecutor { for (TaskType taskType : plugin.getTaskTypeManager().getTaskTypes()) { sender.sendMessage(ChatColor.DARK_GRAY + " * " + ChatColor.RED + taskType.getType()); } + sender.sendMessage(ChatColor.GRAY.toString() + plugin.getTaskTypeManager().getTaskTypes().size() + " registered."); sender.sendMessage(ChatColor.DARK_GRAY + "View info using /q a types [type]."); return true; } else if (args[1].equalsIgnoreCase("info")) { - sender.sendMessage(ChatColor.RED + "Quest controller: " + plugin.getQuestController().getName()); sender.sendMessage(ChatColor.GRAY + "Loaded quests:"); + int i = 0; for (Quest quest : plugin.getQuestManager().getQuests().values()) { sender.sendMessage(ChatColor.DARK_GRAY + " * " + ChatColor.RED + quest.getId() + ChatColor.GRAY + " [" + quest.getTasks().size() + " tasks]"); + i++; + if (i == 25 && plugin.getQuestManager().getQuests().size() > 25) { + sender.sendMessage(ChatColor.DARK_GRAY + " ... and " + (plugin.getQuestManager().getQuests().size() - 25) + " more ..."); + break; + } } + sender.sendMessage(ChatColor.GRAY + "Quest controller: " + ChatColor.RED + plugin.getQuestController().getName()); + sender.sendMessage(ChatColor.GRAY.toString() + plugin.getQuestManager().getQuests().size() + " registered."); sender.sendMessage(ChatColor.DARK_GRAY + "View info using /q a info [quest]."); return true; } else if (args[1].equalsIgnoreCase("update")) { diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java index 98535512..5c6e0862 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java @@ -250,9 +250,6 @@ public class BukkitQuestsLoader implements QuestsLoader { findInvalidTaskReferences(quest, config.getString("placeholders." + p), problems, "placeholders." + p); } } - if (questsConfig.getBoolean("options.show-quest-registrations")) { - questsLogger.info("Registering quest " + quest.getId() + " with " + quest.getTasks().size() + " tasks."); - } questManager.registerQuest(quest); taskTypeManager.registerQuestTasksWithTaskTypes(quest); qItemStackRegistry.register(quest, displayItem); @@ -275,6 +272,8 @@ public class BukkitQuestsLoader implements QuestsLoader { e.printStackTrace(); } + questsLogger.info(questManager.getQuests().size() + " quests have been registered."); + // post-load checks for (Map.Entry loadedQuest : pathToQuest.entrySet()) { List problems = new ArrayList<>(); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/BukkitTaskTypeManager.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/BukkitTaskTypeManager.java index 845c0207..c37017ae 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/BukkitTaskTypeManager.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/BukkitTaskTypeManager.java @@ -10,13 +10,12 @@ public class BukkitTaskTypeManager extends TaskTypeManager { private final BukkitQuestsPlugin plugin; public BukkitTaskTypeManager(BukkitQuestsPlugin plugin) { - super(plugin); this.plugin = plugin; } @Override public void registerTaskType(@NotNull TaskType taskType) { - if (!(taskType instanceof BukkitTaskType)) throw new RuntimeException("task type must be instance of BukkitTaskType!"); + if (!(taskType instanceof BukkitTaskType)) throw new RuntimeException("BukkitTaskTypeManager implementation can only accept instances of BukkitTaskType!"); BukkitTaskType bukkitTaskType = (BukkitTaskType) taskType; super.registerTaskType(taskType); diff --git a/bukkit/src/main/resources/resources/bukkit/config.yml b/bukkit/src/main/resources/resources/bukkit/config.yml index a97e4afd..240a46ca 100644 --- a/bukkit/src/main/resources/resources/bukkit/config.yml +++ b/bukkit/src/main/resources/resources/bukkit/config.yml @@ -205,8 +205,6 @@ options: gui: open: "ITEM_BOOK_PAGE_TURN:1:3" interact: "" - # Show when quests register in console - will only show if verbose-logging-level=2. Disable if you want less console spam at startup. - show-quest-registrations: true # Hide locked quests, quests on cooldown and completed (but not repeatable) quests gui-hide-locked: false # Confirm quest cancellation with a separate menu 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 775d635a..779670c6 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 @@ -1,6 +1,5 @@ package com.leonardobishop.quests.common.tasktype; -import com.leonardobishop.quests.common.plugin.Quests; import com.leonardobishop.quests.common.quest.Quest; import com.leonardobishop.quests.common.quest.Task; import org.jetbrains.annotations.NotNull; @@ -19,11 +18,9 @@ import java.util.Objects; public abstract class TaskTypeManager { private final ArrayList taskTypes = new ArrayList<>(); - private final Quests plugin; private boolean allowRegistrations; - public TaskTypeManager(Quests plugin) { - this.plugin = plugin; + public TaskTypeManager() { allowRegistrations = true; } @@ -62,7 +59,6 @@ public abstract class TaskTypeManager { if (!allowRegistrations) { throw new IllegalStateException("No longer accepting new task types (must be done before quests are loaded)"); } - plugin.getQuestsLogger().info("Task type " + taskType.getType() + " has been registered."); taskTypes.add(taskType); } -- cgit v1.2.3-70-g09d2