26.1

Author: Faboslav

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
             -   name: "Set up JDK"
                 uses: actions/setup-java@v4
                 with:
-                    java-version: 21
+                    java-version: 25
                     distribution: temurin
 
             -   name: "Setup gradle"
@@ -88,7 +88,7 @@ jobs:
             -   name: "Set up JDK"
                 uses: actions/setup-java@v4
                 with:
-                    java-version: 21
+                    java-version: 25
                     distribution: temurin
 
             -   name: "Parse gradle properties"
@@ -148,7 +148,7 @@ jobs:
             -   name: "Set up JDK"
                 uses: actions/setup-java@v4
                 with:
-                    java-version: 21
+                    java-version: 25
                     distribution: temurin
 
             -   name: "Parse gradle properties"

.github/workflows/publish.yml

@@ -79,7 +79,7 @@ jobs:
             -   name: "Set up JDK"
                 uses: actions/setup-java@v4
                 with:
-                    java-version: 21
+                    java-version: 25
                     distribution: temurin
 
             -   name: "Setup Gradle"

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.0.20
+
+- Ported to 26.1
+- Added "/structurify structure list" command
+- Added "/structurify structure enable" command
+- Added "/structurify structure disable" command
+
 ## 2.0.19
 
 - Fixed load/save of structure set's "is_disabled" property

buildSrc/build.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
 	`kotlin-dsl`
 	kotlin("jvm") version "2.2.0"
@@ -9,8 +11,12 @@ repositories {
 	maven("https://maven.kikugie.dev/snapshots")
 }
 
-dependencies {
-	fun plugin(id: String, version: String) = "$id:$id.gradle.plugin:$version"
+val rootProps = Properties().apply {
+	rootDir.parentFile.resolve("gradle.properties").inputStream().use(::load)
+}
 
-	implementation("dev.kikugie:stonecutter:0.8.3")
+val stonecutterVersion: String = rootProps.getProperty("stonecutter_version")
+
+dependencies {
+	implementation("dev.kikugie:stonecutter:$stonecutterVersion")
 }

buildSrc/src/main/kotlin/FabricLoomCompatPlugin.kt

@@ -0,0 +1,59 @@
+import dev.kikugie.stonecutter.build.StonecutterBuildExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.jvm.tasks.Jar
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.the
+
+open class FabricLoomCompatPlugin : Plugin<Project> {
+	override fun apply(target: Project): Unit = with(target) {
+		val current = the<StonecutterBuildExtension>().current.parsed
+
+		if (current > "26.0") {
+			setupNewLoomFacade()
+		} else {
+			setupOldLoomFacade()
+		}
+
+		extensions.create<FabricExtensions>("fabric", this, current > "26.0")
+	}
+
+	private fun Project.setupNewLoomFacade() {
+		plugins.apply("net.fabricmc.fabric-loom")
+
+		val names = listOf(
+			"api", "implementation", "compileOnly", "runtimeOnly", "localRuntime"
+		)
+
+		for (baseName in names) {
+			val loomified = "mod" + baseName.replaceFirstChar(Char::uppercaseChar)
+			val modConfiguration = configurations.findByName(loomified) ?: configurations.create(loomified)
+
+			configurations.getByName(baseName).extendsFrom(modConfiguration)
+		}
+
+		configurations.findByName("mappings") ?: configurations.register("mappings") {
+			isCanBeResolved = false
+			isCanBeConsumed = false
+		}
+	}
+
+	private fun Project.setupOldLoomFacade() {
+		plugins.apply("net.fabricmc.fabric-loom-remap")
+	}
+
+	open class FabricExtensions(val project: Project, val isNew: Boolean) {
+		val modJar: TaskProvider<Jar> by lazy {
+			val candidate = if (isNew) project.tasks.named("jar")
+			else project.tasks.named("remapJar")
+			candidate as TaskProvider<Jar>
+		}
+
+		val modSourcesJar: TaskProvider<Jar> by lazy {
+			val candidate = if (isNew) project.tasks.named("sourcesJar")
+			else project.tasks.named("remapSourcesJar")
+			candidate as TaskProvider<Jar>
+		}
+	}
+}

buildSrc/src/main/kotlin/build-extensions.kt

@@ -35,9 +35,10 @@ value class ModData(private val project: Project) {
     val license: String get() = modProp("license")
 	val github: String get() = modProp("github")
 	val discord: String get() = modProp("discord")
-    val mc: String get() = depOrNull("minecraft") ?: project.stonecutterBuild.current.version
+    val mc: String get() = project.stonecutterBuild.current.version
+    val mcVersion: String get() = prop("minecraft_version")
 
-    fun propOrNull(key: String) = project.prop(key)
+	fun propOrNull(key: String) = project.prop(key)
     fun prop(key: String) = requireNotNull(propOrNull(key)) { "Missing '$key'" }
     fun modPropOrNull(key: String) = project.prop("mod.$key")
     fun modProp(key: String) = requireNotNull(modPropOrNull(key)) { "Missing 'mod.$key'" }

buildSrc/src/main/kotlin/multiloader-common.gradle.kts

@@ -107,5 +107,5 @@ tasks {
 }
 
 tasks.named("processResources") {
-	dependsOn(":common:${commonMod.propOrNull("minecraft_version")}:stonecutterGenerate")
+	dependsOn(":common:${commonMod.mc}:stonecutterGenerate")
 }

buildSrc/src/main/resources/META-INF/gradle-plugins/fabric-loom-compat.properties

@@ -0,0 +1 @@
+implementation-class=FabricLoomCompatPlugin

common/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
 	id("multiloader-common")
-	id("fabric-loom")
+	id("fabric-loom-compat")
 	id("dev.kikugie.fletching-table.fabric") version "0.1.0-alpha.22"
 }
 
@@ -20,20 +20,25 @@ fletchingTable {
 	}
 }
 
-loom {
-	mixin {
-		useLegacyMixinAp = false
+if (stonecutter.eval(commonMod.mc, "<=1.21.11")) {
+	loom {
+		mixin {
+			useLegacyMixinAp = false
+		}
 	}
 }
 
 dependencies {
-	minecraft(group = "com.mojang", name = "minecraft", version = commonMod.mc)
-	mappings(loom.layered {
-		officialMojangMappings()
-		commonMod.depOrNull("parchment")?.let { parchmentVersion ->
-			parchment("org.parchmentmc.data:parchment-${commonMod.mc}:$parchmentVersion@zip")
-		}
-	})
+	minecraft("com.mojang:minecraft:${commonMod.mcVersion}")
+
+	if (stonecutter.eval(commonMod.mc, "<=1.21.11")) {
+		mappings(loom.layered {
+			officialMojangMappings()
+			commonMod.depOrNull("parchment")?.let { parchmentVersion ->
+				parchment("org.parchmentmc.data:parchment-${commonMod.mc}:$parchmentVersion@zip")
+			}
+		})
+	}
 
 	compileOnly("org.spongepowered:mixin:0.8.5")