From af2c3f081e0d6453421d18fa06972518bbe84d58 Mon Sep 17 00:00:00 2001 From: Stefatorus Date: Wed, 29 Sep 2021 21:38:11 +0300 Subject: [PATCH] Color redsign and rebranding for EntryRise --- src/com/entryrise/lagassist/Data.java | 2 +- src/com/entryrise/lagassist/Main.java | 2 +- src/com/entryrise/lagassist/MonTools.java | 4 +- .../lagassist/chunks/ChkAnalyse.java | 16 ++-- .../entryrise/lagassist/chunks/ChkStats.java | 8 +- .../lagassist/chunks/ChunkGenerator.java | 6 +- .../lagassist/cmd/CommandListener.java | 82 +++++++++---------- .../entryrise/lagassist/cmd/StatsAnalyse.java | 10 +-- .../lagassist/minebench/Approximate.java | 18 ++-- .../lagassist/minebench/SpeedTest.java | 10 +-- .../lagassist/updater/SmartUpdater.java | 32 ++++---- 11 files changed, 95 insertions(+), 95 deletions(-) diff --git a/src/com/entryrise/lagassist/Data.java b/src/com/entryrise/lagassist/Data.java index 008cf59..c190ea6 100644 --- a/src/com/entryrise/lagassist/Data.java +++ b/src/com/entryrise/lagassist/Data.java @@ -130,7 +130,7 @@ public class Data { if (isSellHopper(loc)) { data.set(cloc + ".sellhopper", false); - p.sendMessage(Main.PREFIX + "This sellhopper has been §cdisabled§f at " + percentage + "§f."); + p.sendMessage(Main.PREFIX + "This sellhopper has been §2disabled§f at " + percentage + "§f."); saveData(); return true; } else { diff --git a/src/com/entryrise/lagassist/Main.java b/src/com/entryrise/lagassist/Main.java index 72eabdb..2d0a72a 100644 --- a/src/com/entryrise/lagassist/Main.java +++ b/src/com/entryrise/lagassist/Main.java @@ -40,7 +40,7 @@ public class Main extends JavaPlugin implements Listener { public static String USER = "%%__USER__%%"; - public static final String PREFIX = "§c§lLag§f§lAssist §e» §f"; + public static final String PREFIX = "§2§lLag§f§lAssist §e» §f"; public static JavaPlugin p; public static boolean paper = false; diff --git a/src/com/entryrise/lagassist/MonTools.java b/src/com/entryrise/lagassist/MonTools.java index e39ee29..24a7c44 100644 --- a/src/com/entryrise/lagassist/MonTools.java +++ b/src/com/entryrise/lagassist/MonTools.java @@ -41,7 +41,7 @@ public class MonTools implements Listener { } Bukkit.getLogger().info(" §e[§a✔§e] §fMapVisualizer."); - mapitemmeta.setDisplayName("§c§lLag§f§lAssist §e§lMonitor"); + mapitemmeta.setDisplayName("§2§lLag§f§lAssist §e§lMonitor"); mapitem.setItemMeta(mapitemmeta); int mapid = VersionMgr.getMapId(mapitem); @@ -91,7 +91,7 @@ public class MonTools implements Listener { } else if (tpsraw > 15) { tps = "§e" + format.format(tpsraw); } else { - tps = "§c" + format.format(tpsraw); + tps = "§2" + format.format(tpsraw); } String s = ChatColor.translateAlternateColorCodes('&', stbmsg.replaceAll("\\{TPS\\}", tps) diff --git a/src/com/entryrise/lagassist/chunks/ChkAnalyse.java b/src/com/entryrise/lagassist/chunks/ChkAnalyse.java index 90052ce..90d2f54 100644 --- a/src/com/entryrise/lagassist/chunks/ChkAnalyse.java +++ b/src/com/entryrise/lagassist/chunks/ChkAnalyse.java @@ -54,7 +54,7 @@ public class ChkAnalyse { } Collections.sort(scores); p.sendMessage(""); - p.sendMessage("§c§l⬛⬛⬛⬛⬛⬛ §f§lCHUNKANALYSER §c§l⬛⬛⬛⬛⬛⬛"); + p.sendMessage("§2§l⬛⬛⬛⬛⬛⬛ §f§lCHUNKANALYSER §2§l⬛⬛⬛⬛⬛⬛"); p.sendMessage(""); for (int i = 0; i < ammoshow; i++) { @@ -63,7 +63,7 @@ public class ChkAnalyse { } p.sendMessage(""); - p.sendMessage("§c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); + p.sendMessage("§2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); } }); @@ -129,16 +129,16 @@ public class ChkAnalyse { String cmd = "lagassist tpchunk " + p.getWorld().getName() + " " + String.valueOf(coords[0]) + " " + String.valueOf(coords[1]); - p.sendMessage("§c§l⬛⬛⬛⬛⬛⬛ §f§lCHUNK STATS §c§l⬛⬛⬛⬛⬛⬛"); + p.sendMessage("§2§l⬛⬛⬛⬛⬛⬛ §f§lCHUNK STATS §2§l⬛⬛⬛⬛⬛⬛"); p.sendMessage(""); - p.sendMessage(" §c✸ §fChunk coordonates: §e" + crds); + p.sendMessage(" §2✸ §fChunk coordonates: §7" + crds); p.sendMessage(""); - p.sendMessage(" §c✸ §fEntity Amount: §e" + stats.getEnts().length); - p.sendMessage(" §c✸ §fTiles Amount: §e" + stats.getTiles().length); + p.sendMessage(" §2✸ §fEntity Amount: §7" + stats.getEnts().length); + p.sendMessage(" §2✸ §fTiles Amount: §7" + stats.getTiles().length); p.sendMessage(""); - p.spigot().sendMessage(stats.genMobCount(" §c✸ §fDetailed Info §e(HOVER)", cmd)); + p.spigot().sendMessage(stats.genMobCount(" §2✸ §fDetailed Info §7(HOVER)", cmd)); p.sendMessage(""); - p.sendMessage("§c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); + p.sendMessage("§2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); } diff --git a/src/com/entryrise/lagassist/chunks/ChkStats.java b/src/com/entryrise/lagassist/chunks/ChkStats.java index c7cf7b5..da3f81c 100644 --- a/src/com/entryrise/lagassist/chunks/ChkStats.java +++ b/src/com/entryrise/lagassist/chunks/ChkStats.java @@ -101,11 +101,11 @@ public class ChkStats implements Comparable { String regionfile = "r." + String.valueOf(coords[0] >> 5) + "." + String.valueOf(coords[1] >> 5) + ".mca"; - String empt = "\n§c✸ §fClick to teleport!\n\n§fChunk Information:\n §c✸ §fWorld:§e " - + Chat.capitalize(world.toLowerCase()) + "\n §c✸ §fRegion File:§e " + regionfile + String empt = "\n§2✸ §fClick to teleport!\n\n§fChunk Information:\n §2✸ §fWorld:§e " + + Chat.capitalize(world.toLowerCase()) + "\n §2✸ §fRegion File:§e " + regionfile + "\n\n§fMost often appearances:"; for (String stg : tops.keySet()) { - empt = empt + "\n" + " §c✸ §f" + Chat.capitalize(stg.replace('_', ' ')) + ": §e" + empt = empt + "\n" + " §2✸ §f" + Chat.capitalize(stg.replace('_', ' ')) + ": §e" + String.valueOf(tops.get(stg)); } empt = empt + "\n"; @@ -114,7 +114,7 @@ public class ChkStats implements Comparable { } public TextComponent genText() { - String name = " §c✸ §fChunk §c(" + String.valueOf(coords[0]) + " " + String.valueOf(coords[1]) + String name = " §2✸ §fChunk §2(" + String.valueOf(coords[0]) + " " + String.valueOf(coords[1]) + ")§f Score: §e" + String.valueOf(score); String cmd = "lagassist tpchunk " + world + " " + String.valueOf(coords[0]) + " " + String.valueOf(coords[1]); return genMobCount(name, cmd); diff --git a/src/com/entryrise/lagassist/chunks/ChunkGenerator.java b/src/com/entryrise/lagassist/chunks/ChunkGenerator.java index 41ae011..0964959 100644 --- a/src/com/entryrise/lagassist/chunks/ChunkGenerator.java +++ b/src/com/entryrise/lagassist/chunks/ChunkGenerator.java @@ -42,7 +42,7 @@ public class ChunkGenerator { } if (args.length != 2) { - s.sendMessage(Main.PREFIX + "Correct usage: §c/lagassist pregench [Max-Millis-Per-Tick]"); + s.sendMessage(Main.PREFIX + "Correct usage: §2/lagassist pregench [Max-Millis-Per-Tick]"); return; } @@ -153,7 +153,7 @@ public class ChunkGenerator { if (i % 300 == 0 && i != 0) { int percent = (int) ((double) i / chunks.size() * 100); Bukkit.getLogger() - .info("§e[§a✪§e] §fThe pregeneration of the §c" + .info("§e[§a✪§e] §fThe pregeneration of the §2" + Chat.capitalize(world.getName()) + " §fworld is at §a" + percent + "% completion."); } @@ -168,7 +168,7 @@ public class ChunkGenerator { gentask.cancel(); gentask = null; Bukkit.getLogger() - .info("§e[§a✪§e] §fThe pregeneration of the §c" + Chat.capitalize(world.getName()) + .info("§e[§a✪§e] §fThe pregeneration of the §2" + Chat.capitalize(world.getName()) + " §fworld is finished. Thank you for your patience."); } diff --git a/src/com/entryrise/lagassist/cmd/CommandListener.java b/src/com/entryrise/lagassist/cmd/CommandListener.java index e9d6d03..5cb431d 100644 --- a/src/com/entryrise/lagassist/cmd/CommandListener.java +++ b/src/com/entryrise/lagassist/cmd/CommandListener.java @@ -70,7 +70,7 @@ public class CommandListener implements CommandExecutor { } else if (arg.equalsIgnoreCase("stopgen") && sender.hasPermission("lagassist.generatechunks")) { ChunkGenerator.stopGen(sender); } else if (arg.equalsIgnoreCase("tpchunk")) { - sender.sendMessage(Main.PREFIX + "Correct usage: §c/lagassist tpchunk [WORLD] [X] [Z]"); + sender.sendMessage(Main.PREFIX + "Correct usage: §2/lagassist tpchunk [WORLD] [X] [Z]"); } else if (arg.equalsIgnoreCase("reload") && sender.hasPermission("lagassist.reload")) { Main.ReloadPlugin(sender); } else if (arg.equalsIgnoreCase("changelog")) { @@ -80,7 +80,7 @@ public class CommandListener implements CommandExecutor { UUID p = ((Player) sender).getUniqueId(); if (MonTools.actionmon.contains(p)) { MonTools.actionmon.remove(p); - sender.sendMessage(Main.PREFIX + "StatsBar §cDisabled."); + sender.sendMessage(Main.PREFIX + "StatsBar §2Disabled."); Reflection.sendAction(Bukkit.getPlayer(p), ""); } else { MonTools.actionmon.add(p); @@ -124,7 +124,7 @@ public class CommandListener implements CommandExecutor { p.teleport(new Location(w, x, y, z)); p.sendMessage(Main.PREFIX + "You have been teleported to the desired chunk."); } else { - sender.sendMessage(Main.PREFIX + "Correct usage: §c/lagassist tpchunk [WORLD] [X] [Z]"); + sender.sendMessage(Main.PREFIX + "Correct usage: §2/lagassist tpchunk [WORLD] [X] [Z]"); } } else { sender.sendMessage(Main.PREFIX + "You cannot tp to laggy chunks from console."); @@ -145,61 +145,61 @@ public class CommandListener implements CommandExecutor { if (s instanceof Player) { Player p = (Player) s; p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist MobCuller §c- §eClear the configured mobs", - "§fClears the mobs that you have set to remove\nin the configuration file.\n\n§c(!) It won't remove named mobs.", + " §2✸ §fLagAssist MobCuller §2- §eClear the configured mobs", + "§fClears the mobs that you have set to remove\nin the configuration file.\n\n§2(!) It won't remove named mobs.", "LagAssist MobCuller")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist RedstoneCuller §c- §eDisables Redstone", + " §2✸ §fLagAssist RedstoneCuller §2- §eDisables Redstone", "§fDisables all the redstone that has been triggered in 30 ticks.\n\nIt can be used to temporarily disable lag-machines\nor to even break them, if you configure it to do so.\nIt also breaks lag-machines that don't use redstone wire!", "LagAssist RedstoneCuller")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist ToggleSpawning §c- §eToggles mob spawning", + " §2✸ §fLagAssist ToggleSpawning §2- §eToggles mob spawning", "§fDisables all mob-spawning once it is toggled on.\n\nIt can be used when many players are online,\nand your server is not keeping up to all the mobs.", "LagAssist ToggleSpawning")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist TogglePhyisics §c- §eToggles physics events.", + " §2✸ §fLagAssist TogglePhyisics §2- §eToggles physics events.", "§fIt disables all physics events that are enabled\nin the config.\n\nIt can be used to drastically reduce lag on non-minigame servers.", "LagAssist TogglePhysics")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist ChunkAnalyse §c- §eFind the laggiest chunks", + " §2✸ §fLagAssist ChunkAnalyse §2- §eFind the laggiest chunks", "§fOutput the first X laggiest chunks, based on a score table.\n\nIt can be fully configured, from how many chunks to show to\nhow much score each entity or tile-entity has.", "LagAssist ChunkAnalyse")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist GetMap §c- §eGet a graph of server TPS", - "§fGives you a map that can help find lagspikes.\n§c(!) It exaggerates lag so it is more visible.\n§c(!) do not get alarmed.\n\n§fYou can use it along a cronometer\n§fto find how often the lagspikes happen. Then, you can\nuse your timings report to find a plugin that runs\nTasks at that interval.", + " §2✸ §fLagAssist GetMap §2- §eGet a graph of server TPS", + "§fGives you a map that can help find lagspikes.\n§2(!) It exaggerates lag so it is more visible.\n§2(!) do not get alarmed.\n\n§fYou can use it along a cronometer\n§fto find how often the lagspikes happen. Then, you can\nuse your timings report to find a plugin that runs\nTasks at that interval.", "LagAssist GetMap")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist Benchmark §c- §eGenerates a performance report", + " §2✸ §fLagAssist Benchmark §2- §eGenerates a performance report", "§fIt can be used to approximate how many players your server\ncan run without lagging, based on collected information.\nIt can also be used to find if hosts are overselling, and how much.", "LagAssist Benchmark")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist StatsBar §c- §eGet a simple action-bar TPS Meter", + " §2✸ §fLagAssist StatsBar §2- §eGet a simple action-bar TPS Meter", "§fShows a simple action-bar showing data that\nis related to lag.\n\nIf you have rare lagspikes, this can help\npinpoint when they happen without having\nto stop doing something else.", "LagAssist StatsBar")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist TpChunk §c- §eTeleport to a chunk", - "§f/LagAssist TpChunk [World] [X] [Z].\n\n§c(!) The X and Z variables are not F3 coords.\n\n", + " §2✸ §fLagAssist TpChunk §2- §eTeleport to a chunk", + "§f/LagAssist TpChunk [World] [X] [Z].\n\n§2(!) The X and Z variables are not F3 coords.\n\n", "LagAssist TpChunk")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist PreGenCH §c- §ePre-Generate chunks", - "§f/LagAssist PreGenCH [Radius] [Delay] [Amount]\n\n§c(!) This doesn't have any failsafes.\n§c(!) If you don't know how to use it, ask me first.", + " §2✸ §fLagAssist PreGenCH §2- §ePre-Generate chunks", + "§f/LagAssist PreGenCH [Radius] [Delay] [Amount]\n\n§2(!) This doesn't have any failsafes.\n§2(!) If you don't know how to use it, ask me first.", "LagAssist PreGenCH")); p.spigot() .sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist ChunkHopper §c- §eGet Chunk Hoppers", + " §2✸ §fLagAssist ChunkHopper §2- §eGet Chunk Hoppers", "§f/LagAssist chunkhopper [Player] [Amount]\n\n§fTGive a player a chunk hopper.", "LagAssist ChunkHopper")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist Changelog §c- §eCheck Version info.", + " §2✸ §fLagAssist Changelog §2- §eCheck Version info.", "§fThis tool will show you the changelog in an update.\nIt is really useful if you haven't checked the changelog in the updates page already.", "LagAssist Changelog")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist Version §c- §eShows you the plugin version.", + " §2✸ §fLagAssist Version §2- §eShows you the plugin version.", "§fThis should be used when reporting bugs.\nYou should allways update first when having a bug,\nas I fix bugs quite fast once i find them.", "LagAssist Version")); p.spigot().sendMessage( - Chat.genHoverAndSuggestTextComponent(" §c✸ §fLagAssist Reload §c- §eReloads the config", + Chat.genHoverAndSuggestTextComponent(" §2✸ §fLagAssist Reload §2- §eReloads the config", "§fUse it when you changed the config", "LagAssist Reload")); } else { s.sendMessage(" ✸ LagAssist MobCuller - Clear the configured mobs"); @@ -221,60 +221,60 @@ public class CommandListener implements CommandExecutor { private static void helpnew(CommandSender p) { p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist MobCuller §c- §eClear the configured mobs", - "§fClears the mobs that you have set to remove\nin the configuration file.\n\n§c(!) It won't remove named mobs.", + " §2✸ §fLagAssist MobCuller §2- §eClear the configured mobs", + "§fClears the mobs that you have set to remove\nin the configuration file.\n\n§2(!) It won't remove named mobs.", "LagAssist MobCuller")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist RedstoneCuller §c- §eDisables Redstone", + " §2✸ §fLagAssist RedstoneCuller §2- §eDisables Redstone", "§fDisables all the redstone that has been triggered in 30 ticks.\n\nIt can be used to temporarily disable lag-machines\nor to even break them, if you configure it to do so.\nIt also breaks lag-machines that don't use redstone wire!", "LagAssist RedstoneCuller")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist ToggleSpawning §c- §eToggles mob spawning", + " §2✸ §fLagAssist ToggleSpawning §2- §eToggles mob spawning", "§fDisables all mob-spawning once it is toggled on.\n\nIt can be used when many players are online,\nand your server is not keeping up to all the mobs.", "LagAssist ToggleSpawning")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist TogglePhyisics §c- §eToggles physics events.", + " §2✸ §fLagAssist TogglePhyisics §2- §eToggles physics events.", "§fIt disables all physics events that are enabled\nin the config.\n\nIt can be used to drastically reduce lag on non-minigame servers.", "LagAssist TogglePhysics")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist ChunkAnalyse §c- §eFind the laggiest chunks", + " §2✸ §fLagAssist ChunkAnalyse §2- §eFind the laggiest chunks", "§fOutput the first X laggiest chunks, based on a score table.\n\nIt can be fully configured, from how many chunks to show to\nhow much score each entity or tile-entity has.", "LagAssist ChunkAnalyse")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist GetMap §c- §eGet a graph of server TPS", - "§fGives you a map that can help find lagspikes.\n§c(!) It exaggerates lag so it is more visible.\n§c(!) do not get alarmed.\n\n§fYou can use it along a cronometer\n§fto find how often the lagspikes happen. Then, you can\nuse your timings report to find a plugin that runs\nTasks at that interval.", + " §2✸ §fLagAssist GetMap §2- §eGet a graph of server TPS", + "§fGives you a map that can help find lagspikes.\n§2(!) It exaggerates lag so it is more visible.\n§2(!) do not get alarmed.\n\n§fYou can use it along a cronometer\n§fto find how often the lagspikes happen. Then, you can\nuse your timings report to find a plugin that runs\nTasks at that interval.", "LagAssist GetMap")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist Benchmark §c- §eGenerates a performance report", + " §2✸ §fLagAssist Benchmark §2- §eGenerates a performance report", "§fIt can be used to approximate how many players your server\ncan run without lagging, based on collected information.\nIt can also be used to find if hosts are overselling, and how much.", "LagAssist Benchmark")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist Ping §c- §eShows a ping benchmark", + " §2✸ §fLagAssist Ping §2- §eShows a ping benchmark", "§fIt can be used to find the best location to host your server\nbased on what the player ping is.\nThe recommended ping value is under 90ms.", "LagAssist Ping")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist StatsBar §c- §eGet a simple action-bar TPS Meter", + " §2✸ §fLagAssist StatsBar §2- §eGet a simple action-bar TPS Meter", "§fShows a simple action-bar showing data that\nis related to lag.\n\nIf you have rare lagspikes, this can help\npinpoint when they happen without having\nto stop doing something else.", "LagAssist StatsBar")); p.spigot() .sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist TpChunk §c- §eTeleport to a chunk", - "§f/LagAssist TpChunk [World] [X] [Z].\n\n§c(!) The X and Z variables are not F3 coords.\n\n", + " §2✸ §fLagAssist TpChunk §2- §eTeleport to a chunk", + "§f/LagAssist TpChunk [World] [X] [Z].\n\n§2(!) The X and Z variables are not F3 coords.\n\n", "LagAssist TpChunk")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist PreGenCH §c- §ePre-Generate chunks", - "§f/LagAssist PreGenCH [Radius] [Delay] [Amount]\n\n§c(!) This doesn't have any failsafes.\n§c(!) If you don't know how to use it, ask me first.", + " §2✸ §fLagAssist PreGenCH §2- §ePre-Generate chunks", + "§f/LagAssist PreGenCH [Radius] [Delay] [Amount]\n\n§2(!) This doesn't have any failsafes.\n§2(!) If you don't know how to use it, ask me first.", "LagAssist PreGenCH")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist Changelog §c- §eCheck Version info.", + " §2✸ §fLagAssist Changelog §2- §eCheck Version info.", "§fThis tool will show you the changelog in an update.\nIt is really useful if you haven't checked the changelog in the updates page already.", "LagAssist Changelog")); p.spigot().sendMessage(Chat.genHoverAndSuggestTextComponent( - " §c✸ §fLagAssist Version §c- §eShows you the plugin version.", + " §2✸ §fLagAssist Version §2- §eShows you the plugin version.", "§fThis should be used when reporting bugs.\nYou should allways update first when having a bug,\nas I fix bugs quite fast once i find them.", "LagAssist Version")); p.spigot().sendMessage( - Chat.genHoverAndSuggestTextComponent(" §c✸ §fLagAssist Reload §c- §eReloads the config", + Chat.genHoverAndSuggestTextComponent(" §2✸ §fLagAssist Reload §2- §eReloads the config", "§fUse it when you changed the config", "LagAssist Reload")); } @@ -283,7 +283,7 @@ public class CommandListener implements CommandExecutor { boolean oldvers = Bukkit.getVersion().contains("1.8"); - p.sendMessage("§c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛§f§l LAG ASSIST §c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); + p.sendMessage("§2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛§f§l LAG ASSIST §2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); p.sendMessage(""); if (oldvers) { help18(p); @@ -291,7 +291,7 @@ public class CommandListener implements CommandExecutor { helpnew(p); } p.sendMessage(""); - p.sendMessage("§c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); + p.sendMessage("§2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); } } diff --git a/src/com/entryrise/lagassist/cmd/StatsAnalyse.java b/src/com/entryrise/lagassist/cmd/StatsAnalyse.java index c1798ab..fb7f53f 100644 --- a/src/com/entryrise/lagassist/cmd/StatsAnalyse.java +++ b/src/com/entryrise/lagassist/cmd/StatsAnalyse.java @@ -53,11 +53,11 @@ public class StatsAnalyse implements Listener { crstg = "NOT AVAILABLE"; } - String stats = "\n\n §c✸ §fExact TPS: §c" + df.format(Monitor.exactTPS) + "\n\n §c✸ §fEntities: §c" - + String.valueOf(ent) + "\n §c✸ §fLoaded Chunks: §c" + String.valueOf(chk) - + "\n\n §c✸ §fFree Memory: §c" + String.valueOf(Monitor.freeMEM()) + "MB" - + "\n §c✸ §fCPU Cores: §c" + crstg + "\n §c✸ §fLoad Average: §c" + loadstg - + "\n §c✸ §fDisk Space: §c" + String.valueOf((Main.p.getDataFolder().getUsableSpace() / 1073741824)) + String stats = "\n\n §2✸ §fExact TPS: §2" + df.format(Monitor.exactTPS) + "\n\n §2✸ §fEntities: §2" + + String.valueOf(ent) + "\n §2✸ §fLoaded Chunks: §2" + String.valueOf(chk) + + "\n\n §2✸ §fFree Memory: §2" + String.valueOf(Monitor.freeMEM()) + "MB" + + "\n §2✸ §fCPU Cores: §2" + crstg + "\n §2✸ §fLoad Average: §2" + loadstg + + "\n §2✸ §fDisk Space: §2" + String.valueOf((Main.p.getDataFolder().getUsableSpace() / 1073741824)) + "GB\n"; msg.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(stats).create())); diff --git a/src/com/entryrise/lagassist/minebench/Approximate.java b/src/com/entryrise/lagassist/minebench/Approximate.java index 4f79cd0..5289747 100644 --- a/src/com/entryrise/lagassist/minebench/Approximate.java +++ b/src/com/entryrise/lagassist/minebench/Approximate.java @@ -109,20 +109,20 @@ public class Approximate { public void run() { for (CommandSender cs : receivers) { cs.sendMessage(""); - cs.sendMessage("§c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛§f§l BENCHMARK RESULTS §c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); + cs.sendMessage("§2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛§f§l BENCHMARK RESULTS §2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); cs.sendMessage(""); - cs.sendMessage(" §c✸ §fCPU Name: §e" + cpuname); + cs.sendMessage(" §2✸ §fCPU Name: §e" + cpuname); cs.sendMessage(""); - cs.sendMessage(" §c✸ §fCPU Score (SINGLE): §e" + br.getStringifiedSth()); - cs.sendMessage(" §c✸ §fCPU Score (MULTI): §e" + br.getStringifiedMth()); + cs.sendMessage(" §2✸ §fCPU Score (SINGLE): §e" + br.getStringifiedSth()); + cs.sendMessage(" §2✸ §fCPU Score (MULTI): §e" + br.getStringifiedMth()); cs.sendMessage(""); - cs.sendMessage(" §c✸ §fDownload Speed: §e" + MIBDL + " Mib/s (" + MBDL + "MB/s)"); - cs.sendMessage(" §c✸ §fUpload Speed: §e" + MIBUP + " Mib/s (" + MBUP + " MB/s)"); + cs.sendMessage(" §2✸ §fDownload Speed: §e" + MIBDL + " Mib/s (" + MBDL + "MB/s)"); + cs.sendMessage(" §2✸ §fUpload Speed: §e" + MIBUP + " Mib/s (" + MBUP + " MB/s)"); cs.sendMessage(""); - cs.sendMessage(" §c✸ §fMax Players (SINGLE): §e" + singleapprox); - cs.sendMessage(" §c✸ §fMax Players (GLOBAL): §e" + multiapprox); + cs.sendMessage(" §2✸ §fMax Players (SINGLE): §e" + singleapprox); + cs.sendMessage(" §2✸ §fMax Players (GLOBAL): §e" + multiapprox); cs.sendMessage(""); - cs.sendMessage("§c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); + cs.sendMessage("§2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); } receivers.clear(); inuse = false; diff --git a/src/com/entryrise/lagassist/minebench/SpeedTest.java b/src/com/entryrise/lagassist/minebench/SpeedTest.java index 21866f6..867829b 100644 --- a/src/com/entryrise/lagassist/minebench/SpeedTest.java +++ b/src/com/entryrise/lagassist/minebench/SpeedTest.java @@ -128,14 +128,14 @@ public class SpeedTest { } s.sendMessage(""); - s.sendMessage("§c§l⬛⬛⬛⬛⬛⬛§f§l PINGTEST RESULTS §c§l⬛⬛⬛⬛⬛⬛"); + s.sendMessage("§2§l⬛⬛⬛⬛⬛⬛§f§l PINGTEST RESULTS §2§l⬛⬛⬛⬛⬛⬛"); s.sendMessage(""); - s.sendMessage(" §c✸ §fLowest Ping: §e" + String.valueOf(min) + "ms §c(" + namemin + ")"); - s.sendMessage(" §c✸ §fHighest Ping: §e" + String.valueOf(max) + "ms §c(" + namemax + ")"); + s.sendMessage(" §2✸ §fLowest Ping: §e" + String.valueOf(min) + "ms §2(" + namemin + ")"); + s.sendMessage(" §2✸ §fHighest Ping: §e" + String.valueOf(max) + "ms §2(" + namemax + ")"); s.sendMessage(""); - s.sendMessage(" §c✸ §fAverage Ping: §e" + df.format((double) (med / nr)) + "ms"); + s.sendMessage(" §2✸ §fAverage Ping: §e" + df.format((double) (med / nr)) + "ms"); s.sendMessage(""); - s.sendMessage("§c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); + s.sendMessage("§2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); } } diff --git a/src/com/entryrise/lagassist/updater/SmartUpdater.java b/src/com/entryrise/lagassist/updater/SmartUpdater.java index 888df0e..4f37e71 100644 --- a/src/com/entryrise/lagassist/updater/SmartUpdater.java +++ b/src/com/entryrise/lagassist/updater/SmartUpdater.java @@ -38,18 +38,18 @@ public class SmartUpdater { ui = getNextUpdate(); if (ui == null) { - Bukkit.getLogger().info("§c§lLag§f§lAssist §e» §fYou are up to date with LagAssist."); + Bukkit.getLogger().info("§2§lLag§f§lAssist §e» §fYou are up to date with LagAssist."); return; } - Bukkit.getLogger().info("§c§lLag§f§lAssist §e» §fWe found a newer LagAssist version:"); + Bukkit.getLogger().info("§2§lLag§f§lAssist §e» §fWe found a newer LagAssist version:"); if (ui.isUnsafe()) { - Bukkit.getLogger().warning("§c§lLag§f§lAssist §e» §fThis version is considered Unsafe!"); + Bukkit.getLogger().warning("§2§lLag§f§lAssist §e» §fThis version is considered Unsafe!"); } - Bukkit.getLogger().info(" §c[§e֍§c] §fVersion: " + ui.getVersion()); - Bukkit.getLogger().info(" §c[§e֍§c] §fReviews: " + ((int) (ui.getRating() * 100)) / 100f + "§e★"); - Bukkit.getLogger().info(" §c[§e֍§c] §fDownloads: " + ui.getDownloads()); - Bukkit.getLogger().info(" §c[§e֍§c] §fFor more info, use §c/lagassist changelog"); + Bukkit.getLogger().info(" §2[§e֍§2] §fVersion: " + ui.getVersion()); + Bukkit.getLogger().info(" §2[§e֍§2] §fReviews: " + ((int) (ui.getRating() * 100)) / 100f + "§e★"); + Bukkit.getLogger().info(" §2[§e֍§2] §fDownloads: " + ui.getDownloads()); + Bukkit.getLogger().info(" §2[§e֍§2] §fFor more info, use §2/lagassist changelog"); } }); @@ -164,27 +164,27 @@ public class SmartUpdater { public static void showChangelog(CommandSender s) { if (ui == null) { - s.sendMessage("§c§lLag§f§lAssist §e» §fThere is no new recommended version available."); + s.sendMessage("§2§lLag§f§lAssist §e» §fThere is no new recommended version available."); return; } String formatdesc = getFormattedDesc(); - s.sendMessage("§c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛§f§l LAGASSIST CHANGELOG §c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); + s.sendMessage("§2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛§f§l LAGASSIST CHANGELOG §2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); s.sendMessage(""); - s.sendMessage(" §c✸ §fNew Version: §e" + ui.getVersion()); + s.sendMessage(" §2✸ §fNew Version: §e" + ui.getVersion()); s.sendMessage(""); - s.sendMessage(" §c✸ §fTitle:"); + s.sendMessage(" §2✸ §fTitle:"); s.sendMessage(" §e" + ui.getTitle()); s.sendMessage(""); - s.sendMessage(" §c✸ §fDescription:"); + s.sendMessage(" §2✸ §fDescription:"); s.sendMessage(" §e" + formatdesc); s.sendMessage(""); - s.sendMessage(" §c✸ §fRating: §e" + ui.getRating() + "★"); - s.sendMessage(" §c✸ §fDownloads: §e" + ui.getDownloads()); - s.sendMessage(" §c✸ §fLikes: §e" + ui.getLikes()); + s.sendMessage(" §2✸ §fRating: §e" + ui.getRating() + "★"); + s.sendMessage(" §2✸ §fDownloads: §e" + ui.getDownloads()); + s.sendMessage(" §2✸ §fLikes: §e" + ui.getLikes()); s.sendMessage(""); - s.sendMessage("§c§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); + s.sendMessage("§2§l⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛⬛"); } }