From 2795db4433a2301a97637a60a7fa1f634192172d Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 13 May 2015 23:00:05 +0200 Subject: [PATCH] Page ArgSetting --- src/com/massivecraft/massivecore/cmd/ArgSetting.java | 2 +- src/com/massivecraft/massivecore/cmd/HelpCommand.java | 7 +++---- .../cmd/massivecore/CmdMassiveCoreBufferWhitespace.java | 4 ++-- .../cmd/massivecore/CmdMassiveCoreUsysAspectList.java | 6 +++--- .../cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java | 7 ++++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/com/massivecraft/massivecore/cmd/ArgSetting.java b/src/com/massivecraft/massivecore/cmd/ArgSetting.java index 7d4a9b6c..7f524fa7 100644 --- a/src/com/massivecraft/massivecore/cmd/ArgSetting.java +++ b/src/com/massivecraft/massivecore/cmd/ArgSetting.java @@ -189,7 +189,7 @@ public class ArgSetting // COMMONLY USED ARG SETTINGS // -------------------------------------------- // - public static ArgSetting getPager() + public static ArgSetting getPage() { // We can't use a singletone, because people might // want to set a description. diff --git a/src/com/massivecraft/massivecore/cmd/HelpCommand.java b/src/com/massivecraft/massivecore/cmd/HelpCommand.java index 70dd5855..6b5d9431 100644 --- a/src/com/massivecraft/massivecore/cmd/HelpCommand.java +++ b/src/com/massivecraft/massivecore/cmd/HelpCommand.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.MassiveCommand; -import com.massivecraft.massivecore.cmd.arg.ARInteger; import com.massivecraft.massivecore.util.Txt; public class HelpCommand extends MassiveCommand @@ -21,7 +20,7 @@ public class HelpCommand extends MassiveCommand this.addAliases("?", "h", "help"); // Args - this.addArg(ARInteger.get(), "page", "1"); + this.addArg(ArgSetting.getPage()); // Other this.setDesc(""); @@ -35,7 +34,7 @@ public class HelpCommand extends MassiveCommand public void perform() throws MassiveException { // Args - int pagenumber = this.readArg(1); + int page = this.readArg(); // Get parent command if ( ! this.hasParentCommand()) return; @@ -57,7 +56,7 @@ public class HelpCommand extends MassiveCommand } // Send Lines - sendMessage(Txt.getPage(lines, pagenumber, "Help for command \"" + parentCommand.getAliases().get(0) + "\"", sender)); + sendMessage(Txt.getPage(lines, page, "Help for command \"" + parentCommand.getAliases().get(0) + "\"", sender)); } } diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferWhitespace.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferWhitespace.java index 668972a6..f65f1158 100644 --- a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferWhitespace.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferWhitespace.java @@ -20,7 +20,7 @@ public class CmdMassiveCoreBufferWhitespace extends MassiveCommand this.addAliases("w", "whitespace"); // Args - this.addArg(ARInteger.get(), "times", "1").setDesc("the amount of whitespace to add to your buffer"); + this.addArg(1, ARInteger.get(), "times").setDesc("the amount of whitespace to add to your buffer"); // Requirements this.addRequirements(ReqHasPerm.get(MassiveCorePerm.BUFFER_WHITESPACE.node)); @@ -33,7 +33,7 @@ public class CmdMassiveCoreBufferWhitespace extends MassiveCommand @Override public void perform() throws MassiveException { - int times = this.readArg(1); + int times = this.readArg(); String string = Txt.repeat(" ", times); diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java index 740bbf6d..c3c13a06 100644 --- a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java @@ -24,7 +24,7 @@ public class CmdMassiveCoreUsysAspectList extends MassiveCommand this.addAliases("l", "list"); // Args - this.addArg(ArgSetting.getPager()).setDesc("the page in the aspect list"); + this.addArg(ArgSetting.getPage()).setDesc("the page in the aspect list"); // Requirements this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_ASPECT_LIST.node)); @@ -38,7 +38,7 @@ public class CmdMassiveCoreUsysAspectList extends MassiveCommand public void perform() throws MassiveException { // Args - int pageHumanBased = this.readArg(); + int page = this.readArg(); // Create Lines List lines = new ArrayList(); @@ -50,7 +50,7 @@ public class CmdMassiveCoreUsysAspectList extends MassiveCommand } // Send them - this.sendMessage(Txt.getPage(lines, pageHumanBased, "Aspect List", sender)); + this.sendMessage(Txt.getPage(lines, page, "Aspect List", sender)); } } diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java index d4a1aa28..3beae06e 100644 --- a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java @@ -7,6 +7,7 @@ import com.massivecraft.massivecore.MassiveCorePerm; import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.Multiverse; import com.massivecraft.massivecore.MultiverseColl; +import com.massivecraft.massivecore.cmd.ArgSetting; import com.massivecraft.massivecore.cmd.MassiveCommand; import com.massivecraft.massivecore.cmd.arg.ARInteger; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; @@ -24,7 +25,7 @@ public class CmdMassiveCoreUsysMultiverseList extends MassiveCommand this.addAliases("l", "list"); // Args - this.addArg(ARInteger.get(), "page", "1").setDesc("the page in the multiverse list"); + this.addArg(ArgSetting.getPage()); // Requirements this.addRequirements(ReqHasPerm.get(MassiveCorePerm.USYS_MULTIVERSE_LIST.node)); @@ -38,7 +39,7 @@ public class CmdMassiveCoreUsysMultiverseList extends MassiveCommand public void perform() throws MassiveException { // Args - int pageHumanBased = this.readArg(1); + int page = this.readArg(); // Create Lines List lines = new ArrayList(); @@ -49,7 +50,7 @@ public class CmdMassiveCoreUsysMultiverseList extends MassiveCommand } // Send them - this.sendMessage(Txt.getPage(lines, pageHumanBased, "Multiverse List", sender)); + this.sendMessage(Txt.getPage(lines, page, "Multiverse List", sender)); } }