From ecb0f88fc39f015ab44098ebcb4ecb5a333c1dc4 Mon Sep 17 00:00:00 2001
From: Anastasia Chrysanthemum <cow@chrysanthemum.lgbt>
Date: Fri, 27 Feb 2026 00:50:33 +1100
Subject: [PATCH] build: Cleanup.

---
 fabric/build.gradle.kts   |  8 +++++---
 neoforge/build.gradle.kts |  1 +
 xplat/build.gradle.kts    | 14 +++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
index cebf669..3dae8a7 100644
--- a/fabric/build.gradle.kts
+++ b/fabric/build.gradle.kts
@@ -1,3 +1,5 @@
+@file:Suppress("UnstableApiUsage") // Layered Mappings is considered experimental
+
 import lgbt.greenhouse.config.gradle.Properties
 import net.fabricmc.loom.task.RemapJarTask
 import org.gradle.kotlin.dsl.getByName
@@ -9,8 +11,8 @@ plugins {
 	alias(libs.plugins.mod.publish)
 }
 
-// TODO: 26.1, Remove Me!
-val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)!!
+// TODO: 26.1: Remove Me!
+val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)
 
 dependencies {
 	minecraft(libs.minecraft)
@@ -111,7 +113,7 @@ publishMods {
 	}
 }
 
-// TODO: 26.1, Remove this mess!
+// TODO: 26.1: Remove this mess!
 tasks.register<RemapJarTask>("remapXplatApi") {
 	dependsOn(project(":xplat").tasks.getByName("apiJar"))
 	inputFile.set(project(":xplat").tasks.getByName<org.gradle.jvm.tasks.Jar>("apiJar").archiveFile)
diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
index 3cb5a30..7accc2e 100644
--- a/neoforge/build.gradle.kts
+++ b/neoforge/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 	id("me.modmuss50.mod-publish-plugin")
 }
 
+// TODO: 26.1: Remove Me!
 val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)
 
 dependencies {
diff --git a/xplat/build.gradle.kts b/xplat/build.gradle.kts
index 7ef999a..d4b284c 100644
--- a/xplat/build.gradle.kts
+++ b/xplat/build.gradle.kts
@@ -19,11 +19,11 @@ plugins {
 sourceSets {
 	register("intermediary")
 }
-val intermediary = sourceSets.getByName("intermediary")!!
+val intermediary = sourceSets.getByName("intermediary")
 val apiComponent = components.create<JvmSoftwareComponentInternal>("api") as DefaultJvmSoftwareComponent
 
-// TODO: 26.1, Remove Me!
-val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)!!
+// TODO: 26.1: Remove Me!
+val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)
 
 configurations {
 	register("xplatJava") {
@@ -42,8 +42,8 @@ configurations {
 		isCanBeResolved = false
 		isCanBeConsumed = true
 	}
-	// TODO: 26.1, Remove below configurations!
 	register("apiCompileElements")
+	// TODO: 26.1: Remove below configurations!
 	register("intermediaryApiCompileElements")
 	register("mojmapApi")
 	register("intermediaryApi")
@@ -58,7 +58,7 @@ dependencies {
 	compileOnly(libs.mixin.extras)
 	annotationProcessor(libs.mixin.extras)
 
-	// TODO: 26.1... Simplify Yumi MC Foundation
+	// TODO: 26.1: Simplify Yumi MC Foundation
 	compileOnly(libs.yumi.mc.foundation) {
 		attributes {
 			attribute(mappingsAttribute, "mojmap")
@@ -132,9 +132,9 @@ publishMods {
 	}
 }
 
-// TODO: 26.1, Remove this mess!
+// TODO: 26.1: Clean up this mess!
 project.afterEvaluate {
-	val main = sourceSets["main"]!!
+	val main = sourceSets["main"]
 	configurations.getByName(main.apiElementsConfigurationName) {
 		extendsFrom(configurations["mojmapApi"])
 	}
-- 
2.51.2