support for 1.20.5/1.20.6

Author: PouekDEV

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -43,7 +43,8 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	// The new Minecraft 1.20.5 upwards uses Java 21
+	it.options.release = 21
 }
 
 java {
@@ -52,8 +53,8 @@ java {
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.20.4
-	yarn_mappings=1.20.4+build.3
-	loader_version=0.15.3
+	minecraft_version=1.20.6
+	yarn_mappings=1.20.6+build.1
+	loader_version=0.15.10
 
 # Mod Properties
-	mod_version = 1.6.0-1.20.4
+	mod_version = 1.6.1-1.20.6
 	maven_group = one.pouekdev
 	archives_base_name = coordinatelist
 
 # Dependencies
-	fabric_version=0.92.0+1.20.4
-	midnightlib_version=1.5.3-fabric
+	fabric_version=0.97.8+1.20.6
+	midnightlib_version=1.5.4-fabric

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -155,8 +155,10 @@ public void onInitializeClient() {
                         positionMatrix = matrixStack.peek().getPositionMatrix();
                         float h = (float) (-textWidth/2);
                         VertexConsumerProvider.Immediate v = VertexConsumerProvider.immediate(tessellator.getBuffer());
+                        if(CListConfig.waypoint_text_background) {
+                            textRenderer.draw(labelText, h,0,0x00000000,false,positionMatrix,v, TextRenderer.TextLayerType.NORMAL,0x90000000,LightmapTextureManager.MAX_LIGHT_COORDINATE);
+                        }
                         // This fixes text flickering
-                        textRenderer.draw(labelText, h,0,0x00000000,false,positionMatrix,v, TextRenderer.TextLayerType.NORMAL,0x90000000,LightmapTextureManager.MAX_LIGHT_COORDINATE);
                         matrixStack.translate(0,0,-0.03f);
                         positionMatrix = matrixStack.peek().getPositionMatrix();
                         textRenderer.draw(labelText, h,0,0xFFFFFF,false,positionMatrix,v, TextRenderer.TextLayerType.NORMAL,0x00000000,LightmapTextureManager.MAX_LIGHT_COORDINATE);

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

@@ -7,4 +7,5 @@ public class CListConfig extends MidnightConfig {
     @Entry(min=0) public static int render_distance = 0;
     @Entry public static boolean waypoints_toggled = true;
     @Entry public static boolean can_place_deathpoints = true;
+    @Entry public static boolean waypoint_text_background = true;
 }

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

@@ -9,6 +9,11 @@ public class CListWaypointColor {
         g = green;
         b = blue;
     }
+    public void setRGB(float red, float green, float blue){
+        r = red;
+        g = green;
+        b = blue;
+    }
     public int rgbToHex(){
         int red = (int) (r * 255);
         int green = (int) (g * 255);

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

@@ -1,16 +1,19 @@
 package one.pouekdev.coordinatelist;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.GridWidget;
 import net.minecraft.client.gui.widget.SimplePositioningWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import org.lwjgl.glfw.GLFW;
 
 public class CListWaypointConfig extends Screen {
     public int id;
+    public boolean render_color_picker = false;
     public CListWaypoint waypoint;
     public TextFieldWidget waypoint_name;
     public TextFieldWidget waypoint_color;
@@ -58,6 +61,24 @@ protected void init(){
         addDrawableChild(this.y);
         addDrawableChild(this.z);
     }
+    public static class SpriteButton extends ButtonWidget {
+        public int x_pos;
+        public int y_pos;
+        public SpriteButton(int x, int y, int width, int height, PressAction onPress) {
+            super(x, y, width, height, Text.literal(""), onPress,null);
+            this.x_pos = x;
+            this.y_pos = y;
+        }
+        @Override
+        public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+            Identifier icon;
+            icon = new Identifier("coordinatelist", "icon/change");
+            RenderSystem.enableBlend();
+            RenderSystem.defaultBlendFunc();
+            context.drawGuiTexture(icon, x_pos, y_pos, width, height);
+            RenderSystem.disableBlend();
+        }
+    }
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         this.waypoint_name.setX((this.width-150)/2);
@@ -77,8 +98,12 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         int top = centerY - SQUARE_SIZE / 2;
         int right = centerX + SQUARE_SIZE / 2;
         int bottom = centerY + SQUARE_SIZE / 2;
+        //SpriteButton change_color = new SpriteButton((this.width-50)/2+38,(this.height-20)/2-15,12,12,button -> {
+        //    render_color_picker = !render_color_picker;
+        //});
         super.render(context, mouseX, mouseY, delta);
         context.fill(left, top, right, bottom, CListClient.variables.colors.get(id).rgbToHex());
+        //change_color.renderWidget(context,mouseX,mouseY,delta);
     }
     @Override
     public boolean charTyped(char chr, int keyCode) {

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

@@ -56,10 +56,6 @@ protected void init() {
         gridWidgetBottom.forEachChild(this::addDrawableChild);
     }
     @Override
-    public void renderBackground(DrawContext context, int mouseX, int mouseY, float delta) {
-        renderBackgroundTexture(context);
-    }
-    @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
         //list.render(context, mouseX, mouseY, delta);

src/main/java/one/pouekdev/coordinatelist/mixin/CListChatGrabber.java

@@ -1,6 +1,7 @@
 package one.pouekdev.coordinatelist.mixin;
 
 import net.minecraft.client.gui.hud.ChatHud;
+import net.minecraft.client.gui.hud.ChatHudLine;
 import net.minecraft.client.gui.hud.MessageIndicator;
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.Text;
@@ -21,11 +22,11 @@
 @Mixin(ChatHud.class)
 public abstract class CListChatGrabber {
     @Inject(method = "logChatMessage", at = @At("RETURN"))
-    private void getCoordsFromChat(Text message, @Nullable MessageIndicator indicator, CallbackInfo ci) {
+    private void getCoordsFromChat(ChatHudLine message, CallbackInfo ci) {
         List<String> numbersList = Lists.newArrayList();
         String player;
         try{
-            String content = message.getString().replaceAll("\r", "\\\\r").replaceAll("\n", "\\\\n");
+            String content = message.content().getString().replaceAll("\r", "\\\\r").replaceAll("\n", "\\\\n");
             player = StringUtils.substringBetween(content, "<", ">");
             content = content.replace("<","").replace(">","").replace(player,"");
             numbersList = CListClient.findNumbersInString(content);

src/main/resources/assets/coordinatelist/lang/en_us.json

@@ -8,6 +8,7 @@
   "coordinatelist.midnightconfig.render_distance": "The distance to which the waypoint is visible (0 means no limit)",
   "coordinatelist.midnightconfig.waypoints_toggled": "Show waypoints",
   "coordinatelist.midnightconfig.can_place_deathpoints": "Create waypoints on death",
+  "coordinatelist.midnightconfig.waypoint_text_background": "Show background behind the waypoint name",
   "modmenu.summaryTranslation.coordinatelist": "A simple minimalistic fabric mod for saving your coordinates.",
   "modmenu.descriptionTranslation.coordinatelist": "Coordinate List (CList for short) is a simple minimalistic fabric mod for saving your coordinates. No minimaps. Just a list with in-game waypoints.",
   "waypoint.last.death": "Last death",