Refactor plugin-spi

build.gradle.kts

@@ -15,6 +15,7 @@ plugins {
     id("implementation-structure")
     id(apiLibs.plugins.ideaExt.get().pluginId)
     alias(libs.plugins.versions)
+    alias(libs.plugins.blossom)
 }
 
 val apiVersion: String by project
@@ -67,6 +68,10 @@ val applaunch by sourceSets.registering {
     configurations.named(implementationConfigurationName) {
         extendsFrom(serviceLayerConfig.get())
     }
+
+    blossom.javaSources {
+        property("pluginSpiVersion", apiLibs.pluginSpi.get().version)
+    }
 }
 
 // Game layer
@@ -158,6 +163,14 @@ idea {
     }
 }
 
+sourceSets {
+    test {
+        blossom.resources {
+            property("apiVersion", apiVersion.replace("-SNAPSHOT", ""))
+        }
+    }
+}
+
 allprojects {
     configurations.configureEach {
         resolutionStrategy.dependencySubstitution {

forge/src/applaunch/java/org/spongepowered/forge/applaunch/loading/moddiscovery/AbstractModProvider.java → forge/src/applaunch/java/org/spongepowered/forge/applaunch/mod/discovery/AbstractModProvider.java

@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.forge.applaunch.loading.moddiscovery;
+package org.spongepowered.forge.applaunch.mod.discovery;
 
 import cpw.mods.jarhandling.SecureJar;
 import net.minecraftforge.forgespi.locating.IModFile;