Properly load mixins without a coremod

* Fixes a bug in which mods that specified the mixin tweaker, but had no coremod, and no late/early mixin annotations, would not be considered as mixin candidates
* Gracefully handle DiscovererV1 (mainly for in-dev testing)

Author: mitchej123

gradle.properties

@@ -134,7 +134,7 @@ usesMavenPublishing = true
 #
 # The project's ID on Modrinth. Can be either the slug or the ID.
 # Leave this empty if you don't want to publish to Modrinth.
-modrinthProjectId =
+modrinthProjectId = jarjar
 
 # The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
 # Syntax: scope1-type1:name1;scope2-type2:name2;...
@@ -143,21 +143,21 @@ modrinthProjectId =
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
 # Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
-modrinthRelations =
+modrinthRelations = required-project:lwjgl3ify
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
 #
 # The project's numeric ID on CurseForge. You can find this in the About Project box.
 # Leave this empty if you don't want to publish on CurseForge.
-curseForgeProjectId =
+curseForgeProjectId = 1215676
 
 # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
 # Syntax: type1:name1;type2:name2;...
 # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
 #       and the name is the CurseForge project slug of the other mod.
 # Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
 # Note: UniMixins is automatically set as a required dependency if usesMixins = true.
-curseForgeRelations =
+curseForgeRelations = requiredDependency:lwjgl3ify
 
 # Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
 # projects. New projects should not use this parameter.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.36'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37'
 }

src/main/java/com/mitchej123/jarjar/fml/common/discovery/asm/ModClassVisitorV2.java

@@ -31,14 +31,17 @@ public ModClassVisitorV2(ASMModParser discoverer) {
         if(discoverer instanceof ASMModParserV2 discovererV2) {
             this.discovererV2 = discovererV2;
         } else {
-            throw new IllegalArgumentException("ASMModParser must be an instance of ASMModParserV2");
+            this.discovererV2 = null;
         }
-
     }
 
     @Override
     public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        discovererV2.beginNewTypeName(name, version, superName, interfaces);
+        if(discovererV2 != null) {
+            discovererV2.beginNewTypeName(name, version, superName, interfaces);
+        } else {
+            super.visit(version, access, name, signature, superName, interfaces);
+        }
     }
 
 }

src/main/java/com/mitchej123/jarjar/fml/relauncher/CoreModManagerV2.java

@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -262,6 +263,7 @@ public static void discoverCoreMods(File mcDir, LaunchClassLoader classLoader) {
             }
         }
     }
+    private static final Set<String> injectedURLS = new HashSet<>();
 
     private static void loadTweakersAndCoreMods(File mcDir, LaunchClassLoader classLoader) {
         FMLRelaunchLog.fine("Loading Tweakers and coremods");
@@ -278,6 +280,7 @@ private static void loadTweakersAndCoreMods(File mcDir, LaunchClassLoader classL
         modCandidates.clear();
         modCandidates.addAll(resolvedCandidates.get());
 
+        boolean injectMixins = false;
 
         for (ModCandidateV2 candidate : modCandidates) {
             final File modFile = candidate.getModContainer();
@@ -289,7 +292,20 @@ private static void loadTweakersAndCoreMods(File mcDir, LaunchClassLoader classL
                 FMLRelaunchLog.info("Tweaker is %s", candidate.getTweaker());
                 handleCascadingTweak(modFile, null, candidate.getTweaker(), classLoader, candidate.getSortOrder());
                 if ("org.spongepowered.asm.launch.MixinTweaker".equals(candidate.getTweaker())) {
-                    injectMixinTweaker(classLoader, mcDir, FMLInjectionData.mccversion);
+                    injectMixins = true;
+                    try {
+                        if(injectedURLS.add(modFile.getName())) {
+                            // Have to manually stuff the tweaker into the parent classloader
+                            getADDURL().invoke(classLoader.getClass().getClassLoader(), modFile.toURI().toURL());
+                        }
+                    } catch (IllegalAccessException | InvocationTargetException | MalformedURLException | NoSuchMethodException e) {
+                        throw new RuntimeException(e);
+                    }
+                    try {
+                        classLoader.addURL(modFile.toURI().toURL());
+                    } catch (MalformedURLException e) {
+                        FMLRelaunchLog.log(Level.ERROR, e, "Unable to convert file into a URL. weird");
+                    }
                 }
 
                 if (!candidate.containsMod()) {
@@ -316,6 +332,9 @@ private static void loadTweakersAndCoreMods(File mcDir, LaunchClassLoader classL
                 loadCoreMod(classLoader, candidate.getCoreMod(), modFile);
             }
         }
+        if(injectMixins) {
+            injectMixinTweaker(classLoader, mcDir, FMLInjectionData.mccversion);
+        }
         modCandidates.clear();
     }
 
@@ -357,14 +376,20 @@ private static void addModAccessTransformers(Map<String, String> atMap) {
         }
     }
 
+    public static Method getADDURL() throws NoSuchMethodException {
+        if (ADDURL == null) {
+            ADDURL = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
+            ADDURL.setAccessible(true);
+        }
+
+        return ADDURL;
+
+    }
+
     public static void handleCascadingTweak(File coreMod, JarFile jar, String cascadedTweaker, LaunchClassLoader classLoader, Integer sortingOrder) {
         try {
             // Have to manually stuff the tweaker into the parent classloader
-            if (ADDURL == null) {
-                ADDURL = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
-                ADDURL.setAccessible(true);
-            }
-            ADDURL.invoke(classLoader.getClass().getClassLoader(), coreMod.toURI().toURL());
+            getADDURL().invoke(classLoader.getClass().getClassLoader(), coreMod.toURI().toURL());
             classLoader.addURL(coreMod.toURI().toURL());
             CoreModManager.tweaker.injectCascadingTweak(cascadedTweaker);
             tweakSorting.put(cascadedTweaker, sortingOrder);