diff --git a/src/api b/src/api index 5f4a153bf..705bf53ae 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 5f4a153bf0fe0065530fadf7d0124f70b903ec26 +Subproject commit 705bf53aea98dc0f7cc234186cd43f2c3ae6dd87 diff --git a/src/main/java/foxz/command/ScriptedCommand.java b/src/main/java/foxz/command/ScriptedCommand.java new file mode 100644 index 000000000..221d3433d --- /dev/null +++ b/src/main/java/foxz/command/ScriptedCommand.java @@ -0,0 +1,80 @@ +package foxz.command; + +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; +import noppes.npcs.api.ICommand; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class ScriptedCommand extends CommandBase implements ICommand { + private String commandName; + private int permissionLevel; + private String commandUsage; + private ArrayList aliases; + + public ScriptedCommand(String commandName, int permissionLevel) { + this.commandName = commandName; + this.permissionLevel = permissionLevel; + this.commandUsage = ""; + this.aliases = new ArrayList<>(); + } + + public void setCommandName(String commandName) { + this.commandName = commandName; + } + + public void setCommandUsage(String commandUsage) { + this.commandUsage = commandUsage; + } + + public void setPermissionLevel(int permissionLevel) { + this.permissionLevel = permissionLevel; + } + + @Override + public String getCommandName() { + return this.commandName; + } + + @Override + public String getCommandUsage(ICommandSender p_71518_1_) { + return this.commandUsage; + } + + public String getCommandUsage() { + return this.commandUsage; + } + + @Override + public void processCommand(ICommandSender p_71515_1_, String[] p_71515_2_) { + } + + public int getRequiredPermissionLevel() + { + return this.permissionLevel; + } + + public int getPermissionLevel() { return this.getRequiredPermissionLevel(); } + + public List getCommandAliases() { + return this.aliases; + } + + public String[] getAliases() { + return this.aliases.toArray(new String[0]); + } + + public void addAliases(String... aliases) { + this.aliases.addAll(Arrays.asList(aliases)); + } + + public boolean hasAlias(String alias) { + return this.aliases.contains(alias); + } + + public void removeAlias(String alias) { + this.aliases.remove(alias); + } +} diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 2fcf8234d..3639d47e0 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -6,8 +6,10 @@ package noppes.npcs.scripted; import cpw.mods.fml.common.eventhandler.EventBus; +import foxz.command.ScriptedCommand; import jdk.nashorn.internal.ir.debug.ObjectSizeCalculator; import net.minecraft.block.Block; +import net.minecraft.command.CommandHandler; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -69,6 +71,14 @@ public class NpcAPI extends AbstractNpcAPI { worldCache.clear(); } + public void registerICommand(ICommand command) { + ((CommandHandler)CustomNpcs.getServer().getCommandManager()).registerCommand((ScriptedCommand) command); + } + + public ICommand getICommand(String commandName, int priorityLevel) { + return new ScriptedCommand(commandName,priorityLevel); + } + public void addGlobalObject(String key, Object obj) { NpcAPI.engineObjects.put(key,obj); }