From ab4af2741f93656e63eaa28f352686dda854019a Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Wed, 6 Apr 2016 03:02:15 +1000 Subject: [PATCH] Prefix --- core/src/main/java/com/boydti/fawe/command/Reload.java | 3 ++- core/src/main/java/com/boydti/fawe/config/BBC.java | 1 + core/src/main/java/com/boydti/fawe/object/FawePlayer.java | 3 ++- .../com/boydti/fawe/object/changeset/DiskStorageHistory.java | 3 ++- .../boydti/fawe/object/changeset/MemoryOptimizedHistory.java | 3 ++- .../com/sk89q/worldedit/extension/platform/CommandManager.java | 2 +- forge/src/main/java/com/boydti/fawe/forge/FaweSponge.java | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/boydti/fawe/command/Reload.java b/core/src/main/java/com/boydti/fawe/command/Reload.java index d25b987c..6943125e 100644 --- a/core/src/main/java/com/boydti/fawe/command/Reload.java +++ b/core/src/main/java/com/boydti/fawe/command/Reload.java @@ -1,6 +1,7 @@ package com.boydti.fawe.command; import com.boydti.fawe.Fawe; +import com.boydti.fawe.config.BBC; import com.boydti.fawe.object.FaweCommand; import com.boydti.fawe.object.FawePlayer; import com.boydti.fawe.util.MainUtil; @@ -14,7 +15,7 @@ public class Reload extends FaweCommand { @Override public boolean execute(final FawePlayer player, final String... args) { Fawe.get().setupConfigs(); - MainUtil.sendMessage(player, "&d[FAWE] Reloaded configuration"); + MainUtil.sendMessage(player, "&d" + BBC.PREFIX.s() + " Reloaded configuration"); return true; } } diff --git a/core/src/main/java/com/boydti/fawe/config/BBC.java b/core/src/main/java/com/boydti/fawe/config/BBC.java index 24b308ad..50070b41 100644 --- a/core/src/main/java/com/boydti/fawe/config/BBC.java +++ b/core/src/main/java/com/boydti/fawe/config/BBC.java @@ -16,6 +16,7 @@ public enum BBC { * Things to note about this class: * Can use multiple arguments %s, %s1, %s2, %s3 etc */ + PREFIX("[FAWE]", "Info"), COMMAND_SYNTAX("&cUsage: &7%s0", "Error"), NO_PERM("&cYou are lacking the permission node: %s0", "Error"), SCHEMATIC_NOT_FOUND("&cSchematic not found: &7%s0", "Error"), diff --git a/core/src/main/java/com/boydti/fawe/object/FawePlayer.java b/core/src/main/java/com/boydti/fawe/object/FawePlayer.java index d6a5bb33..2cab2b6d 100644 --- a/core/src/main/java/com/boydti/fawe/object/FawePlayer.java +++ b/core/src/main/java/com/boydti/fawe/object/FawePlayer.java @@ -1,6 +1,7 @@ package com.boydti.fawe.object; import com.boydti.fawe.Fawe; +import com.boydti.fawe.config.BBC; import com.boydti.fawe.config.Settings; import com.boydti.fawe.object.changeset.DiskStorageHistory; import com.boydti.fawe.util.WEManager; @@ -53,7 +54,7 @@ public abstract class FawePlayer { } } if (editIds.size() > 0) { - Fawe.debug("[FAWE] Indexing " + editIds.size() + " history objects for " + getName()); + Fawe.debug(BBC.PREFIX.s() + " Indexing " + editIds.size() + " history objects for " + getName()); for (int index : editIds) { DiskStorageHistory set = new DiskStorageHistory(world, uuid, index); EditSession edit = set.toEditSession(getPlayer()); diff --git a/core/src/main/java/com/boydti/fawe/object/changeset/DiskStorageHistory.java b/core/src/main/java/com/boydti/fawe/object/changeset/DiskStorageHistory.java index eeefcbeb..78c145e1 100644 --- a/core/src/main/java/com/boydti/fawe/object/changeset/DiskStorageHistory.java +++ b/core/src/main/java/com/boydti/fawe/object/changeset/DiskStorageHistory.java @@ -2,6 +2,7 @@ package com.boydti.fawe.object.changeset; import com.boydti.fawe.Fawe; import com.boydti.fawe.FaweCache; +import com.boydti.fawe.config.BBC; import com.boydti.fawe.config.Settings; import com.boydti.fawe.util.MainUtil; import com.boydti.fawe.util.ReflectionUtils; @@ -141,7 +142,7 @@ public class DiskStorageHistory implements ChangeSet, FaweChangeSet { if ((change instanceof BlockChange)) { add((BlockChange) change); } else { - Fawe.debug("[FAWE] Does not support " + change + " yet! (Please bug Empire92)"); + Fawe.debug(BBC.PREFIX.s() + "Does not support " + change + " yet! (Please bug Empire92)"); } } diff --git a/core/src/main/java/com/boydti/fawe/object/changeset/MemoryOptimizedHistory.java b/core/src/main/java/com/boydti/fawe/object/changeset/MemoryOptimizedHistory.java index 1760882a..91533276 100644 --- a/core/src/main/java/com/boydti/fawe/object/changeset/MemoryOptimizedHistory.java +++ b/core/src/main/java/com/boydti/fawe/object/changeset/MemoryOptimizedHistory.java @@ -2,6 +2,7 @@ package com.boydti.fawe.object.changeset; import com.boydti.fawe.Fawe; import com.boydti.fawe.FaweCache; +import com.boydti.fawe.config.BBC; import com.boydti.fawe.config.Settings; import com.boydti.fawe.util.MainUtil; import com.boydti.fawe.util.ReflectionUtils; @@ -290,7 +291,7 @@ public class MemoryOptimizedHistory implements ChangeSet, FaweChangeSet { int saved = total - ids.length; if (ratio > 3) { // TODO remove this debug message - Fawe.debug("[FAWE] History compressed. Saved ~ " + saved + "b (" + ratio + "x smaller)"); + Fawe.debug(BBC.PREFIX.s() + "History compressed. Saved ~ " + saved + "b (" + ratio + "x smaller)"); } idsStream = null; idsStreamZip = null; diff --git a/core/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java b/core/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java index 60fc2fdf..0c248399 100644 --- a/core/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java +++ b/core/src/main/java/com/sk89q/worldedit/extension/platform/CommandManager.java @@ -292,7 +292,7 @@ public final class CommandManager { SetQueue.IMP.addTask(new Runnable() { @Override public void run() { - actor.print("[FAWE] Action completed in " + (time / 1000d) + " seconds"); + actor.print(BBC.PREFIX.s() + " Action completed in " + (time / 1000d) + " seconds"); } }); } diff --git a/forge/src/main/java/com/boydti/fawe/forge/FaweSponge.java b/forge/src/main/java/com/boydti/fawe/forge/FaweSponge.java index fabfb67a..c2c1e22a 100644 --- a/forge/src/main/java/com/boydti/fawe/forge/FaweSponge.java +++ b/forge/src/main/java/com/boydti/fawe/forge/FaweSponge.java @@ -94,7 +94,7 @@ public class FaweSponge implements IFawe { @Override public void setupVault() { - debug("[FAWE] Permission hook not implemented yet!"); + debug(BBC.PREFIX.s() + "Permission hook not implemented yet!"); } @Override