From 8eae46ad071f011a7c8e4d9d7048851508fb0a8f Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Thu, 15 Feb 2024 14:32:46 -0500 Subject: [PATCH] Remove YAML-only pointsall subcommand --- .../BukkitQuestadminCommandHandler.java | 9 -- .../BukkitQuestadminPointsallCommand.java | 128 ------------------ core/src/main/resources/plugin.yml | 4 - core/src/main/resources/strings.yml | 7 - 4 files changed, 148 deletions(-) delete mode 100644 core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminPointsallCommand.java diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/BukkitQuestadminCommandHandler.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/BukkitQuestadminCommandHandler.java index f8a8345ff..ec6657ca5 100644 --- a/core/src/main/java/me/pikamug/quests/commands/questadmin/BukkitQuestadminCommandHandler.java +++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/BukkitQuestadminCommandHandler.java @@ -16,7 +16,6 @@ import me.pikamug.quests.commands.questadmin.subcommands.BukkitQuestadminGiveCom import me.pikamug.quests.commands.questadmin.subcommands.BukkitQuestadminGivepointsCommand; import me.pikamug.quests.commands.questadmin.subcommands.BukkitQuestadminNextstageCommand; import me.pikamug.quests.commands.questadmin.subcommands.BukkitQuestadminPointsCommand; -import me.pikamug.quests.commands.questadmin.subcommands.BukkitQuestadminPointsallCommand; import me.pikamug.quests.commands.questadmin.subcommands.BukkitQuestadminQuitCommand; import me.pikamug.quests.commands.questadmin.subcommands.BukkitQuestadminReloadCommand; import me.pikamug.quests.commands.questadmin.subcommands.BukkitQuestadminRemoveCommand; @@ -50,7 +49,6 @@ public class BukkitQuestadminCommandHandler { new BukkitQuestadminPointsCommand(plugin), new BukkitQuestadminTakepointsCommand(plugin), new BukkitQuestadminGivepointsCommand(plugin), - new BukkitQuestadminPointsallCommand(plugin), new BukkitQuestadminFinishCommand(plugin), new BukkitQuestadminNextstageCommand(plugin), new BukkitQuestadminSetstageCommand(plugin), @@ -142,13 +140,6 @@ public class BukkitQuestadminCommandHandler { + (translateSubCommands ? BukkitLang.get("COMMAND_QUESTADMIN_GIVEPOINTS") : "givepoints") + ChatColor.RED)); } - if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.pointsall")) { - cs.sendMessage(ChatColor.YELLOW + "/questadmin " + ChatColor.RED - + BukkitLang.get("COMMAND_QUESTADMIN_POINTSALL_HELP") - .replace("", BukkitLang.get("questPoints")) - .replace("", ChatColor.GOLD - + (translateSubCommands ? BukkitLang.get("COMMAND_QUESTADMIN_POINTSALL") : "pointsall") + ChatColor.RED)); - } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.finish")) { cs.sendMessage(ChatColor.YELLOW + "/questadmin " + ChatColor.RED + BukkitLang.get("COMMAND_QUESTADMIN_FINISH_HELP").replace("", ChatColor.GOLD diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminPointsallCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminPointsallCommand.java deleted file mode 100644 index 26b7f4aee..000000000 --- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminPointsallCommand.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) PikaMug and contributors - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT - * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package me.pikamug.quests.commands.questadmin.subcommands; - -import me.pikamug.quests.BukkitQuestsPlugin; -import me.pikamug.quests.commands.BukkitQuestsSubCommand; -import me.pikamug.quests.player.Quester; -import me.pikamug.quests.util.BukkitLang; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; - -import java.io.File; -import java.io.IOException; - -public class BukkitQuestadminPointsallCommand extends BukkitQuestsSubCommand { - - private final BukkitQuestsPlugin plugin; - - public BukkitQuestadminPointsallCommand(BukkitQuestsPlugin plugin) { - this.plugin = plugin; - } - - @Override - public String getName() { - return "pointsall"; - } - - @Override - public String getNameI18N() { - return BukkitLang.get("COMMAND_QUESTADMIN_POINTSALL"); - } - - @Override - public String getDescription() { - return BukkitLang.get("COMMAND_QUESTADMIN_POINTSALL_HELP"); - } - - @Override - public String getPermission() { - return "quests.admin.pointsall"; - } - - @Override - public String getSyntax() { - return "/questadmin pointsall"; - } - - @Override - public int getMaxArguments() { - return 2; - } - - @Override - public void execute(CommandSender cs, String[] args) { - if (args.length == 1) { - // Shows command usage - return; - } - if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.pointsall")) { - final int amount; - try { - amount = Integer.parseInt(args[1]); - if (amount < 0) { - cs.sendMessage(ChatColor.RED + BukkitLang.get("inputPosNum")); - return; - } - } catch (final NumberFormatException e) { - cs.sendMessage(ChatColor.RED + BukkitLang.get("inputNum")); - return; - } - cs.sendMessage(ChatColor.YELLOW + BukkitLang.get("settingAllQuestPoints") - .replace("", BukkitLang.get("questPoints"))); - for (final Quester q : plugin.getOfflineQuesters()) { - q.setQuestPoints(amount); - } - Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { - final File questerFolder = new File(plugin.getDataFolder(), "data"); - if (questerFolder.exists() && questerFolder.isDirectory()) { - final FileConfiguration data = new YamlConfiguration(); - final File[] files = questerFolder.listFiles(); - int failCount = 0; - boolean suppressed = false; - if (files != null) { - for (final File f : files) { - try { - data.load(f); - data.set("quest-points", amount); - data.save(f); - } catch (final IOException | InvalidConfigurationException e) { - if (failCount < 10) { - String msg = BukkitLang.get("errorReading"); - msg = msg.replace("", ChatColor.DARK_AQUA + f.getName() + ChatColor.RED); - cs.sendMessage(ChatColor.RED + msg); - failCount++; - } else if (!suppressed) { - String msg = BukkitLang.get("errorReadingSuppress"); - msg = msg.replace("", ChatColor.DARK_AQUA + f.getName() + ChatColor.RED); - cs.sendMessage(ChatColor.RED + msg); - suppressed = true; - } - } - } - } - cs.sendMessage(ChatColor.GREEN + BukkitLang.get("done")); - String msg = BukkitLang.get("allQuestPointsSet").replace("", BukkitLang.get("questPoints")); - msg = msg.replace("", ChatColor.AQUA + "" + amount + ChatColor.GOLD); - plugin.getServer().broadcastMessage(ChatColor.YELLOW + "" + ChatColor.GOLD + msg); - } else { - cs.sendMessage(ChatColor.RED + BukkitLang.get("errorDataFolder")); - } - }); - } else { - cs.sendMessage(ChatColor.RED + BukkitLang.get("noPermission")); - } - } -} diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml index 4e0250426..7969fe13f 100644 --- a/core/src/main/resources/plugin.yml +++ b/core/src/main/resources/plugin.yml @@ -75,7 +75,6 @@ permissions: quests.admin.points: true quests.admin.takepoints: true quests.admin.givepoints: true - quests.admin.pointsall: true quests.admin.finish: true quests.admin.nextstage: true quests.admin.setstage: true @@ -105,9 +104,6 @@ permissions: quests.admin.givepoints: description: Add to a player's Quest Points default: op - quests.admin.pointsall: - description: Set ALL players' Quest Points - default: op quests.admin.finish: description: Force a player to complete a quest default: op diff --git a/core/src/main/resources/strings.yml b/core/src/main/resources/strings.yml index 1ce43bd6f..d9f6fd1f2 100644 --- a/core/src/main/resources/strings.yml +++ b/core/src/main/resources/strings.yml @@ -35,8 +35,6 @@ COMMAND_QUESTADMIN_TAKEPOINTS: "takepoints" COMMAND_QUESTADMIN_TAKEPOINTS_HELP: " [player] [amount] - Take away a player's " COMMAND_QUESTADMIN_GIVEPOINTS: "givepoints" COMMAND_QUESTADMIN_GIVEPOINTS_HELP: " [player] [amount] - Add to a player's " -COMMAND_QUESTADMIN_POINTSALL: "pointsall" -COMMAND_QUESTADMIN_POINTSALL_HELP: " [amount] - Set ALL players' " COMMAND_QUESTADMIN_FINISH: "finish" COMMAND_QUESTADMIN_FINISH_HELP: " [player] [quest] - Force a player to complete a quest" COMMAND_QUESTADMIN_NEXTSTAGE: "nextstage" @@ -701,8 +699,6 @@ questForceNextStage: " has advanced to the next stage in the quest has advanced you to the next stage in your quest ." questReset: " has been reset." questRemoved: "Quest has been removed from player 's completed quests." -settingAllQuestPoints: "Setting all players' ..." -allQuestPointsSet: "All players' have been set to !" setQuestPoints: "'s have been set to ." questPointsSet: " has set your to ." takeQuestPoints: "Took away from ." @@ -719,9 +715,6 @@ questsUnknownAdminCommand: "Unknown command. Type /questsadmin for help." errorNPCID: 'Error: There is no NPC with ID ' questSaveError: "An error occurred while saving." questErrorReadingFile: "Error reading ." -errorReading: "Error reading , skipping..." -errorReadingSuppress: "Error reading , suppressing further errors." -errorDataFolder: "Error: Unable to read from data folder!" errorLoading: "Plugin is currently loading. Please try again later!" unknownError: "An unknown error occurred. See console output." journalTitle: "Quest Journal"