changes to editors

plugin.yml

@@ -19,15 +19,17 @@ permissions:
           citizens.npc.character.*: true
           citizens.npc.create: true
           citizens.npc.despawn: true
-          citizens.npc.equip: true
+          citizens.npc.edit.*:
+            children:
+              citizens.npc.edit.equip: true
+              citizens.npc.edit.path: true
+              citizens.npc.edit.text: true
           citizens.npc.help: true
-          citizens.npc.path: true
           citizens.npc.remove: true
           citizens.npc.remove.all: true
           citizens.npc.rename: true
           citizens.npc.select: true
           citizens.npc.spawn: true
-          citizens.npc.text: true
           citizens.npc.tp: true
           citizens.npc.tphere: true
           citizens.npc.lookclose: true

src/net/citizensnpcs/command/command/EditorCommands.java

@@ -6,7 +6,6 @@ import net.citizensnpcs.Citizens;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.command.Command;
 import net.citizensnpcs.command.CommandContext;
-import net.citizensnpcs.util.Messaging;
 
 public class EditorCommands {
 
@@ -15,40 +14,11 @@ public class EditorCommands {
 
     @Command(
              aliases = { "npc" },
-             usage = "equip",
+             usage = "edit (editor)",
-             desc = "Toggle equipment editor",
+             desc = "Toggle an NPC editor",
-             modifiers = { "equip" },
+             modifiers = { "edit" },
-             min = 1,
+             min = 2,
-             max = 1,
+             max = 2)
-             permission = "npc.equip")
     public void toggleEquipEditor(CommandContext args, Player player, NPC npc) {
-        if (!(npc instanceof Player)) {
-            Messaging.sendError(player, "The NPC must be a human to equip armor and items.");
-            return;
-        }
-    }
-
-    @Command(
-             aliases = { "npc" },
-             usage = "path",
-             desc = "Toggle path editor",
-             modifiers = { "path" },
-             min = 1,
-             max = 1,
-             permission = "npc.path")
-    public void togglePathEditor(CommandContext args, Player player, NPC npc) {
-        // TODO
-    }
-
-    @Command(
-             aliases = { "npc" },
-             usage = "text",
-             desc = "Toggle text editor",
-             modifiers = { "text" },
-             min = 1,
-             max = 1,
-             permission = "npc.text")
-    public void toggleTextEditor(CommandContext args, Player player, NPC npc) {
-        // TODO
     }
 }

src/net/citizensnpcs/command/command/NPCCommands.java

@@ -202,7 +202,7 @@ public class NPCCommands {
             return;
         }
         if (!player.hasPermission("citizens.npc.character." + character.getName())
-                && !player.hasPermission("citizens.npc.character.*")) {
+                && !player.hasPermission("citizens.npc.character.*") && !player.hasPermission("citizens.admin")) {
             Messaging.sendError(player, "You don't have permission to execute that command.");
             return;
         }

src/net/citizensnpcs/editor/Editor.java

@@ -1,8 +1,8 @@
 package net.citizensnpcs.editor;
 
-public interface Editor {
+public abstract class Editor {
 
-    public void begin();
+    public abstract void begin();
 
-    public void end();
+    public abstract void end();
 }

src/net/citizensnpcs/editor/EquipmentEditor.java

@@ -1,13 +1,6 @@
 package net.citizensnpcs.editor;
 
-import org.bukkit.entity.Player;
+public class EquipmentEditor extends Editor {
-
-public class EquipmentEditor implements Editor {
-    private Player player;
-
-    public EquipmentEditor(Player player) {
-        this.player = player;
-    }
 
     @Override
     public void begin() {

src/net/citizensnpcs/editor/PathEditor.java

@@ -1,23 +1,12 @@
 package net.citizensnpcs.editor;
 
-import org.bukkit.entity.Player;
+public class PathEditor extends Editor {
-
-public class PathEditor implements Editor {
-    private final Player player;
-
-    public PathEditor(Player player) {
-        this.player = player;
-    }
 
     @Override
     public void begin() {
-        // TODO Auto-generated method stub
-
     }
 
     @Override
     public void end() {
-        // TODO Auto-generated method stub
-
     }
 }

src/net/citizensnpcs/editor/TextEditor.java

@@ -1,13 +1,6 @@
 package net.citizensnpcs.editor;
 
-import org.bukkit.entity.Player;
+public class TextEditor extends Editor {
-
-public class TextEditor implements Editor {
-    private Player player;
-
-    public TextEditor(Player player) {
-        this.player = player;
-    }
 
     @Override
     public void begin() {