Fix StackOverflowException

README.md

@@ -24,9 +24,6 @@ This mod's config file is `betterpingdisplay.json`. It contains the following op
 * **1.15.x**
 * **1.16.x**
 * **1.17.x**
-* **1.18.x**
-* **1.19.x**
-* **1.20.x**
 
 ## Requirements
 * [Fabric](https://fabricmc.net/)

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.2-SNAPSHOT'
+	id 'fabric-loom' version '0.9.9'
 	id 'maven-publish'
 }
 
@@ -32,10 +32,18 @@ processResources {
 	}
 }
 
-tasks.withType(JavaCompile).configureEach {
+tasks.withType(JavaCompile) {
 	options.encoding = "UTF-8"
 }
 
+// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+// if it is present.
+// If you remove this task, sources will not be generated.
+task sourcesJar(type: Jar, dependsOn: classes) {
+	classifier = "sources"
+	from sourceSets.main.allSource
+}
+
 jar {
 	from "LICENSE"
 }
@@ -48,6 +56,9 @@ publishing {
 			artifact(remapJar) {
 				builtBy remapJar
 			}
+			artifact(sourcesJar) {
+				builtBy remapSourcesJar
+			}
 		}
 	}
 

gradle.properties

@@ -2,16 +2,16 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-# check these on https://fabricmc.net/use
+	# check these on https://fabricmc.net/use
-minecraft_version=1.20.1
+	minecraft_version=1.17.1
-yarn_mappings=1.20.1+build.1
+	yarn_mappings=1.17.1+build.23
-loader_version=0.14.21
+	loader_version=0.11.6
 
 # Mod Properties
-mod_version = 1.1.4
+	mod_version = 1.1.1
-maven_group = com.vladmarica
+	maven_group = com.vladmarica
-archives_base_name = BetterPingDisplay-Fabric
+	archives_base_name = BetterPingDisplay-Fabric
 
 # Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.83.0+1.20.1
+	fabric_version=0.37.0+1.17

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 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-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/vladmarica/betterpingdisplay/BetterPingDisplayMod.java

@@ -1,14 +1,13 @@
 package com.vladmarica.betterpingdisplay;
 
 import com.vladmarica.betterpingdisplay.Config.ConfigData;
+import java.io.File;
+import java.nio.file.Path;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.io.File;
-import java.nio.file.Path;
-
 public class BetterPingDisplayMod implements ModInitializer {
 	public static final String MODID = "betterpingdisplay";
 	public static final Logger LOGGER = LogManager.getLogger(MODID);

src/main/java/com/vladmarica/betterpingdisplay/Config.java

@@ -3,8 +3,11 @@ package com.vladmarica.betterpingdisplay;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
-
+import java.io.File;
-import java.io.*;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Serializable;
 
 public class Config {
   private static final int DEFAULT_PING_TEXT_COLOR = 0xA0A0A0;
@@ -19,16 +22,19 @@ public class Config {
     if (configFileFormat.pingTextColor.startsWith("#")) {
       try {
         textColor = Integer.parseInt(configFileFormat.pingTextColor.substring(1), 16);
-            } catch (NumberFormatException ex) {
+      }
+      catch (NumberFormatException ex) {
         BetterPingDisplayMod.LOGGER.error("Config option 'pingTextColor' is invalid - it must be a hex color code");
       }
-        } else {
+    }
+    else {
       BetterPingDisplayMod.LOGGER.error("Config option 'pingTextColor' is invalid - it must be a hex color code");
     }
 
     if (configFileFormat.pingTextFormatString.contains("%d")) {
       textFormatString = configFileFormat.pingTextFormatString;
-        } else {
+    }
+    else {
       BetterPingDisplayMod.LOGGER.error("Config option 'pingTextFormatString' is invalid - it needs to contain %d");
     }
 
@@ -62,7 +68,8 @@ public class Config {
       Gson gson = new Gson();
       reader = new FileReader(configFile);
       return gson.fromJson(reader, ConfigData.class);
-        } finally {
+    }
+    finally {
       if (reader != null) {
         reader.close();
       }

src/main/java/com/vladmarica/betterpingdisplay/hud/ColorUtil.java

@@ -34,6 +34,5 @@ public final class ColorUtil {
     return color & 0xFF;
   }
 
-    private ColorUtil() {
+  private ColorUtil() {}
-    }
 }

src/main/java/com/vladmarica/betterpingdisplay/hud/CustomPlayerListHud.java

@@ -5,9 +5,10 @@ import com.vladmarica.betterpingdisplay.BetterPingDisplayMod;
 import com.vladmarica.betterpingdisplay.Config;
 import com.vladmarica.betterpingdisplay.mixin.PlayerListHudInvoker;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.hud.PlayerListHud;
 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.client.util.math.MatrixStack;
 
 public final class CustomPlayerListHud {
   private static final int PING_TEXT_RENDER_OFFSET = -13;
@@ -15,11 +16,12 @@ public final class CustomPlayerListHud {
   private static final Config config = BetterPingDisplayMod.instance().getConfig();
 
   public static void renderPingDisplay(
-            MinecraftClient client, PlayerListHud hud, DrawContext context, int width, int x, int y, PlayerListEntry player) {
+          MinecraftClient client, PlayerListHud hud, MatrixStack matrixStack, int width, int x, int y, PlayerListEntry player) {
+    TextRenderer textRenderer = client.textRenderer;
+
     String pingString = String.format(config.getTextFormatString(), player.getLatency());
-        int pingStringWidth = client.textRenderer.getWidth(pingString);
+    int pingStringWidth = textRenderer.getWidth(pingString);
-        int pingTextColor = config.shouldAutoColorPingText()
+    int pingTextColor = config.shouldAutoColorPingText() ? PingColors.getColor(player.getLatency()) : config.getTextColor();
-                ? PingColors.getColor(player.getLatency()) : config.getTextColor();
     int textX = width + x - pingStringWidth + PING_TEXT_RENDER_OFFSET;
 
     if (!config.shouldRenderPingBars()) {
@@ -27,10 +29,10 @@ public final class CustomPlayerListHud {
     }
 
     // Draw the ping text for the given player
-        context.drawTextWithShadow(client.textRenderer, pingString, textX, y, pingTextColor);
+    textRenderer.drawWithShadow(matrixStack, pingString, (float) textX, (float) y, pingTextColor);
 
     if (config.shouldRenderPingBars()) {
-            ((PlayerListHudInvoker) hud).invokeRenderLatencyIcon(context, width, x, y, player);
+      ((PlayerListHudInvoker) hud).invokeRenderLatencyIcon(matrixStack, width, x, y, player);
     } else {
       // If we don't render ping bars, we need to reset the render system color so the rest
       // of the player list renders properly

src/main/java/com/vladmarica/betterpingdisplay/hud/PingColors.java

@@ -31,10 +31,9 @@ public final class PingColors {
   }
 
   private static float computeOffset(int start, int end, int value) {
-        float offset = (value - start) / (float) (end - start);
+    float offset =  (value - start) / (float) ( end - start);
     return MathHelper.clamp(offset, 0.0F, 1.0F);
   }
 
-    private PingColors() {
+  private PingColors() {}
-    }
 }

src/main/java/com/vladmarica/betterpingdisplay/mixin/PlayerListHudInvoker.java

@@ -1,13 +1,13 @@
 package com.vladmarica.betterpingdisplay.mixin;
 
-import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.PlayerListHud;
 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(PlayerListHud.class)
 public interface PlayerListHudInvoker {
   @Invoker("renderLatencyIcon")
-    void invokeRenderLatencyIcon(DrawContext context, int width, int x, int y, PlayerListEntry entry);
+  void invokeRenderLatencyIcon(MatrixStack matrices, int width, int x, int y, PlayerListEntry entry);
 }

src/main/java/com/vladmarica/betterpingdisplay/mixin/PlayerListHudMixin.java

@@ -2,9 +2,11 @@ package com.vladmarica.betterpingdisplay.mixin;
 
 import com.vladmarica.betterpingdisplay.hud.CustomPlayerListHud;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.PlayerListHud;
 import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.ScoreboardObjective;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -40,9 +42,9 @@ public abstract class PlayerListHudMixin {
 	 * {@link CustomPlayerListHud#renderPingDisplay}.
 	 */
 	@Redirect(method = "render",
-            at = @At(value = "INVOKE", target = "net/minecraft/client/gui/hud/PlayerListHud.renderLatencyIcon(Lnet/minecraft/client/gui/DrawContext;IIILnet/minecraft/client/network/PlayerListEntry;)V"))
+			at = @At(value = "INVOKE", target = "net/minecraft/client/gui/hud/PlayerListHud.renderLatencyIcon(Lnet/minecraft/client/util/math/MatrixStack;IIILnet/minecraft/client/network/PlayerListEntry;)V"))
 	private void redirectRenderLatencyIconCall(
-            PlayerListHud instance, DrawContext context, int width, int x, int y, @NotNull PlayerListEntry entry) {
+			PlayerListHud instance, MatrixStack matrices, int width, int x, int y, @NotNull PlayerListEntry entry) {
-        CustomPlayerListHud.renderPingDisplay(client, instance, context, width, x, y, entry);
+		CustomPlayerListHud.renderPingDisplay(client, instance, matrices, width, x, y, entry);
 	}
 }

src/main/resources/fabric.mod.json

@@ -1,18 +1,17 @@
 {
   "schemaVersion": 1,
   "id": "betterpingdisplay",
-  "version": "1.1.3",
+  "version": "1.1.1",
 
   "name": "Better Ping Display",
   "description": "Shows the actual ping number instead of just bars in the player list!",
   "authors": [
-    "Quintinity",
+    "Quintinity"
-    "Yuuki"
   ],
   "contact": {
-    "homepage": "https://git.raiza.dev/Raiza.dev/better-ping-display-fabric",
+    "homepage": "https://github.com/vladmarica/better-ping-display-fabric",
-    "sources": "https://git.raiza.dev/Raiza.dev/better-ping-display-fabric",
+    "sources": "https://github.com/vladmarica/better-ping-display-fabric",
-    "issues": "https://git.raiza.dev/Raiza.dev/better-ping-display-fabric/issues"
+    "issues": "https://github.com/vladmarica/better-ping-display-fabric/issues"
   },
 
   "license": "MIT",
@@ -29,8 +28,10 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.14",
+    "fabricloader": ">=0.7.4",
-    "minecraft": ">=1.19"
+    "minecraft": "1.17.x"
   },
-  "suggests": {}
+  "suggests": {
+    "flamingo": "*"
+  }
 }