diff --git a/src/main/java/meteordevelopment/meteorclient/gui/GuiTheme.java b/src/main/java/meteordevelopment/meteorclient/gui/GuiTheme.java index 2b52425f84..1ffb452857 100644 --- a/src/main/java/meteordevelopment/meteorclient/gui/GuiTheme.java +++ b/src/main/java/meteordevelopment/meteorclient/gui/GuiTheme.java @@ -27,10 +27,12 @@ import meteordevelopment.meteorclient.utils.misc.ISerializable; import meteordevelopment.meteorclient.utils.misc.Keybind; import meteordevelopment.meteorclient.utils.misc.Names; +import meteordevelopment.meteorclient.utils.player.ChatUtils; import meteordevelopment.meteorclient.utils.render.color.Color; import net.minecraft.client.gui.screen.Screen; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; +import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import java.util.HashMap; @@ -282,6 +284,10 @@ public WidgetScreen proxiesScreen() { public abstract boolean hideHUD(); + public Text prefix() { + return ChatUtils.getMeteorPrefix(); + } + public double textWidth(String text, int length, boolean title) { return scale(textRenderer().getWidth(text, length, false) * (title ? TITLE_TEXT_SCALE : 1)); } diff --git a/src/main/java/meteordevelopment/meteorclient/utils/player/ChatUtils.java b/src/main/java/meteordevelopment/meteorclient/utils/player/ChatUtils.java index c3e21511ad..deb614dbec 100644 --- a/src/main/java/meteordevelopment/meteorclient/utils/player/ChatUtils.java +++ b/src/main/java/meteordevelopment/meteorclient/utils/player/ChatUtils.java @@ -7,6 +7,7 @@ import com.mojang.brigadier.StringReader; import meteordevelopment.meteorclient.MeteorClient; +import meteordevelopment.meteorclient.gui.GuiThemes; import meteordevelopment.meteorclient.mixininterface.IChatHud; import meteordevelopment.meteorclient.pathing.BaritoneUtils; import meteordevelopment.meteorclient.systems.config.Config; @@ -182,7 +183,7 @@ private static MutableText getCustomPrefix(String prefixTitle, Formatting prefix private static Text getPrefix() { if (customPrefixes.isEmpty()) { forcedPrefixClassName = null; - return PREFIX; + return GuiThemes.get().prefix(); } boolean foundChatUtils = false; @@ -204,16 +205,16 @@ private static Text getPrefix() { } } - if (className == null) return PREFIX; + if (className == null) return GuiThemes.get().prefix(); for (Pair> pair : customPrefixes) { if (className.startsWith(pair.getLeft())) { Text prefix = pair.getRight().get(); - return prefix != null ? prefix : PREFIX; + return prefix != null ? prefix : GuiThemes.get().prefix(); } } - return PREFIX; + return GuiThemes.get().prefix(); } private static MutableText formatMsg(String message, Formatting defaultColor) {