From 3d2ba396efe20fc0e0d6d5f724ac54c11286ac22 Mon Sep 17 00:00:00 2001 From: "Ansgar [Hiajen]" Date: Sat, 24 Jul 2021 20:06:11 +0200 Subject: [PATCH] #8 implement grade as number and gradient --- gradle.properties | 2 +- .../eaa/custom/ping/CustomPlayerListHud.java | 21 +++++++++++++------ .../net/saltymc/eaa/custom/ping/TagDTO.java | 6 ++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9654a03..e223165 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.11.3 # Mod Properties - mod_version = 1.1.0 + mod_version = 1.1.1 maven_group = net.saltymc.eaa archives_base_name = EAA_MOD diff --git a/src/main/java/net/saltymc/eaa/custom/ping/CustomPlayerListHud.java b/src/main/java/net/saltymc/eaa/custom/ping/CustomPlayerListHud.java index ee02343..292ad3b 100644 --- a/src/main/java/net/saltymc/eaa/custom/ping/CustomPlayerListHud.java +++ b/src/main/java/net/saltymc/eaa/custom/ping/CustomPlayerListHud.java @@ -163,12 +163,21 @@ public final class CustomPlayerListHud { /* * PLAYER TAG */ - int offset_tag_playername = aa; - TagDTO playerTAG = TagFunction.getScoreboardTag(player.getProfile().getId().toString()); - mc.textRenderer.drawWithShadow(stack, playerTAG.getType().getTag(), (float)aa, (float)ab, playerTAG.getType().getColor()); - offset_tag_playername += mc.textRenderer.getWidth(playerTAG.getType().getTag()) + 1; - mc.textRenderer.drawWithShadow(stack,"|", (float) offset_tag_playername, (float) ab, playerTAG.getGradeColor()); - offset_tag_playername += mc.textRenderer.getWidth("|") + 2; + int offset_tag_playername = aa; // safe current x offset -> + TagDTO playerTAG = TagFunction.getScoreboardTag(player.getProfile().getId().toString()); // retrieve Tag object + mc.textRenderer.drawWithShadow(stack, playerTAG.getType().getTag(), (float)aa, (float)ab, playerTAG.getType().getColor()); // draw tag name + + offset_tag_playername += mc.textRenderer.getWidth(playerTAG.getType().getTag()) + 1; // add tag name length to offset + + // current offset plus amount to center grade text + float tmp_x = offset_tag_playername + + ((mc.textRenderer.getWidth("10") - mc.textRenderer.getWidth(playerTAG.getGrade() < 1 ? "|" : playerTAG.getGrade() +"")) + / 2.0f); + mc.textRenderer.drawWithShadow(stack, + playerTAG.getGrade() < 1 ? "|" : playerTAG.getGrade() +"", // if not given draw a pipe + (float) tmp_x, (float) ab, playerTAG.getGradeColor()); + + offset_tag_playername += mc.textRenderer.getWidth("10") + 2; // add offset of largest character Text playerName = hud.getPlayerName(player); diff --git a/src/main/java/net/saltymc/eaa/custom/ping/TagDTO.java b/src/main/java/net/saltymc/eaa/custom/ping/TagDTO.java index 42c14e8..47d36b3 100644 --- a/src/main/java/net/saltymc/eaa/custom/ping/TagDTO.java +++ b/src/main/java/net/saltymc/eaa/custom/ping/TagDTO.java @@ -5,10 +5,12 @@ import net.saltymc.eaa.util.database.DB_Tag; import static net.saltymc.eaa.custom.ping.PingColors.computeOffset; public class TagDTO { + final int grade; final int gradeColor; final DB_Tag.Type type; public TagDTO(int grade, DB_Tag.Type type) { + this.grade = grade; this.gradeColor = calcGradient(grade, type); this.type = type; } @@ -30,4 +32,8 @@ public class TagDTO { type.getColor(), computeOffset(0, 10, grade)); } + + public int getGrade(){ + return grade; + } }