Fixup shadow compatibility support.

Author: Fox2Code

dev/src/main/groovy/com/fox2code/foxloader/dev/CompatibilityModule.java

@@ -58,6 +58,10 @@ public static void appendDependenciesNamesToExclude(FoxLoaderConfig config, Coll
         if (config.useLWJGLX) {
             collection.add("com.fox2code:lwjglx:" + config.LWJGLXVersion);
         }
+        collection.add(DependencyHelper.annotations.name);
+        collection.add(DependencyHelper.jansi.name);
+        collection.add("net.silveros:reindev-fl:" +
+                BuildConfig.REINDEV_VERSION + "-fl_" + BuildConfig.FOXLOADER_VERSION);
         String foxLoaderVersion = BuildConfig.FOXLOADER_VERSION;
         if (config.foxLoaderLibVersionOverride != null) {
             foxLoaderVersion = config.foxLoaderLibVersionOverride;
@@ -69,6 +73,7 @@ public static void appendDependenciesNamesToExclude(FoxLoaderConfig config, Coll
         for (DependencyHelper.Dependency dependency : DependencyHelper.commonDependenciesModernJava) {
             collection.add(dependency.name);
         }
+        collection.add(DependencyHelper.sparkDependency.name);
         for (String bundle : config.usedDependencyBundlesList) {
             for (DependencyHelper.Dependency dependency : DependencyHelper.getDependencyBundle(bundle)) {
                 collection.add(dependency.name);

dev/src/main/groovy/com/fox2code/foxloader/dev/compatibility/ShadowCompatibility.groovy

@@ -46,13 +46,11 @@ final class ShadowCompatibility extends CompatibilityModule {
 
     @Override
     void onLateApply(Project project, FoxLoaderConfig config) {
+        final HashSet<String> dependenciesToExclude = new HashSet<>()
+        appendDependenciesNamesToExclude(config, dependenciesToExclude)
         project.tasks.named('shadowJar', ShadowJar) {
             archiveClassifier.set("")
             dependencies {
-                for (String dependencyToExclude : getDependenciesNamesToExclude(config)) {
-                    exclude(dependency(dependencyToExclude))
-                }
-                // LWJGLX support.
                 exclude(new Spec<? super ResolvedDependency>() {
                     @Override
                     boolean isSatisfiedBy(Object o) {
@@ -62,7 +60,10 @@ final class ShadowCompatibility extends CompatibilityModule {
 
                     boolean isSatisfiedBy(ResolvedDependency resolvedDependency) {
                         String dependencyName = resolvedDependency.getName()
-                        return dependencyName.startsWith("org.lwjgl.lwjgl:") ||
+                        return dependenciesToExclude.contains(dependencyName) ||
+                                dependencyName.startsWith("net.fabricmc:sponge-mixin:") ||
+                                dependencyName.startsWith("org.spongepowered:mixin:") ||
+                                dependencyName.startsWith("org.lwjgl.lwjgl:") ||
                                 dependencyName.startsWith("org.lwjgl:")
                     }
                 })

patching/src/main/java/com/fox2code/foxloader/dependencies/DependencyHelper.java

@@ -59,7 +59,7 @@ public final class DependencyHelper {
             "org.fusesource.jansi:jansi:" + BuildConfig.JANSI_VERSION, MAVEN_CENTRAL,
             "org.fusesource.jansi.AnsiConsole", null, "0b7b8b003a90ea491579b62f5118828e45112914c65589b00faa49d6ec785839");
 
-    private static final Dependency annotations =
+    public static final Dependency annotations =
             new Dependency("org.jetbrains:annotations:24.1.0", MAVEN_CENTRAL,
                     "org.jetbrains.annotations.NotNull", null, "27a770dc7ce50500918bb8c3c0660c98290630ec796b5e3cf6b90f403b3033c6");