Skip to content

Commit d49a839

Browse files
crosby-moecrosby-moe
committed
do some impl with new messagebuilder api
1 parent f9e8373 commit d49a839

22 files changed

+216
-232
lines changed

‎src/main/java/meteordevelopment/meteorclient/commands/Command.java‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
import com.mojang.brigadier.builder.RequiredArgumentBuilder;
1212
import meteordevelopment.meteorclient.MeteorClient;
1313
import meteordevelopment.meteorclient.systems.config.Config;
14-
import meteordevelopment.meteorclient.utils.player.ChatUtils;
14+
import meteordevelopment.meteorclient.utils.misc.text.MessageBuilder;
15+
import meteordevelopment.meteorclient.utils.misc.text.MessageKind;
1516
import net.minecraft.client.MinecraftClient;
1617
import net.minecraft.command.CommandRegistryAccess;
1718
import net.minecraft.command.CommandSource;
@@ -81,39 +82,24 @@ public String toString(String... args) {
8182
return base.toString();
8283
}
8384

84-
public void info(Text message) {
85-
ChatUtils.forceNextPrefixClass(getClass());
86-
ChatUtils.sendMsg(translationKey, message);
85+
public MessageBuilder info(Text message) {
86+
return MessageBuilder.create().setSource(this).setTranslationContext(this.translationKey)
87+
.body(message).setKind(MessageKind.Info);
8788
}
8889

89-
public void info(String messageKey, Object... args) {
90-
ChatUtils.forceNextPrefixClass(getClass());
91-
ChatUtils.infoPrefix(translationKey, translationKey + ".info." + messageKey, args);
90+
public MessageBuilder info(String message, Object... args) {
91+
return MessageBuilder.create().setSource(this).setTranslationContext(this.translationKey)
92+
.body(message, args).setKind(MessageKind.Info);
9293
}
9394

94-
public void infoRaw(String message, Object... args) {
95-
ChatUtils.forceNextPrefixClass(getClass());
96-
ChatUtils.infoPrefixRaw(translationKey, message, args);
95+
public MessageBuilder warning(String message, Object... args) {
96+
return MessageBuilder.create().setSource(this).setTranslationContext(this.translationKey)
97+
.body(message, args).setKind(MessageKind.Warning);
9798
}
9899

99-
public void warning(String messageKey, Object... args) {
100-
ChatUtils.forceNextPrefixClass(getClass());
101-
ChatUtils.warningPrefix(translationKey, translationKey + ".warning." + messageKey, args);
102-
}
103-
104-
public void warningRaw(String message, Object... args) {
105-
ChatUtils.forceNextPrefixClass(getClass());
106-
ChatUtils.warningPrefixRaw(translationKey, message, args);
107-
}
108-
109-
public void error(String messageKey, Object... args) {
110-
ChatUtils.forceNextPrefixClass(getClass());
111-
ChatUtils.errorPrefix(translationKey, translationKey + ".error." + messageKey, args);
112-
}
113-
114-
public void errorRaw(String message, Object... args) {
115-
ChatUtils.forceNextPrefixClass(getClass());
116-
ChatUtils.errorPrefixRaw(translationKey, message, args);
100+
public MessageBuilder error(String message, Object... args) {
101+
return MessageBuilder.create().setSource(this).setTranslationContext(this.translationKey)
102+
.body(message, args).setKind(MessageKind.Error);
117103
}
118104

119105
public MutableText translatable(String string, Object... args) {

‎src/main/java/meteordevelopment/meteorclient/commands/commands/BindCommand.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import meteordevelopment.meteorclient.commands.arguments.ModuleArgumentType;
1111
import meteordevelopment.meteorclient.systems.modules.Module;
1212
import meteordevelopment.meteorclient.systems.modules.Modules;
13-
import meteordevelopment.meteorclient.utils.player.ChatUtils;
1413
import net.minecraft.command.CommandSource;
1514

1615
public class BindCommand extends Command {
@@ -25,8 +24,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
2524
Modules.get().setModuleToBind(module);
2625
Modules.get().awaitKeyRelease();
2726

28-
ChatUtils.forceNextPrefixClass(module.getClass());
29-
ChatUtils.infoPrefix(module.getTranslationKey(), this.translationKey + ".info.press_key");
27+
this.info("press_key").prefix(module.getTitleText()).send();
3028

3129
return SINGLE_SUCCESS;
3230
}));

‎src/main/java/meteordevelopment/meteorclient/commands/commands/BindsCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import meteordevelopment.meteorclient.commands.Command;
1010
import meteordevelopment.meteorclient.systems.modules.Module;
1111
import meteordevelopment.meteorclient.systems.modules.Modules;
12-
import meteordevelopment.meteorclient.utils.player.ChatUtils;
12+
import meteordevelopment.meteorclient.utils.misc.text.MessageBuilder;
1313
import net.minecraft.command.CommandSource;
1414
import net.minecraft.text.HoverEvent;
1515
import net.minecraft.text.MutableText;
@@ -31,7 +31,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
3131
.filter(module -> module.keybind.isSet())
3232
.toList();
3333

34-
ChatUtils.info(translationKey + ".info.bound_modules", ChatUtils.highlight(modules.size()));
34+
this.info("bound_modules", MessageBuilder.highlight(modules.size())).send();
3535

3636
for (Module module : modules) {
3737
HoverEvent hoverEvent = new HoverEvent.ShowText(getTooltip(module));
@@ -47,7 +47,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
4747
key.setStyle(key.getStyle().withHoverEvent(hoverEvent));
4848
text.append(key.formatted(Formatting.GRAY));
4949

50-
ChatUtils.sendMsg(text);
50+
this.info(text).send();
5151
}
5252

5353
return SINGLE_SUCCESS;

‎src/main/java/meteordevelopment/meteorclient/commands/commands/CommandsCommand.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import meteordevelopment.meteorclient.commands.Command;
1010
import meteordevelopment.meteorclient.commands.Commands;
1111
import meteordevelopment.meteorclient.systems.config.Config;
12+
import meteordevelopment.meteorclient.utils.misc.text.MessageBuilder;
1213
import meteordevelopment.meteorclient.utils.player.ChatUtils;
1314
import net.minecraft.command.CommandSource;
1415
import net.minecraft.text.ClickEvent;
@@ -25,19 +26,19 @@ public CommandsCommand() {
2526
@Override
2627
public void build(LiteralArgumentBuilder<CommandSource> builder) {
2728
builder.executes(context -> {
28-
ChatUtils.info(translationKey + ".info.commands", ChatUtils.highlight(Commands.COMMANDS.size()));
29+
this.info("commands", MessageBuilder.highlight(Commands.COMMANDS.size())).send();
2930

30-
MutableText commands = Text.literal("");
31+
MutableText commands = Text.empty();
3132
Commands.COMMANDS.forEach(command -> commands.append(getCommandText(command)));
32-
ChatUtils.sendMsg(commands);
33+
this.info(commands).send();
3334

3435
return SINGLE_SUCCESS;
3536
});
3637
}
3738

3839
private MutableText getCommandText(Command command) {
3940
// Hover tooltip
40-
MutableText tooltip = Text.literal("");
41+
MutableText tooltip = Text.empty();
4142

4243
tooltip.append(command.getTitle().formatted(Formatting.BLUE, Formatting.BOLD)).append("\n");
4344

‎src/main/java/meteordevelopment/meteorclient/commands/commands/FakePlayerCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import meteordevelopment.meteorclient.systems.modules.player.FakePlayer;
1414
import meteordevelopment.meteorclient.utils.entity.fakeplayer.FakePlayerEntity;
1515
import meteordevelopment.meteorclient.utils.entity.fakeplayer.FakePlayerManager;
16-
import meteordevelopment.meteorclient.utils.player.ChatUtils;
16+
import meteordevelopment.meteorclient.utils.misc.text.MessageBuilder;
1717
import net.minecraft.command.CommandSource;
1818

1919
public class FakePlayerCommand extends Command {
@@ -43,12 +43,12 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
4343
.executes(context -> {
4444
FakePlayerEntity fp = FakePlayerArgumentType.get(context);
4545
if (fp == null || !FakePlayerManager.contains(fp)) {
46-
error("not_found");
46+
this.error("not_found").send();
4747
return SINGLE_SUCCESS;
4848
}
4949

5050
FakePlayerManager.remove(fp);
51-
info("removed", fp.getName().getString());
51+
this.info("removed", MessageBuilder.highlight(fp)).send();
5252

5353
return SINGLE_SUCCESS;
5454
})
@@ -64,8 +64,8 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
6464

6565
builder.then(literal("list")
6666
.executes(context -> {
67-
info("fake_players", ChatUtils.highlight(FakePlayerManager.count()));
68-
FakePlayerManager.forEach(fp -> info("(highlight)%s".formatted(fp.getName().getString())));
67+
this.info("fake_players", MessageBuilder.highlight(FakePlayerManager.count())).send();
68+
FakePlayerManager.forEach(fp -> this.info(MessageBuilder.highlight(fp)).send());
6969
return SINGLE_SUCCESS;
7070
})
7171
);

‎src/main/java/meteordevelopment/meteorclient/commands/commands/FriendsCommand.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
import meteordevelopment.meteorclient.commands.arguments.PlayerListEntryArgumentType;
1313
import meteordevelopment.meteorclient.systems.friends.Friend;
1414
import meteordevelopment.meteorclient.systems.friends.Friends;
15-
import meteordevelopment.meteorclient.utils.player.ChatUtils;
15+
import meteordevelopment.meteorclient.utils.misc.text.MessageBuilder;
1616
import net.minecraft.command.CommandSource;
17-
import net.minecraft.util.Formatting;
1817

1918
public class FriendsCommand extends Command {
2019
public FriendsCommand() {
@@ -30,7 +29,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
3029
Friend friend = new Friend(profile.name(), profile.id());
3130

3231
if (Friends.get().add(friend)) {
33-
ChatUtils.sendMsg(friend.hashCode(), Formatting.GRAY, translationKey + ".info.added", friend.getName());
32+
this.info("added", friend.getName()).setId(friend.hashCode()).send();
3433
}
3534
else error("already_friends");
3635

@@ -44,25 +43,24 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
4443
.executes(context -> {
4544
Friend friend = FriendArgumentType.get(context);
4645
if (friend == null) {
47-
error("not_friends");
46+
this.error("not_friends").send();
4847
return SINGLE_SUCCESS;
4948
}
5049

5150
if (Friends.get().remove(friend)) {
52-
ChatUtils.sendMsg(friend.hashCode(), Formatting.GRAY, translationKey + ".info.removed", friend.getName());
51+
this.info("removed", friend.getName()).setId(friend.hashCode()).send();
5352
}
54-
else error("failed");
53+
else this.error("failed").send();
5554

5655
return SINGLE_SUCCESS;
5756
})
5857
)
5958
);
6059

6160
builder.then(literal("list").executes(context -> {
62-
info("friends", ChatUtils.highlight(Friends.get().count()));
63-
Friends.get().forEach(friend -> ChatUtils.infoRaw("(highlight)%s".formatted(friend.getName())));
64-
return SINGLE_SUCCESS;
65-
})
66-
);
61+
this.info("friends", MessageBuilder.highlight(Friends.get().count())).send();
62+
Friends.get().forEach(friend -> this.info(MessageBuilder.highlight(friend.getName())).send());
63+
return SINGLE_SUCCESS;
64+
}));
6765
}
6866
}

‎src/main/java/meteordevelopment/meteorclient/commands/commands/InputCommand.java‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import meteordevelopment.meteorclient.commands.Command;
1313
import meteordevelopment.meteorclient.events.world.TickEvent;
1414
import meteordevelopment.meteorclient.mixin.KeyBindingAccessor;
15-
import meteordevelopment.meteorclient.utils.player.ChatUtils;
15+
import meteordevelopment.meteorclient.utils.misc.text.MessageBuilder;
1616
import meteordevelopment.orbit.EventHandler;
1717
import net.minecraft.client.option.KeyBinding;
18-
import net.minecraft.client.resource.language.I18n;
1918
import net.minecraft.command.CommandSource;
19+
import net.minecraft.text.Text;
2020

2121
import java.util.ArrayList;
2222
import java.util.List;
@@ -81,32 +81,38 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
8181
}
8282

8383
builder.then(literal("clear").executes(ctx -> {
84-
if (activeHandlers.isEmpty()) warning("no_handlers");
84+
if (activeHandlers.isEmpty()) this.warning("no_handlers").send();
8585
else {
86-
info("cleared_handlers");
86+
this.info("cleared_handlers").send();
8787
activeHandlers.forEach(MeteorClient.EVENT_BUS::unsubscribe);
8888
activeHandlers.clear();
8989
}
9090
return SINGLE_SUCCESS;
9191
}));
9292

9393
builder.then(literal("list").executes(ctx -> {
94-
if (activeHandlers.isEmpty()) warning("no_handlers");
94+
if (activeHandlers.isEmpty()) this.warning("no_handlers").send();
9595
else {
96-
info("active_handlers");
96+
this.info("active_handlers").send();
9797
for (int i = 0; i < activeHandlers.size(); i++) {
9898
KeypressHandler handler = activeHandlers.get(i);
99-
info("keypress_handler", ChatUtils.highlight(i), ChatUtils.highlight(I18n.translate(handler.key.getId())), ChatUtils.highlight(handler.ticks), ChatUtils.highlight(handler.totalTicks));
99+
this.info(
100+
"keypress_handler",
101+
MessageBuilder.highlight(i),
102+
MessageBuilder.highlight(Text.translatable(handler.key.getId())),
103+
MessageBuilder.highlight(handler.ticks),
104+
MessageBuilder.highlight(handler.key.getId())
105+
).send();
100106
}
101107
}
102108
return SINGLE_SUCCESS;
103109
}));
104110

105111
builder.then(literal("remove").then(argument("index", IntegerArgumentType.integer(0)).executes(ctx -> {
106112
int index = IntegerArgumentType.getInteger(ctx, "index");
107-
if (index >= activeHandlers.size()) warning("out_of_range");
113+
if (index >= activeHandlers.size()) this.warning("out_of_range").send();
108114
else {
109-
info("removed_handler");
115+
this.info("removed_handler").send();
110116
MeteorClient.EVENT_BUS.unsubscribe(activeHandlers.get(index));
111117
activeHandlers.remove(index);
112118
}

0 commit comments

Comments
 (0)