diff options
Diffstat (limited to 'bukkit/src')
5 files changed, 16 insertions, 9 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<String, Quest> loadedQuest : pathToQuest.entrySet()) { List<ConfigProblem> 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 |