[Neoforge] Create 1.21 Neoforge Version of oωo (owo-lib)

build.gradle

@@ -1,32 +1,46 @@
 //file:noinspection GradlePackageVersionRange
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id "dev.architectury.loom" version "1.7.410"
     id 'maven-publish'
 }
 
+base {
+    archivesName = project.archives_base_name
+}
+
 allprojects {
+    if (project.name == "owo-neo-publish") return;
+
     apply plugin: "java"
-    apply plugin: "fabric-loom"
+    apply plugin: "dev.architectury.loom"
     apply plugin: "maven-publish"
 
     def ENV = System.getenv()
 
     version = "${project.mod_version}+${rootProject.minecraft_base_version}"
     group = rootProject.maven_group
 
+    repositories {
+        maven { url 'https://maven.neoforged.net/releases/' }
+    }
+
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
-        modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
+        mappings loom.layered {
+            it.mappings("net.fabricmc:yarn:${rootProject.yarn_mappings}:v2")
+            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:1.21+build.4")
+        }
+        //modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
 
-        modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+        neoForge "net.neoforged:neoforge:${project.neoforge_version}"
+        //modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
     }
 
     processResources {
         inputs.property "version", project.version
         filteringCharset "UTF-8"
 
-        filesMatching("fabric.mod.json") {
+        filesMatching("META-INF/neoforge.mods.toml") {
             expand "version": project.version
         }
     }
@@ -49,9 +63,6 @@ allprojects {
             toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
         }
         archivesBaseName = project.archives_base_name
-        // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-        // if it is present.
-        // If you remove this line, sources will not be generated.
         withSourcesJar()
     }
 
@@ -62,12 +73,6 @@ allprojects {
     }
 
     publishing {
-        publications {
-            mavenJava(MavenPublication) {
-                from components.java
-            }
-        }
-
         repositories {
             maven {
                 url ENV.MAVEN_URL
@@ -90,7 +95,8 @@ repositories {
         }
     }
     maven { url "https://maven.nucleoid.xyz/" }
-    maven { url 'https://maven.wispforest.io' }
+    maven { url 'https://maven.wispforest.io/releases' }
+    maven { url "https://maven.su5ed.dev/releases" }
     mavenLocal()
 }
 
@@ -107,38 +113,62 @@ loom {
             client()
             ideConfigGenerated project.rootProject == project
             name = "Testmod Client"
+            mods {
+                create("uwu") {
+                    sourceSet sourceSets.testmod
+                }
+                create("owo"){
+                    sourceSet sourceSets.main
+                }
+            }
             source sourceSets.testmod
         }
         testmodServer {
             server()
             ideConfigGenerated project.rootProject == project
             name = "Testmod Server"
+            mods {
+                create("uwu") {
+                    sourceSet sourceSets.testmod
+                }
+                create("owo"){
+                    sourceSet sourceSets.main
+                }
+            }
             source sourceSets.testmod
         }
     }
 
     accessWidenerPath = file("src/main/resources/owo.accesswidener")
+
+    neoForge {
+        // TODO: Figure out within the future
+//        publish file("src/main/resources/interfaces.json")
+//        publish file("src/main/resources/META-INF/owo.accesstransformer.cfg")
+    }
 }
 
 dependencies {
-//    modLocalRuntime("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}")
-    modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:${project.rei_version}")
-    modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}")
+    //implementation("org.sinytra:forgified-fabric-loader:${project.loader_version}")
+    //modImplementation("org.sinytra.forgified-fabric-api:forgified-fabric-api:${project.fabric_version}")
 
-    modCompileOnly("dev.emi:emi-fabric:${project.emi_version}")
-//    modLocalRuntime("dev.emi:emi-fabric:${project.emi_version}")
+    //modLocalRuntime("me.shedaniel:RoughlyEnoughItems-neoforge:${project.rei_version}")
+    modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:${project.rei_version}")
+    modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-neoforge:${project.rei_version}")
 
-    modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
-    modLocalRuntime("com.terraformersmc:modmenu:${project.modmenu_version}")
+    modCompileOnly("dev.emi:emi-neoforge:${project.emi_version}")
 
-    include api("io.wispforest:endec:0.1.5")
-    include api("io.wispforest.endec:netty:0.1.2")
-    include api("io.wispforest.endec:gson:0.1.3")
-    include api("io.wispforest.endec:jankson:0.1.3")
+    forgeRuntimeLibrary(include(api("io.wispforest:endec:0.1.8")))
+    forgeRuntimeLibrary(include(api("io.wispforest.endec:netty:0.1.4")))
+    forgeRuntimeLibrary(include(api("io.wispforest.endec:gson:0.1.5")))
+    forgeRuntimeLibrary(include(api("io.wispforest.endec:jankson:0.1.5")))
 
-    include api("blue.endless:jankson:${project.jankson_version}")
+    forgeRuntimeLibrary(include(api("blue.endless:jankson:${project.jankson_version}")))
 
-    modCompileOnly("xyz.nucleoid:server-translations-api:${project.stapi_version}")
+    include implementation("org.sinytra:forgified-fabric-loader:${project.loader_version}:full")
+    include modApi("org.sinytra.forgified-fabric-api:fabric-api-base:0.4.42+d1308dedd1") { exclude group: "fabric-api" }
+    include modApi("org.sinytra.forgified-fabric-api:fabric-networking-api-v1:4.2.2+a92978fd19") { exclude group: "fabric-api" }
+    include modApi("org.sinytra.forgified-fabric-api:fabric-screen-api-v1:2.0.24+79a4c2b0d1") { exclude group: "fabric-api" }
 
     testmodImplementation sourceSets.main.output
     testmodAnnotationProcessor sourceSets.main.output

gradle.properties

@@ -1,23 +1,28 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
+
+loom.platform=neoforge
+
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_base_version=1.21
-minecraft_version=1.21
+minecraft_version=1.21.1
 yarn_mappings=1.21+build.2
-loader_version=0.15.11
+loader_version=2.5.29+0.16.0+1.21
 # Mod Properties
-mod_version=0.12.15
+mod_version=0.12.15-beta.6
 maven_group=io.wispforest
-archives_base_name=owo-lib
+archives_base_name=owo-lib-neoforge
+
 # Dependencies
-fabric_version=0.100.1+1.21
+fabric_version=0.104.0+2.0.14+1.21.1
+neoforge_version=21.1.57
 
 # https://maven.shedaniel.me/me/shedaniel/RoughlyEnoughItems-fabric/
 rei_version=15.0.728
 
 # https://maven.terraformersmc.com/releases/dev/emi/emi-fabric/
-emi_version=1.1.6+1.20.6
+emi_version=1.1.7+1.21
 
 # https://search.maven.org/artifact/blue.endless/jankson
 jankson_version=1.2.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

owo-neo-publish/build.gradle.kts

@@ -0,0 +1,135 @@
+import org.gradle.jvm.tasks.Jar;
+
+plugins {
+    // Apply the plugin. You can find the latest version at https://projects.neoforged.net/neoforged/ModDevGradle
+    id("net.neoforged.moddev") version "2.0.42-beta"
+    id("maven-publish")
+}
+
+apply(plugin = "maven-publish")
+
+version = "${rootProject.property("mod_version")}+${rootProject.property("minecraft_base_version")}"
+group = rootProject.property("maven_group")!!
+
+val ENV = System.getenv()
+
+repositories {
+    maven("https://maven.terraformersmc.com/releases/")
+    maven("https://maven.shedaniel.me/")
+    maven {
+        url = uri("https://api.modrinth.com/maven")
+        content {
+            includeGroup("maven.modrinth")
+        }
+    }
+    maven("https://maven.nucleoid.xyz/")
+    maven("https://maven.wispforest.io/releases")
+    maven("https://maven.su5ed.dev/releases")
+    mavenLocal()
+}
+
+dependencies {
+    implementation(rootProject)
+
+    api("io.wispforest:endec:0.1.8")
+    api("io.wispforest.endec:netty:0.1.4")
+    api("io.wispforest.endec:gson:0.1.5")
+    api("io.wispforest.endec:jankson:0.1.5")
+
+    api("blue.endless:jankson:${project.property("jankson_version")}")
+
+    api("org.sinytra:forgified-fabric-loader:${project.property("loader_version")}:full")
+    api("org.sinytra.forgified-fabric-api:fabric-api-base:0.4.42+d1308dedd1") { exclude(group = "fabric-api")  }
+    api("org.sinytra.forgified-fabric-api:fabric-networking-api-v1:4.2.2+a92978fd19") { exclude(group = "fabric-api") }
+    api("org.sinytra.forgified-fabric-api:fabric-screen-api-v1:2.0.24+79a4c2b0d1") { exclude(group = "fabric-api") }
+}
+
+neoForge {
+    // We currently only support NeoForge versions later than 21.0.x
+    // See https://projects.neoforged.net/neoforged/neoforge for the latest updates
+    version = rootProject.property("neoforge_version").toString()
+
+    // Validate AT files and raise errors when they have invalid targets
+    // This option is false by default, but turning it on is recommended
+    validateAccessTransformers = true
+
+    accessTransformers {
+        from(rootProject.file("src/main/resources/META-INF/owo.accesstransformer.cfg"))
+        publish(rootProject.file("src/main/resources/META-INF/owo.accesstransformer.cfg"))
+    }
+
+    interfaceInjectionData {
+        from(rootProject.file("src/main/resources/interfaces.json"))
+        publish(rootProject.file("src/main/resources/interfaces.json"))
+    }
+}
+
+val targetJavaVersion = 21
+tasks.withType<JavaCompile>().configureEach {
+    this.options.encoding = "UTF-8"
+    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
+        this.options.release = targetJavaVersion
+    }
+}
+
+//tasks.getByName("build") {
+//    onlyIf("test") {
+//        false;
+//    }
+//}
+
+java {
+    val javaVersion = JavaVersion.toVersion(targetJavaVersion)
+    if (JavaVersion.current() < javaVersion) {
+        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
+    }
+    base.archivesName.set(rootProject.property("archives_base_name").toString())
+    withSourcesJar()
+
+    val data: MutableMap<String, Set<PublishArtifact>> = mutableMapOf();
+
+    for (cfg in rootProject.configurations) {
+        if (cfg.name.equals("runtimeElements")) continue;
+
+        with(cfg.artifacts) {
+            val publishArtifact = this.filter {
+                    publishArtifact -> return@filter publishArtifact.file.name.contains("owo-lib");
+            }.toSet()
+
+            data[cfg.name] = publishArtifact
+
+            if (!publishArtifact.isEmpty()) this.removeAll(publishArtifact);
+        }
+    }
+
+    for (cfg in project.configurations) {
+        with(cfg.artifacts) {
+            this.filter {
+                publishArtifact -> return@filter publishArtifact.file.name.contains("owo-lib");
+            }.toSet().let {
+                publishArtifact -> this.removeAll(publishArtifact)
+            }
+
+            data[cfg.name]?.let { this.addAll(it) }
+        }
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("mavenCommon") {
+            this.from(components["java"])
+
+            artifactId = rootProject.property("archives_base_name").toString()
+        }
+    }
+    repositories {
+        maven {
+            url = uri(ENV["MAVEN_URL"]!!)
+            credentials {
+                username = ENV["MAVEN_USER"]
+                password = ENV["MAVEN_PASSWORD"]
+            }
+        }
+    }
+}

owo-neo-publish/gradle.properties

@@ -0,0 +1,2 @@
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx2G=

owo-sentinel/src/main/java/io/wispforest/owosentinel/DownloadTask.java

@@ -20,12 +20,12 @@ protected void done() {
 
     @Override
     protected Void doInBackground() {
-        try {
-            OwoSentinel.downloadAndInstall(logger);
-        } catch (Exception e) {
-            logger.accept("Download failed!");
-            OwoSentinel.LOGGER.error("Download failed", e);
-        }
+//        try {
+//            OwoSentinel.downloadAndInstall(logger);
+//        } catch (Exception e) {
+//            logger.accept("Download failed!");
+//            OwoSentinel.LOGGER.error("Download failed", e);
+//        }
         return null;
     }
 }

owo-sentinel/src/main/java/io/wispforest/owosentinel/Maldenhagen.java

@@ -1,15 +1,19 @@
 package io.wispforest.owosentinel;
 
-import net.fabricmc.loader.api.LanguageAdapter;
-import net.fabricmc.loader.api.ModContainer;
+import cpw.mods.modlauncher.api.NamedPath;
+import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService;
 
-public class Maldenhagen implements LanguageAdapter {
+import java.nio.file.Path;
+import java.util.List;
+
+public class Maldenhagen implements ITransformerDiscoveryService {
     @Override
-    public <T> T create(ModContainer mod, String value, Class<T> type) {
-        throw new UnsupportedOperationException();
+    public List<NamedPath> candidates(Path gameDirectory) {
+        return List.of();
     }
 
-    static {
-        OwoSentinel.launch();
+    @Override
+    public void earlyInitialization(String launchTarget, String[] arguments) {
+        //OwoSentinel.launch();
     }
 }