From de1968c216813cdc6c21e6f0d4133d82fd86979f Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Tue, 14 Oct 2014 09:41:20 +0200 Subject: [PATCH] These messages are even better. --- .../com/massivecraft/factions/cmd/CmdFactionsAccess.java | 1 - .../massivecraft/factions/cmd/CmdFactionsSetCircle.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsSetFill.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsSetSquare.java | 4 ++-- .../factions/cmd/CmdFactionsSetTransfer.java | 9 +++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java index 3fe3d738..c8191f31 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsAccess.java @@ -1,7 +1,6 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Perm; -import com.massivecraft.massivecore.cmd.HelpCommand; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java index 680fee37..5771ebee 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java @@ -21,8 +21,8 @@ public class CmdFactionsSetCircle extends CmdFactionsSetXRadius this.addAliases("c", "circle"); // Format - this.setFormatOne(null); - this.setFormatMany("%s %s %d chunks using circle near %s."); + this.setFormatOne("%s %s %d chunk %s using circle."); + this.setFormatMany("%s %s %d chunks near %s using circle."); // Requirements this.addRequirements(ReqIsPlayer.get()); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetFill.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetFill.java index b179005f..f70f19a6 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetFill.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetFill.java @@ -25,8 +25,8 @@ public class CmdFactionsSetFill extends CmdFactionsSetXSimple this.addAliases("f", "fill"); // Format - this.setFormatOne(null); - this.setFormatMany("%s %s %d chunks using fill near %s."); + this.setFormatOne("%s %s %d chunk %s using fill."); + this.setFormatMany("%s %s %d chunks near %s using fill."); // Requirements this.addRequirements(ReqIsPlayer.get()); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java index 1c4330b9..c3e2fa96 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java @@ -21,8 +21,8 @@ public class CmdFactionsSetSquare extends CmdFactionsSetXRadius this.addAliases("s", "square"); // Format - this.setFormatOne(null); - this.setFormatMany("%s %s %d chunks using square near %s."); + this.setFormatOne("%s %s %d chunk %s using square."); + this.setFormatMany("%s %s %d chunks near %s using square."); // Requirements this.addRequirements(ReqIsPlayer.get()); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetTransfer.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetTransfer.java index 5a7ff7a4..bc596e65 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetTransfer.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetTransfer.java @@ -45,8 +45,8 @@ public class CmdFactionsSetTransfer extends CmdFactionsSetXTransfer if (MUtil.list("a", "al", "all").contains(this.arg(0).toLowerCase())) { chunks = BoardColl.get().getChunks(oldFaction); - this.setFormatOne("%s %s all %d chunks."); - this.setFormatMany("%s %s all %d chunks."); + this.setFormatOne("%s %s %d chunk using transfer all."); + this.setFormatMany("%s %s %d chunks using transfer all."); } else { @@ -71,8 +71,9 @@ public class CmdFactionsSetTransfer extends CmdFactionsSetXTransfer Board board = BoardColl.get().get(worldId); chunks = board.getChunks(oldFaction); String worldDisplayName = Mixin.getWorldDisplayName(worldId); - this.setFormatOne("%s %s all %d chunks in " + worldDisplayName + "."); - this.setFormatMany("%s %s all %d chunks in " + worldDisplayName + "."); + this.setFormatOne("%s %s %d chunk using transfer " + worldDisplayName + "."); + this.setFormatMany("%s %s %d chunks using transfer " + worldDisplayName + "."); + } // Return Ret