From a22ba45b1cbd4e7804f4a65b76e8c09fa352ca4b Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 18 Apr 2019 20:47:25 +0200 Subject: [PATCH] Minors --- .../java/com/boydti/fawe/bukkit/FaweBukkit.java | 4 ++-- .../com/sk89q/worldedit/command/HelpBuilder.java | 4 ++-- .../sk89q/worldedit/command/WorldEditCommands.java | 13 +------------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java index 09a269f15..793f2ef1e 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java @@ -302,7 +302,7 @@ public class FaweBukkit implements IFawe, Listener { try { this.vault = new VaultUtil(); } catch (final Throwable e) { - this.debug("&dVault is used for persistent `/wea` toggles."); + this.debug(BBC.getPrefix() + "&dVault is used for persistent `/wea` toggles."); } } @@ -310,7 +310,7 @@ public class FaweBukkit implements IFawe, Listener { public String getDebugInfo() { StringBuilder msg = new StringBuilder(); List pl = new ArrayList<>(); - msg.append("server.version: " + Bukkit.getVersion() + " / " + Bukkit.getBukkitVersion() + "\n"); + msg.append("server.version: " + Bukkit.getVersion() + "\n"); msg.append("Plugins: \n"); for (Plugin p : Bukkit.getPluginManager().getPlugins()) { msg.append(" - " + p.getName() + ": " + p.getDescription().getVersion() + "\n"); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/HelpBuilder.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/HelpBuilder.java index 189792bbe..0434c5209 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/HelpBuilder.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/HelpBuilder.java @@ -161,7 +161,7 @@ public abstract class HelpBuilder implements Runnable { visited.add(args.getString(i)); isRootLevel = false; } else { - String msg = String.format("'%s' has no sub-commands. (Maybe '%s' is for a parameter?)", + String msg = String.format(BBC.getPrefix() + "'%s' has no sub-commands. (Maybe '%s' is for a parameter?)", Joiner.on(" ").join(visited), command); displayFailure(msg); return; @@ -200,7 +200,7 @@ public abstract class HelpBuilder implements Runnable { // Box if (offset >= aliases.size()) { - displayFailure(String.format("There is no page %d (total number of pages is %d).", page + 1, pageTotal)); + displayFailure(String.format(BBC.getPrefix() + "There is no page %d (total number of pages is %d).", page + 1, pageTotal)); } else { int end = Math.min(offset + perPage, aliases.size()); List subAliases = aliases.subList(offset, end); diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java index 4c83671c5..6ec63bea9 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java @@ -23,9 +23,7 @@ import com.boydti.fawe.Fawe; import com.boydti.fawe.FaweVersion; import com.boydti.fawe.config.BBC; import com.boydti.fawe.config.Settings; -import com.boydti.fawe.object.FawePlayer; import com.boydti.fawe.util.*; -import com.google.common.io.Files; import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandPermissions; @@ -35,21 +33,12 @@ import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent; import com.sk89q.worldedit.extension.platform.*; - -import java.io.IOException; -import java.net.URL; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Capability; import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.extension.platform.PlatformManager; -import com.sk89q.worldedit.util.paste.ActorCallbackPaste; -import com.sk89q.worldedit.util.report.ConfigReport; -import com.sk89q.worldedit.util.report.ReportList; -import com.sk89q.worldedit.util.report.SystemInfoReport; -import java.io.File; import java.io.IOException; -import java.nio.charset.Charset; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -89,7 +78,7 @@ public class WorldEditCommands { PlatformManager pm = we.getPlatformManager(); actor.printDebug("Platforms:"); for (Platform platform : pm.getPlatforms()) { - actor.printDebug(String.format(" - %s", platform.getPlatformName())); + actor.printDebug(String.format(" - %s (%s)", platform.getPlatformName(), platform.getVersion())); } actor.printDebug("Capabilities:"); for (Capability capability : Capability.values()) {