Skip to content

allow themes to change the chat prefix #5951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crosby-moe wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −4
Open

allow themes to change the chat prefix #5951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/gui/GuiTheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/meteordevelopment/meteorclient/utils/player/ChatUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -204,16 +205,16 @@ private static Text getPrefix() {
}
}

if (className == null) return PREFIX;
if (className == null) return GuiThemes.get().prefix();

for (Pair<String, Supplier<Text>> 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) {
Expand Down