Skip to content

Commit 34cee95

Browse files
WhatDamonWhatDamon
committed
refactor: rename TranslationService to FormattingService
1 parent 432f572 commit 34cee95

3 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎src/main/java/org/damon233/performtrackermod/command/PtrackerCommand.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.damon233.performtrackermod.config.ConfigAccess;
3131
import org.damon233.performtrackermod.controller.TrackerController;
3232
import org.damon233.performtrackermod.data.SystemInfo;
33-
import org.damon233.performtrackermod.utils.TranslationService;
33+
import org.damon233.performtrackermod.utils.FormattingService;
3434

3535
import java.util.function.Consumer;
3636
import java.util.function.Supplier;
@@ -129,22 +129,22 @@ void sendSuccess(ServerCommandSource source, Object value) {
129129
Text name = Text.translatable(translationKey);
130130
Text val = value instanceof Boolean ?
131131
Text.translatable(Boolean.TRUE.equals(value) ? "performtracker.config.value.true" : "performtracker.config.value.false") :
132-
TranslationService.colorValue(String.valueOf(value));
132+
FormattingService.colorValue(String.valueOf(value));
133133
source.sendFeedback(() -> Text.translatable("performtracker.config.set.success",
134-
TranslationService.colorLabel(name.getString()), val), false);
134+
FormattingService.colorLabel(name.getString()), val), false);
135135
}
136136

137137
void sendInfo(ServerCommandSource source) {
138138
source.sendFeedback(() -> Text.translatable("performtracker.config.info",
139-
TranslationService.colorLabel(Text.translatable(translationKey).getString()),
140-
TranslationService.colorValue(String.valueOf(getter.get())),
141-
TranslationService.colorValue(String.valueOf(defaultGetter.get()))), false);
139+
FormattingService.colorLabel(Text.translatable(translationKey).getString()),
140+
FormattingService.colorValue(String.valueOf(getter.get())),
141+
FormattingService.colorValue(String.valueOf(defaultGetter.get()))), false);
142142
}
143143

144144
void sendLine(ServerCommandSource source) {
145-
MutableText current = TranslationService.colorValue(
145+
MutableText current = FormattingService.colorValue(
146146
Boolean.TRUE.equals(getter.get()) ? "true" : "false");
147-
MutableText def = TranslationService.colorValue(
147+
MutableText def = FormattingService.colorValue(
148148
Boolean.TRUE.equals(defaultGetter.get()) ? "true" : "false");
149149
source.sendFeedback(() -> Text.translatable(translationKey).append(": ").append(current).append(" (default: ").append(def).append(")"), false);
150150
}
@@ -243,30 +243,30 @@ public static void register() {
243243
ptracker.then(CommandManager.literal("deviceinfo").executes(ctx -> {
244244
SystemInfo info = SystemInfoCollector.collect();
245245

246-
MutableText title = TranslationService.colorLabel(Text.translatable("performtracker.device.title").getString());
246+
MutableText title = FormattingService.colorLabel(Text.translatable("performtracker.device.title").getString());
247247
String unknown = Text.translatable("performtracker.device.unknown").getString();
248-
MutableText typeLabel = TranslationService.colorLabel(Text.translatable("performtracker.device.type").getString());
249-
MutableText modelLabel = TranslationService.colorLabel(Text.translatable("performtracker.device.model").getString());
250-
MutableText cpuLabel = TranslationService.colorLabel(Text.translatable("performtracker.device.cpu").getString());
251-
MutableText gpuLabel = TranslationService.colorLabel(Text.translatable("performtracker.device.gpu").getString());
252-
MutableText coresLabel = TranslationService.colorLabel(Text.translatable("performtracker.device.cpu_cores").getString());
253-
MutableText memLabel = TranslationService.colorLabel(Text.translatable("performtracker.device.memory").getString());
254-
MutableText osLabel = TranslationService.colorLabel(Text.translatable("performtracker.device.os").getString());
255-
MutableText javaLabel = TranslationService.colorLabel(Text.translatable("performtracker.device.java").getString());
248+
MutableText typeLabel = FormattingService.colorLabel(Text.translatable("performtracker.device.type").getString());
249+
MutableText modelLabel = FormattingService.colorLabel(Text.translatable("performtracker.device.model").getString());
250+
MutableText cpuLabel = FormattingService.colorLabel(Text.translatable("performtracker.device.cpu").getString());
251+
MutableText gpuLabel = FormattingService.colorLabel(Text.translatable("performtracker.device.gpu").getString());
252+
MutableText coresLabel = FormattingService.colorLabel(Text.translatable("performtracker.device.cpu_cores").getString());
253+
MutableText memLabel = FormattingService.colorLabel(Text.translatable("performtracker.device.memory").getString());
254+
MutableText osLabel = FormattingService.colorLabel(Text.translatable("performtracker.device.os").getString());
255+
MutableText javaLabel = FormattingService.colorLabel(Text.translatable("performtracker.device.java").getString());
256256
String typeValue = Text.translatable("performtracker.device.type." + info.deviceType().getCode()).getString();
257257

258258
ctx.getSource().sendFeedback(() -> title, false);
259-
ctx.getSource().sendFeedback(() -> typeLabel.append(TranslationService.colorValue(typeValue)), false);
260-
ctx.getSource().sendFeedback(() -> modelLabel.append(TranslationService.colorValue(info.deviceModel() != null ? info.deviceModel() : unknown)), false);
261-
ctx.getSource().sendFeedback(() -> cpuLabel.append(TranslationService.colorValue(info.cpuName() != null ? info.cpuName() : unknown)), false);
262-
ctx.getSource().sendFeedback(() -> gpuLabel.append(TranslationService.colorValue(info.gpuName() != null ? info.gpuName() : unknown)), false);
263-
ctx.getSource().sendFeedback(() -> coresLabel.append(TranslationService.colorValue(String.valueOf(info.cpuCores()))), false);
264-
ctx.getSource().sendFeedback(() -> memLabel.append(TranslationService.colorValue(SystemInfo.formatBytes(info.totalMemoryBytes()))), false);
265-
ctx.getSource().sendFeedback(() -> osLabel.append(TranslationService.colorValue(info.osName() + " " + info.osVersion() + " (" + info.osArch() + ")")), false);
266-
ctx.getSource().sendFeedback(() -> javaLabel.append(TranslationService.colorValue(info.javaVersion())), false);
259+
ctx.getSource().sendFeedback(() -> typeLabel.append(FormattingService.colorValue(typeValue)), false);
260+
ctx.getSource().sendFeedback(() -> modelLabel.append(FormattingService.colorValue(info.deviceModel() != null ? info.deviceModel() : unknown)), false);
261+
ctx.getSource().sendFeedback(() -> cpuLabel.append(FormattingService.colorValue(info.cpuName() != null ? info.cpuName() : unknown)), false);
262+
ctx.getSource().sendFeedback(() -> gpuLabel.append(FormattingService.colorValue(info.gpuName() != null ? info.gpuName() : unknown)), false);
263+
ctx.getSource().sendFeedback(() -> coresLabel.append(FormattingService.colorValue(String.valueOf(info.cpuCores()))), false);
264+
ctx.getSource().sendFeedback(() -> memLabel.append(FormattingService.colorValue(SystemInfo.formatBytes(info.totalMemoryBytes()))), false);
265+
ctx.getSource().sendFeedback(() -> osLabel.append(FormattingService.colorValue(info.osName() + " " + info.osVersion() + " (" + info.osArch() + ")")), false);
266+
ctx.getSource().sendFeedback(() -> javaLabel.append(FormattingService.colorValue(info.javaVersion())), false);
267267

268268
if (!SystemInfoCollector.isChipRulesValid()) {
269-
ctx.getSource().sendFeedback(() -> TranslationService.chatError("performtracker.error.chip_rules_modified"), false);
269+
ctx.getSource().sendFeedback(() -> FormattingService.chatError("performtracker.error.chip_rules_modified"), false);
270270
}
271271
return 1;
272272
}));

‎src/main/java/org/damon233/performtrackermod/controller/TrackerController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.damon233.performtrackermod.data.PerformanceMetrics;
3737
import org.damon233.performtrackermod.network.HttpService;
3838
import org.damon233.performtrackermod.network.JsonFormatter;
39-
import org.damon233.performtrackermod.utils.TranslationService;
39+
import org.damon233.performtrackermod.utils.FormattingService;
4040
import org.damon233.performtrackermod.writer.CsvWriter;
4141
import org.damon233.performtrackermod.writer.JsonWriter;
4242
import org.damon233.performtrackermod.writer.MetricsWriter;
@@ -117,7 +117,7 @@ public synchronized void start(MinecraftServer server) {
117117
HttpService httpService = PerformTracker.getHttpService();
118118
if (httpService != null && !httpService.tryStartServer()) {
119119
server.getPlayerManager().getPlayerList().forEach(player ->
120-
player.sendMessage(TranslationService.chatError("performtracker.error.http_server_failed", ConfigAccess.getLocalServerPort()))
120+
player.sendMessage(FormattingService.chatError("performtracker.error.http_server_failed", ConfigAccess.getLocalServerPort()))
121121
);
122122
}
123123
httpService.start();
@@ -217,7 +217,7 @@ private void outputMetrics() {
217217
long timestamp = System.currentTimeMillis();
218218

219219
if (ConfigAccess.isChatEnabled() && server != null) {
220-
MutableText chatMsg = TranslationService.chatWithMetrics(buildChatMessage(metrics));
220+
MutableText chatMsg = FormattingService.chatWithMetrics(buildChatMessage(metrics));
221221
server.getPlayerManager().getPlayerList().forEach(player ->
222222
player.sendMessage(chatMsg)
223223
);
@@ -273,7 +273,7 @@ private void addChatPart(String label, String value) {
273273
if (chatMessagePartCount >= chatMessageParts.length) {
274274
return;
275275
}
276-
chatMessageParts[chatMessagePartCount++] = Text.literal(label).withColor(0x888888).append(TranslationService.colorValue(value));
276+
chatMessageParts[chatMessagePartCount++] = Text.literal(label).withColor(0x888888).append(FormattingService.colorValue(value));
277277
}
278278

279279
private Object[] buildRowValues(PerformanceMetrics metrics) {

src/main/java/org/damon233/performtrackermod/utils/TranslationService.java renamed to src/main/java/org/damon233/performtrackermod/utils/FormattingService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import net.minecraft.text.Text;
2121
import net.minecraft.util.Formatting;
2222

23-
public class TranslationService {
23+
public class FormattingService {
2424
private static final String PREFIX = "performtracker.";
2525

2626
private static final MutableText PREFIX_TEXT = Text.literal("[").withColor(getColorValue(Formatting.DARK_GRAY))

0 commit comments

Comments
 (0)