From c36d00195467b9f0410247d54a8588ae1fc72bf8 Mon Sep 17 00:00:00 2001 From: Adrian Victor Date: Sat, 23 May 2026 14:36:04 -0300 Subject: [PATCH] Convert to an actual library --- src/main/java/org/adrianvictor/lib/Main.java | 45 ------------------- .../lib/configuration/Configuration.java | 6 +-- .../org/adrianvictor/lib/text/TextColor.java | 6 +-- .../adrianvictor/lib/text/TextColorUtils.java | 13 ++++-- 4 files changed, 15 insertions(+), 55 deletions(-) delete mode 100644 src/main/java/org/adrianvictor/lib/Main.java diff --git a/src/main/java/org/adrianvictor/lib/Main.java b/src/main/java/org/adrianvictor/lib/Main.java deleted file mode 100644 index c8cb630..0000000 --- a/src/main/java/org/adrianvictor/lib/Main.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.adrianvictor.lib; -import org.adrianvictor.lib.reflection.ImplementationRegistry; -import org.adrianvictor.lib.reflection.VersionMatcher; -import org.bukkit.plugin.java.JavaPlugin; - -public class Main extends JavaPlugin { - VersionMatcher matcher; - String serverVersion; - ImplementationRegistry registry; - private static Main instance; - - @Override - public void onDisable() { - getLogger().info("is being disabled."); - } - - @Override - public void onEnable() { - getLogger().info("is loading."); - - instance = this; - matcher = new VersionMatcher(); - serverVersion = matcher.getServerVersion(); - - String classSuffix = matcher.getClassSuffix("release", serverVersion); - - if (classSuffix == null) { - classSuffix = matcher.getClassSuffix("beta", serverVersion); - } - - if (classSuffix == null) { - throw new IllegalStateException("No suitable implementation found for version " + serverVersion); - } - - registry = new ImplementationRegistry(classSuffix); - } - - public static Main getInstance() { - return instance; - } - - public ImplementationRegistry getRegistry() { - return registry; - } -} \ No newline at end of file diff --git a/src/main/java/org/adrianvictor/lib/configuration/Configuration.java b/src/main/java/org/adrianvictor/lib/configuration/Configuration.java index e641f75..9bb76b5 100644 --- a/src/main/java/org/adrianvictor/lib/configuration/Configuration.java +++ b/src/main/java/org/adrianvictor/lib/configuration/Configuration.java @@ -1,10 +1,10 @@ package org.adrianvictor.lib.configuration; -import org.adrianvictor.lib.Main; import org.adrianvictor.lib.configuration.provider.ConfigurationProvider; +import org.adrianvictor.lib.reflection.ImplementationRegistry; public class Configuration { - public static ConfigurationProvider create() { - return Main.getInstance().getRegistry().getInstance(ConfigurationProvider.class, "org.adrianvictor.lib.configuraion"); + public static ConfigurationProvider create(ImplementationRegistry registry) { + return registry.getInstance(ConfigurationProvider.class, "org.adrianvictor.lib.configuraion"); } } \ No newline at end of file diff --git a/src/main/java/org/adrianvictor/lib/text/TextColor.java b/src/main/java/org/adrianvictor/lib/text/TextColor.java index 98ca014..67629a5 100644 --- a/src/main/java/org/adrianvictor/lib/text/TextColor.java +++ b/src/main/java/org/adrianvictor/lib/text/TextColor.java @@ -1,10 +1,10 @@ package org.adrianvictor.lib.text; -import org.adrianvictor.lib.Main; +import org.adrianvictor.lib.reflection.ImplementationRegistry; import org.adrianvictor.lib.text.provider.TextColorProvider; public class TextColor { - public static TextColorProvider create() { - return Main.getInstance().getRegistry().getInstance(TextColorProvider.class, "org.adrianvictor.lib.text"); + public static TextColorProvider create(ImplementationRegistry registry) { + return registry.getInstance(TextColorProvider.class, "org.adrianvictor.lib.text"); } } diff --git a/src/main/java/org/adrianvictor/lib/text/TextColorUtils.java b/src/main/java/org/adrianvictor/lib/text/TextColorUtils.java index ba0fe58..1e1183e 100644 --- a/src/main/java/org/adrianvictor/lib/text/TextColorUtils.java +++ b/src/main/java/org/adrianvictor/lib/text/TextColorUtils.java @@ -1,19 +1,24 @@ package org.adrianvictor.lib.text; +import org.adrianvictor.lib.reflection.ImplementationRegistry; import org.adrianvictor.lib.text.provider.TextColorProvider; public class TextColorUtils { - private static final TextColorProvider provider = TextColor.create(); + private final TextColorProvider provider; - public static String formatColors(String message) { + public TextColorUtils(ImplementationRegistry registry) { + provider = TextColor.create(registry); + } + + public String formatColors(String message) { return message.replace("&", "ยง"); } - public static String ignoreColors(String message) { + public String ignoreColors(String message) { return message.replaceAll("&([0-9a-fk-or])", ""); } - public static String rainbow(String message) { + public String rainbow(String message) { String[] colorNames = {"RED", "GOLD", "YELLOW", "GREEN", "AQUA", "BLUE", "LIGHT_PURPLE"}; int colorIndex = 0; String coloredMessage = "";