Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
11 changes: 6 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ 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
maven_group = net.f53
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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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<Entity> 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<Entity> instance, Entity entity, double squaredDistanceToCamera) {
if (ModConfig.getInstance().enabled && !(entity instanceof PlayerEntity)){
return false;
}
return this.hasLabel(entity);
return this.hasLabel(entity, squaredDistanceToCamera);
}
}
6 changes: 3 additions & 3 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
],

"depends": {
"fabricloader": ">=0.14.6",
"minecraft": "~1.19",
"java": ">=17"
"fabricloader": ">=0.16.0",
"minecraft": "~1.21.1",
"java": ">=21"
}
}
2 changes: 1 addition & 1 deletion src/main/resources/nonametag.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"required": true,
"minVersion": "0.8",
"package": "net.f53.nonametag.mixin",
"compatibilityLevel": "JAVA_17",
"compatibilityLevel": "JAVA_21",
"mixins": [
],
"client": [
Expand Down
Loading