firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[FEAT] MiniMessage formatting support

Browse Source
This commit is contained in:
HypherionSA
2024-08-31 12:19:08 +02:00
parent c808f53841
commit 6f6c93c6ee
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java
View File

@@ -6,6 +6,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier;
import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer;
import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.text.serializer.json.JSONOptions; import net.kyori.adventure.text.serializer.json.JSONOptions;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
@@ -23,6 +24,8 @@ public class ChatUtils {
JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion())
).build(); ).build();
private static final MiniMessage miniMessage = MiniMessage.miniMessage();
public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) {
final String serialised = adventureSerializer.serialize(inComponent); final String serialised = adventureSerializer.serialize(inComponent);
return Component.Serializer.fromJson(serialised, getRegistryLookup()); return Component.Serializer.fromJson(serialised, getRegistryLookup());
@@ -109,7 +112,8 @@ public class ChatUtils {
} }
public static net.kyori.adventure.text.Component format(String value) { public static net.kyori.adventure.text.Component format(String value) {
return net.kyori.adventure.text.Component.translatable(convertFormattingCodes(value)); value = convertFormattingCodes(value);
return miniMessage.deserializeOr(value, net.kyori.adventure.text.Component.translatable(value));
} }
private static String convertFormattingCodes(String input) { private static String convertFormattingCodes(String input) {

1
build.gradle
View File

@@ -62,6 +62,7 @@ subprojects {
shade "me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:${discord_formatter}" shade "me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:${discord_formatter}"
shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-api:${adventure}"
shade "net.kyori:adventure-text-serializer-gson:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}"
shade "net.kyori:adventure-text-minimessage:${adventure}"
compileOnly 'net.luckperms:api:5.4' compileOnly 'net.luckperms:api:5.4'
compileOnly("org.projectlombok:lombok:${lombok}") compileOnly("org.projectlombok:lombok:${lombok}")

2
gradle.properties
View File

@@ -26,7 +26,7 @@ neoforge_version=0.0-beta
# Dependencies # Dependencies
moon_config=1.0.9 moon_config=1.0.9
lombok=1.18.32 lombok=1.18.32
adventure=4.16.0 adventure=4.17.0
rpc_sdk=1.0 rpc_sdk=1.0
discord_formatter=2.0.0 discord_formatter=2.0.0