diff --git a/core/pom.xml b/core/pom.xml index 307c8cc..1162f49 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -127,12 +127,6 @@ compile - - com.google.guava - guava - compile - - 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 93e6e8b..9ae283c 100644 --- a/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java +++ b/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java @@ -14,14 +14,10 @@ import cc.carm.plugin.minesql.util.DBPropertiesUtil; import co.aikar.commands.CommandManager; import co.aikar.commands.InvalidCommandArgument; import co.aikar.commands.Locales; -import com.google.common.collect.ImmutableList; import org.jetbrains.annotations.NotNull; import java.io.File; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Properties; +import java.util.*; import java.util.logging.Logger; public class MineSQLCore implements IMineSQL { @@ -126,8 +122,8 @@ public class MineSQLCore implements IMineSQL { } }); commandManager.getCommandCompletions().registerCompletion("sql-managers", c -> { - if (c.getIssuer().isPlayer()) return ImmutableList.of(); - else return ImmutableList.copyOf(getRegistry().list().keySet()); + if (c.getIssuer().isPlayer()) return Collections.emptyList(); + else return getRegistry().list().keySet(); }); commandManager.registerCommand(new MineSQLCommand(this)); } diff --git a/core/src/main/java/cc/carm/plugin/minesql/MineSQLRegistry.java b/core/src/main/java/cc/carm/plugin/minesql/MineSQLRegistry.java index 99dd808..c0b26d0 100644 --- a/core/src/main/java/cc/carm/plugin/minesql/MineSQLRegistry.java +++ b/core/src/main/java/cc/carm/plugin/minesql/MineSQLRegistry.java @@ -7,7 +7,6 @@ import cc.carm.plugin.minesql.api.SQLRegistry; import cc.carm.plugin.minesql.api.source.SQLSourceConfig; import cn.beecp.BeeDataSource; import cn.beecp.BeeDataSourceConfig; -import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; @@ -115,7 +114,7 @@ public class MineSQLRegistry implements SQLRegistry { @Override @Unmodifiable public @NotNull Map list() { - return ImmutableMap.copyOf(this.managers); + return Collections.unmodifiableMap(this.managers); } @Override 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 1a1baee..8127f3e 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 @@ -1,5 +1,7 @@ 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; import co.aikar.commands.BungeeCommandManager; import co.aikar.commands.CommandManager; @@ -10,6 +12,8 @@ import org.bstats.charts.SimplePie; import org.jetbrains.annotations.NotNull; import java.io.File; +import java.util.Arrays; +import java.util.Optional; import java.util.logging.Logger; public class MineSQLBungee extends Plugin implements MineSQLPlatform { @@ -29,6 +33,7 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform { @Override public void onEnable() { + outputInfo(); getLogger().info("初始化指令管理器..."); this.commandManager = new BungeeCommandManager(this); @@ -59,6 +64,7 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform { @Override public void onDisable() { + outputInfo(); getLogger().info("终止全部数据库连接..."); this.core.getRegistry().shutdownAll(); } @@ -86,5 +92,11 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform { return this.commandManager; } + @SuppressWarnings("deprecation") + public void outputInfo() { + Optional.ofNullable(JarResourceUtils.readResource(this.getResourceAsStream("PLUGIN_INFO"))) + .map(v -> ColorParser.parse(Arrays.asList(v))) + .ifPresent(list -> list.forEach(s -> ProxyServer.getInstance().getConsole().sendMessage(s))); + } } diff --git a/platforms/velocity/pom.xml b/platforms/velocity/pom.xml index e9b84c8..3acc85d 100644 --- a/platforms/velocity/pom.xml +++ b/platforms/velocity/pom.xml @@ -66,6 +66,14 @@ + + + com.velocitypowered + velocity-api + 3.1.1 + provided + + ${project.parent.groupId} @@ -74,26 +82,16 @@ compile - - - com.velocitypowered - velocity-api - 3.0.1 - provided - - org.bstats bstats-velocity 3.0.0 - true co.aikar acf-velocity 0.5.1-SNAPSHOT - true 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 6d42a7d..e94fdcd 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 @@ -30,8 +30,6 @@ import java.util.logging.Logger; ) public class MineSQLVelocity implements MineSQLPlatform { - private static MineSQLVelocity instance; - private final ProxyServer server; private final Logger logger; private final File dataFolder; @@ -45,7 +43,6 @@ public class MineSQLVelocity implements MineSQLPlatform { public MineSQLVelocity(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory, Metrics.Factory metricsFactory) { - instance = this; this.server = server; this.logger = logger; this.dataFolder = dataDirectory.toFile(); @@ -57,7 +54,7 @@ public class MineSQLVelocity implements MineSQLPlatform { @Subscribe(order = PostOrder.FIRST) public void onInitialize(ProxyInitializeEvent event) { - + outputInfo(); getLogger().info("初始化指令管理器..."); this.commandManager = new VelocityCommandManager(server, this); @@ -87,18 +84,19 @@ public class MineSQLVelocity implements MineSQLPlatform { @Subscribe(order = PostOrder.LAST) public void onShutdown(ProxyShutdownEvent event) { + outputInfo(); getLogger().info("终止全部数据库连接..."); this.core.getRegistry().shutdownAll(); } - public static MineSQLVelocity getInstance() { - return instance; - } - public ProxyServer getServer() { return server; } + public @NotNull Logger getLogger() { + return logger; + } + public String getVersion() { return this.server.getPluginManager().getPlugin("minesql") .map(PluginContainer::getDescription) @@ -110,9 +108,6 @@ public class MineSQLVelocity implements MineSQLPlatform { return this.dataFolder; } - public @NotNull Logger getLogger() { - return logger; - } @Override public @NotNull CommandManager getCommandManager() { @@ -123,5 +118,7 @@ public class MineSQLVelocity implements MineSQLPlatform { return this.core.getConfig(); } - + public void outputInfo() { + //TODO + } } diff --git a/plugin/pom.xml b/plugin/pom.xml index c0d7ff1..11ef9c6 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -136,8 +136,12 @@ cc.carm.plugin.minesql.lib.jna - com.google - cc.carm.plugin.minesql.lib.google + com.google.protobuf + cc.carm.plugin.minesql.lib.google.protobuf + + + com.google.errorprone + cc.carm.plugin.minesql.lib.google.errorprone com.github