diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 3711744..a8d650c 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -4,7 +4,10 @@ plugins { dependencies { compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") -// compileOnly("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT") // Minimessage + compileOnly("net.kyori", "adventure-text-minimessage", "4.10.0-20220122.015731-43") { // Minimessage + exclude("net.kyori") + exclude("net.kyori.examination") + } compileOnly("org.spongepowered:configurate-yaml:4.1.2") // Configurate compileOnly("net.luckperms:api:5.3") // Luckperms compileOnly(files("../libs/minimessage-4.10.0-SNAPSHOT.jar")) // Workaround for minimessage diff --git a/galaxy/build.gradle.kts b/galaxy/build.gradle.kts index d32f6a7..bd46b58 100644 --- a/galaxy/build.gradle.kts +++ b/galaxy/build.gradle.kts @@ -5,10 +5,14 @@ plugins { dependencies { implementation(project(":api")) // API - compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") // Galaxy -// compileOnly("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT") // Minimessage + compileOnly("com.alttd:Galaxy-API:1.18.1-R0.1-SNAPSHOT") { + exclude("net.kyori.adventure.text.minimessag") + } // Galaxy + compileOnly("net.kyori", "adventure-text-minimessage", "4.10.0-20220122.015731-43") { // Minimessage + exclude("net.kyori") + exclude("net.kyori.examination") + } compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") // move to proxy - compileOnly(files("../libs/minimessage-4.10.0-SNAPSHOT.jar")) // Workaround for minimessage } tasks { diff --git a/settings.gradle.kts b/settings.gradle.kts index f111f46..e8de8d1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,7 @@ dependencyResolutionManagement { // mavenLocal() mavenCentral() maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy -// maven("https://oss.sonatype.org/content/repositories/snapshots/") // Minimessage + maven("https://oss.sonatype.org/content/repositories/snapshots/") // Minimessage maven("https://nexus.velocitypowered.com/repository/") // Velocity maven("https://nexus.velocitypowered.com/repository/maven-public/") // Velocity maven("https://repo.spongepowered.org/maven") // Configurate diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index c2f61d8..f8bec4e 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -10,11 +10,10 @@ dependencies { implementation("mysql:mysql-connector-java:8.0.27") // mysql implementation("org.spongepowered", "configurate-yaml", "4.1.2") compileOnly("com.alttd.proxydiscordlink:ProxyDiscordLink:1.0.0-BETA-SNAPSHOT") -// implementation("net.kyori", "adventure-text-minimessage", "4.10.0-SNAPSHOT") { -// exclude("net.kyori") -// exclude("net.kyori.examination") -// } - implementation(files("../libs/minimessage-4.10.0-SNAPSHOT.jar")) // Workaround for minimessage + implementation("net.kyori", "adventure-text-minimessage", "4.10.0-20220122.015731-43") { // Minimessage + exclude("net.kyori") + exclude("net.kyori.examination") + } compileOnly("com.gitlab.ruany:LiteBansAPI:0.3.5") } diff --git a/velocity/src/main/java/com/alttd/velocitychat/commands/Report.java b/velocity/src/main/java/com/alttd/velocitychat/commands/Report.java index b9ed7f0..8692cc1 100644 --- a/velocity/src/main/java/com/alttd/velocitychat/commands/Report.java +++ b/velocity/src/main/java/com/alttd/velocitychat/commands/Report.java @@ -4,11 +4,9 @@ import com.alttd.chat.config.Config; import com.alttd.chat.util.Utility; import com.alttd.proxydiscordlink.DiscordLink; import com.alttd.proxydiscordlink.lib.net.dv8tion.jda.api.EmbedBuilder; -import com.alttd.velocitychat.VelocityChat; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder; -import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.tree.LiteralCommandNode; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandMeta; @@ -19,13 +17,11 @@ import com.velocitypowered.api.proxy.ServerConnection; import net.kyori.adventure.text.minimessage.MiniMessage; import java.awt.*; -import java.util.ArrayList; -import java.util.Collection; import java.util.Optional; public class Report { - private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + private static final MiniMessage miniMessage = MiniMessage.get(); public Report(ProxyServer proxyServer) { LiteralCommandNode command = LiteralArgumentBuilder