From 77b6239b1663ee8f8787860658408e6c43fce41b Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 8 Jan 2020 14:32:09 -0500 Subject: [PATCH] Log Colors --- src/main/java/ninja/bytecode/iris/Iris.java | 26 ++++++++++--------- .../iris/schematic/SchematicGroup.java | 3 ++- .../ninja/bytecode/iris/spec/IrisBiome.java | 1 - 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/ninja/bytecode/iris/Iris.java b/src/main/java/ninja/bytecode/iris/Iris.java index 40c4271f8..7ea4decde 100644 --- a/src/main/java/ninja/bytecode/iris/Iris.java +++ b/src/main/java/ninja/bytecode/iris/Iris.java @@ -25,6 +25,7 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; +import net.md_5.bungee.api.ChatColor; import ninja.bytecode.iris.generator.IrisGenerator; import ninja.bytecode.iris.schematic.Schematic; import ninja.bytecode.iris.schematic.SchematicGroup; @@ -60,6 +61,7 @@ public class Iris extends JavaPlugin implements Listener public void onEnable() { + L.consoleConsumer = (s) -> Bukkit.getConsoleSender().sendMessage(s); Direction.calculatePermutations(); dimensions = new GMap<>(); biomes = new GMap<>(); @@ -78,12 +80,12 @@ public class Iris extends JavaPlugin implements Listener new WandManager(); loadComplete(); } - + public static void started(String obj) { profiler.start(obj); } - + public static void stopped(String obj) { profiler.stop(obj); @@ -170,7 +172,7 @@ public class Iris extends JavaPlugin implements Listener m += i.size(); } - L.v("Processing Content"); + L.v(ChatColor.LIGHT_PURPLE + "Processing Content"); TaskExecutor exf = new TaskExecutor(settings.performance.compilerThreads, settings.performance.compilerPriority, "Iris Compiler"); TaskGroup gg = exf.startWork(); @@ -180,12 +182,12 @@ public class Iris extends JavaPlugin implements Listener } gg.execute(); exf.close(); - - L.i("Dimensions: " + dimensions.size()); - L.i("Biomes: " + biomes.size()); - L.i("Object Groups: " + schematics.size()); - L.i("Objects: " + F.f(m)); - L.i("Compilation Time: " + F.duration(p.getMilliseconds(), 2)); + L.i(ChatColor.LIGHT_PURPLE + "Dimensions: " + ChatColor.WHITE + dimensions.size()); + L.i(ChatColor.LIGHT_PURPLE + "Biomes: " + ChatColor.WHITE + biomes.size()); + L.i(ChatColor.LIGHT_PURPLE + "Object Groups: " + ChatColor.WHITE + F.f(schematics.size())); + L.i(ChatColor.LIGHT_PURPLE + "Objects: " + ChatColor.WHITE + F.f(m)); + L.i(ChatColor.LIGHT_PURPLE + "Compilation Time: " + ChatColor.WHITE + F.duration(p.getMilliseconds(), 2)); + L.i(ChatColor.GREEN + "Iris Dimensions Successfully Compiled!"); L.flush(); } @@ -288,7 +290,7 @@ public class Iris extends JavaPlugin implements Listener return internal; } - L.f("Cannot find folder: " + internal.getAbsolutePath()); + L.f(ChatColor.RED + "Cannot find folder: " + internal.getAbsolutePath()); return null; } @@ -298,14 +300,14 @@ public class Iris extends JavaPlugin implements Listener if(internal.exists()) { - L.v("Loading Resource: " + internal.getAbsolutePath()); + L.v(ChatColor.DARK_PURPLE + "Loading Resource: " + ChatColor.GRAY + internal.getAbsolutePath()); L.flush(); return new FileInputStream(internal); } else { - L.f("Cannot find Resource: " + internal.getAbsolutePath()); + L.f(ChatColor.RED + "Cannot find Resource: " + ChatColor.YELLOW + internal.getAbsolutePath()); return null; } } diff --git a/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java b/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java index a37812b76..d5e4a9269 100644 --- a/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java +++ b/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.IOException; import java.util.concurrent.locks.ReentrantLock; +import net.md_5.bungee.api.ChatColor; import ninja.bytecode.iris.Iris; import ninja.bytecode.iris.util.Direction; import ninja.bytecode.shuriken.collections.GList; @@ -160,7 +161,7 @@ public class SchematicGroup gg.execute(); ex.close(); - L.i("Processed " + F.f(schematics.size()) + " Schematics in " + name); + L.i(ChatColor.LIGHT_PURPLE + "Processed " + ChatColor.WHITE + F.f(schematics.size()) + ChatColor.LIGHT_PURPLE + " Schematics in " + ChatColor.WHITE + name); } @Override diff --git a/src/main/java/ninja/bytecode/iris/spec/IrisBiome.java b/src/main/java/ninja/bytecode/iris/spec/IrisBiome.java index 3f788b7fd..4703bb95c 100644 --- a/src/main/java/ninja/bytecode/iris/spec/IrisBiome.java +++ b/src/main/java/ninja/bytecode/iris/spec/IrisBiome.java @@ -13,7 +13,6 @@ import ninja.bytecode.shuriken.collections.GMap; import ninja.bytecode.shuriken.execution.J; import ninja.bytecode.shuriken.json.JSONArray; import ninja.bytecode.shuriken.json.JSONObject; -import ninja.bytecode.shuriken.logging.L; import ninja.bytecode.shuriken.math.CNG; import ninja.bytecode.shuriken.math.M; import ninja.bytecode.shuriken.math.RNG;