From ac1be4b9c81430d47fadc64763e19000b2dd8c1b Mon Sep 17 00:00:00 2001 From: Derek Date: Sat, 10 Oct 2026 04:29:33 -0500 Subject: [PATCH 1/3] build: update versions and deps to 1.21 --- build.gradle | 13 ++++++++----- gradle.properties | 11 ++++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index fcccbcd..f9ad37c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = JavaVersion.VERSION_21 +targetCompatibility = JavaVersion.VERSION_21 archivesBaseName = project.archives_base_name version = project.mod_version @@ -39,6 +39,9 @@ dependencies { // but because you excluded its instance of fabric api, you need to re-add the bits it uses modIncludeImplementation(fabricApi.module("fabric-screen-api-v1", project.fabric_version)) modIncludeImplementation(fabricApi.module("fabric-resource-loader-v0", project.fabric_version)) + + // Mod Menu + modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" } processResources { @@ -50,8 +53,8 @@ processResources { } tasks.withType(JavaCompile).configureEach { - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 + // Minecraft 1.20.5 upwards uses Java 21. + it.options.release = 21 } java { diff --git a/gradle.properties b/gradle.properties index 25ddeab..5f483b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.19 - yarn_mappings=1.19+build.1 - loader_version=0.14.6 + minecraft_version=1.21.1 + yarn_mappings=1.21.1+build.3 + loader_version=0.16.9 # Mod Properties mod_version = 1.0.0 @@ -13,5 +13,6 @@ org.gradle.jvmargs=-Xmx1G archives_base_name = nonametag # Dependencies - fabric_version=0.55.1+1.19 - cloth_config_version=7.0.65 + fabric_version=0.107.0+1.21.1 + cloth_config_version=15.0.130 + modmenu_version=11.0.3 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..e1adfb4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From abfb499dac4d5d20b03b7eefc23befbb8573c77e Mon Sep 17 00:00:00 2001 From: Derek Date: Sat, 10 Oct 2026 04:30:04 -0500 Subject: [PATCH 2/3] build: java 21 --- src/main/resources/fabric.mod.json | 6 +++--- src/main/resources/nonametag.mixins.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index eb4405f..fc58d29 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,8 +30,8 @@ ], "depends": { - "fabricloader": ">=0.14.6", - "minecraft": "~1.19", - "java": ">=17" + "fabricloader": ">=0.16.0", + "minecraft": "~1.21.1", + "java": ">=21" } } diff --git a/src/main/resources/nonametag.mixins.json b/src/main/resources/nonametag.mixins.json index 0197edc..0430211 100644 --- a/src/main/resources/nonametag.mixins.json +++ b/src/main/resources/nonametag.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "net.f53.nonametag.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ ], "client": [ From 0fcf7a24132f43c8c58050fc85008ffc74d6b8ae Mon Sep 17 00:00:00 2001 From: Derek Date: Sat, 10 Oct 2026 04:31:07 -0500 Subject: [PATCH 3/3] fix: update method signature 1.21.1 --- .../net/f53/nonametag/mixin/DisableNameTagRendering.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/f53/nonametag/mixin/DisableNameTagRendering.java b/src/main/java/net/f53/nonametag/mixin/DisableNameTagRendering.java index 75b1cf0..075ce1e 100644 --- a/src/main/java/net/f53/nonametag/mixin/DisableNameTagRendering.java +++ b/src/main/java/net/f53/nonametag/mixin/DisableNameTagRendering.java @@ -11,13 +11,13 @@ @Mixin(EntityRenderer.class) public abstract class DisableNameTagRendering { - @Shadow protected abstract boolean hasLabel(Entity entity); + @Shadow protected abstract boolean hasLabel(Entity entity, double squaredDistanceToCamera); - @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/EntityRenderer;hasLabel(Lnet/minecraft/entity/Entity;)Z")) - private boolean dontRenderTheTag(EntityRenderer instance, Entity entity) { + @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/EntityRenderer;hasLabel(Lnet/minecraft/entity/Entity;D)Z")) + private boolean dontRenderTheTag(EntityRenderer instance, Entity entity, double squaredDistanceToCamera) { if (ModConfig.getInstance().enabled && !(entity instanceof PlayerEntity)){ return false; } - return this.hasLabel(entity); + return this.hasLabel(entity, squaredDistanceToCamera); } }