Skip to content

Commit accf3d8

Browse files
committed
Support simplified text format for Text override
1 parent 42a4aff commit accf3d8

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/main/java/com/lx862/svrutil/feature/TextOverrideFeature.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.google.gson.JsonElement;
44
import com.google.gson.JsonObject;
5+
import eu.pb4.placeholders.api.TextParserUtils;
56
import net.minecraft.text.Text;
67

78
public class TextOverrideFeature extends Feature {
@@ -17,12 +18,12 @@ public void readConfig(JsonObject jsonObject) {
1718
if(jsonObject.has("whitelistedMessage")) {
1819
JsonElement element = jsonObject.get("whitelistedMessage");
1920
try {
20-
whitelistedMessage = Text.Serializer.fromJson(element.getAsString());
21+
whitelistedMessage = Text.Serializer.fromJson(element);
2122
} catch (Exception ignored) {
2223
}
2324

2425
try {
25-
whitelistedMessage = Text.Serializer.fromJson(element);
26+
whitelistedMessage = TextParserUtils.formatText(element.getAsString());
2627
} catch (Exception ignored) {
2728
}
2829
}
@@ -31,11 +32,7 @@ public void readConfig(JsonObject jsonObject) {
3132
@Override
3233
public JsonObject generateConfig() {
3334
JsonObject jsonObject = super.generateConfig();
34-
if(whitelistedMessage == null) {
35-
jsonObject.addProperty("whitelistedMessage", "You are not whitelisted on the server.");
36-
} else {
37-
jsonObject.addProperty("whitelistedMessage", Text.Serializer.toJson(whitelistedMessage));
38-
}
35+
jsonObject.addProperty("whitelistedMessage", "You are not whitelisted on the server.");
3936
return jsonObject;
4037
}
4138

0 commit comments

Comments
 (0)