From d20eb490ea179e8a15f34df4f518cb5dd908e1fe Mon Sep 17 00:00:00 2001
From: kirillsaint <kirillsaint@wtfuck.tk>
Date: Thu, 21 Mar 2024 17:14:12 +0600
Subject: [PATCH] (fix) color tags fix

---
 .../client/cosmetics/Cosmetics.java           | 24 +++++++++----------
 .../mixin/mixins/RenderPlayerMixin.java       |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/silentclient/client/cosmetics/Cosmetics.java b/src/main/java/net/silentclient/client/cosmetics/Cosmetics.java
index 6085d4f..f2ca081 100644
--- a/src/main/java/net/silentclient/client/cosmetics/Cosmetics.java
+++ b/src/main/java/net/silentclient/client/cosmetics/Cosmetics.java
@@ -53,16 +53,16 @@ public class Cosmetics {
 	
 	public void init(boolean cosmeticInit) {
 		if(cosmeticInit) {
-			Client.logger.info("STARTING > cosmeitcs > bandana_model");
+			Client.logger.info("STARTING > cosmetics > bandana_model");
 			try {
 				bandana = new ModelBuffer(new ResourceLocation("silentclient/models/bandana.obj"));
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-			Client.logger.info("STARTING > cosmeitcs > default_icon");
+			Client.logger.info("STARTING > cosmetics > default_icon");
 			defaultIcon = new StaticResourceLocation("silentclient/icons/player_icon.png");
 			PlayerResponse.Account.Cosmetics allCosmetics = getAllCosmetics();
-			Client.logger.info("STARTING > cosmeitcs > capes");
+			Client.logger.info("STARTING > cosmetics > capes");
 			capes.clear();
 			capesShoulders.clear();
 
@@ -73,7 +73,7 @@ public class Cosmetics {
 				});
 			}
 
-			Client.logger.info("STARTING > cosmeitcs > wings");
+			Client.logger.info("STARTING > cosmetics > wings");
 			wings.clear();
 			if(allCosmetics != null && allCosmetics.getWings() != null) {
 				allCosmetics.getWings().forEach((wing) -> {
@@ -81,7 +81,7 @@ public class Cosmetics {
 				});
 			}
 
-			Client.logger.info("STARTING > cosmeitcs > bandanas");
+			Client.logger.info("STARTING > cosmetics > bandanas");
 			bandanas.clear();
 			if(allCosmetics != null && allCosmetics.getBandanas() != null) {
 				allCosmetics.getBandanas().forEach((bandana) -> {
@@ -89,14 +89,14 @@ public class Cosmetics {
 				});
 			}
 
-			Client.logger.info("STARTING > cosmeitcs > hats");
+			Client.logger.info("STARTING > cosmetics > hats");
 			hats.clear();
 			if(allCosmetics != null && allCosmetics.getHats() != null) {
 				allCosmetics.getHats().forEach((hat) -> {
 					hats.put(hat.getId(), new HatData(new AnimatedResourceLocation("silentclient/cosmetics/hats/"+hat.getId(), hat.getFrames(), hat.getFrameDelay(), false, hat.getId() == Client.getInstance().getAccount().getSelectedHat()), hat.getModel()));
 					if(!hatModels.containsKey(hat.getModel())) {
 						try {
-							Client.logger.info("STARTING > cosmeitcs > hats > model > " + hat.getModel());
+							Client.logger.info("STARTING > cosmetics > hats > model > " + hat.getModel());
 							ModelBuffer model = new ModelBuffer(new ResourceLocation("silentclient/models/"+ hat.getModel() + ".obj"));
 							if(model != null) {
 								hatModels.put(hat.getModel(), model);
@@ -107,14 +107,14 @@ public class Cosmetics {
 					}
 				});
 			}
-			Client.logger.info("STARTING > cosmeitcs > shields");
+			Client.logger.info("STARTING > cosmetics > shields");
 			shields.clear();
 			if(allCosmetics != null && allCosmetics.getShields() != null) {
 				allCosmetics.getShields().forEach((shield) -> {
 					shields.put(shield.getId(), new ShieldData(new AnimatedResourceLocation("silentclient/cosmetics/shields/"+shield.getId(), shield.getFrames(), shield.getFrameDelay(), false, shield.getId() == Client.getInstance().getAccount().getSelectedShield()), shield.getModel()));
 					if(!hatModels.containsKey(shield.getModel())) {
 						try {
-							Client.logger.info("STARTING > cosmeitcs > shields > model > " + shield.getModel());
+							Client.logger.info("STARTING > cosmetics > shields > model > " + shield.getModel());
 							ModelBuffer model = new ModelBuffer(new ResourceLocation("silentclient/models/"+ shield.getModel() + ".obj"));
 							if(model != null) {
 								shieldModels.put(shield.getModel(), model);
@@ -126,7 +126,7 @@ public class Cosmetics {
 				});
 			}
 
-			Client.logger.info("STARTING > cosmeitcs > icons");
+			Client.logger.info("STARTING > cosmetics > icons");
 			icons.clear();
 			if(allCosmetics != null && allCosmetics.getIcons() != null) {
 				allCosmetics.getIcons().forEach((icon) -> {
@@ -134,7 +134,7 @@ public class Cosmetics {
 				});
 			}
 
-			Client.logger.info("STARTING > cosmeitcs > emotes");
+			Client.logger.info("STARTING > cosmetics > emotes");
 			emotes.clear();
 			if(allCosmetics != null && allCosmetics.getEmotes() != null) {
 				allCosmetics.getEmotes().forEach((emote) -> {
@@ -142,7 +142,7 @@ public class Cosmetics {
 				});
 			}
 
-			Client.logger.info("STARTING > cosmeitcs > outfits");
+			Client.logger.info("STARTING > cosmetics > outfits");
 			Outfits.loadOutfits();
 		}
 		
diff --git a/src/main/java/net/silentclient/client/mixin/mixins/RenderPlayerMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/RenderPlayerMixin.java
index 1562811..25f4e4b 100644
--- a/src/main/java/net/silentclient/client/mixin/mixins/RenderPlayerMixin.java
+++ b/src/main/java/net/silentclient/client/mixin/mixins/RenderPlayerMixin.java
@@ -55,7 +55,7 @@ public abstract class RenderPlayerMixin extends RendererLivingEntity<AbstractCli
         }
 
         if(nametagMessages) {
-            renderLivingLabel(entityIn, "§r" + ((AbstractClientPlayerExt) entityIn).silent$getAccount().getNametagMessage() + "§r", x, y + ((double) ((float) getFontRendererFromRenderManager().FONT_HEIGHT * 1.15F * p_177069_9_)), z, 64);
+            renderLivingLabel(entityIn, "§r" + ((AbstractClientPlayerExt) entityIn).silent$getAccount().getNametagMessage().replaceAll("&", "§") + "§r", x, y + ((double) ((float) getFontRendererFromRenderManager().FONT_HEIGHT * 1.15F * p_177069_9_)), z, 64);
         }
     }