chore: merge upstream for neo addition

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

.editorconfig

@@ -10,4 +10,7 @@ max_line_length = 120
 tab_width = 4
 
 [*mixins*.json]
-indent_size = 4
+indent_size = 4
+
+[*.yaml]
+indent_size = 2

.github/workflows/check-spotless.yaml

@@ -11,5 +11,5 @@ jobs:
     uses: SpongePowered/.github/.github/workflows/shared-check-spotless.yaml@master
     with:
       runtime_version: 21
-      extra_gradle_params: "-PenableTestPlugins=true -PenableSpongeForge=true"
+      extra_gradle_params: "-Pprojects=vanilla,forge,neoforge,testplugins"
     secrets: inherit

.github/workflows/common-run-build.yaml

@@ -33,7 +33,7 @@ jobs:
           echo "GIT_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
           echo "BUILD_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       - name: build with Gradle
-        run: ./gradlew -PenableTestPlugins=true -PenableSpongeForge=true build --stacktrace
+        run: ./gradlew -Pprojects=vanilla,forge,neoforge,testplugins build --stacktrace
         env:
           CI_SYSTEM: Github Actions
       - name: Archive artifacts for build
@@ -45,6 +45,7 @@ jobs:
             ${{ github.workspace }}/build/libs/*.jar
             ${{ github.workspace }}/vanilla/build/libs/*.jar
             ${{ github.workspace }}/forge/build/libs/*.jar
+            ${{ github.workspace }}/neoforge/build/libs/*.jar
       - name: SpongeVanilla Production Jar
         uses: "actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3" # v4.3.1
         with:
@@ -55,6 +56,11 @@ jobs:
         with:
           name: SpongeForge Production Jar
           path: "${{ github.workspace }}/forge/build/libs/*-universal.jar"
+      - name: SpongeNeo Production Jar
+        uses: "actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3" # v4.3.1
+        with:
+          name: SpongeNeo Production Jar
+          path: "${{ github.workspace }}/neoforge/build/libs/*-universal.jar"
       - name: SpongeVanilla libraries
         uses: "actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3" # v4.3.1
         with:

.github/workflows/deploy.yaml

@@ -44,8 +44,7 @@ jobs:
           echo "GIT_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
           echo "BUILD_NUMBER=${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       - name: Publish to Sponge Maven & GitHub Packages
-#        run: ./gradlew -s -PenableSpongeForge=true :publish :SpongeVanilla:publish :SpongeForge:publish
-        run: ./gradlew -s -PenableSpongeForge=true :publish :SpongeVanilla:publish
+        run: ./gradlew -s -Pprojects=vanilla,forge,neoforge :publish :SpongeVanilla:publish :SpongeForge:publish :SpongeNeo:publish
         env:
           CI_SYSTEM: Github Actions
           GITHUB_USERNAME: "${{ github.actor }}"

.gitignore

@@ -85,3 +85,4 @@ buildSrc/src/api
 # the test plugins themselves can be committed as examples.
 testplugins.settings.gradle.kts
 spongeforge.settings.gradle.kts
+projects.properties

build.gradle.kts

@@ -155,6 +155,11 @@ dependencies {
     }
     applaunchConfig(libs.log4j.core)
     applaunchConfig(libs.log4j.jpl)
+    applaunchConfig(apiLibs.pluginSpi) {
+        exclude(group = "org.checkerframework", module = "checker-qual")
+        exclude(group = "com.google.code.gson", module = "gson")
+        exclude(group = "org.apache.logging.log4j", module = "log4j-api")
+    }
 
     add(mixins.get().implementationConfigurationName, "org.spongepowered:spongeapi:$apiVersion")
 

forge/build.gradle.kts

@@ -208,7 +208,9 @@ dependencies {
 
     val service = serviceLibrariesConfig.name
     service(apiLibs.pluginSpi)
-    service(project(transformersProject.path))
+    service(project(transformersProject.path)) {
+        exclude(group = "cpw.mods", module = "modlauncher")
+    }
     service(platform(apiLibs.configurate.bom))
     service(apiLibs.configurate.core) {
         exclude(group = "org.checkerframework", module = "checker-qual")
@@ -288,14 +290,21 @@ tasks {
         archiveClassifier.set("lang")
         manifest {
             from(forgeManifest)
-            attributes("FMLModType" to "LANGPROVIDER")
+            attributes(
+                "Automatic-Module-Name" to "spongeforge.lang",
+                "FMLModType" to "LANGPROVIDER"
+            )
         }
         from(forgeLang.output)
     }
 
     val forgeServicesJar by registering(Jar::class) {
         archiveClassifier.set("services")
-        manifest.from(forgeManifest)
+
+        manifest {
+            from(forgeManifest)
+            attributes("Automatic-Module-Name" to "spongeforge.services")
+        }
 
         from(commonProject.sourceSets.named("applaunch").map { it.output })
         from(forgeAppLaunch.output)
@@ -358,9 +367,11 @@ tasks {
         exclude("META-INF/INDEX.LIST", "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA", "**/module-info.class")
 
         manifest {
-            attributes("Automatic-Module-Name" to "spongeforge.services")
-            attributes("Multi-Release" to true)
             from(forgeManifest)
+            attributes(
+                "Automatic-Module-Name" to "spongeforge.services",
+                "Multi-Release" to true
+            )
         }
 
         from(commonProject.sourceSets.named("applaunch").map { it.output })

forge/gradle.properties

@@ -5,4 +5,4 @@ description=The SpongeAPI implementation for MinecraftForge
 forgeVersion=52.0.3
 loom.platform=forge
 fabric.loom.dontRemap=true
-mixinConfigs=mixins.spongeforge.accessors.json,mixins.spongeforge.api.json,mixins.spongeforge.inventory.json,mixins.spongeforge.core.json,mixins.spongeforge.tracker.json
+mixinConfigs=mixins.spongeforge.accessors.json,mixins.spongeforge.api.json,mixins.spongeforge.inventory.json,mixins.spongeforge.inventory.shared.json,mixins.spongeforge.core.json,mixins.spongeforge.core.shared.json,mixins.spongeforge.tracker.json

forge/src/applaunch/java/org/spongepowered/forge/applaunch/loading/metadata/PluginDependencyConfigurable.java

@@ -67,10 +67,10 @@ public List<? extends IConfigurable> getConfigList(final String... key) {
     }
 
     private IModInfo.Ordering loadToOrdering(final PluginDependency.LoadOrder order) {
-        if (order == PluginDependency.LoadOrder.AFTER) {
-            return IModInfo.Ordering.AFTER;
-        }
-
-        return IModInfo.Ordering.NONE;
+        return switch (order) {
+            case UNDEFINED -> IModInfo.Ordering.NONE;
+            case BEFORE -> IModInfo.Ordering.BEFORE;
+            case AFTER -> IModInfo.Ordering.AFTER;
+        };
     }
 }

forge/src/applaunch/java/org/spongepowered/forge/applaunch/loading/metadata/PluginFileConfigurable.java

@@ -116,8 +116,6 @@ public List<? extends IConfigurable> getConfigList(final String... key) {
         }
 
         if ("dependencies".equals(query)) {
-
-            // TODO Should we inject a dependency on SpongeForge?
             final Set<PluginDependency> dependencies = metadata.dependencies();
             if (dependencies.isEmpty()) {
                 return Collections.emptyList();

forge/src/applaunch/java/org/spongepowered/forge/applaunch/loading/moddiscovery/ModFileParsers.java → forge/src/applaunch/java/org/spongepowered/forge/applaunch/loading/moddiscovery/PluginFileParser.java

@@ -33,9 +33,9 @@
 import net.minecraftforge.forgespi.locating.IModLocator;
 import net.minecraftforge.forgespi.locating.ModFileFactory;
 import org.spongepowered.common.applaunch.AppLaunch;
+import org.spongepowered.common.applaunch.metadata.PluginMetadataFixer;
 import org.spongepowered.common.applaunch.plugin.PluginPlatformConstants;
 import org.spongepowered.forge.applaunch.loading.metadata.PluginFileConfigurable;
-import org.spongepowered.forge.applaunch.loading.metadata.PluginMetadataUtils;
 import org.spongepowered.plugin.metadata.builtin.MetadataContainer;
 import org.spongepowered.plugin.metadata.builtin.MetadataParser;
 
@@ -46,19 +46,19 @@
 import java.nio.file.Path;
 import java.util.List;
 
-public final class ModFileParsers {
+public final class PluginFileParser {
     private static Constructor<ModJarMetadata> modJarMetadataConstructor;
 
     static {
         try {
-            ModFileParsers.modJarMetadataConstructor = ModJarMetadata.class.getDeclaredConstructor();
-            ModFileParsers.modJarMetadataConstructor.setAccessible(true);
+            PluginFileParser.modJarMetadataConstructor = ModJarMetadata.class.getDeclaredConstructor();
+            PluginFileParser.modJarMetadataConstructor.setAccessible(true);
         } catch (final Exception e) {
             throw new RuntimeException(e);
         }
     }
 
-    public static IModFileInfo parsePluginMetadata(final IModFile iModFile) {
+    private static IModFileInfo parsePluginMetadata(final IModFile iModFile) {
         final ModFile modFile = (ModFile) iModFile;
         AppLaunch.logger().debug("Considering plugin file candidate {}", modFile.getFilePath());
 
@@ -74,7 +74,7 @@ public static IModFileInfo parsePluginMetadata(final IModFile iModFile) {
                 container = MetadataParser.read(reader);
             }
 
-            final PluginFileConfigurable config = new PluginFileConfigurable(PluginMetadataUtils.fixPluginIds(container));
+            final PluginFileConfigurable config = new PluginFileConfigurable(PluginMetadataFixer.fixPluginIds(container));
             return new ModFileInfo(modFile, config, (info) -> {}, List.of());
         } catch (final Exception e) {
             AppLaunch.logger().warn("Could not read metadata for plugin file '{}'", modFile, e);
@@ -92,11 +92,11 @@ private static ModJarMetadata newModJarMetadata() {
 
     public static ModFile newPluginInstance(final IModLocator locator, final Path... path) {
         ModJarMetadata mjm = newModJarMetadata();
-        ModFile modFile = (ModFile) ModFileFactory.FACTORY.build(SecureJar.from(jar -> mjm, path), locator, ModFileParsers::parsePluginMetadata);
+        ModFile modFile = (ModFile) ModFileFactory.FACTORY.build(SecureJar.from(jar -> mjm, path), locator, PluginFileParser::parsePluginMetadata);
         mjm.setModFile(modFile);
         return modFile;
     }
 
-    private ModFileParsers() {
+    private PluginFileParser() {
     }
 }

forge/src/applaunch/java/org/spongepowered/forge/applaunch/loading/moddiscovery/locator/EnvironmentPluginLocator.java

@@ -26,7 +26,7 @@
 
 import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider;
 import net.minecraftforge.forgespi.locating.IModLocator;
-import org.spongepowered.forge.applaunch.loading.moddiscovery.ModFileParsers;
+import org.spongepowered.forge.applaunch.loading.moddiscovery.PluginFileParser;
 
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -41,14 +41,14 @@ public final class EnvironmentPluginLocator extends AbstractModProvider implemen
     public List<ModFileOrException> scanMods() {
         final List<ModFileOrException> modFiles = new ArrayList<>();
         for (final Path[] paths : EnvironmentPluginLocator.getPluginsPaths()) {
-            modFiles.add(new ModFileOrException(ModFileParsers.newPluginInstance(this, paths), null));
+            modFiles.add(new ModFileOrException(PluginFileParser.newPluginInstance(this, paths), null));
         }
         return modFiles;
     }
 
     @Override
     protected ModFileOrException createMod(Path path) {
-        return new ModFileOrException(ModFileParsers.newPluginInstance(this, path), null);
+        return new ModFileOrException(PluginFileParser.newPluginInstance(this, path), null);
     }
 
     @Override

forge/src/applaunch/java/org/spongepowered/forge/applaunch/loading/moddiscovery/locator/PluginsDirectoryLocator.java

@@ -33,7 +33,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.spongepowered.common.applaunch.AppLaunch;
-import org.spongepowered.forge.applaunch.loading.moddiscovery.ModFileParsers;
+import org.spongepowered.forge.applaunch.loading.moddiscovery.PluginFileParser;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -54,18 +54,18 @@ public List<ModFileOrException> scanMods() {
 
         for (final Path pluginDirectory : pluginDirectories) {
             PluginsDirectoryLocator.LOGGER.debug("Scanning plugins directory '{}' for plugins", pluginDirectory);
-            this.scanForModsIn(pluginDirectory).map((f) -> new ModFileOrException(f, null)).forEach(modFiles::add);
+            this.scanForPluginsIn(pluginDirectory).map((f) -> new ModFileOrException(f, null)).forEach(modFiles::add);
         }
 
         return modFiles;
     }
 
-    private Stream<ModFile> scanForModsIn(final Path pluginsDirectory) {
+    private Stream<ModFile> scanForPluginsIn(final Path pluginsDirectory) {
         final List<Path> excluded = ModDirTransformerDiscoverer.allExcluded();
         return LamdbaExceptionUtils.uncheck(() -> Files.list(pluginsDirectory))
             .filter((p) -> !excluded.contains(p) && StringUtils.toLowerCase(p.getFileName().toString()).endsWith(".jar"))
             .sorted(Comparator.comparing((path) -> StringUtils.toLowerCase(path.getFileName().toString())))
-            .map((p) -> ModFileParsers.newPluginInstance(this, p))
+            .map((p) -> PluginFileParser.newPluginInstance(this, p))
             .filter(ModFile::identifyMods);
     }
 

forge/src/applaunch/java/org/spongepowered/forge/applaunch/plugin/ForgePluginPlatform.java

@@ -103,7 +103,6 @@ public void setPluginDirectories(final List<Path> pluginDirectories) {
         // NOOP
     }
 
-    // TODO: Zidane, how will this work with SF?
     @Override
     public String metadataFilePath() {
         return null;

forge/src/launch/java/org/spongepowered/forge/launch/ForgeLaunch.java

@@ -31,25 +31,20 @@
 import com.google.inject.Stage;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import org.spongepowered.common.applaunch.plugin.PluginPlatform;
 import org.spongepowered.common.inject.SpongeCommonModule;
 import org.spongepowered.common.inject.SpongeModule;
 import org.spongepowered.common.launch.Launch;
-import org.spongepowered.common.launch.mapping.SpongeMappingManager;
-import org.spongepowered.forge.applaunch.loading.metadata.PluginMetadataUtils;
 import org.spongepowered.forge.launch.inject.SpongeForgeModule;
 import org.spongepowered.forge.launch.plugin.ForgePluginManager;
 import org.spongepowered.plugin.PluginContainer;
-import org.spongepowered.plugin.metadata.PluginMetadata;
 
 import java.util.List;
 
 public final class ForgeLaunch extends Launch {
 
     private final ForgePluginManager pluginManager;
     private PluginContainer spongeForgePlugin;
-    private final ForgeMappingManager mappings = new ForgeMappingManager();
 
     public ForgeLaunch(final PluginPlatform platform) {
         super(platform);
@@ -66,11 +61,6 @@ public ForgePluginManager pluginManager() {
         return this.pluginManager;
     }
 
-    @Override
-    public SpongeMappingManager mappingManager() {
-        return this.mappings;
-    }
-
     @Override
     public Stage injectionStage() {
         return FMLLoader.isProduction() ? Stage.PRODUCTION : Stage.DEVELOPMENT;
@@ -98,8 +88,4 @@ public PluginContainer platformPlugin() {
 
         return this.spongeForgePlugin;
     }
-
-    public PluginMetadata metadataForMod(final ModInfo info) {
-        return PluginMetadataUtils.modToPlugin(info);
-    }
 }