Revert "Merge SPI into FML (neoforged#58)"

This reverts commit 429fe42.
shartte · Dec 22, 2023 · dd26204 · dd26204
1 parent 429fe42
commit dd26204
Show file tree

Hide file tree

Showing 24 changed files with 8 additions and 978 deletions.
diff --git a/build.gradle b/build.gradle
@@ -58,6 +58,12 @@ allprojects {
 
 subprojects { subProject ->
     subProject.version = gradleutils.getTagOffsetVersion()
+    ext {
+        MANIFESTS = [
+                ''                              : [
+                ] as LinkedHashMap
+        ]
+    }
 
     jar.doFirst {
         manifest.attributes(

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
+spi_version=9.0.2
 mergetool_version=2.0.0
 accesstransformers_version=10.0.1
 coremods_version=6.0.0

diff --git a/loader/build.gradle b/loader/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     api("org.ow2.asm:asm:${asm_version}")
     api("org.ow2.asm:asm-tree:${asm_version}")
     api("org.ow2.asm:asm-commons:${asm_version}")
-    api(project(':spi'))
+    api("net.neoforged:neoforgespi:${spi_version}")
     api("net.neoforged:mergetool:${mergetool_version}:api")
     api("org.apache.logging.log4j:log4j-api:${log4j_version}")
     api("org.slf4j:slf4j-api:${slf4j_api_version}")

diff --git a/settings.gradle b/settings.gradle
@@ -31,7 +31,6 @@ include 'loader'
 include 'core'
 include 'events'
 include 'earlydisplay'
-include 'spi'
 
 includeLanguage 'minecraft'
 includeLanguage 'java'

diff --git a/spi/build.gradle b/spi/build.gradle
diff --git a/spi/src/main/java/net/neoforged/neoforgespi/Environment.java b/spi/src/main/java/net/neoforged/neoforgespi/Environment.java
diff --git a/spi/src/main/java/net/neoforged/neoforgespi/coremod/ICoreModFile.java b/spi/src/main/java/net/neoforged/neoforgespi/coremod/ICoreModFile.java
diff --git a/spi/src/main/java/net/neoforged/neoforgespi/coremod/ICoreModProvider.java b/spi/src/main/java/net/neoforged/neoforgespi/coremod/ICoreModProvider.java
diff --git a/spi/src/main/java/net/neoforged/neoforgespi/language/IConfigurable.java b/spi/src/main/java/net/neoforged/neoforgespi/language/IConfigurable.java
diff --git a/spi/src/main/java/net/neoforged/neoforgespi/language/ILifecycleEvent.java b/spi/src/main/java/net/neoforged/neoforgespi/language/ILifecycleEvent.java
diff --git a/spi/src/main/java/net/neoforged/neoforgespi/language/IModFileInfo.java b/spi/src/main/java/net/neoforged/neoforgespi/language/IModFileInfo.java
diff --git a/spi/src/main/java/net/neoforged/neoforgespi/language/IModInfo.java b/spi/src/main/java/net/neoforged/neoforgespi/language/IModInfo.java