aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2023-06-30 10:12:23 -0400
committerGitHub <noreply@github.com>2023-06-30 16:12:23 +0200
commitfe0017755ccb9701c2bd60236921d11faef3650b (patch)
tree9f06bae0e8b1e9f9c063f2dc5feaef9d66b07da4 /src
parent9ab6d23f94135da8555faaf8ef36f29d70029ceb (diff)
downloadNotEnoughUpdates-fe0017755ccb9701c2bd60236921d11faef3650b.tar.gz
NotEnoughUpdates-fe0017755ccb9701c2bd60236921d11faef3650b.tar.bz2
NotEnoughUpdates-fe0017755ccb9701c2bd60236921d11faef3650b.zip
fix youtube rank prefix color in /pv (#747)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java21
1 files changed, 16 insertions, 5 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java
index d6740c0c..d5c0afba 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/BasicPage.java
@@ -57,6 +57,7 @@ import org.lwjgl.opengl.GL11;
import java.awt.*;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
@@ -238,6 +239,10 @@ public class BasicPage extends GuiProfileViewerPage {
String rankName = Utils.getElementAsString(Utils.getElement(misc, "ranks." + rank + ".tag"), null);
String rankColor = Utils.getElementAsString(Utils.getElement(misc, "ranks." + rank + ".color"), "7");
String rankPlus = Utils.getElementAsString(Utils.getElement(misc, "ranks." + rank + ".plus"), "");
+ String rankTagColor = Utils.getElementAsString(
+ Utils.getElement(misc, "ranks." + rank + ".tagColor"),
+ rankColor
+ );
String name = entityPlayer.getName();
@@ -254,9 +259,16 @@ public class BasicPage extends GuiProfileViewerPage {
playerName = EnumChatFormatting.GRAY + name;
if (rankName != null) {
String icon = selectedProfile.getGamemode() == null ? "" : getIcon(selectedProfile.getGamemode());
- playerName =
- "\u00A7" + rankColor + "[" + rankName + rankPlusColor + rankPlus + "\u00A7" + rankColor + "] " + name +
- (icon.equals("") ? "" : " " + icon);
+ playerName = MessageFormat.format(
+ "§{0}[§{1}{2}{3}{4}§{5}] {6}",
+ rankColor,
+ rankTagColor,
+ rankName,
+ rankPlusColor,
+ rankPlus,
+ rankColor,
+ name
+ ) + (icon.equals("") ? "" : " " + icon);
}
}
}
@@ -335,7 +347,6 @@ public class BasicPage extends GuiProfileViewerPage {
String networthIRLMoney = StringUtils.formatNumber(Math.round(
((networthInCookies * 325) / 675) * 4.99));
-
if (mouseX > guiLeft + offset - fontWidth / 2 && mouseX < guiLeft + offset + fontWidth / 2) {
if (mouseY > guiTop + 32 && mouseY < guiTop + 38 + fr.FONT_HEIGHT) {
getInstance().tooltipToDisplay = new ArrayList<>();
@@ -547,7 +558,7 @@ public class BasicPage extends GuiProfileViewerPage {
GlStateManager.translate(x, y, 0);
ItemStack stack = NotEnoughUpdates.INSTANCE.manager.jsonToStack(item, false);
- //Remove extra attributes so no CIT
+ // Remove extra attributes so no CIT
NBTTagCompound stackTag = stack.getTagCompound() == null ? new NBTTagCompound() : stack.getTagCompound();
stackTag.removeTag("ExtraAttributes");
stack.setTagCompound(stackTag);