From 926727b56608302dadbbaedd34e3d7008b94b8d7 Mon Sep 17 00:00:00 2001 From: Magnus Date: Fri, 12 Jun 2026 09:11:18 +0000 Subject: [PATCH 1/2] 26.2-pre-2 --- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../soundcontroller/mixin/OptionsSubScreenMixin.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 276d627..867900d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,11 +11,11 @@ archives_base_name = soundcontroller ## Fabric: https://fabricmc.net/develop ## ModMenu: https://maven.terraformersmc.com/com/terraformersmc/modmenu -modmenu_version=18.0.0-alpha.8 +modmenu_version=20.0.0-alpha.1 -minecraft_version=26.1 -loader_version=0.18.4 -loom_version=1.14-SNAPSHOT +minecraft_version=26.2-rc-1 +loader_version=0.19.2 +loom_version=1.17-SNAPSHOT # Fabric API -fabric_version=0.146.1+26.1.2 \ No newline at end of file +fabric_version=0.151.0+26.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c61a118..1a70468 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java b/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java index c3d107f..432c482 100644 --- a/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java +++ b/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java @@ -52,7 +52,7 @@ private void replaceDoneButton(Operation original) { @Unique private void soundcontroller$addLayoutButton(Minecraft client, LinearLayout layout, Component text, Screen nextScreen) { layout.addChild(Button.builder(text, button -> { - client.setScreen(nextScreen); + client.setScreenAndShow(nextScreen); }).build()); } } \ No newline at end of file From 8d5cb0645bf5e82487432cfd44e6019bc86b1ddf Mon Sep 17 00:00:00 2001 From: Magnus Date: Mon, 15 Jun 2026 15:50:36 +0000 Subject: [PATCH 2/2] fix done button --- gradle.properties | 6 +++--- .../bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 867900d..513709e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,9 +13,9 @@ archives_base_name = soundcontroller modmenu_version=20.0.0-alpha.1 -minecraft_version=26.2-rc-1 -loader_version=0.19.2 +minecraft_version=26.2-rc-2 +loader_version=0.19.3 loom_version=1.17-SNAPSHOT # Fabric API -fabric_version=0.151.0+26.2 \ No newline at end of file +fabric_version=0.152.1+26.2 \ No newline at end of file diff --git a/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java b/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java index 432c482..db22ea0 100644 --- a/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java +++ b/src/main/java/com/bvengo/soundcontroller/mixin/OptionsSubScreenMixin.java @@ -35,6 +35,7 @@ private void replaceDoneButton(Operation original) { //noinspection ConstantValue if (!((Object)this instanceof SoundOptionsScreen)) { + original.call(); return; }