允许不加载mirai核心启动插件

Author: DreamVoid

.github/workflows/maven.yml

@@ -15,10 +15,10 @@ jobs:
 
     steps:
     - uses: actions/[email protected]
-    - name: Set up JDK 8
+    - name: Set up JDK 21
       uses: actions/[email protected]
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'zulu'
 
     - name: Update version

MiraiMC-Base/src/main/java/me/dreamvoid/miraimc/MiraiMCPlugin.java

@@ -65,13 +65,17 @@ public void preLoad() throws IOException, ParserConfigurationException, SAXExcep
         logger.info("Mirai working dir: " + MiraiMCConfig.General.MiraiWorkingDir);
 
         // 加载 mirai 核心
-        logger.info("Selected mirai core version: " + MiraiMCConfig.General.MiraiCoreVersion);
-        if (MiraiMCConfig.General.MiraiCoreVersion.equalsIgnoreCase("latest")) {
-            MiraiLoader.loadMiraiCore();
-        } else if (MiraiMCConfig.General.MiraiCoreVersion.equalsIgnoreCase("stable")) {
-            MiraiLoader.loadMiraiCore(MiraiLoader.getStableVersion(getPlatform().getPluginVersion()));
+        if(System.getProperty("MiraiMC.do-not-load-mirai-core") == null){
+            logger.info("Selected mirai core version: " + MiraiMCConfig.General.MiraiCoreVersion);
+            if (MiraiMCConfig.General.MiraiCoreVersion.equalsIgnoreCase("latest")) {
+                MiraiLoader.loadMiraiCore();
+            } else if (MiraiMCConfig.General.MiraiCoreVersion.equalsIgnoreCase("stable")) {
+                MiraiLoader.loadMiraiCore(MiraiLoader.getStableVersion(getPlatform().getPluginVersion()));
+            } else {
+                MiraiLoader.loadMiraiCore(MiraiMCConfig.General.MiraiCoreVersion);
+            }
         } else {
-            MiraiLoader.loadMiraiCore(MiraiMCConfig.General.MiraiCoreVersion);
+            logger.info("MiraiMC will not load mirai core, please ensure you have custom mirai core loaded.");
         }
 
         // 加载 EncryptService

MiraiMC-Bukkit/pom.xml

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <version>1.20.6-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

MiraiMC-Bukkit/src/main/java/me/dreamvoid/miraimc/paper/PaperPluginLoader.java

@@ -1,5 +1,7 @@
 package me.dreamvoid.miraimc.paper;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
 import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
 import io.papermc.paper.plugin.loader.PluginLoader;
 import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver;
@@ -8,13 +10,40 @@
 import org.eclipse.aether.repository.RemoteRepository;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
 @SuppressWarnings("all")
 public class PaperPluginLoader implements PluginLoader {
     @Override
-    public void classloader(@NotNull PluginClasspathBuilder pluginClasspathBuilder) {
+    public void classloader(@NotNull PluginClasspathBuilder builder) {
+        File dependencies = builder.getContext().getDataDirectory().resolve("dependencies.json").toFile();
+        HashMap<String, List<String>> map = new HashMap<>();
+        if(dependencies.exists() && !dependencies.isDirectory()){
+            try{
+                map = new Gson().fromJson(new FileReader(dependencies), HashMap.class);
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            } catch (JsonSyntaxException e){
+                e.printStackTrace();
+            }
+        }
         MavenLibraryResolver resolver = new MavenLibraryResolver();
+
+        for(String s : map.get("repositories")){
+            resolver.addRepository(new RemoteRepository.Builder(UUID.randomUUID().toString(), "default", s).build());
+        }
+        for(String s : map.get("dependencies")){
+            resolver.addDependency(new Dependency(new DefaultArtifact(s), null));
+        }
+
+        // Remote
         resolver.addDependency(new Dependency(new DefaultArtifact("cloud.commandframework:cloud-paper:1.8.3"), null));
-        resolver.addRepository(new RemoteRepository.Builder("huawei-cloud", "default", "https://repo.huaweicloud.com/repository/maven/").build());
-        pluginClasspathBuilder.addLibrary(resolver);
+        resolver.addRepository(new RemoteRepository.Builder("central", "default", System.getProperty("MiraiMC.maven-central-url", "https://repo.huaweicloud.com/repository/maven/")).build());
+        builder.addLibrary(resolver);
     }
 }