Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ids etc may contain spaces. Thus I added argConcatFrom with argreader

Browse Source
This commit is contained in:
Olof Larsson 2013-03-15 12:57:29 +01:00
parent 3163253c49
commit de88118d78
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/com/massivecraft/mcore/cmd/MCommand.java
View File

@ -467,14 +467,7 @@ public abstract class MCommand
// ARGUMENT READERS // ARGUMENT READERS
// -------------------------------------------- // // -------------------------------------------- //
public String argConcatFrom(int idx) // argIsSet
{
if ( ! this.argIsSet(idx)) return null;
int from = idx;
int to = args.size();
if (to <= from) return "";
return Txt.implode(this.args.subList(from, to), " ");
}
public boolean argIsSet(int idx) public boolean argIsSet(int idx)
{ {
@ -485,6 +478,8 @@ public abstract class MCommand
return true; return true;
} }
// arg
public String arg(int idx) public String arg(int idx)
{ {
if ( ! this.argIsSet(idx)) return null; if ( ! this.argIsSet(idx)) return null;
@ -499,6 +494,35 @@ public abstract class MCommand
public <T> T arg(int idx, ArgReader<T> argReader, T defaultNotSet) public <T> T arg(int idx, ArgReader<T> argReader, T defaultNotSet)
{ {
String str = this.arg(idx); String str = this.arg(idx);
return this.arg(str, argReader, defaultNotSet);
}
// argConcatFrom
public String argConcatFrom(int idx)
{
if ( ! this.argIsSet(idx)) return null;
int from = idx;
int to = args.size();
if (to <= from) return "";
return Txt.implode(this.args.subList(from, to), " ");
}
public <T> T argConcatFrom(int idx, ArgReader<T> argReader)
{
return this.arg(idx, argReader, null);
}
public <T> T argConcatFrom(int idx, ArgReader<T> argReader, T defaultNotSet)
{
String str = this.argConcatFrom(idx);
return this.arg(str, argReader, defaultNotSet);
}
// Core & Other
public <T> T arg(String str, ArgReader<T> argReader, T defaultNotSet)
{
if (str == null) return defaultNotSet; if (str == null) return defaultNotSet;
ArgResult<T> result = argReader.read(str, this.sender); ArgResult<T> result = argReader.read(str, this.sender);
if (result.hasErrors()) this.msg(result.getErrors()); if (result.hasErrors()) this.msg(result.getErrors());
@ -507,8 +531,6 @@ public abstract class MCommand
public <T> T arg(ArgReader<T> argReader) public <T> T arg(ArgReader<T> argReader)
{ {
ArgResult<T> result = argReader.read(this.sender); return this.arg(null, argReader, null);
if (result.hasErrors()) this.msg(result.getErrors());
return result.getResult();
} }
} }