From 45356beb009569ff268e201b6d63dcab1818c8e2 Mon Sep 17 00:00:00 2001 From: cxntered Date: Sat, 28 Feb 2026 18:46:33 +1100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=A8=20chore:=20port=20to=201.21.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates oneconfig to 1.0.0-alpha.182 --- build.gradle.kts | 22 +++++++++------------- gradle.properties | 2 +- settings.gradle.kts | 4 ++-- stonecutter.gradle.kts | 2 +- versions/1.21.1/gradle.properties | 3 +-- versions/1.21.10/gradle.properties | 3 +-- versions/1.21.11/gradle.properties | 2 ++ versions/1.21.4/gradle.properties | 3 +-- versions/1.21.8/gradle.properties | 3 +-- 9 files changed, 19 insertions(+), 25 deletions(-) create mode 100644 versions/1.21.11/gradle.properties diff --git a/build.gradle.kts b/build.gradle.kts index b699e6c..b64ec26 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,8 @@ plugins { val modid = property("mod.id") val modname = property("mod.name") val modversion = property("mod.version") -val mcversion = property("minecraft_version") +val mcversion = stonecutter.current.version +val oneconfigversion = property("oneconfig_version") base { archivesName.set(property("mod.id") as String) @@ -33,27 +34,22 @@ loom { } dependencies { - minecraft("com.mojang:minecraft:${property("minecraft_version")}") + minecraft("com.mojang:minecraft:$mcversion") @Suppress("UnstableApiUsage") mappings(loom.layered { officialMojangMappings() optionalProp("${property("parchment_version")}") { - parchment("org.parchmentmc.data:parchment-${property("minecraft_version")}:$it@zip") + parchment("org.parchmentmc.data:parchment-$mcversion:$it@zip") } optionalProp("${property("yalmm_version")}") { - mappings("dev.lambdaurora:yalmm-mojbackward:${property("minecraft_version")}+build.$it") + mappings("dev.lambdaurora:yalmm-mojbackward:$mcversion+build.$it") } }) modImplementation("net.fabricmc:fabric-loader:${property("loader_version")}") - modImplementation("org.polyfrost.oneconfig:${property("minecraft_version")}-fabric:1.0.0-alpha.181") - modImplementation("org.polyfrost.oneconfig:commands:1.0.0-alpha.181") - modImplementation("org.polyfrost.oneconfig:config:1.0.0-alpha.181") - modImplementation("org.polyfrost.oneconfig:config-impl:1.0.0-alpha.181") - modImplementation("org.polyfrost.oneconfig:events:1.0.0-alpha.181") - modImplementation("org.polyfrost.oneconfig:internal:1.0.0-alpha.181") - modImplementation("org.polyfrost.oneconfig:ui:1.0.0-alpha.181") - modImplementation("org.polyfrost.oneconfig:utils:1.0.0-alpha.181") - modImplementation("org.polyfrost.oneconfig:hud:1.0.0-alpha.181") + modImplementation("org.polyfrost.oneconfig:$mcversion-fabric:$oneconfigversion") + for (module in arrayOf("config", "config-impl", "internal", "ui")) { + implementation("org.polyfrost.oneconfig:$module:$oneconfigversion") + } } bloom { diff --git a/gradle.properties b/gradle.properties index 2351519..f738aa2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ mod.group=org.polyfrost loom_version=1.14-SNAPSHOT loader_version=0.18.4 -minecraft_version=[VERSIONED] +oneconfig_version=1.0.0-alpha.182 parchment_version=[VERSIONED] yalmm_version=[VERSIONED] diff --git a/settings.gradle.kts b/settings.gradle.kts index 6d44e08..ca39055 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,9 +20,9 @@ plugins { stonecutter { create(rootProject) { - versions("1.21.1", "1.21.4", "1.21.8", "1.21.10") + versions("1.21.1", "1.21.4", "1.21.8", "1.21.10", "1.21.11") - vcsVersion = "1.21.10" + vcsVersion = "1.21.11" } } diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts index 4f17b16..bdea740 100644 --- a/stonecutter.gradle.kts +++ b/stonecutter.gradle.kts @@ -2,4 +2,4 @@ plugins { id("dev.kikugie.stonecutter") } -stonecutter active "1.21.10" /* [SC] DO NOT EDIT */ \ No newline at end of file +stonecutter active "1.21.11" /* [SC] DO NOT EDIT */ \ No newline at end of file diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties index 26001be..7e5b56e 100644 --- a/versions/1.21.1/gradle.properties +++ b/versions/1.21.1/gradle.properties @@ -1,3 +1,2 @@ parchment_version=2024.11.17 -yalmm_version=3 -minecraft_version=1.21.1 \ No newline at end of file +yalmm_version=3 \ No newline at end of file diff --git a/versions/1.21.10/gradle.properties b/versions/1.21.10/gradle.properties index e0860ca..f4e727f 100644 --- a/versions/1.21.10/gradle.properties +++ b/versions/1.21.10/gradle.properties @@ -1,3 +1,2 @@ parchment_version=2025.10.12 -yalmm_version=3 -minecraft_version=1.21.10 \ No newline at end of file +yalmm_version=3 \ No newline at end of file diff --git a/versions/1.21.11/gradle.properties b/versions/1.21.11/gradle.properties new file mode 100644 index 0000000..e999cd6 --- /dev/null +++ b/versions/1.21.11/gradle.properties @@ -0,0 +1,2 @@ +parchment_version=2025.12.20 +yalmm_version=3 \ No newline at end of file diff --git a/versions/1.21.4/gradle.properties b/versions/1.21.4/gradle.properties index 2d5023a..e23569e 100644 --- a/versions/1.21.4/gradle.properties +++ b/versions/1.21.4/gradle.properties @@ -1,3 +1,2 @@ parchment_version=2025.03.23 -yalmm_version=3 -minecraft_version=1.21.4 \ No newline at end of file +yalmm_version=3 \ No newline at end of file diff --git a/versions/1.21.8/gradle.properties b/versions/1.21.8/gradle.properties index ee0b400..4181c79 100644 --- a/versions/1.21.8/gradle.properties +++ b/versions/1.21.8/gradle.properties @@ -1,3 +1,2 @@ parchment_version=2025.09.14 -yalmm_version=3 -minecraft_version=1.21.8 \ No newline at end of file +yalmm_version=3 \ No newline at end of file From 88d661ee801a8a8e686da8c40968c7d7871d4ffb Mon Sep 17 00:00:00 2001 From: cxntered Date: Sat, 28 Feb 2026 18:56:16 +1100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20fix:=20improve=20last=20join?= =?UTF-8?q?ed=20server=20compatibility?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redaction/mixin/client/Mixin_LastJoinedServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/polyfrost/redaction/mixin/client/Mixin_LastJoinedServer.java b/src/main/java/org/polyfrost/redaction/mixin/client/Mixin_LastJoinedServer.java index 33c260a..3d66aea 100644 --- a/src/main/java/org/polyfrost/redaction/mixin/client/Mixin_LastJoinedServer.java +++ b/src/main/java/org/polyfrost/redaction/mixin/client/Mixin_LastJoinedServer.java @@ -38,7 +38,7 @@ private int modifyMultiplayerWidth(int i, @Local Component multiplayerDisabledRe return i; } - @Inject(method = "createNormalMenuOptions", at = @At(value = "RETURN")) + @Inject(method = "createNormalMenuOptions", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/TitleScreen;addRenderableWidget(Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;", ordinal = 1, shift = At.Shift.AFTER)) private void addLastServerButton(int i, int j, /*? if >=1.21.4 {*/ CallbackInfoReturnable cir /*?} else {*/ /*CallbackInfo ci *//*?}*/, @Local Component multiplayerDisabledReason) { if (multiplayerDisabledReason != null) return; From b645076a911b354404fb312a699081b77e60de97 Mon Sep 17 00:00:00 2001 From: cxntered Date: Sun, 1 Mar 2026 15:52:22 +1100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A8=20chore:=20add=20modrinth=20pu?= =?UTF-8?q?blishing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 35 +++++++++++++++++++++++++++++++---- gradle.properties | 2 ++ stonecutter.gradle.kts | 6 +++++- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b64ec26..c16adce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,6 +5,7 @@ plugins { id("net.fabricmc.fabric-loom-remap") version "1.14-SNAPSHOT" id("org.jetbrains.kotlin.jvm") version "2.3.0" id("dev.deftu.gradle.bloom") version "0.2.0" + id("me.modmuss50.mod-publish-plugin") version "1.1.0" } val modid = property("mod.id") @@ -13,9 +14,8 @@ val modversion = property("mod.version") val mcversion = stonecutter.current.version val oneconfigversion = property("oneconfig_version") -base { - archivesName.set(property("mod.id") as String) -} +version = "$modversion+$mcversion" +base.archivesName = modname.toString() repositories { maven("https://maven.parchmentmc.org") @@ -97,4 +97,31 @@ tasks.jar { } fun optionalProp(property: String, block: (String) -> T?): T? = - findProperty(property)?.toString()?.takeUnless { it.isBlank() }?.let(block) \ No newline at end of file + findProperty(property)?.toString()?.takeUnless { it.isBlank() }?.let(block) + +val modrinthId = findProperty("publish.modrinth")?.toString()?.takeIf { it.isNotBlank() } + +// make sure modrinth.token is set in your user gradle properties +publishMods { + file = project.tasks.remapJar.get().archiveFile + + displayName = modversion.toString() + version = "v$modversion" + changelog = project.rootProject.file("CHANGELOG.md").takeIf { it.exists() }?.readText() ?: "No changelog provided." + type = ALPHA + + modLoaders.add("fabric") + + dryRun = modrinthId == null + + if (modrinthId != null) { + modrinth { + projectId = property("publish.modrinth").toString() + accessToken = findProperty("modrinth.token").toString() + + minecraftVersions.add(mcversion) + + requires("oneconfig") + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f738aa2..713a535 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ oneconfig_version=1.0.0-alpha.182 parchment_version=[VERSIONED] yalmm_version=[VERSIONED] +publish.modrinth=Gapz72zt + org.gradle.daemon=true org.gradle.parallel=true org.gradle.configureoncommand=true diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts index bdea740..2c034d6 100644 --- a/stonecutter.gradle.kts +++ b/stonecutter.gradle.kts @@ -2,4 +2,8 @@ plugins { id("dev.kikugie.stonecutter") } -stonecutter active "1.21.11" /* [SC] DO NOT EDIT */ \ No newline at end of file +stonecutter active "1.21.11" /* [SC] DO NOT EDIT */ + +stonecutter tasks { + order("publishModrinth") +} \ No newline at end of file