Merge pull request #51 from thecatcore/feature/biny-mappings-glass-maven

Add Biny mappings and Glass maven support
unimined · Nov 19, 2023 · 83c741b · 83c741b
2 parents 8c3c855 + b3b4ef0
commit 83c741b
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 30 deletions.
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/UniminedExtension.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/UniminedExtension.kt
@@ -145,7 +145,9 @@ abstract class UniminedExtension(val project: Project) {
     abstract fun wagYourMaven(name: String)
     abstract fun mcphackersIvy()
     abstract fun quiltMaven()
+    @Deprecated("Use glassLauncherMaven(\"babric\") instead", ReplaceWith("glassLauncherMaven(\"babric\")"))
     abstract fun babricMaven()
+    abstract fun glassLauncherMaven(name: String)
     abstract fun parchmentMaven()
 
     abstract fun neoForgedMaven()

diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/mapping/MappingsConfig.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/mapping/MappingsConfig.kt
@@ -389,6 +389,23 @@ abstract class MappingsConfig(val project: Project, val minecraft: MinecraftConf
         barn(build.toInt(), key, action)
     }
 
+    @JvmOverloads
+    abstract fun biny(commitName: String, key: String = "yarn", action: MappingDepConfig.() -> Unit = {})
+
+    @JvmOverloads
+    fun biny(
+        commitName: String,
+        key: String = "yarn",
+        @DelegatesTo(value = MappingDepConfig::class, strategy = Closure.DELEGATE_FIRST)
+        action: Closure<*>
+    ) {
+        biny(commitName, key) {
+            action.delegate = this
+            action.resolveStrategy = Closure.DELEGATE_FIRST
+            action.call()
+        }
+    }
+
 
     @JvmOverloads
     abstract fun quilt(build: Int, classifier: String = "intermediary-v2", key: String = "quilt", action: MappingDepConfig.() -> Unit = {})

diff --git a/src/main/kotlin/xyz/wagyourtail/unimined/UniminedExtensionImpl.kt b/src/main/kotlin/xyz/wagyourtail/unimined/UniminedExtensionImpl.kt
@@ -216,15 +216,20 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
         project.logger.info("[Unimined] adding Quilt maven: $quiltMaven")
     }
 
-    val babricMaven by lazy {
+    @Deprecated("Use glassLauncherMaven(\"babric\") instead", ReplaceWith("glassLauncherMaven(\"babric\")"))
+    override fun babricMaven() {
+        glassLauncherMaven("babric")
+    }
+
+    val glassLauncherMaven = defaultedMapOf<String, MavenArtifactRepository> { name ->
         project.repositories.maven {
-            it.name = "babric"
-            it.url = URI.create("https://maven.glass-launcher.net/babric/")
+            it.name = "Glass (${name.capitalized()})"
+            it.url = URI.create("https://maven.glass-launcher.net/$name/")
         }
     }
 
-    override fun babricMaven() {
-        project.logger.info("[Unimined] adding Babric maven: $babricMaven")
+    override fun glassLauncherMaven(name: String) {
+        project.logger.info("[Unimined] adding Glass Launcher maven: ${glassLauncherMaven[name]}")
     }
 
     val wagYourMaven = defaultedMapOf<String, MavenArtifactRepository> { name ->

diff --git a/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt b/src/mapping/kotlin/xyz/wagyourtail/unimined/internal/mapping/MappingsProvider.kt
@@ -100,7 +100,7 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig): MappingsCo
     }
 
     override fun babricIntermediary(key: String, action: MappingDepConfig.() -> Unit) {
-        project.unimined.babricMaven()
+        project.unimined.glassLauncherMaven("babric")
         if (side != EnvType.COMBINED) {
             mapping("babric:intermediary:${minecraft.version}:v2", key) {
                 mapNamespace(side.classifier!!, "official")
@@ -296,7 +296,7 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig): MappingsCo
     }
 
     override fun barn(build: Int, key: String, action: MappingDepConfig.() -> Unit) {
-        project.unimined.babricMaven()
+        project.unimined.glassLauncherMaven("babric")
         mapping("babric:barn:${minecraft.version}+build.${build}:v2", "yarn") {
             outputs("barn", true) { listOf("intermediary") }
             mapNamespace("named", "barn")
@@ -305,6 +305,16 @@ class MappingsProvider(project: Project, minecraft: MinecraftConfig): MappingsCo
         }
     }
 
+    override fun biny(commitName: String, key: String, action: MappingDepConfig.() -> Unit) {
+        project.unimined.glassLauncherMaven("releases")
+        mapping("net.glasslauncher:biny:${minecraft.version}+${commitName}:v2", "yarn") {
+            outputs("biny", true) { listOf("intermediary") }
+            mapNamespace("named", "biny")
+            sourceNamespace("intermediary")
+            action()
+        }
+    }
+
     override fun quilt(build: Int, classifier: String, key: String, action: MappingDepConfig.() -> Unit) {
         project.unimined.quiltMaven()
         mapping("org.quiltmc:quilt-mappings:${minecraft.version}+build.${build}:${classifier}", "quilt") {

diff --git a/...in/xyz/wagyourtail/unimined/internal/minecraft/patch/fabric/BabricMinecraftTransformer.kt b/...in/xyz/wagyourtail/unimined/internal/minecraft/patch/fabric/BabricMinecraftTransformer.kt
@@ -60,7 +60,7 @@ class BabricMinecraftTransformer(project: Project, provider: MinecraftProvider):
 
     override fun addMavens() {
         super.addMavens()
-        project.unimined.babricMaven()
+        project.unimined.glassLauncherMaven("babric")
     }
 
     override val includeGlobs: List<String>

diff --git a/testing/b1.7.3-Babric-Modloader/build.gradle b/testing/b1.7.3-Babric-Modloader/build.gradle
@@ -24,18 +24,6 @@ sourceSets {
     }
 }
 
-tasks.register("babricJar", Jar) {
-    from sourceSets.babric.output, sourceSets.main.output
-
-    archiveClassifier = "babric"
-}
-
-tasks.register("modloaderJar", Jar) {
-    from sourceSets.modloader.output, sourceSets.main.output
-
-    archiveClassifier = "modloader"
-}
-
 repositories {
     mavenLocal()
     maven {
@@ -50,7 +38,7 @@ unimined.minecraft() {
 
     mappings {
         babricIntermediary()
-        barn(9)
+        biny("a00e3b0")
     }
 
     minecraftRemapper.config {
@@ -64,11 +52,11 @@ unimined.minecraft(sourceSets.babric) {
     version "b1.7.3"
 
     mappings {
-        barn(9)
+        biny("a00e3b0")
     }
 
     babric {
-        loader "0.14.19-babric.1"
+        loader "0.14.24-babric.1"
     }
 
     minecraftRemapper.config {
@@ -105,15 +93,10 @@ jar {
     enabled = false
 }
 
-
-processResources {
+processBabricResources {
     inputs.property "version", project.version
 
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
-    }
-
-    filesMatching("mcmod.info") {
+    filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
 }