diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 4dc2e13..6905693 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -12,9 +12,8 @@ dependencies { // MyPet compileOnly("de.keyle:mypet:3.12-SNAPSHOT") // mcMMO - compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.1.206") - compileOnly("com.sk89q.worldguard:worldguard-core:7.0.4") { - exclude("com.google.code.findbugs") + compileOnly("com.gmail.nossr50.mcMMO:mcMMO:2.1.206") { + exclude("com.sk89q.worldguard") } //Jackson (json) diff --git a/settings.gradle.kts b/settings.gradle.kts index 430b200..064ad36 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,14 +5,14 @@ include(":velocity") dependencyResolutionManagement { repositories { - mavenLocal() +// mavenLocal() mavenCentral() maven("https://repo.destro.xyz/snapshots") // Altitude - Galaxy maven("https://oss.sonatype.org/content/groups/public/") // Adventure maven("https://papermc.io/repo/repository/maven-public/") // Velocity maven("https://repo.spongepowered.org/maven") // Configurate maven("https://nexus.neetgames.com/repository/maven-releases/") // mcMMO - maven("https://maven.enginehub.org/repo/") // worldguard +// maven("https://maven.enginehub.org/repo/") // worldguard maven { // mypet name = "GitHubPackages" url = uri("https://maven.pkg.github.com/MyPetORG/MyPet") diff --git a/velocity/src/main/java/com/alttd/vboosters/commands/BoosterCommand.java b/velocity/src/main/java/com/alttd/vboosters/commands/BoosterCommand.java index 337ff9b..b057530 100755 --- a/velocity/src/main/java/com/alttd/vboosters/commands/BoosterCommand.java +++ b/velocity/src/main/java/com/alttd/vboosters/commands/BoosterCommand.java @@ -17,6 +17,7 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import com.mojang.brigadier.tree.LiteralCommandNode; import com.velocitypowered.api.command.BrigadierCommand; import com.velocitypowered.api.command.CommandMeta; import com.velocitypowered.api.command.CommandSource; @@ -24,6 +25,7 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.util.GameProfile; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.JoinConfiguration; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; @@ -65,28 +67,31 @@ public class BoosterCommand { long expiryTime = new Date().getTime() + booster.getDuration(); TagResolver.Builder tagResolver = TagResolver.builder(); - List templates = List.of( + List templates = new ArrayList<>(List.of( Placeholder.unparsed("type", booster.getType().getBoosterName()), Placeholder.unparsed("activator", booster.getActivator()), Placeholder.unparsed("start_time", DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(booster.getStartingTime())), Placeholder.unparsed("duration", TimeUnit.MILLISECONDS.toHours(booster.getDuration()) + " hours"), - Placeholder.unparsed("multiplier", String.valueOf(booster.getMultiplier()))); + Placeholder.unparsed("multiplier", String.valueOf(booster.getMultiplier())))); + + if (booster.isActive()) + templates.add(Placeholder.unparsed("end_time", DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(expiryTime))); + else + templates.add(Placeholder.unparsed("end_time", "unknown")); + for (TagResolver tagResolver1 : templates) tagResolver.resolver(tagResolver1); // cheaty and lazy way I know if (booster.isActive()) - templates.add(Template.of("end_time", DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.SHORT).format(expiryTime))); - else - templates.add(Template.of("end_time", "unknown")); - if (booster.isActive()) - activeBoosterComponents.add(miniMessage.parse(activeBooster, templates)); + activeBoosterComponents.add(miniMessage.deserialize(activeBooster, tagResolver.build())); else if (!booster.finished()) - queuedBoosterComponents.add(miniMessage.parse(queuedBooster, templates)); + queuedBoosterComponents.add(miniMessage.deserialize(queuedBooster, tagResolver.build())); + } - Component separator = miniMessage.parse("\n"); - context.getSource().sendMessage(miniMessage.parse(message, List.of( - Template.of("active_boosters", Component.join(separator, activeBoosterComponents)), - Template.of("queued_boosters", Component.join(separator, queuedBoosterComponents)) + Component separator = miniMessage.deserialize("\n"); + context.getSource().sendMessage(miniMessage.deserialize(message, TagResolver.resolver( + Placeholder.component("active_boosters", Component.join(JoinConfiguration.separator(separator), activeBoosterComponents)), + Placeholder.component("queued_boosters", Component.join(JoinConfiguration.separator(separator), queuedBoosterComponents)) ))); return 1; })