Support NeoForge

2 files changed, 6 insertions, 6 deletions

diff --git a/runtime/build.gradle b/runtime/build.gradle
index ef54168cc..3061e2c05 100644
--- a/runtime/build.gradle
+++ b/runtime/build.gradle
@@ -1,7 +1,7 @@
 archivesBaseName = rootProject.name + "-" + project.name
 
 architectury {
-    common(forgeEnabled.toBoolean())
+    common(platforms.split(","))
 }
 
 loom {
@@ -12,8 +12,8 @@ dependencies {
     modCompileOnly("net.fabricmc:fabric-loader:${project.fabricloader_version}")
     modApi("me.shedaniel.cloth:cloth-config:${cloth_config_version}")
     modApi("dev.architectury:architectury:${architectury_version}")
-    compileClasspath(annotationProcessor("org.projectlombok:lombok:1.18.22"))
-    compileClasspath(project(path: ":api", configuration: "namedElements"))
+    compileOnly(annotationProcessor("org.projectlombok:lombok:1.18.22"))
+    compileOnly(project(path: ":api", configuration: "namedElements"))
     testImplementation(project(path: ":api", configuration: "namedElements"))
     testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
 }
@@ -23,7 +23,7 @@ test {
 }
 
 remapJar {
-    classifier "raw"
+    archiveClassifier = "raw"
 }
 
 task fakeJar(type: Jar, dependsOn: remapJar) {
@@ -31,7 +31,7 @@ task fakeJar(type: Jar, dependsOn: remapJar) {
     from(rootProject.file("fake/fabric.mod.json")) {
         into ""
     }
-    classifier null
+    archiveClassifier = null
 }
 
 artifacts {
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java
index 2f87b2295..e79c0231e 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/search/collapsed/CollapsedEntriesCache.java
@@ -31,8 +31,8 @@ import me.shedaniel.rei.impl.common.InternalLogger;
 import me.shedaniel.rei.impl.common.entry.type.collapsed.CollapsibleEntryRegistryImpl;
 import me.shedaniel.rei.impl.common.util.HashedEntryStackWrapper;
 import net.minecraft.resources.ResourceLocation;
+import org.jetbrains.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;