Merge pull request #214 from 3arthqu4ke/fix-xvfb

Removed xvfb patch because it is not needed anymore with mc-runtime-test 2.4.2

Author: 3arthqu4ke

.github/workflows/run-matrix-in-memory.yml

@@ -92,7 +92,7 @@ jobs:
       - name: Copy launcher jar
         run: cp launcher-jar/headlessmc-launcher.jar .
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.0
+        uses: 3arthqu4ke/mc-runtime-test@2.4.1
         with:
           mc: ${{ matrix.version.mc }}
           modloader: ${{ matrix.version.modloader }}

.github/workflows/run-matrix-xvfb.yml

@@ -88,7 +88,7 @@ jobs:
       - name: Copy launcher jar
         run: cp launcher-jar/headlessmc-launcher.jar .
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.0
+        uses: 3arthqu4ke/mc-runtime-test@2.4.1
         with:
           mc: ${{ matrix.version.mc }}
           modloader: ${{ matrix.version.modloader }}

.github/workflows/run-matrix.yml

@@ -88,7 +88,7 @@ jobs:
       - name: Copy launcher jar
         run: cp launcher-jar/headlessmc-launcher.jar .
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.0
+        uses: 3arthqu4ke/mc-runtime-test@2.4.1
         with:
           mc: ${{ matrix.version.mc }}
           modloader: ${{ matrix.version.modloader }}

.github/workflows/run-specific-all-modloaders.yml

@@ -69,7 +69,7 @@ jobs:
       - name: Copy launcher jar
         run: cp launcher-jar/headlessmc-launcher.jar .
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.0
+        uses: 3arthqu4ke/mc-runtime-test@2.4.1
         with:
           mc: ${{ github.event.inputs.mc }}
           modloader: ${{ matrix.version.modloader }}

.github/workflows/run-specific.yml

@@ -64,7 +64,7 @@ jobs:
         run: cp headlessmc-launcher-wrapper/build/libs/headlessmc-launcher.jar .
 
       - name: Run the MC client
-        uses: 3arthqu4ke/mc-runtime-test@2.4.0
+        uses: 3arthqu4ke/mc-runtime-test@2.4.1
         with:
           mc: ${{ github.event.inputs.mc }}
           modloader: ${{ github.event.inputs.modloader }}

headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/instrumentation/InstrumentationHelper.java

@@ -7,14 +7,9 @@
 import me.earth.headlessmc.launcher.instrumentation.lwjgl.HmcLwjglTransformer;
 import me.earth.headlessmc.launcher.instrumentation.modlauncher.BootstrapLauncherTransformer;
 import me.earth.headlessmc.launcher.instrumentation.paulscode.PaulscodeTransformer;
-import me.earth.headlessmc.launcher.instrumentation.xvfb.XvfbLwjglTransformer;
 import me.earth.headlessmc.launcher.launch.LaunchOptions;
-import me.earth.headlessmc.launcher.version.Library;
-import me.earth.headlessmc.launcher.version.family.FamilyUtil;
-import org.jetbrains.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
-import java.util.List;
 
 @CustomLog
 @UtilityClass
@@ -23,7 +18,7 @@ public class InstrumentationHelper {
     public static final String LWJGL_JAR = "headlessmc-lwjgl.jar";
 
     public static Instrumentation create(LaunchOptions options) {
-        val transformers = new ArrayList<Transformer>(8);
+        val transformers = new ArrayList<Transformer>(7);
         if (options.isLwjgl()) {
             transformers.add(new HmcLwjglTransformer());
             transformers.add(new ResourceExtractor(options.getFiles(), LWJGL_JAR));
@@ -49,32 +44,7 @@ public static Instrumentation create(LaunchOptions options) {
             transformers.add(new BootstrapLauncherTransformer());
         }
 
-        if (options.isXvfb()) {
-            addXvfbTransformer(options, transformers);
-        }
-
         return new Instrumentation(transformers, options.getFiles().getBase());
     }
 
-    @VisibleForTesting
-    static void addXvfbTransformer(LaunchOptions options, List<Transformer> transformers) {
-        log.error("Hello?!");
-        Boolean oldLwjgl = FamilyUtil.iterateParents(options.getVersion(), version -> {
-            for (Library library : version.getLibraries()) {
-                log.error("Cehcking " + library.getName());
-                if ("org.lwjgl.lwjgl".equals(library.getPackage()) && library.getVersionNumber().startsWith("2")) {
-                    log.error("Hello? " + library);
-                    return true;
-                }
-            }
-
-            return null;
-        });
-
-        if (oldLwjgl != null && oldLwjgl) {
-            log.info("Running with old lwjgl, using xvfb transformer");
-            transformers.add(new XvfbLwjglTransformer());
-        }
-    }
-
 }