From 104847bcf6d898b84e0fa5bb38e88cba11169ccb Mon Sep 17 00:00:00 2001 From: PadBro <64410553+PadBro@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:45:52 +0100 Subject: [PATCH] chore: update to 26.1 --- .github/workflows/ci.yml | 4 +-- .github/workflows/release.yml | 4 +-- build.gradle | 35 +++++++------------ gradle.properties | 12 +++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../client/commands/AfkCommand.java | 2 +- .../client/commands/BlacklistCommand.java | 4 +-- .../client/commands/CommandManager.java | 2 +- .../client/commands/DisableCommand.java | 2 +- .../client/commands/EnableCommand.java | 2 +- .../client/managers/AfkManager.java | 8 +++-- src/main/resources/fabric.mod.json | 5 +-- 12 files changed, 38 insertions(+), 44 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b2db2b..5721366 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,10 +41,10 @@ jobs: uses: actions/checkout@v4 - name: validate gradle wrapper uses: gradle/actions/wrapper-validation@v4 - - name: setup jdk 21 + - name: setup jdk 25 uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 25 distribution: 'microsoft' - name: make gradle wrapper executable run: chmod +x ./gradlew diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e916ab..9c748a2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,10 +36,10 @@ jobs: uses: actions/checkout@v4 - name: validate gradle wrapper uses: gradle/actions/wrapper-validation@v4 - - name: setup jdk 21 + - name: setup jdk 25 uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 25 distribution: 'microsoft' - name: make gradle wrapper executable run: chmod +x ./gradlew diff --git a/build.gradle b/build.gradle index 8617c5a..c00e71e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.14-SNAPSHOT' + id 'net.fabricmc.fabric-loom' version "${loom_version}" id 'maven-publish' } @@ -43,15 +43,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}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation "net.fabricmc:fabric-loader:${project.loader_version}" - modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config}") { - exclude(group: "net.fabricmc.fabric-api") - } - modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}") + implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + + implementation "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config}" + implementation "com.terraformersmc:modmenu:${project.modmenu_version}" } processResources { @@ -67,32 +65,25 @@ processResources { } } -def targetJavaVersion = 21 tasks.withType(JavaCompile).configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. - it.options.encoding = "UTF-8" - if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { - it.options.release.set(targetJavaVersion) - } + it.options.release = 25 } java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task // if it is present. // If you remove this line, sources will not be generated. withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } jar { + inputs.property "archivesName", project.base.archivesName + from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } + rename { "${it}_${inputs.properties.archivesName}"} } } diff --git a/gradle.properties b/gradle.properties index 7c9cca0..8026980 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,15 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.11 -yarn_mappings=1.21.11+build.1 -loader_version=0.18.2 +minecraft_version=26.1 +loader_version=0.18.5 +loom_version=1.15-SNAPSHOT # Mod Properties mod_version=1.0-SNAPSHOT maven_group=com.padbro archives_base_name=GreeterBro # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.139.4+1.21.11 -cloth_config=21.11.152 -modmenu_version=17.0.0-alpha.1 +fabric_api_version=0.144.3+26.1 +cloth_config=26.1.154 +modmenu_version=18.0.0-alpha.8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 50fba87..e783808 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1 +1 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip diff --git a/src/client/java/com/padbro/greeterbro/client/commands/AfkCommand.java b/src/client/java/com/padbro/greeterbro/client/commands/AfkCommand.java index 3ce96e9..8933620 100644 --- a/src/client/java/com/padbro/greeterbro/client/commands/AfkCommand.java +++ b/src/client/java/com/padbro/greeterbro/client/commands/AfkCommand.java @@ -9,7 +9,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; +import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.literal; public class AfkCommand { public static void register(LiteralArgumentBuilder root) { diff --git a/src/client/java/com/padbro/greeterbro/client/commands/BlacklistCommand.java b/src/client/java/com/padbro/greeterbro/client/commands/BlacklistCommand.java index 7302b06..68b3bad 100644 --- a/src/client/java/com/padbro/greeterbro/client/commands/BlacklistCommand.java +++ b/src/client/java/com/padbro/greeterbro/client/commands/BlacklistCommand.java @@ -12,8 +12,8 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.string; -import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; -import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; +import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.argument; +import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.literal; public class BlacklistCommand { diff --git a/src/client/java/com/padbro/greeterbro/client/commands/CommandManager.java b/src/client/java/com/padbro/greeterbro/client/commands/CommandManager.java index 8e1b69a..734a2c3 100644 --- a/src/client/java/com/padbro/greeterbro/client/commands/CommandManager.java +++ b/src/client/java/com/padbro/greeterbro/client/commands/CommandManager.java @@ -6,7 +6,7 @@ import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.commands.CommandBuildContext; -import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; +import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.literal; public class CommandManager { private static final LiteralArgumentBuilder commandRoot = diff --git a/src/client/java/com/padbro/greeterbro/client/commands/DisableCommand.java b/src/client/java/com/padbro/greeterbro/client/commands/DisableCommand.java index 00a174d..86637d4 100644 --- a/src/client/java/com/padbro/greeterbro/client/commands/DisableCommand.java +++ b/src/client/java/com/padbro/greeterbro/client/commands/DisableCommand.java @@ -8,7 +8,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; +import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.literal; public class DisableCommand { public static void register(LiteralArgumentBuilder root) { diff --git a/src/client/java/com/padbro/greeterbro/client/commands/EnableCommand.java b/src/client/java/com/padbro/greeterbro/client/commands/EnableCommand.java index fda6771..dea121b 100644 --- a/src/client/java/com/padbro/greeterbro/client/commands/EnableCommand.java +++ b/src/client/java/com/padbro/greeterbro/client/commands/EnableCommand.java @@ -8,7 +8,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; +import static net.fabricmc.fabric.api.client.command.v2.ClientCommands.literal; public class EnableCommand { public static void register(LiteralArgumentBuilder root) { diff --git a/src/client/java/com/padbro/greeterbro/client/managers/AfkManager.java b/src/client/java/com/padbro/greeterbro/client/managers/AfkManager.java index a50ba44..66964cb 100644 --- a/src/client/java/com/padbro/greeterbro/client/managers/AfkManager.java +++ b/src/client/java/com/padbro/greeterbro/client/managers/AfkManager.java @@ -68,9 +68,11 @@ private static void notifyPlayer(MutableComponent message) { } LocalPlayer player = minecraftInstance.player; if (player != null) { - ChatFormatting format = - afkConfig.notifyType == AfkNotifyType.Overlay ? ChatFormatting.YELLOW : ChatFormatting.GRAY; - player.displayClientMessage(message.withStyle(format), afkConfig.notifyType == AfkNotifyType.Overlay); + if (afkConfig.notifyType == AfkNotifyType.Overlay) { + player.sendOverlayMessage(message.withStyle(ChatFormatting.YELLOW)); + } else { + player.sendSystemMessage(message.withStyle(ChatFormatting.GRAY)); + } } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 94e2bdd..1ca2f61 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,7 +31,8 @@ ], "depends": { "fabricloader": ">=${loader_version}", - "fabric": "*", - "minecraft": "${minecraft_version}" + "minecraft": "${minecraft_version}", + "java": ">=25", + "fabric-api": "*" } }