Move everything to iroh

Author: Skidamek

README.md

@@ -44,7 +44,7 @@ AutoModpack works by generating a modpack (**metadata file**) on the server, whi
 
 When a client connects to the server:
 
-1.  Connection: AutoModpack establishes a secure connection and prompts you to [verify the server's certificate fingerprint](https://moddedmc.wiki/en/project/automodpack/docs/technicals/certificate).
+1.  Connection: AutoModpack establishes an Iroh-based connection and prompts you to [verify the server's identity](https://moddedmc.wiki/en/project/automodpack/docs/technicals/certificate). The user-visible identity is the server's Iroh endpoint ID/public key.
 2.  Direct links: Fetches the APIs for direct downloads of your modpack's files from Modrinth and CurseForge, where possible (mods, resource packs, shaders).
 3.  Modpack download: All files are downloaded to the client's automodpack folder.
 4.  Game restart: AutoModpack loads the modpack, and the client is perfectly synced and ready to play!

build.fabric.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     kotlin("jvm")
     id("automodpack.common")
     id("automodpack.utils")
-    id("fabric-loom")
+    id("net.fabricmc.fabric-loom-remap")
 }
 
 version = "${property("mod_version")}"
@@ -42,7 +42,14 @@ dependencies {
 
     // Required for translatable texts in 1.21.9+ for some reason i need both v0 and v1?
     if (sc.current.parsed >= "1.21.9") {
-        include(modImplementation(fabricApi.module("fabric-resource-loader-v1", property("deps.fabric-api") as String))!!)
+        include(
+            modImplementation(
+                fabricApi.module(
+                    "fabric-resource-loader-v1",
+                    property("deps.fabric-api") as String
+                )
+            )!!
+        )
     }
 }
 

buildSrc/src/main/kotlin/MergeJarTask.kt

@@ -34,6 +34,22 @@ abstract class MergeJarTask : DefaultTask() {
     @get:OutputFile
     abstract val outputJar: RegularFileProperty
 
+    private fun resolveSingleOptionalJar(libsDir: File, prefix: String): File? {
+        val matches = libsDir.listFiles()
+            ?.filter { file -> file.isFile && file.name.startsWith(prefix) && file.name.endsWith(".jar") }
+            ?.sortedBy { it.name }
+            .orEmpty()
+
+        return when (matches.size) {
+            0 -> null
+            1 -> matches.single()
+            else -> error(
+                "Expected at most one ${prefix}*.jar in ${libsDir.absolutePath}, " +
+                    "but found ${matches.size}: ${matches.joinToString { it.name }}"
+            )
+        }
+    }
+
     @TaskAction
     fun mergeJars() {
         val mergedDir = File(mergedDirPath.get())
@@ -56,7 +72,6 @@ abstract class MergeJarTask : DefaultTask() {
         val zstdFile = libsDir.listFiles()
             ?.firstOrNull { file -> file.isFile && file.name.startsWith("zstd-jni-") && file.name.endsWith(".jar") }
             ?: error("No zstd-jni-*.jar found in libs directory! ${libsDir.absolutePath}")
-
         val finalJar = File(mergedDir, jarToMerge.name)
 
         val seen = mutableSetOf<String>()
@@ -84,6 +99,6 @@ abstract class MergeJarTask : DefaultTask() {
         }
 
         outputJar.get().asFile.writeText(finalJar.absolutePath)
-        println("Merged: ${jarToMerge.name} and ${zstdFile.name} from: ${loaderFile.name} into: ${finalJar.name} Took: ${System.currentTimeMillis() - time}ms")
+        println("Merged: ${jarToMerge.name}, ${zstdFile.name} from: ${loaderFile.name} into: ${finalJar.name} Took: ${System.currentTimeMillis() - time}ms")
     }
-}
+}

buildSrc/src/main/kotlin/automodpack.common.gradle.kts

@@ -1,5 +1,6 @@
 import java.security.MessageDigest
 import java.math.BigInteger
+import org.gradle.api.plugins.BasePluginExtension
 
 plugins {
     idea
@@ -17,6 +18,11 @@ repositories {
     maven("https://maven.fabricmc.net/")
 }
 
+tasks.register("prepareKotlinBuildScriptModel") {
+    // IntelliJ may request this task against individual Stonecutter variant projects.
+    // The real model task exists on the root build; leaf projects only need a no-op.
+}
+
 tasks.named("build") {
     val taksToRun = mutableListOf<String>()
     for (module in getAllDependentLoaderModules(project.name)) {
@@ -26,36 +32,50 @@ tasks.named("build") {
     finalizedBy(tasks.named("mergeJar"))
 }
 
-val mergedDirPath = rootProject.projectDir.absolutePath + "/merged"
+val mergedRootDir = rootProject.projectDir.resolve("merged")
+val projectMergedStagingDir = mergedRootDir.resolve(".staging").resolve(project.name)
+val publishedMergedJarFileName = providers.provider {
+    val baseExtension = extensions.getByType<BasePluginExtension>()
+    "${baseExtension.archivesName.get()}-${project.version}.jar"
+}
+val publishedMergedJarPath = publishedMergedJarFileName.map { mergedRootDir.resolve(it).absolutePath }
 
 tasks.named("clean") {
     finalizedBy("cleanMerged")
 }
 
 tasks.register("cleanMerged") {
-    val mergedDir = mergedDirPath
+    val mergedDir = projectMergedStagingDir
     doLast {
-        File(mergedDir).deleteRecursively()
+        mergedDir.deleteRecursively()
+        File(publishedMergedJarPath.get()).delete()
     }
 }
 
 val mergeJarTask = tasks.register<MergeJarTask>("mergeJar") {
-    this.mergedDirPath.set(project.rootProject.projectDir.absolutePath + "/merged")
+    this.mergedDirPath.set(projectMergedStagingDir.absolutePath)
     this.rootProjectPath.set(project.rootProject.projectDir.absolutePath)
     this.libsPath.set(project.rootProject.projectDir.absolutePath + "/libs")
     this.buildDirectory.set(layout.buildDirectory)
     this.outputJar.set(layout.buildDirectory.file("merged-jar-path.txt"))
 
     val filesToHash = mutableListOf<Any>()
     for (module in getAllDependentLoaderModules(project.name)) {
-        val modLoaderJar = rootProject.project(module).tasks.named("jar")
-        filesToHash.add(modLoaderJar)
+        val moduleBuildDir = rootProject.project(module).layout.buildDirectory
+        filesToHash.add(fileTree(moduleBuildDir) {
+            include("libs/*.jar")
+            exclude("libs/*-sources.jar")
+        })
     }
+    filesToHash.add(fileTree(rootProject.projectDir.resolve("libs")) {
+        include("zstd-jni-*.jar")
+        include("iroh-pipes-jni-*.jar")
+    })
 
     // Compute the actual hash of the content of all input jars.
     // We use a provider so this is calculated just before task execution, ensuring files exist.
     this.inputHash.set(provider {
-        val outputFile = File(mergedDirPath.get(), getMergedJarPath(buildDirectory.get().dir("libs").asFile).name)
+        val outputFile = File(this@register.mergedDirPath.get(), getMergedJarPath(buildDirectory.get().dir("libs").asFile).name)
         if (!outputFile.exists()) { // Return a random hash if the output file doesn't exist yet. We need to have something.
             return@provider BigInteger(1, MessageDigest.getInstance("MD5").digest(System.currentTimeMillis().toString().toByteArray())).toString(16)
         }
@@ -83,7 +103,8 @@ val mergeJarTask = tasks.register<MergeJarTask>("mergeJar") {
 val mergedJarWrapper = tasks.register<Jar>("mergedJarWrapper") {
     dependsOn(mergeJarTask)
     enabled = false
-    destinationDirectory.set(File(mergedDirPath))
+    destinationDirectory.set(projectMergedStagingDir)
+    archiveFileName.set(publishedMergedJarFileName)
 }
 
 val optimizedMergedJar = jarOptimizer.register(mergedJarWrapper, "pl.skidam", "amp_libs.org.bouncycastle.jcajce.provider.asymmetric")
@@ -93,6 +114,7 @@ tasks.register("optimizeMergedJar") {
 
     val outputJarFile = mergeJarTask.flatMap { it.outputJar }
     val optimizedFileProvider = optimizedMergedJar.flatMap { it.archiveFile }
+    val publishedJarPathProvider = publishedMergedJarPath
 
     inputs.file(outputJarFile)
 
@@ -110,7 +132,11 @@ tasks.register("optimizeMergedJar") {
         if (optimizedFile.exists() && optimizedFile.length() > 0) {
             jarFile.delete()
             optimizedFile.renameTo(jarFile)
-            println("Optimized ${jarFile.name} - Took: ${System.currentTimeMillis() - time}ms")
         }
+
+        mergedRootDir.mkdirs()
+        val publishedJar = File(publishedJarPathProvider.get())
+        jarFile.copyTo(publishedJar, overwrite = true)
+        println("Optimized ${jarFile.name} - Took: ${System.currentTimeMillis() - time}ms")
     }
-}
+}

buildSrc/src/main/kotlin/automodpack.utils.gradle.kts

@@ -1,19 +1,25 @@
 tasks.named<ProcessResources>("processResources") {
+    val isIdeaSync = System.getProperty("idea.sync.active", "false").toBoolean()
+
     fun prop(name: String) = project.findProperty(name) as? String
 
     val props = HashMap<String, String>().apply {
         fun putIfNotEmpty(key: String, value: String?) {
             if (!value.isNullOrEmpty()) put(key, value)
         }
 
-        putIfNotEmpty("version",prop("mod_version"))
-        putIfNotEmpty("minecraft",prop("meta.minecraft"))
-        putIfNotEmpty("id",prop("mod.id"))
-        putIfNotEmpty("name",prop("mod_name"))
-        putIfNotEmpty("description",prop("mod.description"))
+        putIfNotEmpty("version", prop("mod_version"))
+        putIfNotEmpty("minecraft", prop("meta.minecraft"))
+        putIfNotEmpty("id", prop("mod.id"))
+        putIfNotEmpty("name", prop("mod_name"))
+        putIfNotEmpty("description", prop("mod.description"))
     }
 
-    filesMatching(listOf("pack.mcmeta", "fabric.mod.json", "META-INF/neoforge.mods.toml", "META-INF/mods.toml")) {
-        expand(props)
+    inputs.properties(props)
+
+    if (!isIdeaSync) { // dont match on idea sync - fixes bunch of warnings
+        filesMatching(listOf("pack.mcmeta", "fabric.mod.json", "META-INF/neoforge.mods.toml", "META-INF/mods.toml")) {
+            expand(props)
+        }
     }
-}
+}

core/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import java.io.File
 
 plugins {
     kotlin("jvm")
@@ -19,17 +20,45 @@ val deps = listOf(
     "io.netty:netty-all:4.2.9.Final",
     "org.apache.logging.log4j:log4j-core:2.25.2",
     "com.google.code.gson:gson:2.13.2",
-    "org.bouncycastle:bcpkix-jdk18on:1.82",
     "org.apache.httpcomponents.client5:httpclient5:5.5.1",
     "org.tomlj:tomlj:1.1.1",
-    "com.h2database:h2-mvstore:2.4.240"
+    "com.h2database:h2-mvstore:2.4.240",
+    "dnsjava:dnsjava:3.6.4"
 )
 
+fun resolveSingleIrohPipesJniJar(): File {
+    val libsDir = rootProject.projectDir.resolve("libs")
+    val matches = libsDir.listFiles()
+        ?.filter { file -> file.isFile && file.name.startsWith("iroh-pipes-jni-") && file.name.endsWith(".jar") }
+        ?.sortedBy { it.name }
+        .orEmpty()
+
+    return when (matches.size) {
+        1 -> matches.single()
+        0 -> error(
+            "Missing automodpack/libs/iroh-pipes-jni-*.jar. " +
+                "Run scripts/update-iroh-jni.sh from the repository root before building AutoModpack."
+        )
+        else -> error(
+            "Expected exactly one automodpack/libs/iroh-pipes-jni-*.jar but found ${matches.size}: " +
+                matches.joinToString { it.name }
+        )
+    }
+}
+
+val irohPipesJniJar = files(resolveSingleIrohPipesJniJar())
+val stagedIrohNativesDir = rootProject.projectDir.resolve("libs/.iroh-staging")
+val unpackedIrohJavaDir = layout.buildDirectory.dir("generated/iroh-pipes-jni-java")
+
 dependencies {
     // minecraft/loaders uses these, so we cant just implement them because it wont resolve in gradle
     deps.forEach { compileOnly(it) }
     deps.forEach { runtimeOnly(it) }
     deps.forEach { testImplementation(it) }
+    compileOnly("org.slf4j:slf4j-api:1.7.36")
+    testImplementation("org.slf4j:slf4j-api:1.7.36")
+    compileOnly(irohPipesJniJar)
+    testImplementation(irohPipesJniJar)
 
     testImplementation("org.junit.jupiter:junit-jupiter:6.0.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.1")
@@ -47,6 +76,28 @@ tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
 }
 
+val unpackIrohPipesJniJava by tasks.registering(Sync::class) {
+    from({
+        zipTree(resolveSingleIrohPipesJniJar())
+    }) {
+        include("dev/iroh/**")
+        exclude("META-INF/natives/**")
+        exclude("META-INF/MANIFEST.MF")
+        exclude("META-INF/*.SF")
+        exclude("META-INF/*.DSA")
+        exclude("META-INF/*.RSA")
+    }
+    into(unpackedIrohJavaDir)
+}
+
+tasks.named<ProcessResources>("processResources") {
+    dependsOn(unpackIrohPipesJniJava)
+    from(stagedIrohNativesDir) {
+        into("META-INF/natives/iroh")
+    }
+    from(unpackedIrohJavaDir)
+}
+
 tasks.named<Test>("test") {
     useJUnitPlatform()
 }
@@ -65,4 +116,4 @@ tasks.named<ShadowJar>("shadowJar") {
 
 tasks.named("assemble") {
     dependsOn("shadowJar")
-}
+}