From 248f2ca3c4fa63a6a5116d53f67acb4b3e2e75be Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 8 Jan 2020 14:24:28 -0500 Subject: [PATCH 1/2] Less spam --- src/main/java/ninja/bytecode/iris/Iris.java | 5 ----- src/main/java/ninja/bytecode/iris/schematic/Schematic.java | 4 ---- .../java/ninja/bytecode/iris/schematic/SchematicGroup.java | 5 ++--- src/main/java/ninja/bytecode/iris/spec/IrisBiome.java | 1 - 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/main/java/ninja/bytecode/iris/Iris.java b/src/main/java/ninja/bytecode/iris/Iris.java index 6e7cdb609..40c4271f8 100644 --- a/src/main/java/ninja/bytecode/iris/Iris.java +++ b/src/main/java/ninja/bytecode/iris/Iris.java @@ -246,13 +246,11 @@ public class Iris extends JavaPlugin implements Listener public static IrisDimension loadDimension(String s) throws JSONException, IOException { - L.i("Loading Iris Dimension " + s); return new IrisDimension(loadJSON("pack/dimensions/" + s + ".json")); } public static IrisBiome loadBiome(String s) throws JSONException, IOException { - L.i("Loading Iris Biome " + s); return new IrisBiome(loadJSON("pack/biomes/" + s + ".json")); } @@ -263,7 +261,6 @@ public class Iris extends JavaPlugin implements Listener if(g != null) { schematics.put(s, g); - L.i("Loaded Object Group: " + g.getName() + " (" + g.getSchematics().size() + " Objects)"); return g; } @@ -274,7 +271,6 @@ public class Iris extends JavaPlugin implements Listener public static Schematic loadSchematic(String s) throws IOException { - L.i("Loading Iris Object " + s); return Schematic.load(loadResource("pack/objects/" + s + ".ish")); } @@ -289,7 +285,6 @@ public class Iris extends JavaPlugin implements Listener if(internal.exists()) { - L.v("Loading Group: " + string); return internal; } diff --git a/src/main/java/ninja/bytecode/iris/schematic/Schematic.java b/src/main/java/ninja/bytecode/iris/schematic/Schematic.java index b2d7cf3b7..9ac5679e4 100644 --- a/src/main/java/ninja/bytecode/iris/schematic/Schematic.java +++ b/src/main/java/ninja/bytecode/iris/schematic/Schematic.java @@ -85,7 +85,6 @@ public class Schematic mountHeight = avg(avy); mount = new BlockVector(avg(avx), 0, avg(avz)); - L.i("Corrected " + getName() + "'s Mount Point: 0,0,0 -> " + mount.getBlockX() + "," + mount.getBlockY() + "," + mount.getBlockZ()); } private int avg(double[] v) @@ -260,7 +259,6 @@ public class Schematic Schematic s = new Schematic(1, 1, 1); s.read(in); - L.i("Loaded Internal Object: " + s.getSchematic().size()); return s; } @@ -271,7 +269,6 @@ public class Schematic FileInputStream fin = new FileInputStream(f); s.read(fin); - L.i("Loaded Object: " + f.getPath() + " Size: " + s.getSchematic().size()); return s; } @@ -335,7 +332,6 @@ public class Schematic { int downshift = Integer.valueOf(j.split("\\Q=\\E")[1]); shift.subtract(new Vector(0, downshift, 0)); - L.i("Corrected " + getName() + "'s Mount Height: 0,0,0 -> " + shift.getBlockX() + "," + shift.getBlockY() + "," + shift.getBlockZ()); } } diff --git a/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java b/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java index 36bff375a..a37812b76 100644 --- a/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java +++ b/src/main/java/ninja/bytecode/iris/schematic/SchematicGroup.java @@ -9,6 +9,7 @@ import ninja.bytecode.iris.util.Direction; import ninja.bytecode.shuriken.collections.GList; import ninja.bytecode.shuriken.execution.TaskExecutor; import ninja.bytecode.shuriken.execution.TaskExecutor.TaskGroup; +import ninja.bytecode.shuriken.format.F; import ninja.bytecode.shuriken.io.IO; import ninja.bytecode.shuriken.logging.L; @@ -121,8 +122,6 @@ public class SchematicGroup public void processVariants() { GList inject = new GList<>(); - L.v("Processing " + name + " Objects"); - L.v("# Creating Rotations for " + getSchematics().size() + " Objects"); String x = Thread.currentThread().getName(); ReentrantLock rr = new ReentrantLock(); TaskExecutor ex = new TaskExecutor(Iris.settings.performance.compilerThreads, Iris.settings.performance.compilerPriority, x + "/Subroutine "); @@ -146,7 +145,6 @@ public class SchematicGroup gg.execute(); gg = ex.startWork(); getSchematics().add(inject); - L.v("# Generated " + inject.size() + " Rotated Objects to " + getName()); for(Schematic i : getSchematics()) { @@ -162,6 +160,7 @@ public class SchematicGroup gg.execute(); ex.close(); + L.i("Processed " + F.f(schematics.size()) + " Schematics in " + 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 5094f3b01..3f788b7fd 100644 --- a/src/main/java/ninja/bytecode/iris/spec/IrisBiome.java +++ b/src/main/java/ninja/bytecode/iris/spec/IrisBiome.java @@ -170,7 +170,6 @@ public class IrisBiome for(String i : schematicGroups.k()) { - L.v("Loading Object Group: " + i); Iris.loadSchematicGroup(i); } }); From 77b6239b1663ee8f8787860658408e6c43fce41b Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 8 Jan 2020 14:32:09 -0500 Subject: [PATCH 2/2] 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;