Fix missing mixins during unit tests

AlexProgrammerDE · Nov 6, 2024 · 0041ac6 · 0041ac6
1 parent 4e9c95f
commit 0041ac6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/server/src/main/java/com/soulfiremc/launcher/SoulFireAbstractBootstrap.java b/server/src/main/java/com/soulfiremc/launcher/SoulFireAbstractBootstrap.java
@@ -35,6 +35,7 @@
 import org.pf4j.JarPluginManager;
 import org.pf4j.PluginManager;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -148,9 +149,14 @@ private void sendFlagsInfo() {
     log.warn("If you already have those flags or want to disable this warning, only add the '-Dsf.flags.v1=true' to your JVM arguments");
   }
 
-  private void injectMixinsAndRun(String[] args) {
+  public void injectMixinsAndRun(String[] args) {
+    injectMixins(pluginManager);
+    this.postMixinMain(args);
+  }
+
+  public static void injectMixins(@Nullable PluginManager pluginManager) {
     var mixinPaths = new HashSet<String>();
-    Stream.concat(pluginManager
+    Stream.concat(pluginManager == null ? Stream.empty() : pluginManager
           .getExtensions(MixinExtension.class)
           .stream(),
         Stream.of(new SFDefaultMixinExtension()))
@@ -167,9 +173,11 @@ private void injectMixinsAndRun(String[] args) {
 
     var classLoaders = new ArrayList<ClassLoader>();
     classLoaders.add(SoulFireAbstractBootstrap.class.getClassLoader());
-    pluginManager
-      .getPlugins()
-      .forEach(pluginWrapper -> classLoaders.add(pluginWrapper.getPluginClassLoader()));
+    if (pluginManager != null) {
+      pluginManager
+        .getPlugins()
+        .forEach(pluginWrapper -> classLoaders.add(pluginWrapper.getPluginClassLoader()));
+    }
 
     var classProvider = new CustomClassProvider(classLoaders);
     var transformerManager = new TransformerManager(classProvider);
@@ -179,11 +187,9 @@ private void injectMixinsAndRun(String[] args) {
     try {
       transformerManager.hookInstrumentation(Agents.getInstrumentation());
       log.info("Used Runtime Agent to inject mixins");
-
-      this.postMixinMain(args);
     } catch (IOException t) {
       log.error("Failed to inject mixins", t);
-      System.exit(1);
+      throw new IllegalStateException("Failed to inject mixins", t);
     }
   }
 

diff --git a/server/src/test/java/com/soulfiremc/test/LoadTest.java b/server/src/test/java/com/soulfiremc/test/LoadTest.java
@@ -17,6 +17,7 @@
  */
 package com.soulfiremc.test;
 
+import com.soulfiremc.launcher.SoulFireAbstractBootstrap;
 import com.soulfiremc.server.SoulFireServer;
 import com.soulfiremc.server.grpc.DefaultAuthSystem;
 import com.soulfiremc.server.util.PortHelper;
@@ -38,6 +39,7 @@ public void testLoad() {
 
     SFLogAppender.INSTANCE.start();
 
+    SoulFireAbstractBootstrap.injectMixins(null);
     var server = new SoulFireServer("127.0.0.1", PortHelper.getRandomAvailablePort(), new DefaultPluginManager(), Instant.now(), new DefaultAuthSystem(), tempDir);
 
     server.shutdownManager().shutdownSoftware(false);