Register plugins as mixin containers on Neo

Author: Yeregorix

neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/mod/discovery/SpongeLanguageLoader.java

@@ -33,6 +33,8 @@
 import net.neoforged.neoforgespi.language.ModFileScanData;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.spongepowered.common.applaunch.AppLaunch;
+import org.spongepowered.neoforge.applaunch.plugin.NeoPluginPlatform;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -41,6 +43,10 @@
 public final class SpongeLanguageLoader extends BuiltInLanguageLoader {
     private static final Logger LOGGER = LogManager.getLogger();
 
+    public SpongeLanguageLoader() {
+        AppLaunch.<NeoPluginPlatform>pluginPlatform().discovery().registerMixinContainers();
+    }
+
     @Override
     public String name() {
         return "sponge";

neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/mod/metadata/PluginFileConfigurable.java

@@ -111,19 +111,6 @@ public List<? extends IConfigurable> getConfigList(final String... key) {
             return this.plugins.values().stream().map(PluginMetadataConfigurable::new).toList();
         }
 
-        if ("mixins".equals(query)) {
-            final Optional<String> mixinConfigs = this.resource.property("MixinConfigs");
-            if (mixinConfigs.isEmpty()) {
-                return Collections.emptyList();
-            }
-
-            final List<IConfigurable> mixinConfigurables = new ArrayList<>();
-            for (final String config : mixinConfigs.get().split(",")) {
-                mixinConfigurables.add(new PluginMixinConfigurable(config.trim()));
-            }
-            return mixinConfigurables;
-        }
-
         if (key.length != 2) {
             return Collections.emptyList();
         }

neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/plugin/discovery/JarContentsPluginResource.java

@@ -26,6 +26,7 @@
 
 import net.neoforged.fml.jarcontents.JarContents;
 import net.neoforged.fml.jarmoduleinfo.JarModuleInfo;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.spongepowered.common.applaunch.plugin.discovery.SpongeJVMPluginResource;
 
 import java.io.IOException;
@@ -41,6 +42,7 @@
 public final class JarContentsPluginResource implements SpongeJVMPluginResource {
     private final List<Path> paths;
     private final JarContents jar;
+    private @MonotonicNonNull ModuleDescriptor descriptor;
 
     public JarContentsPluginResource(final Path[] paths) {
         Objects.requireNonNull(paths, "paths");
@@ -82,7 +84,10 @@ public Manifest manifest() {
 
     @Override
     public ModuleDescriptor module() {
-        return JarModuleInfo.from(this.jar).createDescriptor(this.jar);
+        if (this.descriptor == null) {
+            this.descriptor = JarModuleInfo.from(this.jar).createDescriptor(this.jar);
+        }
+        return this.descriptor;
     }
 
     @Override

neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/plugin/discovery/NeoPluginDiscovery.java

@@ -26,6 +26,8 @@
 
 import net.neoforged.fml.jarcontents.CompositeJarContents;
 import net.neoforged.fml.jarcontents.JarContents;
+import net.neoforged.fml.loading.mixin.FMLMixinService;
+import org.spongepowered.asm.service.MixinService;
 import org.spongepowered.common.applaunch.plugin.discovery.PluginDiscovery;
 import org.spongepowered.common.applaunch.plugin.discovery.SpongeJVMPluginResource;
 import org.spongepowered.plugin.Environment;
@@ -71,4 +73,14 @@ protected void appendDiscoveryServices(final List<SpongeJVMPluginResource> resou
         this.currentLoader = loader;
         this.environment.logger().debug("Built new service layer {} on top of {}.", loader.getName(), parentLoader.getName());
     }
+
+    @SuppressWarnings("UnstableApiUsage")
+    public void registerMixinContainers() {
+        final FMLMixinService mixinService = (FMLMixinService) MixinService.getService();
+        for (final PluginDiscovery.Candidate candidate : this.candidates()) {
+            if (candidate.pluginFound() && candidate.resource() instanceof JarContentsPluginResource jarResource) {
+                mixinService.addMixinContainer(new PluginResourceContainerHandle(jarResource));
+            }
+        }
+    }
 }

…od/metadata/PluginMixinConfigurable.java …overy/PluginResourceContainerHandle.javaneoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/mod/metadata/PluginMixinConfigurable.java renamed to neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/plugin/discovery/PluginResourceContainerHandle.java neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/mod/metadata/PluginMixinConfigurable.java renamed to neoforge/src/applaunch/java/org/spongepowered/neoforge/applaunch/plugin/discovery/PluginResourceContainerHandle.java

@@ -22,32 +22,37 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.neoforge.applaunch.mod.metadata;
+package org.spongepowered.neoforge.applaunch.plugin.discovery;
 
-import net.neoforged.neoforgespi.language.IConfigurable;
+import org.spongepowered.asm.launch.platform.container.IContainerHandle;
 
-import java.util.Collections;
+import java.util.Collection;
 import java.util.List;
-import java.util.Optional;
 
-public final class PluginMixinConfigurable implements IConfigurable {
-    private final String config;
+public class PluginResourceContainerHandle implements IContainerHandle {
+    private final JarContentsPluginResource resource;
 
-    public PluginMixinConfigurable(final String config) {
-        this.config = config;
+    public PluginResourceContainerHandle(final JarContentsPluginResource resource) {
+        this.resource = resource;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public <T> Optional<T> getConfigElement(final String... key) {
-        if (key.length == 1 && "config".equals(key[0])) {
-            return Optional.of((T) this.config);
-        }
-        return Optional.empty();
+    public String getAttribute(final String name) {
+        return this.resource.property(name).orElse(null);
     }
 
     @Override
-    public List<? extends IConfigurable> getConfigList(final String... key) {
-        return Collections.emptyList();
+    public Collection<IContainerHandle> getNestedContainers() {
+        return List.of();
+    }
+
+    @Override
+    public String getId() {
+        return this.resource.module().name();
+    }
+
+    @Override
+    public String getDescription() {
+        return this.resource.toString();
     }
 }