Skip to content

move to stonecutter 0.5 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2024
Merged

move to stonecutter 0.5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ 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()
}
}

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")
Expand Down
12 changes: 6 additions & 6 deletions stonecutter.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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 {
Expand Down
Loading