Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move commands around

This commit is contained in:
fullwall 2012-04-13 23:59:51 +08:00
parent 19aba97351
commit 44b904ed0a
7 changed files with 119 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/citizensnpcs/Citizens.java
View File

@ -24,6 +24,7 @@ import net.citizensnpcs.command.command.AdminCommands;
import net.citizensnpcs.command.command.EditorCommands;
import net.citizensnpcs.command.command.HelpCommands;
import net.citizensnpcs.command.command.NPCCommands;
import net.citizensnpcs.command.command.ScriptCommands;
import net.citizensnpcs.command.exception.CommandException;
import net.citizensnpcs.command.exception.CommandUsageException;
import net.citizensnpcs.command.exception.ServerCommandException;
@ -131,6 +132,7 @@ public class Citizens extends JavaPlugin {
@Override
public void onEnable() {
Messaging.log(System.getProperty("java.class.path"));
// Disable if the server is not using the compatible Minecraft version
String mcVersion = ((CraftServer) getServer()).getServer().getVersion();
compatible = mcVersion.startsWith(COMPATIBLE_MC_VERSION);
@ -225,11 +227,6 @@ public class Citizens extends JavaPlugin {
}.start();
}
private void registerScriptHelpers() {
ScriptCompiler compiler = CitizensAPI.getScriptCompiler();
compiler.registerGlobalContextProvider(new EventRegistrar(this));
}
private void registerCommands() {
commands.setInjector(new Injector(this));
@ -238,6 +235,12 @@ public class Citizens extends JavaPlugin {
commands.register(EditorCommands.class);
commands.register(HelpCommands.class);
commands.register(NPCCommands.class);
commands.register(ScriptCommands.class);
}
private void registerScriptHelpers() {
ScriptCompiler compiler = CitizensAPI.getScriptCompiler();
compiler.registerGlobalContextProvider(new EventRegistrar(this));
}
public void reload() throws NPCLoadException {

6
src/main/java/net/citizensnpcs/Settings.java
View File

@ -47,11 +47,11 @@ public class Settings {
SELECTION_ITEM("npc.selection.item", "280"),
SELECTION_MESSAGE("npc.selection.message", "<b>You selected <a><npc><b>!"),
SERVER_OWNS_NPCS("npc.server-ownership", false),
STORAGE_FILE("storage.file", "saves.yml"),
STORAGE_TYPE("storage.type", "yaml"),
TALK_CLOSE_MAXIMUM_COOLDOWN("npc.text.max-talk-cooldown", 60),
TALK_CLOSE_MINIMUM_COOLDOWN("npc.text.min-talk-cooldown", 30),
TALK_ITEM("npc.text.talk-item", "340"),
STORAGE_TYPE("storage.type", "yaml"),
STORAGE_FILE("storage.file", "saves.yml");
TALK_ITEM("npc.text.talk-item", "340");
private String path;
private Object value;

3
src/main/java/net/citizensnpcs/command/CommandManager.java
View File

@ -235,11 +235,10 @@ public class CommandManager {
boolean isStatic = Modifier.isStatic(method.getModifiers());
Command cmd = method.getAnnotation(Command.class);
String[] modifiers = cmd.modifiers();
// Cache the aliases too
for (String alias : cmd.aliases()) {
for (String modifier : modifiers) {
for (String modifier : cmd.modifiers()) {
commands.put(alias + " " + modifier, method);
}
}

61
src/main/java/net/citizensnpcs/command/command/AdminCommands.java
View File

@ -1,13 +1,8 @@
package net.citizensnpcs.command.command;
import java.io.File;
import net.citizensnpcs.Citizens;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.exception.NPCLoadException;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.scripting.CompileCallback;
import net.citizensnpcs.api.scripting.ScriptFactory;
import net.citizensnpcs.command.Command;
import net.citizensnpcs.command.CommandContext;
import net.citizensnpcs.command.Requirements;
@ -17,7 +12,6 @@ import net.citizensnpcs.util.Messaging;
import net.citizensnpcs.util.StringHelper;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@Requirements
public class AdminCommands {
@ -27,32 +21,9 @@ public class AdminCommands {
this.plugin = plugin;
}
@Command(
aliases = "citizens",
modifiers = "script",
desc = "compile and run a script",
min = 2,
max = 2,
permission = "script.run")
@ServerCommand
public void runScript(CommandContext args, final CommandSender sender, NPC npc) throws CommandException {
File file = new File(args.getString(1));
if (!file.exists())
throw new CommandException("The file '" + args.getString(1) + "' doesn't exist!");
Messaging.send(
sender,
"Could put into queue? "
+ CitizensAPI.getScriptCompiler().compile(file).withCallback(new CompileCallback() {
@Override
public void onScriptCompiled(ScriptFactory script) {
script.newInstance();
Messaging.send(sender, "<a>Script compiled!");
}
}).begin());
}
@Command(aliases = { "citizens" }, desc = "Show basic plugin information", max = 0, permission = "admin")
public void citizens(CommandContext args, Player player, NPC npc) {
@ServerCommand
public void citizens(CommandContext args, CommandSender player, NPC npc) {
Messaging.send(player,
" " + StringHelper.wrapHeader("<e>Citizens v" + plugin.getDescription().getVersion()));
Messaging.send(player, " <7>-- <c>Written by fullwall and aPunch");
@ -61,13 +32,13 @@ public class AdminCommands {
}
@Command(
aliases = { "citizens" },
usage = "reload",
desc = "Reload Citizens",
modifiers = { "reload" },
min = 1,
max = 1,
permission = "admin")
aliases = { "citizens" },
usage = "reload",
desc = "Reload Citizens",
modifiers = { "reload" },
min = 1,
max = 1,
permission = "admin")
@ServerCommand
public void reload(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
Messaging.send(sender, "<e>Reloading Citizens...");
@ -81,13 +52,13 @@ public class AdminCommands {
}
@Command(
aliases = { "citizens" },
usage = "save",
desc = "Save NPCs",
modifiers = { "save" },
min = 1,
max = 1,
permission = "admin")
aliases = { "citizens" },
usage = "save",
desc = "Save NPCs",
modifiers = { "save" },
min = 1,
max = 1,
permission = "admin")
@ServerCommand
public void save(CommandContext args, CommandSender sender, NPC npc) {
Messaging.send(sender, "<e>Saving Citizens...");

19
src/main/java/net/citizensnpcs/command/command/HelpCommands.java
View File

@ -62,6 +62,25 @@ public class HelpCommands {
return lines;
}
@Command(
aliases = { "script" },
usage = "help (page)",
desc = "Script help menu",
modifiers = { "help" },
min = 1,
max = 2,
permission = "script.help")
@Requirements
@ServerCommand
public void scriptHelp(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
int page = args.argsLength() == 2 ? args.getInteger(1) : 1;
Paginator paginator = new Paginator().header("Script Help");
for (String line : getLines(sender, "script"))
paginator.addLine(line);
if (!paginator.sendPage(sender, page))
throw new CommandException("The page '" + page + "' does not exist.");
}
@Command(
aliases = { "npc" },
usage = "help (page)",

63
src/main/java/net/citizensnpcs/command/command/ScriptCommands.java Normal file
View File

@ -0,0 +1,63 @@
package net.citizensnpcs.command.command;
import java.io.File;
import net.citizensnpcs.Citizens;
import net.citizensnpcs.api.CitizensAPI;
import net.citizensnpcs.api.npc.NPC;
import net.citizensnpcs.api.scripting.CompileCallback;
import net.citizensnpcs.api.scripting.Script;
import net.citizensnpcs.api.scripting.ScriptFactory;
import net.citizensnpcs.command.Command;
import net.citizensnpcs.command.CommandContext;
import net.citizensnpcs.command.ServerCommand;
import net.citizensnpcs.command.exception.CommandException;
import net.citizensnpcs.util.Messaging;
import org.bukkit.command.CommandSender;
import com.google.common.base.Splitter;
public class ScriptCommands {
private final Citizens plugin;
public ScriptCommands(Citizens plugin) {
this.plugin = plugin;
}
@Command(
aliases = { "script" },
modifiers = { "compile", "run" },
usage = "compile|run [file]",
desc = "compile and run a script",
min = 2,
max = 2,
permission = "script.compile")
@ServerCommand
public void runScript(final CommandContext args, final CommandSender sender, NPC npc) throws CommandException {
File file = new File(plugin.getDataFolder(), args.getString(1));
if (!file.exists())
throw new CommandException("The file '" + args.getString(1) + "' doesn't exist!");
boolean success = CitizensAPI.getScriptCompiler().compile(file).withCallback(new CompileCallback() {
@Override
public void onScriptCompiled(ScriptFactory script) {
Script s = script.newInstance();
if (args.hasValueFlag("i")) {
for (String m : Splitter.on(',').split(args.getFlag("i"))) {
try {
s.invoke(m, new Object[] {});
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
}
}
Messaging.send(sender, "<a>Done.");
}
}).begin();
if (success) {
sender.sendMessage("Compiling...");
} else {
sender.sendMessage("Could not schedule compilation.");
}
}
}

23
src/main/resources/plugin.yml
View File

@ -4,6 +4,8 @@ version: 2.0
main: net.citizensnpcs.Citizens
website: http://www.citizensnpcs.net
commands:
script:
description: Scripting commands
citizens:
description: Administration commands
npc:
@ -14,30 +16,23 @@ permissions:
children:
citizens.admin: true
citizens.help: true
citizens.script.*:
children:
citizens.script.compile: true
citizens.npc.*:
children:
citizens.npc.age: true
citizens.npc.character.*: true
citizens.npc.create: true
citizens.npc.despawn: true
citizens.npc.edit.*:
children:
citizens.npc.edit.equip: true
citizens.npc.edit.path: true
citizens.npc.edit.text: true
citizens.npc.equip: true
citizens.npc.help: true
citizens.npc.list: true
citizens.npc.owner: true
citizens.npc.power: 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.talk: true
citizens.npc.text: true
citizens.npc.tp: true
citizens.npc.tphere: true
citizens.npc.lookclose: true
citizens.script.*:
children:
citizens.script.run: true
citizens.npc.lookclose: true