diff --git a/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java index 508a905..ab49e4a 100644 --- a/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java @@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; 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.json.JSONOptions; import net.minecraft.ChatFormatting; @@ -20,6 +21,8 @@ public class ChatUtils { JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); return Component.Serializer.fromJson(serialised); @@ -96,7 +99,8 @@ public class ChatUtils { } 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) { diff --git a/1.18.2/build.gradle b/1.18.2/build.gradle index c222e4f..ccc15b3 100644 --- a/1.18.2/build.gradle +++ b/1.18.2/build.gradle @@ -62,6 +62,7 @@ subprojects { shade "me.hypherionmc.sdlink:mcdiscordformatter-1.18.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" + shade "net.kyori:adventure-text-minimessage:${adventure}" compileOnly 'net.luckperms:api:5.4' compileOnly("org.projectlombok:lombok:${lombok}") diff --git a/1.18.2/gradle.properties b/1.18.2/gradle.properties index dcfeeb3..1a6d6a8 100644 --- a/1.18.2/gradle.properties +++ b/1.18.2/gradle.properties @@ -23,7 +23,7 @@ forge_version=40.2.0 # Dependencies moon_config=1.0.9 lombok=1.18.32 -adventure=4.16.0 +adventure=4.17.0 rpc_sdk=1.0 discord_formatter=2.0.0 diff --git a/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java b/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java index 5759fde..089d04b 100644 --- a/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java @@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; 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.json.JSONOptions; import net.minecraft.ChatFormatting; @@ -17,6 +18,8 @@ public class ChatUtils { JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); return Component.Serializer.fromJson(serialised); @@ -93,7 +96,8 @@ public class ChatUtils { } 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) { diff --git a/1.19.2/build.gradle b/1.19.2/build.gradle index 1c776ad..4da6385 100644 --- a/1.19.2/build.gradle +++ b/1.19.2/build.gradle @@ -62,6 +62,7 @@ subprojects { shade "me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" + shade "net.kyori:adventure-text-minimessage:${adventure}" compileOnly 'net.luckperms:api:5.4' compileOnly("org.projectlombok:lombok:${lombok}") diff --git a/1.19.2/gradle.properties b/1.19.2/gradle.properties index cffb5c8..f7c791c 100644 --- a/1.19.2/gradle.properties +++ b/1.19.2/gradle.properties @@ -23,7 +23,7 @@ forge_version=43.2.0 # Dependencies moon_config=1.0.9 lombok=1.18.32 -adventure=4.16.0 +adventure=4.17.0 rpc_sdk=1.0 discord_formatter=2.0.0 diff --git a/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java b/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java index 5759fde..089d04b 100644 --- a/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java @@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; 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.json.JSONOptions; import net.minecraft.ChatFormatting; @@ -17,6 +18,8 @@ public class ChatUtils { JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); return Component.Serializer.fromJson(serialised); @@ -93,7 +96,8 @@ public class ChatUtils { } 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) { diff --git a/1.19.3/build.gradle b/1.19.3/build.gradle index 1c776ad..4da6385 100644 --- a/1.19.3/build.gradle +++ b/1.19.3/build.gradle @@ -62,6 +62,7 @@ subprojects { shade "me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" + shade "net.kyori:adventure-text-minimessage:${adventure}" compileOnly 'net.luckperms:api:5.4' compileOnly("org.projectlombok:lombok:${lombok}") diff --git a/1.19.3/gradle.properties b/1.19.3/gradle.properties index e9bcd0b..c181622 100644 --- a/1.19.3/gradle.properties +++ b/1.19.3/gradle.properties @@ -23,7 +23,7 @@ forge_version=45.3.0 # Dependencies moon_config=1.0.9 lombok=1.18.32 -adventure=4.16.0 +adventure=4.17.0 rpc_sdk=1.0 discord_formatter=2.0.0 diff --git a/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java b/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java index 5759fde..089d04b 100644 --- a/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java @@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; 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.json.JSONOptions; import net.minecraft.ChatFormatting; @@ -17,6 +18,8 @@ public class ChatUtils { JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); return Component.Serializer.fromJson(serialised); @@ -93,7 +96,8 @@ public class ChatUtils { } 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) { diff --git a/1.20.2/build.gradle b/1.20.2/build.gradle index 1c776ad..4da6385 100644 --- a/1.20.2/build.gradle +++ b/1.20.2/build.gradle @@ -62,6 +62,7 @@ subprojects { shade "me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" + shade "net.kyori:adventure-text-minimessage:${adventure}" compileOnly 'net.luckperms:api:5.4' compileOnly("org.projectlombok:lombok:${lombok}") diff --git a/1.20.2/gradle.properties b/1.20.2/gradle.properties index a26988f..524bfc1 100644 --- a/1.20.2/gradle.properties +++ b/1.20.2/gradle.properties @@ -23,7 +23,7 @@ forge_version=48.1.0 # Dependencies moon_config=1.0.9 lombok=1.18.32 -adventure=4.16.0 +adventure=4.17.0 rpc_sdk=1.0 discord_formatter=2.0.0 diff --git a/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java b/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java index 5759fde..089d04b 100644 --- a/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java @@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; 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.json.JSONOptions; import net.minecraft.ChatFormatting; @@ -17,6 +18,8 @@ public class ChatUtils { JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); return Component.Serializer.fromJson(serialised); @@ -93,7 +96,8 @@ public class ChatUtils { } 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) { diff --git a/1.20.4/build.gradle b/1.20.4/build.gradle index f37e586..2452d3c 100644 --- a/1.20.4/build.gradle +++ b/1.20.4/build.gradle @@ -62,6 +62,7 @@ subprojects { shade "me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" + shade "net.kyori:adventure-text-minimessage:${adventure}" compileOnly 'net.luckperms:api:5.4' compileOnly("org.projectlombok:lombok:${lombok}") diff --git a/1.20.4/gradle.properties b/1.20.4/gradle.properties index 03780b8..30f4182 100644 --- a/1.20.4/gradle.properties +++ b/1.20.4/gradle.properties @@ -26,7 +26,7 @@ neoforge_version=234 # Dependencies moon_config=1.0.9 lombok=1.18.32 -adventure=4.16.0 +adventure=4.17.0 rpc_sdk=1.0 discord_formatter=2.0.0 diff --git a/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java b/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java index 5759fde..089d04b 100644 --- a/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java @@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; 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.json.JSONOptions; import net.minecraft.ChatFormatting; @@ -17,6 +18,8 @@ public class ChatUtils { JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); return Component.Serializer.fromJson(serialised); @@ -93,7 +96,8 @@ public class ChatUtils { } 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) { diff --git a/1.20/build.gradle b/1.20/build.gradle index 24084aa..3ef1c25 100644 --- a/1.20/build.gradle +++ b/1.20/build.gradle @@ -61,6 +61,7 @@ subprojects { shade "me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" + shade "net.kyori:adventure-text-minimessage:${adventure}" compileOnly 'net.luckperms:api:5.4' compileOnly("org.projectlombok:lombok:${lombok}") diff --git a/1.20/gradle.properties b/1.20/gradle.properties index b4f4ecc..6b99090 100644 --- a/1.20/gradle.properties +++ b/1.20/gradle.properties @@ -23,7 +23,7 @@ forge_version=46.0.14 # Dependencies moon_config=1.0.9 lombok=1.18.32 -adventure=4.16.0 +adventure=4.17.0 rpc_sdk=1.0 discord_formatter=2.0.0 diff --git a/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java b/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java index c09982c..a68e6f7 100644 --- a/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java +++ b/1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java @@ -6,6 +6,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; 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.json.JSONOptions; import net.minecraft.ChatFormatting; @@ -23,6 +24,8 @@ public class ChatUtils { JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()) ).build(); + private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); return Component.Serializer.fromJson(serialised, getRegistryLookup()); @@ -109,7 +112,8 @@ public class ChatUtils { } 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) { diff --git a/1.21/build.gradle b/1.21/build.gradle index 861a660..af450e6 100644 --- a/1.21/build.gradle +++ b/1.21/build.gradle @@ -62,6 +62,7 @@ subprojects { shade "me.hypherionmc.sdlink:mcdiscordformatter-1.20.3:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" + shade "net.kyori:adventure-text-minimessage:${adventure}" compileOnly 'net.luckperms:api:5.4' compileOnly("org.projectlombok:lombok:${lombok}") diff --git a/1.21/gradle.properties b/1.21/gradle.properties index 4c3f90f..3ce8c42 100644 --- a/1.21/gradle.properties +++ b/1.21/gradle.properties @@ -26,7 +26,7 @@ neoforge_version=0.0-beta # Dependencies moon_config=1.0.9 lombok=1.18.32 -adventure=4.16.0 +adventure=4.17.0 rpc_sdk=1.0 discord_formatter=2.0.0 diff --git a/commit.sha b/commit.sha index 342c997..98042db 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -c808f5384154268c09c915515116124d8e6e1a5d \ No newline at end of file +6f6c93c6ee044003c78fc061fd159efa139e225e \ No newline at end of file diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 2c72ec3..8bac0bb 100644 --- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; -@@ -11,11 +9,10 @@ +@@ -12,11 +10,10 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -22,7 +22,7 @@ public class ChatUtils { -@@ -25,30 +22,20 @@ +@@ -28,30 +25,20 @@ public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); @@ -56,7 +56,7 @@ } public static String strip(String inString, String... toStrip) { -@@ -77,7 +64,7 @@ +@@ -80,7 +67,7 @@ } public static net.kyori.adventure.text.Component resolve(String component, boolean formatted) { @@ -65,7 +65,7 @@ if (formatted) { returnVal = MinecraftSerializer.INSTANCE.serialize(component); } -@@ -105,7 +92,7 @@ +@@ -108,7 +95,7 @@ if (identifier == null) return net.kyori.adventure.text.Component.text("Unknown"); diff --git a/patches/1.18.2/build.gradle.patch b/patches/1.18.2/build.gradle.patch index 890499e..7e4c6b5 100644 --- a/patches/1.18.2/build.gradle.patch +++ b/patches/1.18.2/build.gradle.patch @@ -19,4 +19,4 @@ + shade "me.hypherionmc.sdlink:mcdiscordformatter-1.18.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" - + shade "net.kyori:adventure-text-minimessage:${adventure}" diff --git a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 625d17c..18581e9 100644 --- a/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; -@@ -11,12 +9,8 @@ +@@ -12,12 +10,8 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -21,7 +21,7 @@ public class ChatUtils { private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( -@@ -25,22 +19,12 @@ +@@ -28,22 +22,12 @@ public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.19.2/build.gradle.patch b/patches/1.19.2/build.gradle.patch index b6610ca..6e95974 100644 --- a/patches/1.19.2/build.gradle.patch +++ b/patches/1.19.2/build.gradle.patch @@ -19,4 +19,4 @@ + shade "me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" - + shade "net.kyori:adventure-text-minimessage:${adventure}" diff --git a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 625d17c..18581e9 100644 --- a/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; -@@ -11,12 +9,8 @@ +@@ -12,12 +10,8 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -21,7 +21,7 @@ public class ChatUtils { private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( -@@ -25,22 +19,12 @@ +@@ -28,22 +22,12 @@ public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.19.3/build.gradle.patch b/patches/1.19.3/build.gradle.patch index b6610ca..6e95974 100644 --- a/patches/1.19.3/build.gradle.patch +++ b/patches/1.19.3/build.gradle.patch @@ -19,4 +19,4 @@ + shade "me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" - + shade "net.kyori:adventure-text-minimessage:${adventure}" diff --git a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 625d17c..18581e9 100644 --- a/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; -@@ -11,12 +9,8 @@ +@@ -12,12 +10,8 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -21,7 +21,7 @@ public class ChatUtils { private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( -@@ -25,22 +19,12 @@ +@@ -28,22 +22,12 @@ public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.20.2/build.gradle.patch b/patches/1.20.2/build.gradle.patch index b6610ca..6e95974 100644 --- a/patches/1.20.2/build.gradle.patch +++ b/patches/1.20.2/build.gradle.patch @@ -19,4 +19,4 @@ + shade "me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" - + shade "net.kyori:adventure-text-minimessage:${adventure}" diff --git a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 625d17c..18581e9 100644 --- a/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; -@@ -11,12 +9,8 @@ +@@ -12,12 +10,8 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -21,7 +21,7 @@ public class ChatUtils { private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( -@@ -25,22 +19,12 @@ +@@ -28,22 +22,12 @@ public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch index 625d17c..18581e9 100644 --- a/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch +++ b/patches/1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java.patch @@ -8,7 +8,7 @@ import com.hypherionmc.craterlib.nojang.resources.ResourceIdentifier; import me.hypherionmc.mcdiscordformatter.discord.DiscordSerializer; import me.hypherionmc.mcdiscordformatter.minecraft.MinecraftSerializer; -@@ -11,12 +9,8 @@ +@@ -12,12 +10,8 @@ import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; @@ -21,7 +21,7 @@ public class ChatUtils { private static final GsonComponentSerializer adventureSerializer = GsonComponentSerializer.builder().options( -@@ -25,22 +19,12 @@ +@@ -28,22 +22,12 @@ public static Component adventureToMojang(net.kyori.adventure.text.Component inComponent) { final String serialised = adventureSerializer.serialize(inComponent); diff --git a/patches/1.20/build.gradle.patch b/patches/1.20/build.gradle.patch index 02a0314..e44bb97 100644 --- a/patches/1.20/build.gradle.patch +++ b/patches/1.20/build.gradle.patch @@ -27,4 +27,4 @@ + shade "me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:${discord_formatter}" shade "net.kyori:adventure-api:${adventure}" shade "net.kyori:adventure-text-serializer-gson:${adventure}" - + shade "net.kyori:adventure-text-minimessage:${adventure}"