From 4497b0eeef7be414db38f1f7095a5d3d6bce96f9 Mon Sep 17 00:00:00 2001 From: skidam Date: Sun, 22 Dec 2024 13:42:57 +0100 Subject: [PATCH] move to stonecutter 0.5 --- settings.gradle.kts | 3 +-- stonecutter.gradle.kts | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 4b311618..b3365b37 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,6 @@ pluginManagement { maven { url = uri("https://maven.fabricmc.net/") } maven { url = uri("https://maven.neoforged.net/releases") } maven { url = uri("https://files.minecraftforge.net/maven/") } - maven { url = uri("https://maven.kikugie.dev/releases") } mavenLocal() } } @@ -14,7 +13,7 @@ pluginManagement { plugins { id("com.github.johnrengelman.shadow") version "8.1.1" apply false id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false - id("dev.kikugie.stonecutter") version "0.4.+" + id("dev.kikugie.stonecutter") version "0.5" } include(":core") diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts index 4ffe4793..0293f08a 100644 --- a/stonecutter.gradle.kts +++ b/stonecutter.gradle.kts @@ -17,8 +17,8 @@ stonecutter registerChiseled tasks.register("chiseledBuild", stonecutter.chisele finalizedBy("mergeJars") } -stonecutter configureEach { - val current = project.property("loom.platform") +stonecutter parameters { + val current = node!!.property("loom.platform").toString() val platforms = listOf("fabric", "forge", "neoforge").map { it to (it == current) } consts(platforms) } @@ -28,19 +28,19 @@ val mergedDir = File("${rootProject.projectDir}/merged") class MinecraftVersionData(private val name: String) { fun greaterThan(other: String) : Boolean { - return stonecutter.compare(name, other.lowercase()) > 0 + return stonecutter.eval(name, ">" + other.lowercase()) } fun lessThan(other: String) : Boolean { - return stonecutter.compare(name, other.lowercase()) < 0 + return stonecutter.eval(name, "<" + other.lowercase()) } fun greaterOrEqual(other: String) : Boolean { - return stonecutter.compare(name, other.lowercase()) >= 0 + return stonecutter.eval(name, ">=" + other.lowercase()) } fun lessOrEqual(other: String) : Boolean { - return stonecutter.compare(name, other.lowercase()) <= 0 + return stonecutter.eval(name, "<=" + other.lowercase()) } override fun equals(other: Any?) : Boolean {