Merge pull request #49 from halotroop2288/pr/ornithe

Add Ornithe Maven + Mappings support
unimined · Nov 19, 2023 · 8c3c855 · 8c3c855
2 parents 1968a7f + f018328
commit 8c3c855
Show file tree

Hide file tree

Showing 15 changed files with 660 additions and 12 deletions.
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/UniminedExtension.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/UniminedExtension.kt
@@ -141,6 +141,7 @@ abstract class UniminedExtension(val project: Project) {
     abstract fun minecraftForgeMaven()
     abstract fun fabricMaven()
     abstract fun legacyFabricMaven()
+    abstract fun ornitheMaven()
     abstract fun wagYourMaven(name: String)
     abstract fun mcphackersIvy()
     abstract fun quiltMaven()
@@ -149,4 +150,4 @@ abstract class UniminedExtension(val project: Project) {
 
     abstract fun neoForgedMaven()
     abstract fun sonatypeStaging()
-}
+}
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/mapping/MappingsConfig.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/mapping/MappingsConfig.kt
@@ -61,6 +61,22 @@ abstract class MappingsConfig(val project: Project, val minecraft: MinecraftConf
         }
     }
 
+    @JvmOverloads
+    abstract fun calamus(key: String = "intermediary", action: MappingDepConfig.() -> Unit = {})
+
+    @JvmOverloads
+    fun calamus(
+        key: String = "intermediary",
+        @DelegatesTo(value = MappingDepConfig::class, strategy = Closure.DELEGATE_FIRST)
+        action: Closure<*>
+    ) {
+        calamus(key) {
+            action.delegate = this
+            action.resolveStrategy = Closure.DELEGATE_FIRST
+            action.call()
+        }
+    }
+
     @JvmOverloads
     abstract fun legacyIntermediary(revision: Int = 1, key: String = "intermediary", action: MappingDepConfig.() -> Unit = {})
 
@@ -243,6 +259,38 @@ abstract class MappingsConfig(val project: Project, val minecraft: MinecraftConf
         yarn(build.toInt(), key, action)
     }
 
+    @JvmOverloads
+    abstract fun feather(build: Int, key: String = "yarn", action: MappingDepConfig.() -> Unit = {})
+
+    @JvmOverloads
+    fun feather(build: String, key: String = "yarn", action: MappingDepConfig.() -> Unit = {}) {
+        feather(build.toInt(), key, action)
+    }
+
+    @JvmOverloads
+    fun feather(
+        build: Int,
+        key: String = "yarn",
+        @DelegatesTo(value = MappingDepConfig::class, strategy = Closure.DELEGATE_FIRST)
+        action: Closure<*>
+    ) {
+        feather(build, key) {
+            action.delegate = this
+            action.resolveStrategy = Closure.DELEGATE_FIRST
+            action.call()
+        }
+    }
+
+    @JvmOverloads
+    fun feather(
+        build: String,
+        key: String = "yarn",
+        @DelegatesTo(value = MappingDepConfig::class, strategy = Closure.DELEGATE_FIRST)
+        action: Closure<*>
+    ) {
+        feather(build.toInt(), key, action)
+    }
+
     @JvmOverloads
     abstract fun legacyYarn(build: Int, revision: Int = 1, key: String = "yarn", action: MappingDepConfig.() -> Unit = {})
 

diff --git a/src/main/kotlin/xyz/wagyourtail/unimined/UniminedExtensionImpl.kt b/src/main/kotlin/xyz/wagyourtail/unimined/UniminedExtensionImpl.kt
@@ -156,7 +156,7 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
     }
 
     override fun minecraftForgeMaven() {
-        project.logger.info("[Unimined] adding forge maven: $minecraftForgeMaven")
+        project.logger.info("[Unimined] adding Minecraft Forge maven: $minecraftForgeMaven")
     }
 
     val neoForgedMaven by lazy {
@@ -171,7 +171,7 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
     }
 
     override fun neoForgedMaven() {
-        project.logger.info("[Unimined] adding neoForged maven: $neoForgedMaven")
+        project.logger.info("[Unimined] adding Neo-Forged maven: $neoForgedMaven")
     }
 
     val fabricMaven by lazy {
@@ -182,7 +182,17 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
     }
 
     override fun fabricMaven() {
-        project.logger.info("[Unimined] adding fabric maven: $fabricMaven")
+        project.logger.info("[Unimined] adding Fabric maven: $fabricMaven")
+    }
+
+    val ornitheMaven by lazy {
+        project.repositories.maven {
+            it.name = "ornithe"
+            it.url = URI.create("https://maven.ornithemc.net/releases")
+        }
+    }
+    override fun ornitheMaven() {
+        project.logger.info("[Unimined] adding Ornithe maven: $ornitheMaven")
     }
 
     val legacyFabricMaven by lazy {
@@ -192,7 +202,7 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
         }
     }
     override fun legacyFabricMaven() {
-        project.logger.info("[Unimined] adding legacy fabric maven: $legacyFabricMaven")
+        project.logger.info("[Unimined] adding Legacy Fabric maven: $legacyFabricMaven")
     }
 
     val quiltMaven by lazy {
@@ -203,7 +213,7 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
     }
 
     override fun quiltMaven() {
-        project.logger.info("[Unimined] adding quilt maven: $quiltMaven")
+        project.logger.info("[Unimined] adding Quilt maven: $quiltMaven")
     }
 
     val babricMaven by lazy {
@@ -214,7 +224,7 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
     }
 
     override fun babricMaven() {
-        project.logger.info("[Unimined] adding babric maven: $babricMaven")
+        project.logger.info("[Unimined] adding Babric maven: $babricMaven")
     }
 
     val wagYourMaven = defaultedMapOf<String, MavenArtifactRepository> { name ->
@@ -225,7 +235,7 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
     }
 
     override fun wagYourMaven(name: String) {
-        project.logger.info("[Unimined] adding wagyourtail maven: ${wagYourMaven[name]}")
+        project.logger.info("[Unimined] adding WagYourTail maven: ${wagYourMaven[name]}")
     }
 
     val mcphackersIvy by lazy {
@@ -311,4 +321,4 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
             }
         }
     }
-}
+}
diff --git a/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt b/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt
@@ -65,6 +65,19 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig): MappingsCo
         }
     }
 
+    override fun calamus(key: String, action: MappingDepConfig.() -> Unit) {
+        project.unimined.ornitheMaven()
+        val environment = when (side) {
+            EnvType.CLIENT -> "-client"
+            EnvType.SERVER -> "-server"
+            else -> ""
+        }
+        mapping("net.ornithemc:calamus-intermediary:${minecraft.version}${environment}:v2", key) {
+            outputs("intermediary", false) { listOf("official") }
+            action()
+        }
+    }
+
     override fun legacyIntermediary(revision: Int, key: String, action: MappingDepConfig.() -> Unit) {
         project.unimined.legacyFabricMaven()
         if (legacyFabricMappingsVersionFinalize.value != revision) {
@@ -243,6 +256,22 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig): MappingsCo
         }
     }
 
+    override fun feather(build: Int, key: String, action: MappingDepConfig.() -> Unit) {
+        project.unimined.ornitheMaven()
+        val environment = when (side) {
+            EnvType.CLIENT -> "-client"
+            EnvType.SERVER -> "-server"
+            else -> ""
+        }
+        mapping("net.ornithemc:feather:${minecraft.version}${environment}+build.${build}:v2", key) {
+            outputs("yarn", true) { listOf("intermediary") }
+            mapNamespace("named", "yarn")
+            sourceNamespace("intermediary")
+            renest()
+            action()
+        }
+    }
+
     override fun legacyYarn(build: Int, revision: Int, key: String, action: MappingDepConfig.() -> Unit) {
         project.unimined.legacyFabricMaven()
         if (legacyFabricMappingsVersionFinalize.value != revision) {
@@ -641,4 +670,4 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig): MappingsCo
             }
         }
     }
-}
+}
diff --git a/testing/1.2.5-Fabric-Quilt/build.gradle b/testing/1.2.5-Fabric-Quilt/build.gradle
@@ -0,0 +1,107 @@
+plugins {
+    id 'java'
+    id 'xyz.wagyourtail.unimined' // version '1.0.0'
+}
+
+group 'com.example'
+//archivesBaseName 'UniminedExampleMod'
+version '1.0-SNAPSHOT'
+
+// this is just here so we can test the outputs easier and clean between tests
+unimined.useGlobalCache = false
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+sourceSets {
+    fabric {
+        compileClasspath += sourceSets.main.output
+        runtimeClasspath += sourceSets.main.output
+    }
+    quilt {
+        compileClasspath += sourceSets.main.output + sourceSets.fabric.output
+        runtimeClasspath += sourceSets.main.output + sourceSets.fabric.output
+    }
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+unimined.minecraft() {
+    version "1.2.5"
+    side "client"
+
+    mappings {
+        calamus()
+        feather(20)
+
+        devFallbackNamespace "intermediary"
+    }
+
+    minecraftRemapper.config {
+        ignoreConflicts(true)
+    }
+
+    defaultRemapJar = false
+
+}
+
+unimined.minecraft(sourceSets.fabric) {
+    version "1.2.5"
+    side "client"
+
+    mappings {
+        calamus()
+        feather(20)
+    }
+
+    minecraftRemapper.config {
+        ignoreConflicts(true)
+    }
+
+    fabric {
+        loader '0.14.24'
+    }
+
+    defaultRemapJar = false
+}
+
+unimined.minecraft(sourceSets.quilt) {
+    version "1.2.5"
+    side "client"
+
+    mappings {
+        calamus()
+        feather(20)
+    }
+
+    minecraftRemapper.config {
+        ignoreConflicts(true)
+    }
+
+    quilt {
+        loader '0.21.2'
+    }
+
+    defaultRemapJar = false
+}
+
+repositories {
+}
+
+dependencies {
+}
+
+jar {
+    enabled = false
+}
+
+processResources {
+    inputs.property "version", project.version
+
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
+}
diff --git a/testing/1.2.5-Fabric-Quilt/gradle.properties b/testing/1.2.5-Fabric-Quilt/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx2G
diff --git a/testing/1.2.5-Fabric-Quilt/gradle/wrapper/gradle-wrapper.properties b/testing/1.2.5-Fabric-Quilt/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists