From aa9c7df875851bdf9b2106077a0c7c4af70e7444 Mon Sep 17 00:00:00 2001 From: Coutume Date: Tue, 1 Oct 2013 17:38:33 +0200 Subject: [PATCH] Ajout de la commande /rmmap --- bin/fr/moribus/ImageOnMap/ImageCommande.class | Bin 3769 -> 0 bytes bin/fr/moribus/ImageOnMap/ImageOnMap.class | Bin 2543 -> 3001 bytes bin/fr/moribus/ImageOnMap/Rendu.class | Bin 3671 -> 4837 bytes plugin.yml | 7 +- src/fr/moribus/ImageOnMap/ImageOnMap.java | 17 +++-- .../ImageOnMap/ImageRenduCommande.java | 65 +++++++----------- src/fr/moribus/ImageOnMap/Rendu.java | 29 +++++++- 7 files changed, 68 insertions(+), 50 deletions(-) delete mode 100644 bin/fr/moribus/ImageOnMap/ImageCommande.class diff --git a/bin/fr/moribus/ImageOnMap/ImageCommande.class b/bin/fr/moribus/ImageOnMap/ImageCommande.class deleted file mode 100644 index 422cf3a17a87e23c9ded6d17004c9ecf1cfd9911..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3769 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 literal 2543 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 Zh@YEvi2esnLTvjNZ4&r9#YXV%{{g0qgB}0? diff --git a/plugin.yml b/plugin.yml index 1d54bfd..3c3f645 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,8 +1,11 @@ name: ImageOnMap main: fr.moribus.ImageOnMap.ImageOnMap -version: 1.0 +version: 1.2 commands: tomap: description: render an image in a map - usage: / [URL] [true or false] \ No newline at end of file + usage: / [URL] + rmmap: + description: remove an image + usage: / \ No newline at end of file diff --git a/src/fr/moribus/ImageOnMap/ImageOnMap.java b/src/fr/moribus/ImageOnMap/ImageOnMap.java index 0000984..ed96696 100644 --- a/src/fr/moribus/ImageOnMap/ImageOnMap.java +++ b/src/fr/moribus/ImageOnMap/ImageOnMap.java @@ -1,5 +1,6 @@ package fr.moribus.ImageOnMap; +import java.io.File; import java.util.Set; import org.bukkit.Bukkit; @@ -8,12 +9,18 @@ import org.bukkit.plugin.java.JavaPlugin; public final class ImageOnMap extends JavaPlugin { - + File dossier; @Override public void onEnable() { + dossier = new File(getDataFolder().getPath() + "/Image"); + if (!dossier.exists()) + { + dossier.mkdir(); + } System.out.println("Loading ImageOnMap"); - getCommand("tomap").setExecutor(new ImageCommande(this)); + getCommand("tomap").setExecutor(new ImageRenduCommande(this)); + getCommand("rmmap").setExecutor(new ImageSupprCommande(this)); this.saveDefaultConfig(); ChargerMap(); } @@ -24,16 +31,16 @@ public final class ImageOnMap extends JavaPlugin System.out.println("Stopping ImageOnMap"); } - void ChargerMap() + public void ChargerMap() { Set cle = getConfig().getKeys(false); for (String s: cle) { - System.out.println("Loading" + s); + System.out.println("Loading " + s); @SuppressWarnings("deprecation") MapView carte = Bukkit.getMap(Short.parseShort(getConfig().getStringList(s).get(0))); Rendu.SupprRendu(carte); - carte.addRenderer(new Rendu("./plugins/ImageOnMap/" + getConfig().getStringList(s).get(1) + ".png", getConfig().getStringList(s).get(2))); + carte.addRenderer(new Rendu("./plugins/ImageOnMap/Image/" + getConfig().getStringList(s).get(1) + ".png", getConfig().getStringList(s).get(2))); } } diff --git a/src/fr/moribus/ImageOnMap/ImageRenduCommande.java b/src/fr/moribus/ImageOnMap/ImageRenduCommande.java index 3a97d9e..4f38a1d 100644 --- a/src/fr/moribus/ImageOnMap/ImageRenduCommande.java +++ b/src/fr/moribus/ImageOnMap/ImageRenduCommande.java @@ -1,27 +1,23 @@ package fr.moribus.ImageOnMap; -import java.util.ArrayList; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; -import org.bukkit.command.BlockCommandSender; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.map.MapView; -import org.bukkit.plugin.Plugin; -public class ImageCommande implements CommandExecutor +public class ImageRenduCommande implements CommandExecutor { Player joueur; - Plugin ca; + ImageOnMap ca; boolean imgSvg; - public ImageCommande(Plugin plugin) + public ImageRenduCommande(ImageOnMap plugin) { ca = plugin; } @@ -32,50 +28,39 @@ public class ImageCommande implements CommandExecutor String[] arg3) { // On vérifie si celui qui exécute la commande est bien un joueur - if (sender instanceof Player) - joueur = (Player) sender; - else if (sender instanceof ConsoleCommandSender) - {System.out.println(ChatColor.RED + "Cette commande ne peut être utilisée dans la console !"); return true;} - else if (sender instanceof BlockCommandSender) - {System.out.println(ChatColor.RED + "Cette commande ne peut être utilisée par un bloc-commande !"); return true;} - else - {System.out.println(ChatColor.RED + "Cette commande ne peut être lancée de cette façon !"); return true;} + if (!ImgUtility.VerifierIdentite(sender)) + return false; - if (arg3.length < 2) + joueur = (Player) sender; + + if(!joueur.hasPermission("imageonmap.userender") || !joueur.isOp()) { - joueur.sendMessage("You must enter image url, and true if you want image to be persistant (false otherwise)"); + joueur.sendMessage("You are not allowed to use this command ( " + arg1.getName() + " )!"); + return false; + } + + + if(joueur.getItemInHand().getType() != Material.MAP) + { + joueur.sendMessage(ChatColor.RED + "Vous devez tenir une map en main !!"); + return false; + } + + if (arg3.length < 1) + { + joueur.sendMessage(ChatColor.RED + "You must enter image url"); return false; } - if (arg3[1].contains("true")) - imgSvg = true; - else - imgSvg = false; - + imgSvg = true; // On crée une map - Rendu ren = new Rendu(arg3[0], imgSvg); - MapView carte = Bukkit.createMap(joueur.getWorld()); + Rendu ren = new Rendu(arg3[0], imgSvg, ca); + MapView carte = Bukkit.getMap(joueur.getItemInHand().getDurability()); Rendu.SupprRendu(carte); carte.addRenderer(ren); joueur.setItemInHand(new ItemStack(Material.MAP, 1, carte.getId())); - if (imgSvg) - { - SvgMap(carte.getId(), "map" + carte.getId(), joueur.getName()); - } - return true; } - void SvgMap(int IdMap, String nomImage, String nomJoueur) - { - System.out.println("Sauvegarde de la map.."); - ArrayList liste = new ArrayList(); - liste.add(String.valueOf(IdMap)); - liste.add(nomImage); - liste.add(nomJoueur); - ca.getConfig().set("map" + IdMap, liste); - ca.saveConfig(); - } - } \ No newline at end of file diff --git a/src/fr/moribus/ImageOnMap/Rendu.java b/src/fr/moribus/ImageOnMap/Rendu.java index e6de7c5..a17115c 100644 --- a/src/fr/moribus/ImageOnMap/Rendu.java +++ b/src/fr/moribus/ImageOnMap/Rendu.java @@ -4,6 +4,7 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.net.URI; +import java.util.ArrayList; import javax.imageio.ImageIO; @@ -25,12 +26,15 @@ public class Rendu extends MapRenderer implements Runnable MapView carte; String URLImage, nomJoueur; Player joueur; + boolean hasFail; + ImageOnMap plugin; - public Rendu(String url, boolean svg) + public Rendu(String url, boolean svg, ImageOnMap plug) { estRendu = true; estSVGee = svg; URLImage = url; + plugin = plug; } public Rendu(String url, String pseudo) @@ -59,6 +63,7 @@ public class Rendu extends MapRenderer implements Runnable } // Le chargement et le rendu de l'image se font dans un thread afin d'éviter le lag.. + @SuppressWarnings("deprecation") @Override public void run() { @@ -72,6 +77,7 @@ public class Rendu extends MapRenderer implements Runnable } catch (IOException e) { e.printStackTrace(); + hasFail = true; } } if (touhou == null && local == true) @@ -83,6 +89,7 @@ public class Rendu extends MapRenderer implements Runnable } catch (IOException e) { e.printStackTrace(); + hasFail = true; } } @@ -91,14 +98,19 @@ public class Rendu extends MapRenderer implements Runnable { try { - @SuppressWarnings("deprecation") - File outputfile = new File("./plugins/ImageOnMap/map" + carte.getId() + ".png"); + File outputfile = new File("./plugins/ImageOnMap/Image/map" + carte.getId() + ".png"); ImageIO.write(MapPalette.resizeImage(touhou), "png", outputfile); + hasFail = false; } catch (IOException e) { e.printStackTrace(); + hasFail = true; } } + if(!hasFail && local == false) + { + SvgMap(carte.getId(), "map" + carte.getId(), joueur.getName()); + } //System.out.println("Rendu de l'image.."); @@ -115,6 +127,17 @@ public class Rendu extends MapRenderer implements Runnable } + void SvgMap(int IdMap, String nomImage, String nomJoueur) + { + System.out.println("Sauvegarde de la map.."); + ArrayList liste = new ArrayList(); + liste.add(String.valueOf(IdMap)); + liste.add(nomImage); + liste.add(nomJoueur); + plugin.getConfig().set("map" + IdMap, liste); + plugin.saveConfig(); + } + static void SupprRendu(MapView map) { if (map.getRenderers().size() != 0)