diff --git a/src/main/java/fr/moribus/imageonmap/commands/maptool/DeleteCommand.java b/src/main/java/fr/moribus/imageonmap/commands/maptool/DeleteCommand.java index 9fd2a66..19d2f1e 100644 --- a/src/main/java/fr/moribus/imageonmap/commands/maptool/DeleteCommand.java +++ b/src/main/java/fr/moribus/imageonmap/commands/maptool/DeleteCommand.java @@ -76,14 +76,15 @@ public class DeleteCommand extends IoMCommand { protected void run() throws CommandException { ArrayList arguments = getArgs(); final boolean confirm = hasFlag("confirm"); - for (String s : arguments) { - info(sender, s); - } if (arguments.size() > 3 || (arguments.size() > 2 && !confirm)) { warning(I.t("Too many parameters! Usage: /maptool delete [playername] ")); return; } + if (arguments.size() < 1) { + warning(I.t("Too few parameters! Usage: /maptool delete [playername] ")); + return; + } final String playerName; final String mapName; diff --git a/src/main/java/fr/moribus/imageonmap/commands/maptool/GetCommand.java b/src/main/java/fr/moribus/imageonmap/commands/maptool/GetCommand.java index 45d1736..cd0b956 100644 --- a/src/main/java/fr/moribus/imageonmap/commands/maptool/GetCommand.java +++ b/src/main/java/fr/moribus/imageonmap/commands/maptool/GetCommand.java @@ -55,7 +55,11 @@ public class GetCommand extends IoMCommand { protected void run() throws CommandException { ArrayList arguments = getArgs(); if (arguments.size() > 2) { - warning(I.t("Too many parameters! Usage: /maptool getother [playername] ")); + warning(I.t("Too many parameters! Usage: /maptool get [playername] ")); + return; + } + if (arguments.size() < 1) { + warning(I.t("Too few parameters! Usage: /maptool get [playername] ")); return; } diff --git a/src/main/java/fr/moribus/imageonmap/commands/maptool/UpdateOtherCommand.java b/src/main/java/fr/moribus/imageonmap/commands/maptool/UpdateOtherCommand.java deleted file mode 100644 index 224859e..0000000 --- a/src/main/java/fr/moribus/imageonmap/commands/maptool/UpdateOtherCommand.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright or © or Copr. Moribus (2013) - * Copyright or © or Copr. ProkopyL (2015) - * Copyright or © or Copr. Amaury Carrade (2016 – 2020) - * Copyright or © or Copr. Vlammar (2019 – 2020) - * - * This software is a computer program whose purpose is to allow insertion of - * custom images in a Minecraft world. - * - * This software is governed by the CeCILL-B license under French law and - * abiding by the rules of distribution of free software. You can use, - * modify and/ or redistribute the software under the terms of the CeCILL-B - * license as circulated by CEA, CNRS and INRIA at the following URL - * "http://www.cecill.info". - * - * As a counterpart to the access to the source code and rights to copy, - * modify and redistribute granted by the license, users are provided only - * with a limited warranty and the software's author, the holder of the - * economic rights, and the successive licensors have only limited - * liability. - * - * In this respect, the user's attention is drawn to the risks associated - * with loading, using, modifying and/or developing or reproducing the - * software by the user in light of its specific status of free software, - * that may mean that it is complicated to manipulate, and that also - * therefore means that it is reserved for developers and experienced - * professionals having in-depth computer knowledge. Users are therefore - * encouraged to load and test the software's suitability as regards their - * requirements in conditions enabling the security of their systems and/or - * data to be ensured and, more generally, to use and operate it in the - * same conditions as regards security. - * - * The fact that you are presently reading this means that you have had - * knowledge of the CeCILL-B license and that you accept its terms. - */ - -package fr.moribus.imageonmap.commands.maptool; - -import fr.moribus.imageonmap.Permissions; -import fr.moribus.imageonmap.commands.IoMCommand; -import fr.moribus.imageonmap.image.ImageRendererExecutor; -import fr.moribus.imageonmap.image.ImageUtils; -import fr.moribus.imageonmap.map.ImageMap; -import fr.moribus.imageonmap.map.MapManager; -import fr.zcraft.quartzlib.components.commands.CommandException; -import fr.zcraft.quartzlib.components.commands.CommandInfo; -import fr.zcraft.quartzlib.components.i18n.I; -import fr.zcraft.quartzlib.components.worker.WorkerCallback; -import fr.zcraft.quartzlib.tools.PluginLogger; -import fr.zcraft.quartzlib.tools.text.ActionBar; -import fr.zcraft.quartzlib.tools.text.MessageSender; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashMap; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandInfo(name = "update", usageParameters = " [stretched|covered] \"\"") -public class UpdateOtherCommand extends IoMCommand { - @Override - protected void run() throws CommandException { - //TODO separer les deux update(update et update other) - final Player player = playerSender(); - ImageUtils.ScalingType scaling; - - URL url; - - if (args.length < 1) { - throwInvalidArgument(I.t("You must give an URL and a map name to update.")); - } - if (args.length < 2) { - throwInvalidArgument(I.t("You must give a map name to update.")); - } - - switch (args[1]) { - - case "stretched": - scaling = ImageUtils.ScalingType.STRETCHED; - break; - case "covered": - scaling = ImageUtils.ScalingType.COVERED; - break; - default: - scaling = ImageUtils.ScalingType.CONTAINED; - } - ImageMap map; - if (scaling.equals(ImageUtils.ScalingType.CONTAINED)) { - map = getMapFromArgs(player, 1); - } else { - map = getMapFromArgs(player, 2); - } - try { - url = new URL(args[0]); - MapManager.load(); - - Integer[] size = {1, 1}; - if (map.getType() == ImageMap.Type.POSTER) { - size = map.getSize(new HashMap(), map.getUserUUID(), map.getId()); - } - int width = size[0]; - int height = size[1]; - try { - ActionBar.sendPermanentMessage(player, ChatColor.DARK_GREEN + I.t("Updating...")); - ImageRendererExecutor - .update(url, scaling, player.getUniqueId(), map, width, height, new WorkerCallback() { - @Override - public void finished(ImageMap result) { - ActionBar.removeMessage(player); - MessageSender.sendActionBarMessage(player, - ChatColor.DARK_GREEN + I.t("The map was updated using the new image!")); - } - - @Override - public void errored(Throwable exception) { - player.sendMessage(I.t("{ce}Map rendering failed: {0}", exception.getMessage())); - - PluginLogger.warning("Rendering from {0} failed: {1}: {2}", - player.getName(), - exception.getClass().getCanonicalName(), - exception.getMessage()); - } - }); - } finally { - ActionBar.removeMessage(player); - } - } catch (MalformedURLException ex) { - throwInvalidArgument(I.t("Invalid URL.")); - } - } - - @Override - public boolean canExecute(CommandSender sender) { - return Permissions.UPDATEOTHER.grantedTo(sender); - } -}