Skip to content

Commit 4932f32

Browse files
Joo200Joo200
committed
Cleanup sending messages, use ANSI Serializer for CLI
1 parent 9f530d5 commit 4932f32

File tree

17 files changed

+37
-327
lines changed

17 files changed

+37
-327
lines changed

‎worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCommandSender.java‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import com.sk89q.worldedit.extension.platform.AbstractCommandBlockActor;
2424
import com.sk89q.worldedit.session.SessionKey;
2525
import com.sk89q.worldedit.util.adventure.text.Component;
26-
import com.sk89q.worldedit.util.adventure.text.format.NamedTextColor;
2726
import com.sk89q.worldedit.util.auth.AuthorizationException;
2827
import com.sk89q.worldedit.util.formatting.WorldEditText;
2928
import org.bukkit.Bukkit;
@@ -64,30 +63,6 @@ public void printRaw(String msg) {
6463
}
6564
}
6665

67-
@Override
68-
@Deprecated
69-
public void print(String msg) {
70-
for (String part : msg.split("\n")) {
71-
print(Component.text(part, NamedTextColor.LIGHT_PURPLE));
72-
}
73-
}
74-
75-
@Override
76-
@Deprecated
77-
public void printDebug(String msg) {
78-
for (String part : msg.split("\n")) {
79-
print(Component.text(part, NamedTextColor.GRAY));
80-
}
81-
}
82-
83-
@Override
84-
@Deprecated
85-
public void printError(String msg) {
86-
for (String part : msg.split("\n")) {
87-
print(Component.text(part, NamedTextColor.RED));
88-
}
89-
}
90-
9166
@Override
9267
public void print(Component component) {
9368
plugin.getAudiences().sender(sender).sendMessage(WorldEditText.format(component, getLocale()));

‎worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,30 +71,6 @@ public void printRaw(String msg) {
7171
}
7272
}
7373

74-
@Override
75-
@Deprecated
76-
public void print(String msg) {
77-
for (String part : msg.split("\n")) {
78-
sender.sendMessage("§d" + part);
79-
}
80-
}
81-
82-
@Override
83-
@Deprecated
84-
public void printDebug(String msg) {
85-
for (String part : msg.split("\n")) {
86-
sender.sendMessage("§7" + part);
87-
}
88-
}
89-
90-
@Override
91-
@Deprecated
92-
public void printError(String msg) {
93-
for (String part : msg.split("\n")) {
94-
sender.sendMessage("§c" + part);
95-
}
96-
}
97-
9874
@Override
9975
public void print(Component component) {
10076
plugin.getAudiences().sender(sender).sendMessage(WorldEditText.format(component, getLocale()));

‎worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -112,30 +112,6 @@ public void printRaw(String msg) {
112112
}
113113
}
114114

115-
@Override
116-
@Deprecated
117-
public void print(String msg) {
118-
for (String part : msg.split("\n")) {
119-
player.sendMessage("§d" + part);
120-
}
121-
}
122-
123-
@Override
124-
@Deprecated
125-
public void printDebug(String msg) {
126-
for (String part : msg.split("\n")) {
127-
player.sendMessage("§7" + part);
128-
}
129-
}
130-
131-
@Override
132-
@Deprecated
133-
public void printError(String msg) {
134-
for (String part : msg.split("\n")) {
135-
player.sendMessage("§c" + part);
136-
}
137-
}
138-
139115
@Override
140116
public void print(Component component) {
141117
plugin.getAudiences().player(player).sendMessage(WorldEditText.format(component, getLocale()));

‎worldedit-cli/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies {
1919
"annotationProcessor"(project(":worldedit-libs:core:ap"))
2020
"annotationProcessor"("com.google.guava:guava:${Versions.GUAVA}")
2121
"api"(project(":worldedit-core"))
22+
"api"(project(":worldedit-libs:cli"))
2223
"implementation"(platform("org.apache.logging.log4j:log4j-bom:${Versions.LOG4J}") {
2324
because("We control Log4J on this platform")
2425
})

‎worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLICommandSender.java‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.sk89q.worldedit.session.SessionKey;
2626
import com.sk89q.worldedit.util.FileDialogUtil;
2727
import com.sk89q.worldedit.util.adventure.text.Component;
28-
import com.sk89q.worldedit.util.adventure.text.serializer.plain.PlainTextComponentSerializer;
28+
import com.sk89q.worldedit.util.adventure.text.serializer.ansi.ANSIComponentSerializer;
2929
import com.sk89q.worldedit.util.auth.AuthorizationException;
3030
import com.sk89q.worldedit.util.formatting.WorldEditText;
3131
import org.apache.logging.log4j.Logger;
@@ -72,38 +72,19 @@ public void printRaw(String msg) {
7272
}
7373
}
7474

75-
private static final String ANSI_PURPLE = "\u001B[35m";
76-
private static final String ANSI_RED = "\u001B[31m";
77-
private static final String ANSI_GREEN = "\u001B[32m";
78-
private static final String ANSI_RESET = "\u001B[0m";
79-
8075
@Override
81-
@Deprecated
82-
public void print(String msg) {
83-
for (String part : msg.split("\n")) {
84-
sender.info(ANSI_PURPLE + part + ANSI_RESET);
85-
}
76+
public void printError(Component component) {
77+
sender.error(ANSIComponentSerializer.ansi().serialize(WorldEditText.format(component, getLocale())));
8678
}
8779

8880
@Override
89-
@Deprecated
90-
public void printDebug(String msg) {
91-
for (String part : msg.split("\n")) {
92-
sender.debug(ANSI_GREEN + part + ANSI_RESET);
93-
}
94-
}
95-
96-
@Override
97-
@Deprecated
98-
public void printError(String msg) {
99-
for (String part : msg.split("\n")) {
100-
sender.error(ANSI_RED + part + ANSI_RESET);
101-
}
81+
public void printDebug(Component component) {
82+
sender.debug(ANSIComponentSerializer.ansi().serialize(WorldEditText.format(component, getLocale())));
10283
}
10384

10485
@Override
10586
public void print(Component component) {
106-
print(PlainTextComponentSerializer.plainText().serialize(WorldEditText.format(component, getLocale())));
87+
sender.info(ANSIComponentSerializer.ansi().serialize(WorldEditText.format(component, getLocale())));
10788
}
10889

10990
@Override

‎worldedit-cli/src/main/java/com/sk89q/worldedit/cli/data/FileRegistries.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public void loadDataFiles() {
4848
ResourceLoader resourceLoader = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.CONFIGURATION).getResourceLoader();
4949
try {
5050
URL url = resourceLoader.getResource(FileRegistries.class, app.getPlatform().getDataVersion() + ".json");
51+
if (url == null) {
52+
throw new RuntimeException("The provided file " + app.getPlatform().getDataVersion() + " is not compatible with this version of WorldEdit-CLI. Please update or report this.");
53+
}
5154
this.dataFile = gson.fromJson(Resources.toString(url, StandardCharsets.UTF_8), DataFile.class);
5255
} catch (IOException e) {
5356
throw new RuntimeException("The provided file is not compatible with this version of WorldEdit-CLI. Please update or report this.");

‎worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Actor.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ default String getDisplayName() {
6767
* @deprecated Use component-based functions (printDebug)
6868
*/
6969
@Deprecated
70-
void printDebug(String msg);
70+
default void printDebug(String msg) {
71+
for (String part : msg.split("\n")) {
72+
print(Component.text(part, NamedTextColor.GRAY));
73+
}
74+
}
7175

7276
/**
7377
* Print a WorldEdit message.
@@ -76,7 +80,11 @@ default String getDisplayName() {
7680
* @deprecated Use component-based functions (printInfo)
7781
*/
7882
@Deprecated
79-
void print(String msg);
83+
default void print(String msg) {
84+
for (String part : msg.split("\n")) {
85+
print(Component.text(part, NamedTextColor.LIGHT_PURPLE));
86+
}
87+
}
8088

8189
/**
8290
* Print a WorldEdit error.
@@ -85,7 +93,11 @@ default String getDisplayName() {
8593
* @deprecated Use component-based functions (printError)
8694
*/
8795
@Deprecated
88-
void printError(String msg);
96+
default void printError(String msg) {
97+
for (String part : msg.split("\n")) {
98+
print(Component.text(part, NamedTextColor.RED));
99+
}
100+
}
89101

90102
/**
91103
* Print a WorldEdit error.

‎worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlayerProxy.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -119,24 +119,6 @@ public void printRaw(String msg) {
119119
basePlayer.print(Component.text(msg));
120120
}
121121

122-
@Override
123-
@Deprecated
124-
public void printDebug(String msg) {
125-
basePlayer.printDebug(Component.text(msg));
126-
}
127-
128-
@Override
129-
@Deprecated
130-
public void print(String msg) {
131-
basePlayer.printInfo(Component.text(msg));
132-
}
133-
134-
@Override
135-
@Deprecated
136-
public void printError(String msg) {
137-
basePlayer.printError(Component.text(msg));
138-
}
139-
140122
@Override
141123
public void print(Component component) {
142124
basePlayer.print(component);

‎worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockCommandSender.java‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import net.minecraft.world.level.BaseCommandBlock;
3434
import net.minecraft.world.level.block.Block;
3535
import net.minecraft.world.level.block.Blocks;
36+
import org.jetbrains.annotations.NotNull;
3637

3738
import java.nio.charset.StandardCharsets;
3839
import java.util.Locale;
@@ -65,27 +66,9 @@ public void printRaw(String msg) {
6566
}
6667

6768
@Override
68-
@Deprecated
69-
public void printDebug(String msg) {
70-
sendColorized(msg, ChatFormatting.GRAY);
71-
}
72-
73-
@Override
74-
@Deprecated
75-
public void print(String msg) {
76-
sendColorized(msg, ChatFormatting.LIGHT_PURPLE);
77-
}
78-
79-
@Override
80-
@Deprecated
81-
public void printError(String msg) {
82-
sendColorized(msg, ChatFormatting.RED);
83-
}
84-
85-
@Override
86-
public void print(Component component) {
87-
sendMessage(net.minecraft.network.chat.Component.Serializer.fromJson(
88-
GsonComponentSerializer.gson().serialize(WorldEditText.format(component, getLocale()))
69+
public void print(@NotNull Component component) {
70+
this.sender.sendSystemMessage(net.minecraft.network.chat.Component.Serializer.fromJson(
71+
GsonComponentSerializer.gson().serialize(WorldEditText.format(component, getLocale()))
8972
));
9073
}
9174

‎worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricCommandSender.java‎

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.sk89q.worldedit.util.adventure.text.Component;
2626
import com.sk89q.worldedit.util.adventure.text.serializer.gson.GsonComponentSerializer;
2727
import com.sk89q.worldedit.util.formatting.WorldEditText;
28-
import net.minecraft.ChatFormatting;
2928
import net.minecraft.commands.CommandSourceStack;
3029

3130
import java.util.Locale;
@@ -65,47 +64,17 @@ public String getName() {
6564
@Deprecated
6665
public void printRaw(String msg) {
6766
for (String part : msg.split("\n")) {
68-
sendMessage(net.minecraft.network.chat.Component.literal(part));
67+
print(Component.text(part));
6968
}
7069
}
7170

72-
@Override
73-
@Deprecated
74-
public void printDebug(String msg) {
75-
sendColorized(msg, ChatFormatting.GRAY);
76-
}
77-
78-
@Override
79-
@Deprecated
80-
public void print(String msg) {
81-
sendColorized(msg, ChatFormatting.LIGHT_PURPLE);
82-
}
83-
84-
@Override
85-
@Deprecated
86-
public void printError(String msg) {
87-
sendColorized(msg, ChatFormatting.RED);
88-
}
89-
9071
@Override
9172
public void print(Component component) {
92-
sendMessage(net.minecraft.network.chat.Component.Serializer.fromJson(
93-
GsonComponentSerializer.gson().serialize(WorldEditText.format(component, getLocale()))
73+
this.sender.sendSystemMessage(net.minecraft.network.chat.Component.Serializer.fromJson(
74+
GsonComponentSerializer.gson().serialize(WorldEditText.format(component, getLocale()))
9475
));
9576
}
9677

97-
private void sendColorized(String msg, ChatFormatting formatting) {
98-
for (String part : msg.split("\n")) {
99-
var component = net.minecraft.network.chat.Component.literal(part);
100-
component.withStyle(formatting);
101-
sendMessage(component);
102-
}
103-
}
104-
105-
private void sendMessage(net.minecraft.network.chat.Component textComponent) {
106-
this.sender.sendSystemMessage(textComponent);
107-
}
108-
10978
@Override
11079
public String[] getGroups() {
11180
return new String[0];

0 commit comments

Comments
 (0)