From b30f0856c36fe25c89c59fa7afcf31f241ea70bf Mon Sep 17 00:00:00 2001 From: xGinko Date: Wed, 21 Feb 2024 15:00:38 +0100 Subject: [PATCH] improve color management --- .../java/me/xginko/villageroptimizer/VillagerOptimizer.java | 3 ++- .../commands/villageroptimizer/VillagerOptimizerCmd.java | 6 +++--- .../villageroptimizer/subcommands/DisableSubCmd.java | 2 +- .../villageroptimizer/subcommands/ReloadSubCmd.java | 2 +- .../villageroptimizer/subcommands/VersionSubCmd.java | 2 +- .../villageroptimizer/modules/VillagerChunkLimit.java | 4 ++-- .../modules/gameplay/RestockOptimizedTrades.java | 2 +- .../modules/optimization/OptimizeByBlock.java | 4 ++-- .../modules/optimization/OptimizeByNametag.java | 4 ++-- .../modules/optimization/OptimizeByWorkstation.java | 4 ++-- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java b/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java index 2d73786..58c6905 100644 --- a/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java +++ b/src/main/java/me/xginko/villageroptimizer/VillagerOptimizer.java @@ -29,7 +29,8 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; public final class VillagerOptimizer extends JavaPlugin { - public static final Style STYLE = Style.style(TextColor.color(102,255,230), TextDecoration.BOLD); + public static final TextColor COLOR = TextColor.color(102,255,230); + public static final Style STYLE = Style.style(COLOR, TextDecoration.BOLD); private static VillagerOptimizer instance; private static VillagerCache villagerCache; diff --git a/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/VillagerOptimizerCmd.java b/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/VillagerOptimizerCmd.java index afb16fa..175a193 100644 --- a/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/VillagerOptimizerCmd.java +++ b/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/VillagerOptimizerCmd.java @@ -59,17 +59,17 @@ public class VillagerOptimizerCmd implements VillagerOptimizerCommand { private void sendCommandOverview(CommandSender sender) { if (!sender.hasPermission(Commands.RELOAD.get()) && !sender.hasPermission(Commands.VERSION.get())) return; KyoriUtil.sendMessage(sender, Component.text("-----------------------------------------------------").color(NamedTextColor.GRAY)); - KyoriUtil.sendMessage(sender, Component.text("VillagerOptimizer Commands").color(VillagerOptimizer.STYLE.color())); + KyoriUtil.sendMessage(sender, Component.text("VillagerOptimizer Commands").color(VillagerOptimizer.COLOR)); KyoriUtil.sendMessage(sender, Component.text("-----------------------------------------------------").color(NamedTextColor.GRAY)); subCommands.forEach(subCommand -> KyoriUtil.sendMessage(sender, subCommand.getSyntax().append(Component.text(" - ").color(NamedTextColor.DARK_GRAY)).append(subCommand.getDescription()))); KyoriUtil.sendMessage(sender, - Component.text("/optimizevillagers ").color(VillagerOptimizer.STYLE.color()) + Component.text("/optimizevillagers ").color(VillagerOptimizer.COLOR) .append(Component.text(" - ").color(NamedTextColor.DARK_GRAY)) .append(Component.text("Optimize villagers in a radius").color(NamedTextColor.GRAY)) ); KyoriUtil.sendMessage(sender, - Component.text("/unoptmizevillagers ").color(VillagerOptimizer.STYLE.color()) + Component.text("/unoptmizevillagers ").color(VillagerOptimizer.COLOR) .append(Component.text(" - ").color(NamedTextColor.DARK_GRAY)) .append(Component.text("Unoptimize villagers in a radius").color(NamedTextColor.GRAY)) ); diff --git a/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/DisableSubCmd.java b/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/DisableSubCmd.java index e329165..728b667 100644 --- a/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/DisableSubCmd.java +++ b/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/DisableSubCmd.java @@ -24,7 +24,7 @@ public class DisableSubCmd extends SubCommand { @Override public TextComponent getSyntax() { - return Component.text("/villageroptimizer disable").color(VillagerOptimizer.STYLE.color()); + return Component.text("/villageroptimizer disable").color(VillagerOptimizer.COLOR); } @Override diff --git a/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/ReloadSubCmd.java b/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/ReloadSubCmd.java index fc265c7..f0619f7 100644 --- a/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/ReloadSubCmd.java +++ b/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/ReloadSubCmd.java @@ -23,7 +23,7 @@ public class ReloadSubCmd extends SubCommand { @Override public TextComponent getSyntax() { - return Component.text("/villageroptimizer reload").color(VillagerOptimizer.STYLE.color()); + return Component.text("/villageroptimizer reload").color(VillagerOptimizer.COLOR); } @Override diff --git a/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/VersionSubCmd.java b/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/VersionSubCmd.java index 7eaed60..de42b8e 100644 --- a/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/VersionSubCmd.java +++ b/src/main/java/me/xginko/villageroptimizer/commands/villageroptimizer/subcommands/VersionSubCmd.java @@ -26,7 +26,7 @@ public class VersionSubCmd extends SubCommand { @Override public TextComponent getSyntax() { - return Component.text("/villageroptimizer version").color(VillagerOptimizer.STYLE.color()); + return Component.text("/villageroptimizer version").color(VillagerOptimizer.COLOR); } @Override diff --git a/src/main/java/me/xginko/villageroptimizer/modules/VillagerChunkLimit.java b/src/main/java/me/xginko/villageroptimizer/modules/VillagerChunkLimit.java index c45047a..378eb93 100644 --- a/src/main/java/me/xginko/villageroptimizer/modules/VillagerChunkLimit.java +++ b/src/main/java/me/xginko/villageroptimizer/modules/VillagerChunkLimit.java @@ -157,7 +157,7 @@ public class VillagerChunkLimit implements VillagerOptimizerModule, Listener { if (log_enabled) { VillagerOptimizer.getLog().info(Component.text( "Removed unoptimized villager with profession '" + villager.getProfession().name() + "' at " + - CommonUtil.formatLocation(villager.getLocation())).color(VillagerOptimizer.STYLE.color())); + CommonUtil.formatLocation(villager.getLocation())).color(VillagerOptimizer.COLOR)); } }); } @@ -180,7 +180,7 @@ public class VillagerChunkLimit implements VillagerOptimizerModule, Listener { if (log_enabled) { VillagerOptimizer.getLog().info(Component.text("Removed optimized villager with profession '" + villager.getProfession().name() + "' at " + - CommonUtil.formatLocation(villager.getLocation())).color(VillagerOptimizer.STYLE.color())); + CommonUtil.formatLocation(villager.getLocation())).color(VillagerOptimizer.COLOR)); } }); } diff --git a/src/main/java/me/xginko/villageroptimizer/modules/gameplay/RestockOptimizedTrades.java b/src/main/java/me/xginko/villageroptimizer/modules/gameplay/RestockOptimizedTrades.java index 64af127..0dd7e92 100644 --- a/src/main/java/me/xginko/villageroptimizer/modules/gameplay/RestockOptimizedTrades.java +++ b/src/main/java/me/xginko/villageroptimizer/modules/gameplay/RestockOptimizedTrades.java @@ -82,7 +82,7 @@ public class RestockOptimizedTrades implements VillagerOptimizerModule, Listener if (log_enabled) { VillagerOptimizer.getLog().info(Component.text("Restocked optimized villager at " + - CommonUtil.formatLocation(wVillager.villager().getLocation())).style(VillagerOptimizer.STYLE)); + CommonUtil.formatLocation(wVillager.villager().getLocation())).color(VillagerOptimizer.COLOR)); } } } diff --git a/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java b/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java index b665601..dcb264c 100644 --- a/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java +++ b/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByBlock.java @@ -151,7 +151,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener { if (log_enabled) { VillagerOptimizer.getLog().info(Component.text(player.getName() + " optimized villager by block at " + - CommonUtil.formatLocation(closestOptimizableVillager.villager().getLocation())).color(VillagerOptimizer.STYLE.color())); + CommonUtil.formatLocation(closestOptimizableVillager.villager().getLocation())).color(VillagerOptimizer.COLOR)); } } else { CommonUtil.shakeHead(closestOptimizableVillager.villager()); @@ -219,7 +219,7 @@ public class OptimizeByBlock implements VillagerOptimizerModule, Listener { if (log_enabled) { VillagerOptimizer.getLog().info(Component.text(player.getName() + " unoptimized villager by block at " + - CommonUtil.formatLocation(closestOptimizedVillager.villager().getLocation())).color(VillagerOptimizer.STYLE.color())); + CommonUtil.formatLocation(closestOptimizedVillager.villager().getLocation())).color(VillagerOptimizer.COLOR)); } } } \ No newline at end of file diff --git a/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java b/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java index cebfd97..c7d8d04 100644 --- a/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java +++ b/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByNametag.java @@ -126,7 +126,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener { if (log_enabled) { VillagerOptimizer.getLog().info(Component.text(player.getName() + " optimized villager by nametag '" + name + "' at " + - CommonUtil.formatLocation(wVillager.villager().getLocation())).color(VillagerOptimizer.STYLE.color())); + CommonUtil.formatLocation(wVillager.villager().getLocation())).color(VillagerOptimizer.COLOR)); } } else { event.setCancelled(true); @@ -155,7 +155,7 @@ public class OptimizeByNametag implements VillagerOptimizerModule, Listener { if (log_enabled) { VillagerOptimizer.getLog().info(Component.text(player.getName() + " unoptimized villager by nametag '" + name + "' at " + - CommonUtil.formatLocation(wVillager.villager().getLocation())).color(VillagerOptimizer.STYLE.color())); + CommonUtil.formatLocation(wVillager.villager().getLocation())).color(VillagerOptimizer.COLOR)); } } } diff --git a/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java b/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java index d86a2ce..cd7f3e1 100644 --- a/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java +++ b/src/main/java/me/xginko/villageroptimizer/modules/optimization/OptimizeByWorkstation.java @@ -167,7 +167,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener if (log_enabled) { VillagerOptimizer.getLog().info(Component.text(player.getName() + " optimized villager by workstation (" + placed.getType().toString().toLowerCase() + ") at " + - CommonUtil.formatLocation(finalToOptimize.villager().getLocation())).color(VillagerOptimizer.STYLE.color())); + CommonUtil.formatLocation(finalToOptimize.villager().getLocation())).color(VillagerOptimizer.COLOR)); } }, toOptimize.canLooseProfession() ? resettable_delay_millis : delay_millis, TimeUnit.MILLISECONDS)); } @@ -232,7 +232,7 @@ public class OptimizeByWorkstation implements VillagerOptimizerModule, Listener if (log_enabled) { VillagerOptimizer.getLog().info(Component.text(player.getName() + " unoptimized villager by workstation (" + broken.getType().toString().toLowerCase() + ") at " + - CommonUtil.formatLocation(closestOptimizedVillager.villager().getLocation())).color(VillagerOptimizer.STYLE.color())); + CommonUtil.formatLocation(closestOptimizedVillager.villager().getLocation())).color(VillagerOptimizer.COLOR)); } } } \ No newline at end of file