From 7468210666cdd0f5ec0b9edf44fca3c4ed397b9c Mon Sep 17 00:00:00 2001 From: Magnus Date: Fri, 23 Jan 2026 22:29:09 +0000 Subject: [PATCH 1/2] 26.1-snapshot-4 --- build.gradle | 15 +++++++-------- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../bvengo/soundcontroller/SoundController.java | 2 +- src/main/resources/fabric.mod.json | 4 ++-- src/main/resources/soundcontroller.mixins.json | 2 +- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index f603f58..39c54da 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version "${loom_version}" + id 'net.fabricmc.fabric-loom' version "${loom_version}" id 'maven-publish' } @@ -23,14 +23,13 @@ repositories { dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // Tells Gradle to use mod menu - modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}", { + implementation "com.terraformersmc:modmenu:${project.modmenu_version}", { exclude module: 'fabric-api' } } @@ -44,7 +43,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 21 + it.options.release = 25 } java { @@ -53,8 +52,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } jar { diff --git a/gradle.properties b/gradle.properties index fb5ca57..553d8c5 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=17.0.0-alpha.1 +modmenu_version=18.0.0-alpha.5 -minecraft_version=1.21.11 -loader_version=0.18.1 -loom_version=1.13-SNAPSHOT +minecraft_version=26.1-snapshot-4 +loader_version=0.18.4 +loom_version=1.14-SNAPSHOT # Fabric API -fabric_version=0.139.4+1.21.11 \ No newline at end of file +fabric_version=0.142.1+26.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..23449a2 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-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/bvengo/soundcontroller/SoundController.java b/src/main/java/com/bvengo/soundcontroller/SoundController.java index 9686073..6fd9710 100644 --- a/src/main/java/com/bvengo/soundcontroller/SoundController.java +++ b/src/main/java/com/bvengo/soundcontroller/SoundController.java @@ -26,7 +26,7 @@ public void onInitializeClient() { }); ResourceLoader.get(PackType.CLIENT_RESOURCES) - .registerReloader(SoundReloadListener.ID, new SoundReloadListener()); + .registerReloadListener(SoundReloadListener.ID, new SoundReloadListener()); LOGGER.info("{} loaded.", LOGGER.getName()); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 98086da..2576fa9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,8 +28,8 @@ ], "depends": { "fabricloader": ">=0.16.0", - "minecraft": ">=1.21.11", - "java": ">=21", + "minecraft": ">=26.1-alpha.4", + "java": ">=25", "fabric-api": "*" }, "recommends": { diff --git a/src/main/resources/soundcontroller.mixins.json b/src/main/resources/soundcontroller.mixins.json index 9e4e37c..e35143e 100644 --- a/src/main/resources/soundcontroller.mixins.json +++ b/src/main/resources/soundcontroller.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "com.bvengo.soundcontroller.mixin", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "mixins": [], "client": [ "OptionsSubScreenMixin", From f03c6d2303545976dee4767e5c131cd199c48add Mon Sep 17 00:00:00 2001 From: Magnus <152890427+Maganoos@users.noreply.github.com> Date: Fri, 23 Jan 2026 22:33:00 +0000 Subject: [PATCH 2/2] Update Java version in build workflow to 25 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87706b4..8949c41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: matrix: # Use these Java versions java: [ - 21, # Current Java LTS & minimum supported by Minecraft + 25, # Current Java LTS & minimum supported by Minecraft ] # and run on both Linux and Windows os: [ubuntu-22.04, windows-2022] @@ -33,7 +33,7 @@ jobs: - name: build run: ./gradlew build - name: capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS + if: ${{ runner.os == 'Linux' && matrix.java == '25' }} # Only upload artifacts built from latest java on one OS uses: actions/upload-artifact@v4 with: name: Artifacts