Update adventure

This commit is contained in:
mbax
2021-12-03 20:16:45 -05:00
parent cca20fae90
commit a0bdb54842
4 changed files with 8 additions and 9 deletions
+1 -1
View File
@@ -102,7 +102,7 @@
<dependency> <dependency>
<groupId>net.kyori</groupId> <groupId>net.kyori</groupId>
<artifactId>adventure-platform-bukkit</artifactId> <artifactId>adventure-platform-bukkit</artifactId>
<version>4.0.1-SNAPSHOT</version> <version>4.0.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -65,7 +65,7 @@ public class HelpMeCommand implements CommandExecutor {
if (args.length >= 1 && args[0].equalsIgnoreCase("mini")) { if (args.length >= 1 && args[0].equalsIgnoreCase("mini")) {
Audience audience = PlayerVaults.getInstance().getPlatform().sender(sender); Audience audience = PlayerVaults.getInstance().getPlatform().sender(sender);
for (String string : mainInfo.toString().split("\n")) { for (String string : mainInfo.toString().split("\n")) {
audience.sendMessage(MiniMessage.get().parse((sender instanceof Player ? "<rainbow>" : "<green>") + string)); audience.sendMessage(MiniMessage.miniMessage().parse((sender instanceof Player ? "<rainbow>" : "<green>") + string));
} }
return true; return true;
} }
@@ -115,9 +115,9 @@ public class HelpMeCommand implements CommandExecutor {
String delKey = result.getPaste().get().getDeletionKey().orElse("No deletion key"); String delKey = result.getPaste().get().getDeletionKey().orElse("No deletion key");
String url = "https://paste.gg/anonymous/" + result.getPaste().get().getId(); String url = "https://paste.gg/anonymous/" + result.getPaste().get().getId();
audience.sendMessage(Component.text("URL generated: ").append(Component.text().clickEvent(ClickEvent.openUrl(url)).content(url))); audience.sendMessage(Component.text("URL generated: ").append(Component.text().clickEvent(ClickEvent.openUrl(url)).content(url)));
audience.sendMessage(MiniMessage.get().parse((sender instanceof Player ? "<rainbow>" : "<green>") + "Deletion key:</rainbow> " + delKey)); audience.sendMessage(MiniMessage.miniMessage().parse((sender instanceof Player ? "<rainbow>" : "<green>") + "Deletion key:</rainbow> " + delKey));
} else { } else {
audience.sendMessage(MiniMessage.get().parse("<red>Failed to generate output. See console for details.")); audience.sendMessage(MiniMessage.miniMessage().parse("<red>Failed to generate output. See console for details."));
PlayerVaults.getInstance().getLogger().warning("Received: " + result.getMessage()); PlayerVaults.getInstance().getLogger().warning("Received: " + result.getMessage());
} }
} }
@@ -127,7 +127,7 @@ public class HelpMeCommand implements CommandExecutor {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
PlayerVaults.getInstance().getPlatform().sender(sender).sendMessage(MiniMessage.get().parse("<red>Failed to generate output. See console for details.")); PlayerVaults.getInstance().getPlatform().sender(sender).sendMessage(MiniMessage.miniMessage().parse("<red>Failed to generate output. See console for details."));
} }
}.runTask(PlayerVaults.getInstance()); }.runTask(PlayerVaults.getInstance());
} }
@@ -4,9 +4,9 @@ import com.drtshock.playervaults.PlayerVaults;
import com.drtshock.playervaults.config.annotation.Comment; import com.drtshock.playervaults.config.annotation.Comment;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.craftbukkit.BukkitComponentSerializer;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
@@ -128,7 +128,7 @@ public class Translation {
} }
} else { } else {
if (this.arrContains(features, TL.PRE_FORMATTED)) { if (this.arrContains(features, TL.PRE_FORMATTED)) {
repl = MiniMessage.get().escapeTokens(repl).replace("\\", "\\\\"); repl = MiniMessage.miniMessage().escapeTokens(repl).replace("\\", "\\\\");
} }
replMatcher.appendReplacement(builder, repl); replMatcher.appendReplacement(builder, repl);
} }
@@ -154,7 +154,7 @@ public class Translation {
tagMatcher.appendTail(builder); tagMatcher.appendTail(builder);
line = builder.toString(); line = builder.toString();
} }
return MiniMessage.get().parse(line); return MiniMessage.miniMessage().parse(line);
} }
public @NonNull String getLegacy() { public @NonNull String getLegacy() {
@@ -256,7 +256,6 @@ public class VaultManager {
* @param sender The sender of whom to send messages to. * @param sender The sender of whom to send messages to.
* @param holder The vault holder. * @param holder The vault holder.
* @param number The vault number. * @param number The vault number.
* @throws IOException Uh oh!
*/ */
public void deleteVault(CommandSender sender, final String holder, final int number) { public void deleteVault(CommandSender sender, final String holder, final int number) {
new BukkitRunnable() { new BukkitRunnable() {