Merge branch 1.21.8 into 1.21.9.

Author: LambdAurora

CHANGELOG.md

@@ -139,4 +139,9 @@
 
 - Updated [Yumi Minecraft Libraries: Foundation].
 
+### 8.0.3
+
+- Improved mojmap publication.
+- Updated [Yumi Minecraft Libraries: Foundation].
+
 [Yumi Minecraft Libraries: Foundation]: https://github.com/YumiProject/yumi-minecraft-foundation-library "Yumi Minecraft Foundation Library page"

README.md

@@ -33,14 +33,14 @@ dependencies {
 	/* Fabric definitions */
 
 	include(modImplementation("dev.lambdaurora:spruceui:${project.spruceui_version}"))
-	include("dev.yumi.mc.core:yumi-mc-foundation:1.0.0-alpha.5+1.21.1")
+	include("dev.yumi.mc.core:yumi-mc-foundation:1.0.0-alpha.15+1.21.1")
 }
 ```
 
 And this to your `gradle.properties`:
 
 ```properties
-spruceui_version=8.0.1+1.21.6
+spruceui_version=8.0.3+1.21.8
 ```
 
 It will JAR-in-JAR SpruceUI so users of your mod don't need to download it separately!
@@ -50,16 +50,18 @@ It will JAR-in-JAR SpruceUI so users of your mod don't need to download it separ
 Defining the dependency on NeoForge is slightly different:
 
 ```kotlin
+val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class)
+
 dependencies {
 	val spruceui = implementation("dev.lambdaurora:spruceui:${project.spruceui_version}") {
-		capabilities {
-			requireCapability("dev.lambdaurora:spruceui-mojmap")
+		attributes {
+			attribute(mappingsAttribute, "mojmap")
 		}
 	}
 
-	jarJar("dev.yumi.mc.core:yumi-mc-foundation:1.0.0-alpha.5+1.21.1") {
-		capabilities {
-			requireCapability("dev.yumi.mc.core:yumi-mc-foundation-mojmap")
+	jarJar("dev.yumi.mc.core:yumi-mc-foundation:1.0.0-alpha.15+1.21.1") {
+		attributes {
+			attribute(mappingsAttribute, "mojmap")
 		}
 	}
 	jarJar(spruceui) {

build.gradle.kts

@@ -1,5 +1,11 @@
+import dev.lambdaurora.mcdev.api.MappingVariant
+import dev.lambdaurora.mcdev.api.manifest.Nmt
+import dev.lambdaurora.mcdev.task.GenerateNmtTask
+import net.fabricmc.loom.LoomGradleExtension
+import net.fabricmc.loom.api.mappings.layered.MappingsNamespace
 import net.fabricmc.loom.task.RemapJarTask
 import spruceui.Constants
+import spruceui.task.XplatTransformJar
 
 plugins {
 	id("spruceui-common")
@@ -77,6 +83,11 @@ repositories {
 	}
 }
 
+val mojmap = lambdamcdev.setupMojmapRemapping()
+configurations.getByName("mojmapApi") {
+	this.extendsFrom(configurations["api"])
+}
+
 dependencies {
 	@Suppress("UnstableApiUsage")
 	mappings(loom.layered {
@@ -87,11 +98,7 @@ dependencies {
 	})
 	modImplementation(libs.fabric.loader)
 
-	modApi(libs.yumi.mc.foundation) {
-		// Exclude Minecraft and loader-provided libraries.
-		exclude(group = "org.slf4j")
-		exclude(group = "org.ow2.asm")
-	}
+	modApi(libs.yumi.mc.foundation)
 
 	fabricModules.stream().map { fabricApi.module(it, libs.versions.fabric.api.get()) }.forEach {
 		modImplementation(it)
@@ -101,19 +108,16 @@ dependencies {
 		isTransitive = false
 	}*/
 
+	"mojmapApi"(libs.yumi.mc.foundation) {
+		attributes {
+			attribute(MappingVariant.ATTRIBUTE, objects.named(MappingVariant.MOJMAP))
+		}
+	}
+
 	"testmodCompileOnly"(libs.neoforge.loader)
 	"testmodImplementation"(sourceSets.main.get().output)
 }
 
-val mojmap by sourceSets.creating {}
-
-java {
-	registerFeature("mojmap") {
-		usingSourceSet(mojmap)
-		withSourcesJar()
-	}
-}
-
 tasks.withType<JavaCompile>().configureEach {
 	options.isDeprecation = true
 	options.isIncremental = true
@@ -153,6 +157,65 @@ val remapTestmodJar = tasks.register<RemapJarTask>("remapTestmodJar") {
 }
 tasks.build.get().dependsOn(remapTestmodJar)
 
+//region Mojmap
+val remapMojmap = mojmap.registerRemap(tasks.remapJar) {
+	this.destinationDirectory.set(layout.buildDirectory.map { it.dir("devlibs") })
+}
+
+val remapMojmapSourcesJar = mojmap.registerSourcesRemap(tasks.remapSourcesJar) {
+	this.classpath.from(configurations["minecraftClientLibraries"])
+	this.archiveClassifier = "preprocessed-mojmap-sources"
+}
+
+val nmtGeneration by tasks.registering(GenerateNmtTask::class) {
+	this.nmt = lambdamcdev.manifests.fmj().map {
+		it.derive(::Nmt)
+			.withBlurIcon(false)
+			.withLoaderVersion("[2,)")
+			.withMixins("spruceui.mixins.json")
+			.withDepend("minecraft", "[" + libs.versions.minecraft.get() + ",)")
+			.withDepend("yumi_mc_core", "[${libs.versions.yumi.mc.foundation.get()},)")
+	}
+	this.outputDir = project.layout.buildDirectory.map { it.dir("generated/generated_neoforge_resources") }
+}
+
+val xplatTransformJar by tasks.registering(XplatTransformJar::class) {
+	dependsOn(remapMojmap, nmtGeneration)
+
+	inputJar.set(remapMojmap.flatMap { it.archiveFile })
+	from(nmtGeneration)
+	this.archiveClassifier = "mojmap"
+}
+mojmap.setJarArtifact(xplatTransformJar)
+
+val xplatTransformSourcesJar by tasks.registering(XplatTransformJar::class) {
+	dependsOn(remapMojmapSourcesJar, nmtGeneration)
+
+	inputJar.set(remapMojmapSourcesJar.flatMap { it.archiveFile })
+	from(nmtGeneration)
+	this.archiveClassifier = "mojmap-sources"
+}
+mojmap.setSourcesArtifact(xplatTransformSourcesJar)
+
+val remapTestmodMojmapJar = mojmap.registerRemap("remapTestmodJarToMojmap") {
+	dependsOn(remapTestmodJar)
+
+	classpath.setFrom(
+		(loom as LoomGradleExtension).getMinecraftJarsCollection(MappingsNamespace.INTERMEDIARY),
+		tasks.remapJar
+	)
+	inputFile.convention(remapTestmodJar.flatMap { it.archiveFile })
+	archiveClassifier = "preprocessed"
+	sourceNamespace = "intermediary"
+	targetNamespace = "named"
+	archiveClassifier = "testmod-mojmap"
+}
+
+tasks.build.configure {
+	dependsOn(xplatTransformJar, xplatTransformSourcesJar, remapTestmodMojmapJar)
+}
+//endregion
+
 license {
 	rule(file("HEADER"))
 }

build_logic/src/main/kotlin/spruceui-common.gradle.kts

@@ -12,10 +12,10 @@ plugins {
 val libs = the<LibrariesForLibs>()
 Constants.finalizeInit(libs)
 
-version = "${project.property("mod_version")}+${McVersionLookup.getVersionTag(Constants.mcVersion())}"
+version = "${project.property("version")}+${McVersionLookup.getVersionTag(Constants.mcVersion())}"
 lambdamcdev.namespace = Constants.NAMESPACE
 
-val javaVersion = Integer.parseInt(project.property("java_version").toString())
+val javaVersion = Integer.parseInt(project.property("java_version") as String)
 
 repositories {
 	mavenCentral()

gradle.properties

@@ -3,9 +3,7 @@ org.gradle.jvmargs=-Xmx2G
 
 # Project properties
 group=dev.lambdaurora
+version=9.0.0-beta.1
 java_version=21
 
-# Mod Properties
-mod_version=9.0.0-beta.1
-
 fabric.loom.dropNonIntermediateRootMethods=true

gradle/libs.versions.toml

@@ -6,12 +6,12 @@ fabric-api = "0.133.1+1.21.9"
 mappings-yalmm = "5"
 modmenu="15.0.0-beta.1"
 
-yumi-mc-foundation = "1.0.0-alpha.9+1.21.1"
+yumi-mc-foundation = "1.0.0-alpha.15+1.21.1"
 
 # Gradle
 gradle-licenser = "2.1.+"
 gradle-loom = "1.11.+"
-gradle-lambdamcdev = "1.3.+"
+gradle-lambdamcdev = "1.6.+"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }

settings.gradle.kts

@@ -15,4 +15,3 @@ pluginManagement {
 }
 
 includeBuild("build_logic")
-include(":moj_xplat")