Formatting Codes as Text Formatting

because idk,,...

Author: moehreag

src/main/java/io/github/axolotlclient/AxolotlClient.java

@@ -30,6 +30,8 @@
 import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourcePack;
 import net.minecraft.scoreboard.Team;
+import net.minecraft.text.LiteralText;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -164,10 +166,11 @@ public static void addBadge(Entity entity, MatrixStack matrices){
 				RenderSystem.color4f(1, 1, 1, 1);
 
 				if(AxolotlClient.CONFIG.customBadge.get()) {
+                    LiteralText badgeText = Util.formatFromCodes(AxolotlClient.CONFIG.badgeText.get());
 					if(AxolotlClient.CONFIG.useShadows.get()) {
-						MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, AxolotlClient.CONFIG.badgeText.get(), x, 0, -1);
+						MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, badgeText, x, 0, -1);
 					} else {
-						MinecraftClient.getInstance().textRenderer.draw(matrices, AxolotlClient.CONFIG.badgeText.get(), x, 0, -1);
+						MinecraftClient.getInstance().textRenderer.draw(matrices, badgeText, x, 0, -1);
 					}
 				}
 				else DrawableHelper.drawTexture(matrices, x, 0, 0, 0, 8, 8, 8, 8);

src/main/java/io/github/axolotlclient/mixin/SharedConstantsMixin.java

@@ -0,0 +1,20 @@
+package io.github.axolotlclient.mixin;
+
+import io.github.axolotlclient.config.screen.OptionsScreenBuilder;
+import net.minecraft.SharedConstants;
+import net.minecraft.client.MinecraftClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(SharedConstants.class)
+public abstract class SharedConstantsMixin {
+
+    @Inject(method = "isValidChar", at = @At("HEAD"), cancellable = true)
+    private static void noInvalidChars(char chr, CallbackInfoReturnable<Boolean> cir){
+        if(chr=='§' && MinecraftClient.getInstance().currentScreen instanceof OptionsScreenBuilder){
+            cir.setReturnValue(true);
+        }
+    }
+}

src/main/java/io/github/axolotlclient/modules/tnttime/TntTime.java

@@ -32,7 +32,7 @@ public void init() {
 
     @Override
     public void tick() {
-        if(decimalPlaces.get() != decimals){
+        if(decimalPlaces.get() != decimals || format == null){
             StringBuilder string = new StringBuilder("#0");
             if (decimalPlaces.get() > 0) {
                 string.append(".");

src/main/java/io/github/axolotlclient/util/Util.java

@@ -24,12 +24,15 @@
 import net.minecraft.scoreboard.ScoreboardObjective;
 import net.minecraft.scoreboard.ScoreboardPlayerScore;
 import net.minecraft.scoreboard.Team;
+import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.math.Vec3d;
 import org.lwjgl.opengl.GL11;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -91,6 +94,33 @@ else if (MinecraftClient.getInstance().getCurrentServerEntry() != null && Minecr
 		return game;
 	}
 
+    public static LiteralText formatFromCodes(String formattedString){
+        LiteralText text = new LiteralText("");
+        String[] arr = formattedString.split("§");
+
+        List<Formatting> modifiers = new ArrayList<>();
+        for (String s:arr){
+
+            Formatting formatting = Formatting.byCode(s.length()>0 ? s.charAt(0) : 0);
+            if(formatting != null && formatting.isModifier()){
+                modifiers.add(formatting);
+                continue;
+            }
+            LiteralText part = new LiteralText(s.length()>0 ? s.substring(1):"");
+            if(formatting != null){
+                part.formatted(formatting);
+
+                if(!modifiers.isEmpty()){
+                    modifiers.forEach(part::formatted);
+                    modifiers.clear();
+                }
+            }
+            text.append(part);
+        }
+
+        return text;
+    }
+
     public static double calculateDistance(Vec3d pos1, Vec3d pos2){
         return calculateDistance(pos1.x, pos2.x, pos1.y, pos2.y, pos1.z, pos2.z);
     }

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

@@ -219,6 +219,8 @@
 	"green": "Green",
 	"blue": "Blue",
 
+	"freelook": "Freelook",
+
 	"disableReason.crash.tooltip": "This option has been disabled <br>because it would crash your game.",
 	"disableReason.ban_reason.tooltip": "This option is disabled <br>because it is known to be bannable on your current server.",
 

src/main/resources/axolotlclient.mixins.json

@@ -46,7 +46,8 @@
 		"MixinTitleScreen",
 		"MixinTntEntityRenderer",
 		"MixinWorldListWidgetEntry",
-		"MixinWorldRenderer"
+		"MixinWorldRenderer",
+		"SharedConstantsMixin"
 	],
 	"server": [],
 	"injectors": {