diff --git a/core/pom.xml b/core/pom.xml index d077ef4..9d75ea2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -68,17 +68,10 @@ provided - - net.byteflux - libby-core - ${deps.libby.version} - compile - - com.github.chris2018998 beecp - provided + compile @@ -87,6 +80,24 @@ compile + + org.mariadb.jdbc + mariadb-java-client + compile + + + + com.mysql + mysql-connector-j + compile + + + + com.h2database + h2 + compile + + cc.carm.lib easyplugin-githubchecker diff --git a/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java b/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java index 96b58ad..e1d12ee 100644 --- a/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java +++ b/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java @@ -14,12 +14,10 @@ import cc.carm.plugin.minesql.command.MineSQLCommand; import cc.carm.plugin.minesql.command.MineSQLHelpFormatter; import cc.carm.plugin.minesql.conf.PluginConfiguration; import cc.carm.plugin.minesql.conf.SQLSourceGroup; -import cc.carm.plugin.minesql.lib.PluginLibraries; import cc.carm.plugin.minesql.util.DBPropertiesUtil; import co.aikar.commands.CommandManager; import co.aikar.commands.InvalidCommandArgument; import co.aikar.commands.Locales; -import net.byteflux.libby.Library; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.stone.beecp.BeeDataSource; @@ -50,17 +48,6 @@ public class MineSQLCore implements IMineSQL { instance = this; this.platform = platform; - getLogger().info("加载数据库依赖文件..."); - getPlatform().getLibraryManager().addMavenLocal(); - getPlatform().getLibraryManager().addMavenCentral(); - getPlatform().getLibraryManager().addSonatype(); - - for (PluginLibraries value : PluginLibraries.values()) { - Library lib = value.getLibrary(); - getLogger().info(" 加载 " + lib.getArtifactId() + " (" + lib.getVersion() + ") ..."); - getPlatform().getLibraryManager().loadLibrary(value.getLibrary()); - } - getLogger().info("加载配置文件..."); this.configProvider = EasyConfiguration.from(new File(platform.getPluginFolder(), "config.yml")); this.config = new PluginConfiguration(); diff --git a/core/src/main/java/cc/carm/plugin/minesql/MineSQLPlatform.java b/core/src/main/java/cc/carm/plugin/minesql/MineSQLPlatform.java index 7570e7a..083bd75 100644 --- a/core/src/main/java/cc/carm/plugin/minesql/MineSQLPlatform.java +++ b/core/src/main/java/cc/carm/plugin/minesql/MineSQLPlatform.java @@ -1,7 +1,6 @@ package cc.carm.plugin.minesql; import co.aikar.commands.CommandManager; -import net.byteflux.libby.LibraryManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -16,6 +15,4 @@ public interface MineSQLPlatform { @Nullable CommandManager getCommandManager(); - @NotNull LibraryManager getLibraryManager(); - } diff --git a/core/src/main/java/cc/carm/plugin/minesql/lib/PluginLibraries.java b/core/src/main/java/cc/carm/plugin/minesql/lib/PluginLibraries.java index 7811d3d..95a7836 100644 --- a/core/src/main/java/cc/carm/plugin/minesql/lib/PluginLibraries.java +++ b/core/src/main/java/cc/carm/plugin/minesql/lib/PluginLibraries.java @@ -1,7 +1,6 @@ package cc.carm.plugin.minesql.lib; import cc.carm.plugin.minesql.util.VersionReader; -import net.byteflux.libby.Library; import org.jetbrains.annotations.NotNull; public enum PluginLibraries { @@ -21,16 +20,8 @@ public enum PluginLibraries { this.artifactID = artifactID; } - public @NotNull Library getLibrary() { - return Library.builder().id(name()) - .groupId(this.groupID).artifactId(this.artifactID) - .version(getVersion()) - .build(); - } - public @NotNull String getVersion() { return READER.get(name().toLowerCase().replace('_', '-')); } - } diff --git a/platforms/bukkit/src/main/java/cc/carm/plugin/minesql/MineSQLBukkit.java b/platforms/bukkit/src/main/java/cc/carm/plugin/minesql/MineSQLBukkit.java index d27fad6..8054d12 100644 --- a/platforms/bukkit/src/main/java/cc/carm/plugin/minesql/MineSQLBukkit.java +++ b/platforms/bukkit/src/main/java/cc/carm/plugin/minesql/MineSQLBukkit.java @@ -85,11 +85,6 @@ public class MineSQLBukkit extends EasyPlugin implements MineSQLPlatform { return commandManager; } - @Override - public @NotNull LibraryManager getLibraryManager() { - return this.libraryManager; - } - @Override public @NotNull File getPluginFolder() { return getDataFolder(); diff --git a/platforms/bungee/pom.xml b/platforms/bungee/pom.xml index 355f5a3..d873171 100644 --- a/platforms/bungee/pom.xml +++ b/platforms/bungee/pom.xml @@ -72,13 +72,6 @@ provided - - net.byteflux - libby-bungee - ${deps.libby.version} - compile - - org.bstats bstats-bungeecord diff --git a/platforms/bungee/src/main/java/cc/carm/plugin/minesql/MineSQLBungee.java b/platforms/bungee/src/main/java/cc/carm/plugin/minesql/MineSQLBungee.java index aaf5a97..89be132 100644 --- a/platforms/bungee/src/main/java/cc/carm/plugin/minesql/MineSQLBungee.java +++ b/platforms/bungee/src/main/java/cc/carm/plugin/minesql/MineSQLBungee.java @@ -5,8 +5,6 @@ import cc.carm.lib.easyplugin.utils.JarResourceUtils; import cc.carm.plugin.minesql.conf.PluginConfiguration; import co.aikar.commands.BungeeCommandManager; import co.aikar.commands.CommandManager; -import net.byteflux.libby.BungeeLibraryManager; -import net.byteflux.libby.LibraryManager; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; import org.bstats.bungeecord.Metrics; @@ -22,8 +20,6 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform { protected static MineSQLBungee instance; - protected BungeeLibraryManager libraryManager; - protected MineSQLCore core; protected BungeeCommandManager commandManager; @@ -31,9 +27,6 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform { public void onLoad() { MineSQLBungee.instance = this; - getLogger().info("加载依赖管理器..."); - this.libraryManager = new BungeeLibraryManager(this); - getLogger().info("加载基础核心..."); this.core = new MineSQLCore(this); } @@ -99,11 +92,6 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform { return this.commandManager; } - @Override - public @NotNull LibraryManager getLibraryManager() { - return this.libraryManager; - } - @SuppressWarnings("deprecation") public void outputInfo() { Optional.ofNullable(JarResourceUtils.readResource(this.getResourceAsStream("PLUGIN_INFO"))) diff --git a/platforms/sponge8/pom.xml b/platforms/sponge8/pom.xml index 6f87275..a34f4d5 100644 --- a/platforms/sponge8/pom.xml +++ b/platforms/sponge8/pom.xml @@ -84,13 +84,6 @@ - - net.byteflux - libby-sponge - ${deps.libby.version} - compile - - org.bstats bstats-sponge diff --git a/platforms/sponge8/src/main/java/cc/carm/plugin/minesql/MineSQLSponge.java b/platforms/sponge8/src/main/java/cc/carm/plugin/minesql/MineSQLSponge.java index f0625e3..5b4afb5 100644 --- a/platforms/sponge8/src/main/java/cc/carm/plugin/minesql/MineSQLSponge.java +++ b/platforms/sponge8/src/main/java/cc/carm/plugin/minesql/MineSQLSponge.java @@ -5,8 +5,6 @@ import cc.carm.lib.easyplugin.utils.JarResourceUtils; import cc.carm.plugin.minesql.conf.PluginConfiguration; import co.aikar.commands.CommandManager; import com.google.inject.Inject; -import net.byteflux.libby.LibraryManager; -import net.byteflux.libby.SpongeLibraryManager; import net.kyori.adventure.text.Component; import org.bstats.charts.SimplePie; import org.bstats.sponge.Metrics; @@ -43,17 +41,13 @@ public class MineSQLSponge implements MineSQLPlatform { private final PluginContainer pluginContainer; private final Metrics.Factory metricsFactory; - protected final SpongeLibraryManager libraryManager; protected final MineSQLCore core; // protected SpongeCommandManager commandManager; @Inject - public MineSQLSponge(Metrics.Factory factory, - PluginContainer pluginContainer, - SpongeLibraryManager libraryManager) { + public MineSQLSponge(Metrics.Factory factory, PluginContainer pluginContainer) { this.pluginContainer = pluginContainer; this.metricsFactory = factory; - this.libraryManager = libraryManager; getLogger().info("加载基础核心..."); this.core = new MineSQLCore(this); @@ -115,11 +109,6 @@ public class MineSQLSponge implements MineSQLPlatform { return null; } - @Override - public @NotNull LibraryManager getLibraryManager() { - return this.libraryManager; - } - public String getVersion() { return pluginContainer.metadata().version().toString(); } diff --git a/platforms/velocity/pom.xml b/platforms/velocity/pom.xml index 8e0c67f..b3818e1 100644 --- a/platforms/velocity/pom.xml +++ b/platforms/velocity/pom.xml @@ -82,13 +82,6 @@ compile - - net.byteflux - libby-velocity - ${deps.libby.version} - compile - - org.bstats bstats-velocity diff --git a/platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java b/platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java index 9cbca19..6a0d442 100644 --- a/platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java +++ b/platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java @@ -1,6 +1,5 @@ package cc.carm.plugin.minesql; - import cc.carm.lib.easyplugin.utils.ColorParser; import cc.carm.lib.easyplugin.utils.JarResourceUtils; import cc.carm.plugin.minesql.conf.PluginConfiguration; @@ -16,13 +15,10 @@ import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.plugin.PluginDescription; import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; -import net.byteflux.libby.LibraryManager; -import net.byteflux.libby.VelocityLibraryManager; import net.kyori.adventure.text.Component; import org.bstats.charts.SimplePie; import org.bstats.velocity.Metrics; import org.jetbrains.annotations.NotNull; -import org.slf4j.LoggerFactory; import java.io.File; import java.nio.file.Path; @@ -43,7 +39,6 @@ public class MineSQLVelocity implements MineSQLPlatform { private final File dataFolder; private final Metrics.Factory metricsFactory; - protected VelocityLibraryManager libraryManager; protected MineSQLCore core; protected VelocityCommandManager commandManager; @@ -56,18 +51,16 @@ public class MineSQLVelocity implements MineSQLPlatform { this.logger = logger; this.dataFolder = dataDirectory.toFile(); this.metricsFactory = metricsFactory; - this.libraryManager = new VelocityLibraryManager<>( - LoggerFactory.getLogger("minesql"), dataDirectory, - server.getPluginManager(), this - ); + + outputInfo(); + getLogger().info("加载基础核心..."); + this.core = new MineSQLCore(this); } @Subscribe(order = PostOrder.FIRST) public void onInitialize(ProxyInitializeEvent event) { - outputInfo(); - getLogger().info("加载基础核心..."); - this.core = new MineSQLCore(this); + getLogger().info("初始化指令管理器..."); this.commandManager = new VelocityCommandManager(server, this); @@ -126,11 +119,6 @@ public class MineSQLVelocity implements MineSQLPlatform { return commandManager; } - @Override - public @NotNull LibraryManager getLibraryManager() { - return this.libraryManager; - } - public @NotNull PluginConfiguration getConfiguration() { return this.core.getConfig(); } diff --git a/pom.xml b/pom.xml index 40ac067..429351c 100644 --- a/pom.xml +++ b/pom.xml @@ -105,11 +105,6 @@ https://repo.aikar.co/content/groups/aikar/ - - AlessioDP - https://repo.alessiodp.com/releases/ - - central https://repo1.maven.org/maven2/