Halfway done with 1.21.5 support

Author: PouekDEV

.github/workflows/build.yml

@@ -8,29 +8,22 @@ on: [pull_request, push, workflow_dispatch]
 
 jobs:
   build:
-    strategy:
-      matrix:
-        # Use these Java versions
-        java: [
-          21,    # Current Java LTS
-        ]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout repository
         uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
-      - name: setup jdk ${{ matrix.java }}
+        uses: gradle/actions/wrapper-validation@v4
+      - name: setup jdk
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: '21'
           distribution: 'microsoft'
       - name: make gradle wrapper executable
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Jakub Starostecki
+Copyright (c) 2025 Jakub Starostecki
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.gradle

@@ -1,11 +1,15 @@
 plugins {
-	id 'fabric-loom' version '1.9-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
 version = project.mod_version
 group = project.maven_group
 
+base {
+	archivesName = project.archives_base_name
+}
+
 repositories {
 	maven { url = "https://api.modrinth.com/maven" }
 	// Add repositories to retrieve artifacts from in here.
@@ -20,24 +24,18 @@ dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "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}"
 	modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
 	include "maven.modrinth:midnightlib:${project.midnightlib_version}"
-	// Uncomment the following line to enable the deprecated Fabric API modules.
-	// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
-	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
-}
-
-base {
-	archivesName = project.archives_base_name
 }
 
 processResources {
 	inputs.property "version", project.version
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand "version": inputs.properties.version
 	}
 }
 
@@ -58,15 +56,18 @@ java {
 }
 
 jar {
+	inputs.property "archivesName", project.base.archivesName
+
 	from("LICENSE") {
-		rename { "${it}_${base.archivesName.get()}"}
+		rename { "${it}_${inputs.properties.archivesName}"}
 	}
 }
 
 // configure the maven publication
 publishing {
 	publications {
-		mavenJava(MavenPublication) {
+		create("mavenJava", MavenPublication) {
+			artifactId = project.archives_base_name
 			from components.java
 		}
 	}
@@ -78,4 +79,4 @@ publishing {
 		// The repositories here will be used for publishing your artifact, not for
 		// retrieving dependencies.
 	}
-}
+}

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.21.4
-	yarn_mappings=1.21.4+build.2
-	loader_version=0.16.9
+	minecraft_version=1.21.5
+	yarn_mappings=1.21.5+build.1
+	loader_version=0.16.10
 
 # Mod Properties
-	mod_version = 1.7.2-1.21.4
+	mod_version = 1.7.2-1.21.5
 	maven_group = one.pouekdev
 	archives_base_name = coordinatelist
 
 # Dependencies
-	fabric_version=0.112.0+1.21.4
-	midnightlib_version=1.6.6-fabric
+	fabric_version=0.119.5+1.21.5
+	midnightlib_version=1.7.1+1.21.4-fabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

src/main/java/one/pouekdev/coordinatelist/CListClient.java

@@ -1,12 +1,11 @@
 package one.pouekdev.coordinatelist;
 
-import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.VertexFormat;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.render.*;
 import net.minecraft.client.util.InputUtil;
@@ -21,26 +20,22 @@
 import org.apache.commons.lang3.StringUtils;
 import org.joml.Matrix4f;
 import org.lwjgl.glfw.GLFW;
-import org.lwjgl.opengl.GL11;
 import eu.midnightdust.lib.config.MidnightConfig;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Random;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class CListClient implements ClientModInitializer {
     public static CListVariables variables = new CListVariables();
     static Random rand = new Random();
     KeyBinding open_waypoints_keybind;
     KeyBinding add_a_waypoint;
     KeyBinding toggle_visibility;
-    public float calculateSizeWaypoint(){
+    public float calculateWaypointSize(){
         return 0.5f * (CListConfig.multiplier/10.0f);
     }
-    public float calculateSizeText(){
+    public float calculateTextSize(){
         return 15f * (CListConfig.multiplier/10.0f);
     }
     public float distanceTo(CListWaypoint waypoint) {
@@ -77,15 +72,6 @@ public Vec3d calculateRenderCoords(CListWaypoint waypoint, Camera camera, float
         }
         return new Vec3d(prx,pry,prz);
     }
-    public static List<String> findNumbersInString(String input) {
-        List<String> numbersList = new ArrayList<>();
-        Pattern pattern = Pattern.compile("-?\\b(?![A-Za-z])\\d+(\\.\\d+)?\\b");
-        Matcher matcher = pattern.matcher(input);
-        while (matcher.find()) {
-            numbersList.add(matcher.group());
-        }
-        return numbersList;
-    }
     @Override
     public void onInitializeClient() {
         open_waypoints_keybind = KeyBindingHelper.registerKeyBinding(new KeyBinding(
@@ -108,14 +94,12 @@ public void onInitializeClient() {
         ));
         WorldRenderEvents.END.register(context ->{
             if (!variables.waypoints.isEmpty() && CListConfig.waypoints_toggled && !CListVariables.minecraft_client.options.hudHidden) {
-                RenderSystem.disableCull();
-                RenderSystem.depthFunc(GL11.GL_ALWAYS);
                 for(int i = 0; i < variables.waypoints.size(); i++){
                     CListWaypoint waypoint = variables.waypoints.get(i);
                     int distance_without_decimal_places = (int) distanceTo(waypoint);
                     if(Objects.equals(waypoint.getDimensionString(), getDimension(String.valueOf(variables.last_world.getDimension().effects()))) && waypoint.render && (CListConfig.render_distance == 0 || CListConfig.render_distance >= distance_without_decimal_places)) {
                         Camera camera = context.camera();
-                        float size = calculateSizeWaypoint();
+                        float size = calculateWaypointSize();
                         Vec3d renderCoords = calculateRenderCoords(waypoint, camera, distance_without_decimal_places);
                         Vec3d targetPosition = new Vec3d(renderCoords.x, renderCoords.y+1, renderCoords.z);
                         Vec3d transformedPosition = targetPosition.subtract(camera.getPos());
@@ -130,25 +114,21 @@ public void onInitializeClient() {
                         BufferBuilder buffer = tessellator.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR);
                         buffer.vertex(positionMatrix, 0, 1, 0).color(variables.colors.get(i).r, variables.colors.get(i).g, variables.colors.get(i).b, 1f).texture(0f, 0f);
                         buffer.vertex(positionMatrix, 0, 0, 0).color(variables.colors.get(i).r, variables.colors.get(i).g, variables.colors.get(i).b, 1f).texture(0f, 1f);
-                        buffer.vertex(positionMatrix, 1, 0, 0).color(variables.colors.get(i).r, variables.colors.get(i).g, variables.colors.get(i).b, 1f).texture(1f, 1);
+                        buffer.vertex(positionMatrix, 1, 0, 0).color(variables.colors.get(i).r, variables.colors.get(i).g, variables.colors.get(i).b, 1f).texture(1f, 1f);
                         buffer.vertex(positionMatrix, 1, 1, 0).color(variables.colors.get(i).r, variables.colors.get(i).g, variables.colors.get(i).b, 1f).texture(1f, 0f);
-                        RenderSystem.setShader(ShaderProgramKeys.POSITION_TEX_COLOR);
+                        Identifier icon;
                         if(waypoint.deathpoint){
-                            RenderSystem.setShaderTexture(0, Identifier.of("coordinatelist", "skull.png"));
+                            icon = Identifier.of("coordinatelist", "skull.png");
                         }
                         else {
-                            RenderSystem.setShaderTexture(0, Identifier.of("coordinatelist", "waypoint_icon.png"));
+                            icon = Identifier.of("coordinatelist", "waypoint_icon.png");
                         }
-                        RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
-                        BufferRenderer.drawWithGlobalProgram(buffer.end());
-                        RenderSystem.enableBlend();
-                        RenderSystem.depthMask(true);
-                        RenderSystem.clear(GL11.GL_DEPTH_BUFFER_BIT);
+                        CListRenderLayers.POSITION_TEX_COLOR.apply(icon).draw(buffer.end());
                         TextRenderer textRenderer = CListVariables.minecraft_client.textRenderer;
                         String labelText = waypoint.name + " (" + distance_without_decimal_places + " m)";
                         int textWidth = textRenderer.getWidth(labelText);
                         matrixStack.scale(-0.025f, -0.025f, 0.025f);
-                        size = calculateSizeText();
+                        size = calculateTextSize();
                         matrixStack.scale((float) Math.log(size * 4), (float) Math.log(size * 4), (float) Math.log(size * 4));
                         matrixStack.translate(0,-20,0);
                         positionMatrix = matrixStack.peek().getPositionMatrix();
@@ -157,16 +137,14 @@ public void onInitializeClient() {
                         if(CListConfig.waypoint_text_background) {
                             textRenderer.draw(labelText, h, 0, 0xFFFFFF, false, positionMatrix, v, TextRenderer.TextLayerType.NORMAL, 0x90000000, LightmapTextureManager.MAX_LIGHT_COORDINATE);
                         }
-                        // This fixes text flickering. If somebody finds a better way to fix it, please open a PR
-                        matrixStack.translate(0,0,0.06f);
-                        positionMatrix = matrixStack.peek().getPositionMatrix();
-                        textRenderer.draw(labelText, h,0,0xFFFFFF,false,positionMatrix,v, TextRenderer.TextLayerType.NORMAL,0x00000000,LightmapTextureManager.MAX_LIGHT_COORDINATE);
+                        else{
+                            textRenderer.draw(labelText, h, 0, 0xFFFFFF, false, positionMatrix, v, TextRenderer.TextLayerType.NORMAL, 0x00000000, LightmapTextureManager.MAX_LIGHT_COORDINATE);
+                        }
+                        // If we want text to be rendered on top we will have to have a separate layer for it
+                        // A separate layer breaks the rotation of the text
                         v.draw();
-                        RenderSystem.disableBlend();
                     }
                 }
-                RenderSystem.depthFunc(GL11.GL_LEQUAL);
-                RenderSystem.enableCull();
             }
         });
         ClientTickEvents.END_CLIENT_TICK.register(client -> {

src/main/java/one/pouekdev/coordinatelist/CListRenderLayers.java

@@ -0,0 +1,51 @@
+package one.pouekdev.coordinatelist;
+
+import com.mojang.blaze3d.pipeline.RenderPipeline;
+import com.mojang.blaze3d.platform.DepthTestFunction;
+import net.minecraft.client.gl.RenderPipelines;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderPhase;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.TriState;
+import net.minecraft.util.Util;
+
+import java.util.function.Function;
+
+public class CListRenderLayers {
+    private static final RenderPipeline TEXT_PIPELINE = RenderPipelines.register(
+            RenderPipeline.builder(RenderPipelines.TEXT_SNIPPET, RenderPipelines.FOG_SNIPPET)
+                    .withLocation("pipeline/text")
+                    .withVertexShader("core/rendertype_text")
+                    .withFragmentShader("core/rendertype_text")
+                    .withSampler("Sampler0")
+                    .withSampler("Sampler2")
+                    .build()
+    );
+    public static final RenderLayer TEXT = RenderLayer.of(
+            "text",
+            1536,
+            false,
+            true,
+            TEXT_PIPELINE,
+            RenderLayer.MultiPhaseParameters.builder().build(false)
+    );
+    private static final RenderPipeline POSITION_TEX_COLOR_PIPELINE = RenderPipelines.register(
+            RenderPipeline.builder(RenderPipelines.POSITION_TEX_COLOR_SNIPPET)
+                    .withLocation("pipeline/position_tex_color")
+                    .withCull(false)
+                    .withoutBlend()
+                    .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
+                    .withDepthWrite(true)
+                    .build()
+    );
+    public static final Function<Identifier, RenderLayer> POSITION_TEX_COLOR = Util.memoize(
+            texture -> RenderLayer.of(
+                    "pos_tex_color",
+                    1536,
+                    false,
+                    true,
+                    POSITION_TEX_COLOR_PIPELINE,
+                    RenderLayer.MultiPhaseParameters.builder().texture(new RenderPhase.Texture(texture, TriState.FALSE, false)).build(false)
+            )
+    );
+}

src/main/java/one/pouekdev/coordinatelist/CListWaypoint.java

@@ -39,9 +39,6 @@ public class CListWaypoint {
     public String getCoordinates(){
         return "X: " + x + " Y: " + y + " Z: " + z;
     }
-    public void setName(String value){
-        this.name = value;
-    }
     public void toggleVisibility(){
         this.bug_fix += 1;
         if(bug_fix == 2){