调整LifeCycle类名并增加获取实例的方法

DreamVoid · DreamVoid · commit 54d3b477db7c · 2024-06-14T23:33:01.000+08:00
diff --git a/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/LifeCycle.java b/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/LifeCycle.java
@@ -15,12 +15,15 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-public class MiraiMCPlugin {
-    public static MiraiMCPlugin INSTANCE;
+/**
+ * MiraiMC 生命周期
+ */
+public class LifeCycle {
+    public static LifeCycle INSTANCE;
     private static Platform platform;
     private Logger logger;
 
-    public MiraiMCPlugin(Platform plugin){
+    public LifeCycle(Platform plugin){
         INSTANCE = this;
         platform = plugin;
     }
@@ -31,7 +34,7 @@ public static Platform getPlatform() {
 
     /**
      * 此方法应在插件实例化时调用，用于设置必要的运行环境，此时配置尚未初始化。
-     * @param logger Logger 实例。由于各平台初始化 Logger 的时机不一，因此需要一个 Logger 来辅助。
+     * @param logger {@link java.util.logging.Logger} 实例。由于各平台初始化 Logger 的时机不一，因此需要一个 Logger 来辅助。
      */
     public void startUp(Logger logger) {
         logger.info("Preparing MiraiMC start-up.");
diff --git a/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/api/MiraiMC.java b/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/api/MiraiMC.java
@@ -1,6 +1,8 @@
 package me.dreamvoid.miraimc.api;
 
+import me.dreamvoid.miraimc.LifeCycle;
 import me.dreamvoid.miraimc.MiraiMCConfig;
+import me.dreamvoid.miraimc.Platform;
 import me.dreamvoid.miraimc.internal.database.DatabaseHandler;
 
 import javax.annotation.Nullable;
@@ -102,4 +104,12 @@ public static UUID getBind(long account) {
             throw new RuntimeException("处理数据时出现异常，请检查MiraiMC数据库配置是否正确", e);
         }
     }
+
+    /**
+     * 获取 MiraiMC 运行时实用方法实例
+     * @return MiraiMC 运行时实例
+     */
+    public Platform getPlatform(){
+        return LifeCycle.getPlatform();
+    }
 }
diff --git a/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/commands/MiraiCommand.java b/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/commands/MiraiCommand.java
@@ -2,7 +2,7 @@
 
 import me.dreamvoid.miraimc.IMiraiAutoLogin;
 import me.dreamvoid.miraimc.MiraiMCConfig;
-import me.dreamvoid.miraimc.MiraiMCPlugin;
+import me.dreamvoid.miraimc.LifeCycle;
 import me.dreamvoid.miraimc.api.MiraiBot;
 import me.dreamvoid.miraimc.httpapi.MiraiHttpAPI;
 import me.dreamvoid.miraimc.httpapi.exception.AbnormalStatusException;
@@ -21,12 +21,12 @@
 import java.util.NoSuchElementException;
 
 public class MiraiCommand implements ICommandExecutor {
-    private final IMiraiAutoLogin MiraiAutoLogin = MiraiMCPlugin.getPlatform().getAutoLogin();
+    private final IMiraiAutoLogin MiraiAutoLogin = LifeCycle.getPlatform().getAutoLogin();
 
     @Override
     public boolean onCommand(ICommandSender sender, String[] args) {
         if (args.length == 0) {
-            sender.sendMessage("This server is running "+ MiraiMCPlugin.getPlatform().getPluginName() +" version "+ MiraiMCPlugin.getPlatform().getPluginVersion()+" by "+ MiraiMCPlugin.getPlatform().getAuthors().toString().replace("[","").replace("]",""));
+            sender.sendMessage("This server is running "+ LifeCycle.getPlatform().getPluginName() +" version "+ LifeCycle.getPlatform().getPluginVersion()+" by "+ LifeCycle.getPlatform().getAuthors().toString().replace("[","").replace("]",""));
             if(Utils.isDeveloperMode()) sender.sendMessage("Developer mode is on.");
             return false;
         }
@@ -35,7 +35,7 @@ public boolean onCommand(ICommandSender sender, String[] args) {
             case "login": {
                 if(sender.hasPermission("miraimc.command.mirai.login")){
                     if(args.length >= 3) {
-                        MiraiMCPlugin.getPlatform().runTaskAsync(() -> {
+                        LifeCycle.getPlatform().runTaskAsync(() -> {
                             BotConfiguration.MiraiProtocol Protocol = null;
                             boolean useHttpApi = false;
                             if (args.length == 3) {
diff --git a/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/commands/MiraiMcCommand.java b/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/commands/MiraiMcCommand.java
@@ -1,6 +1,6 @@
 package me.dreamvoid.miraimc.commands;
 
-import me.dreamvoid.miraimc.MiraiMCPlugin;
+import me.dreamvoid.miraimc.LifeCycle;
 import me.dreamvoid.miraimc.api.MiraiMC;
 import me.dreamvoid.miraimc.MiraiMCConfig;
 import me.dreamvoid.miraimc.internal.Utils;
@@ -13,7 +13,7 @@ public class MiraiMcCommand implements ICommandExecutor {
     @Override
     public boolean onCommand(ICommandSender sender, String[] args) {
         if (args.length == 0) {
-            sender.sendMessage("This server is running "+ MiraiMCPlugin.getPlatform().getPluginName() +" version "+ MiraiMCPlugin.getPlatform().getPluginVersion()+" by "+ MiraiMCPlugin.getPlatform().getAuthors().toString().replace("[","").replace("]",""));
+            sender.sendMessage("This server is running "+ LifeCycle.getPlatform().getPluginName() +" version "+ LifeCycle.getPlatform().getPluginVersion()+" by "+ LifeCycle.getPlatform().getAuthors().toString().replace("[","").replace("]",""));
             if(Utils.isDeveloperMode()) sender.sendMessage("Developer mode is on.");
             return false;
         }
@@ -37,8 +37,8 @@ public boolean onCommand(ICommandSender sender, String[] args) {
                         switch (args[1].toLowerCase()) {
                             case "add": {
                                 if (args.length >= 4) {
-                                    MiraiMCPlugin.getPlatform().runTaskAsync(() -> {
-                                        UUID uuid = MiraiMCPlugin.getPlatform().getPlayerUUID(args[2]);
+                                    LifeCycle.getPlatform().runTaskAsync(() -> {
+                                        UUID uuid = LifeCycle.getPlatform().getPlayerUUID(args[2]);
                                         long qqid = Long.parseLong(args[3]);
                                         MiraiMC.addBind(uuid, qqid);
                                         sender.sendMessage("&a已添加绑定！");
@@ -49,8 +49,8 @@ public boolean onCommand(ICommandSender sender, String[] args) {
                             }
                             case "removeplayer": {
                                 if (args.length >= 3) {
-                                    MiraiMCPlugin.getPlatform().runTaskAsync(() -> {
-                                        UUID uuid = MiraiMCPlugin.getPlatform().getPlayerUUID(args[2]);
+                                    LifeCycle.getPlatform().runTaskAsync(() -> {
+                                        UUID uuid = LifeCycle.getPlatform().getPlayerUUID(args[2]);
                                         MiraiMC.removeBind(uuid);
                                         sender.sendMessage("&a已移除相应绑定！");
                                     });
@@ -60,7 +60,7 @@ public boolean onCommand(ICommandSender sender, String[] args) {
                             }
                             case "removeqq": {
                                 if (args.length >= 3) {
-                                    MiraiMCPlugin.getPlatform().runTaskAsync(() -> {
+                                    LifeCycle.getPlatform().runTaskAsync(() -> {
                                         long qqid = Long.parseLong(args[2]);
                                         MiraiMC.removeBind(qqid);
                                         sender.sendMessage("&a已移除相应绑定！");
@@ -71,8 +71,8 @@ public boolean onCommand(ICommandSender sender, String[] args) {
                             }
                             case "getplayer": {
                                 if (args.length >= 3) {
-                                    MiraiMCPlugin.getPlatform().runTaskAsync(() -> {
-                                        UUID uuid = MiraiMCPlugin.getPlatform().getPlayerUUID(args[2]);
+                                    LifeCycle.getPlatform().runTaskAsync(() -> {
+                                        UUID uuid = LifeCycle.getPlatform().getPlayerUUID(args[2]);
                                         long qqId = MiraiMC.getBind(uuid);
                                         if (qqId != 0) {
                                             sender.sendMessage("&a绑定的QQ号：" + qqId);
@@ -85,11 +85,11 @@ public boolean onCommand(ICommandSender sender, String[] args) {
                             }
                             case "getqq": {
                                 if (args.length >= 3) {
-                                    MiraiMCPlugin.getPlatform().runTaskAsync(() -> {
+                                    LifeCycle.getPlatform().runTaskAsync(() -> {
                                         long qqid = Long.parseLong(args[2]);
                                         UUID uuid = MiraiMC.getBind(qqid);
                                         if (uuid != null) {
-                                            sender.sendMessage("&a绑定的玩家名：" + MiraiMCPlugin.getPlatform().getPlayerName(uuid));
+                                            sender.sendMessage("&a绑定的玩家名：" + LifeCycle.getPlatform().getPlayerName(uuid));
                                         } else
                                             sender.sendMessage("&c未找到符合条件的记录！");
                                     });
diff --git a/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/MiraiEncryptServiceFactory.java b/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/MiraiEncryptServiceFactory.java
@@ -6,7 +6,7 @@
 import com.google.gson.reflect.TypeToken;
 import kotlinx.coroutines.CoroutineScope;
 import me.dreamvoid.miraimc.MiraiMCConfig;
-import me.dreamvoid.miraimc.MiraiMCPlugin;
+import me.dreamvoid.miraimc.LifeCycle;
 import me.dreamvoid.miraimc.internal.encryptservice.UnidbgFetchQsign;
 import net.mamoe.mirai.Bot;
 import net.mamoe.mirai.internal.spi.EncryptService;
@@ -32,7 +32,7 @@ public static void install(){
         MiraiEncryptServiceFactoryKt.install();
         config = new File(MiraiMCConfig.PluginDir, "services.json");
         if (!config.exists()) {
-            try (InputStream in = MiraiMCPlugin.class.getResourceAsStream("/services.json")) {
+            try (InputStream in = LifeCycle.class.getResourceAsStream("/services.json")) {
                 assert in != null;
                 Files.copy(in, config.toPath());
             } catch (IOException e) {
diff --git a/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/MiraiLoader.java b/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/MiraiLoader.java
@@ -1,7 +1,7 @@
 package me.dreamvoid.miraimc.internal;
 
 import me.dreamvoid.miraimc.MiraiMCConfig;
-import me.dreamvoid.miraimc.MiraiMCPlugin;
+import me.dreamvoid.miraimc.LifeCycle;
 import me.dreamvoid.miraimc.internal.webapi.Info;
 import me.dreamvoid.miraimc.internal.webapi.Version;
 import org.eclipse.aether.artifact.DefaultArtifact;
@@ -65,6 +65,6 @@ public static String getStableVersion(String PluginVersion) {
      * @param version 版本
      */
     public static void loadMiraiCore(String version) throws RuntimeException, IOException, ParserConfigurationException, SAXException {
-        MiraiMCPlugin.getPlatform().getLibraryLoader().loadLibraryMaven(mavenCentral, new Dependency(new DefaultArtifact("net.mamoe:mirai-core-all:" + (version.equalsIgnoreCase("latest") ? MiraiMCPlugin.getPlatform().getLibraryLoader().getLibraryVersion(mavenCentral, "net.mamoe", "mirai-core-all") : version)), null));
+        LifeCycle.getPlatform().getLibraryLoader().loadLibraryMaven(mavenCentral, new Dependency(new DefaultArtifact("net.mamoe:mirai-core-all:" + (version.equalsIgnoreCase("latest") ? LifeCycle.getPlatform().getLibraryLoader().getLibraryVersion(mavenCentral, "net.mamoe", "mirai-core-all") : version)), null));
     }
 }
diff --git a/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/database/SQLite.java b/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/database/SQLite.java
@@ -3,7 +3,7 @@
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import me.dreamvoid.miraimc.MiraiMCConfig;
-import me.dreamvoid.miraimc.MiraiMCPlugin;
+import me.dreamvoid.miraimc.LifeCycle;
 import me.dreamvoid.miraimc.internal.Utils;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.graph.Dependency;
@@ -38,7 +38,7 @@ public void initialize() throws ClassNotFoundException {
         if(Utils.findClass("org.sqlite.JDBC")){
             driver = "org.sqlite.JDBC";
         } else {
-            MiraiMCPlugin.getPlatform().getLibraryLoader().loadLibraryMaven(new RemoteRepository.Builder("central","default", MiraiMCConfig.General.MavenRepoUrl).build(), new Dependency(new DefaultArtifact("org.xerial:sqlite-jdbc:3.36.0.3"), null));
+            LifeCycle.getPlatform().getLibraryLoader().loadLibraryMaven(new RemoteRepository.Builder("central","default", MiraiMCConfig.General.MavenRepoUrl).build(), new Dependency(new DefaultArtifact("org.xerial:sqlite-jdbc:3.36.0.3"), null));
             initialize();
             return;
         }
diff --git a/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/encryptservice/UnidbgFetchQsign.java b/MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/internal/encryptservice/UnidbgFetchQsign.java
@@ -6,7 +6,7 @@
 import com.google.gson.reflect.TypeToken;
 import kotlin.coroutines.CoroutineContext;
 import kotlinx.coroutines.CoroutineScope;
-import me.dreamvoid.miraimc.MiraiMCPlugin;
+import me.dreamvoid.miraimc.LifeCycle;
 import me.dreamvoid.miraimc.internal.MiraiEncryptServiceFactory;
 import me.dreamvoid.miraimc.internal.MiraiEncryptServiceFactoryKt;
 import me.dreamvoid.miraimc.internal.Utils;
@@ -101,7 +101,7 @@ public void initialize(@NotNull EncryptServiceContext context) {
                     String response1 = Utils.Http.get(server + "/destroy?uin=" + uin + "&key=" + key);
                     DataWrapper body1 = new Gson().fromJson(response1, DataWrapper.class);
                     logger.info("Bot(" + uin + ") destroy, " + body1.message);
-                    MiraiMCPlugin.getPlatform().cancelTask(taskId);
+                    LifeCycle.getPlatform().cancelTask(taskId);
                 } catch (Throwable cause) {
                     logger.warning("Bot(" + uin + ") destroy", cause);
                 } finally {
@@ -168,7 +168,7 @@ public EncryptService.SignResult qSecurityGetSign(@NotNull EncryptServiceContext
                 long interval = Long.parseLong(System.getProperty(MiraiEncryptServiceFactory.REQUEST_TOKEN_INTERVAL, "2400000"));
                 if (interval > 0L) {
                     final boolean[] firstRun = {true};
-                    taskId = MiraiMCPlugin.getPlatform().runTaskTimerAsync(() -> {
+                    taskId = LifeCycle.getPlatform().runTaskTimerAsync(() -> {
                         if (interval < 600_000) logger.warning(MiraiEncryptServiceFactory.REQUEST_TOKEN_INTERVAL + "="+ interval +"< 600_000 (ms)");
                         if (firstRun[0]){
                             firstRun[0] = false;
@@ -229,7 +229,7 @@ private SignResult sign(long uin, String cmd, int seq, byte[] buffer){
     private void callback(long uin, List<RequestCallback> request){
         MiraiLogger logger = Bot.getInstance(uin).getLogger();
 
-        MiraiMCPlugin.getPlatform().runTaskAsync(() -> {
+        LifeCycle.getPlatform().runTaskAsync(() -> {
             for(RequestCallback callback : request){
                 logger.verbose("Bot(" + uin + ") sendMessage " + callback.cmd);
                 //ChannelResult result = MiraiEncryptServiceFactoryKt.channelSendMessage(channel0, "mobileqq.msf.security", callback.cmd, 0, hexToBytes(callback.body));
diff --git a/MiraiMC-Bukkit/src/main/java/me/dreamvoid/miraimc/bukkit/BukkitPlugin.java b/MiraiMC-Bukkit/src/main/java/me/dreamvoid/miraimc/bukkit/BukkitPlugin.java
@@ -2,7 +2,7 @@
 
 import me.dreamvoid.miraimc.IMiraiAutoLogin;
 import me.dreamvoid.miraimc.IMiraiEvent;
-import me.dreamvoid.miraimc.MiraiMCPlugin;
+import me.dreamvoid.miraimc.LifeCycle;
 import me.dreamvoid.miraimc.Platform;
 import me.dreamvoid.miraimc.api.MiraiBot;
 import me.dreamvoid.miraimc.bukkit.utils.Metrics;
@@ -28,12 +28,12 @@
 public class BukkitPlugin extends JavaPlugin implements Platform {
     private MiraiEvent MiraiEvent;
     private MiraiAutoLogin MiraiAutoLogin;
-    private final MiraiMCPlugin lifeCycle;
+    private final LifeCycle lifeCycle;
     private final MiraiMCConfig platformConfig;
     private final LibraryLoader loader;
 
     public BukkitPlugin(){
-        lifeCycle = new MiraiMCPlugin(this);
+        lifeCycle = new LifeCycle(this);
         lifeCycle.startUp(getLogger());
         platformConfig = new BukkitConfig(this);
         loader = new LibraryLoader((URLClassLoader) this.getClassLoader());
diff --git a/MiraiMC-Bungee/src/main/java/me/dreamvoid/miraimc/bungee/BungeePlugin.java b/MiraiMC-Bungee/src/main/java/me/dreamvoid/miraimc/bungee/BungeePlugin.java
@@ -22,12 +22,12 @@
 public class BungeePlugin extends Plugin implements Platform {
     private MiraiEvent MiraiEvent;
     private MiraiAutoLogin MiraiAutoLogin;
-    private final MiraiMCPlugin lifeCycle;
+    private final LifeCycle lifeCycle;
     private final MiraiMCConfig platformConfig;
     private final LibraryLoader loader;
 
     public BungeePlugin(){
-        lifeCycle = new MiraiMCPlugin(this);
+        lifeCycle = new LifeCycle(this);
         lifeCycle.startUp(getLogger());
         platformConfig = new BungeeConfig(this);
         loader = new LibraryLoader((URLClassLoader) this.getClass().getClassLoader());
diff --git a/MiraiMC-Nukkit/src/main/java/me/dreamvoid/miraimc/nukkit/NukkitPlugin.java b/MiraiMC-Nukkit/src/main/java/me/dreamvoid/miraimc/nukkit/NukkitPlugin.java
@@ -19,7 +19,7 @@ public class NukkitPlugin extends PluginBase implements Platform {
 
     private MiraiEvent MiraiEvent;
     private MiraiAutoLogin MiraiAutoLogin;
-    private final MiraiMCPlugin lifeCycle;
+    private final LifeCycle lifeCycle;
     private MiraiMCConfig platformConfig;
     private Logger NukkitLogger;
     private final LibraryLoader loader;
@@ -29,7 +29,7 @@ public static NukkitPlugin getInstance() {
     }
 
     public NukkitPlugin(){
-        lifeCycle = new MiraiMCPlugin(this);
+        lifeCycle = new LifeCycle(this);
         lifeCycle.startUp(new NukkitLogger("MiraiMC-Nukkit", Server.getInstance().getLogger()));
         loader = new LibraryLoader((URLClassLoader) this.getClass().getClassLoader());
     }
diff --git a/MiraiMC-Sponge/src/main/java/me/dreamvoid/miraimc/sponge/SpongePlugin.java b/MiraiMC-Sponge/src/main/java/me/dreamvoid/miraimc/sponge/SpongePlugin.java
@@ -44,13 +44,13 @@
         authors = {"DreamVoid"}
 )
 public class SpongePlugin implements Platform {
-    private MiraiMCPlugin lifeCycle;
+    private LifeCycle lifeCycle;
     private MiraiMCConfig platformConfig;
     private java.util.logging.Logger SpongeLogger;
     private final LibraryLoader loader;
 
     public SpongePlugin(){
-        lifeCycle = new MiraiMCPlugin(this);
+        lifeCycle = new LifeCycle(this);
         lifeCycle.startUp(new SpongeLogger("MiraiMC", LoggerFactory.getLogger("MiraiMC")));
         loader = new LibraryLoader((URLClassLoader) getClass().getClassLoader());
     }
diff --git a/MiraiMC-Velocity/src/main/java/me/dreamvoid/miraimc/velocity/VelocityPlugin.java b/MiraiMC-Velocity/src/main/java/me/dreamvoid/miraimc/velocity/VelocityPlugin.java
@@ -40,7 +40,7 @@
         authors = {"DreamVoid"}
 )
 public class VelocityPlugin implements Platform {
-    private final MiraiMCPlugin lifeCycle;
+    private final LifeCycle lifeCycle;
     private final MiraiMCConfig platformConfig;
     private final java.util.logging.Logger VelocityLogger;
     private final LibraryLoader loader;
@@ -53,7 +53,7 @@ public VelocityPlugin(ProxyServer server, Logger logger, @DataDirectory Path dat
         this.metricsFactory = metricsFactory;
 
         VelocityLogger = new VelocityLogger("MiraiMC", this);
-        lifeCycle = new MiraiMCPlugin(this);
+        lifeCycle = new LifeCycle(this);
         lifeCycle.startUp(VelocityLogger);
         platformConfig = new VelocityConfig(this);
         loader = new LibraryLoader((URLClassLoader) getClass().getClassLoader());

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package me.dreamvoid.miraimc.api;`
`2`	`2`
	`3`	`+import me.dreamvoid.miraimc.LifeCycle;`
`3`	`4`	`import me.dreamvoid.miraimc.MiraiMCConfig;`
	`5`	`+import me.dreamvoid.miraimc.Platform;`
`4`	`6`	`import me.dreamvoid.miraimc.internal.database.DatabaseHandler;`
`5`	`7`
`6`	`8`	`import javax.annotation.Nullable;`
`@@ -102,4 +104,12 @@ public static UUID getBind(long account) {`
`102`	`104`	`throw new RuntimeException("处理数据时出现异常，请检查MiraiMC数据库配置是否正确", e);`
`103`	`105`	`}`
`104`	`106`	`}`
	`107`	`+`
	`108`	`+ /**`
	`109`	`+ * 获取 MiraiMC 运行时实用方法实例`
	`110`	`+ * @return MiraiMC 运行时实例`
	`111`	`+ */`
	`112`	`+ public Platform getPlatform(){`
	`113`	`+ return LifeCycle.getPlatform();`
	`114`	`+ }`
`105`	`115`	`}`