Redstoner/Parcels
Archived
0
Fork 0
Code Activity

Tweak some command output

Browse Source
This commit is contained in:
Dico
2018-08-02 19:10:18 +01:00
parent 5626ff5652
commit 0f3934710b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dicore3/command/src/main/java/io/dico/dicore/command/chat/AbstractChatController.java
View File

@@ -36,7 +36,7 @@ public class AbstractChatController implements IChatController {
@Override @Override
public void sendMessage(CommandSender sender, EMessageType type, String message) { public void sendMessage(CommandSender sender, EMessageType type, String message) {
if (message != null && !message.isEmpty()) { if (message != null && !message.isEmpty()) {
sender.sendMessage(getMessagePrefixForType(type) + getChatFormatForType(type) + message); sender.sendMessage(filterMessage(getMessagePrefixForType(type) + getChatFormatForType(type) + message));
} }
} }

6
src/main/kotlin/io/dico/parcels2/command/CommandsGeneral.kt
View File

@@ -88,11 +88,13 @@ class CommandsGeneral(plugin: ParcelsPlugin) : AbstractParcelCommands(plugin) {
@ParcelRequire(owner = true) @ParcelRequire(owner = true)
fun ParcelScope.cmdClear(context: ExecutionContext, @Flag sure: Boolean): Any? { fun ParcelScope.cmdClear(context: ExecutionContext, @Flag sure: Boolean): Any? {
if (!sure) return "Are you sure? You cannot undo this action!\n" + if (!sure) return "Are you sure? You cannot undo this action!\n" +
"Type ${context.rawInput} -sure if you want to go through with this." "Run \"/${context.rawInput} -sure\" if you want to go through with this."
world.clearParcel(parcel.id) world.clearParcel(parcel.id)
.onProgressUpdate(1000, 1000) { progress, elapsedTime -> .onProgressUpdate(1000, 1000) { progress, elapsedTime ->
context.sendMessage(EMessageType.INFORMATIVE, "Clear progress: %.02f%%, %.2fs elapsed" val alt = context.getFormat(EMessageType.NUMBER)
val main = context.getFormat(EMessageType.INFORMATIVE)
context.sendMessage(EMessageType.INFORMATIVE, false, "Clear progress: $alt%.02f$main%%, $alt%.2f${main}s elapsed"
.format(progress * 100, elapsedTime / 1000.0)) .format(progress * 100, elapsedTime / 1000.0))
} }