Update DesertWell to 2.0.2, improve adventure API usage

common/src/main/java/net/william278/husksync/HuskSync.java

@@ -13,8 +13,8 @@
 
 package net.william278.husksync;
 
-import net.william278.desertwell.UpdateChecker;
-import net.william278.desertwell.Version;
+import net.william278.desertwell.util.UpdateChecker;
+import net.william278.desertwell.util.Version;
 import net.william278.husksync.config.Locales;
 import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.DataAdapter;
@@ -166,14 +166,14 @@ public interface HuskSync {
      * @return a {@link CompletableFuture} returning the latest {@link Version} if the current one is out-of-date
      */
     default CompletableFuture<Optional<Version>> getLatestVersionIfOutdated() {
-        final UpdateChecker updateChecker = UpdateChecker.create(getPluginVersion(), SPIGOT_RESOURCE_ID);
-        return updateChecker.isUpToDate().thenApply(upToDate -> {
-            if (upToDate) {
-                return Optional.empty();
-            } else {
-                return Optional.of(updateChecker.getLatestVersion().join());
-            }
-        });
+        return UpdateChecker.builder()
+                .currentVersion(getPluginVersion())
+                .endpoint(UpdateChecker.Endpoint.SPIGOT)
+                .resource(Integer.toString(SPIGOT_RESOURCE_ID)).build()
+                .check()
+                .thenApply(checked -> checked.isUpToDate()
+                        ? Optional.empty()
+                        : Optional.of(checked.getLatestVersion()));
     }
 
     /**

common/src/main/java/net/william278/husksync/command/HuskSyncCommand.java

@@ -14,7 +14,9 @@
 package net.william278.husksync.command;
 
 import de.themoep.minedown.adventure.MineDown;
-import net.william278.desertwell.AboutMenu;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.TextColor;
+import net.william278.desertwell.about.AboutMenu;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.migrator.Migrator;
 import net.william278.husksync.player.OnlineUser;
@@ -31,30 +33,32 @@ public class HuskSyncCommand extends CommandBase implements TabCompletable, Cons
 
     public HuskSyncCommand(@NotNull HuskSync implementor) {
         super("husksync", Permission.COMMAND_HUSKSYNC, implementor);
-        this.aboutMenu = AboutMenu.create("HuskSync")
-                .withDescription("A modern, cross-server player data synchronization system")
-                .withVersion(implementor.getPluginVersion())
-                .addAttribution("Author",
-                        AboutMenu.Credit.of("William278").withDescription("Click to visit website").withUrl("https://william278.net"))
-                .addAttribution("Contributors",
-                        AboutMenu.Credit.of("HarvelsX").withDescription("Code"),
-                        AboutMenu.Credit.of("HookWoods").withDescription("Code"))
-                .addAttribution("Translators",
-                        AboutMenu.Credit.of("Namiu").withDescription("Japanese (ja-jp)"),
-                        AboutMenu.Credit.of("anchelthe").withDescription("Spanish (es-es)"),
-                        AboutMenu.Credit.of("Melonzio").withDescription("Spanish (es-es)"),
-                        AboutMenu.Credit.of("Ceddix").withDescription("German (de-de)"),
-                        AboutMenu.Credit.of("Pukejoy_1").withDescription("Bulgarian (bg-bg)"),
-                        AboutMenu.Credit.of("mateusneresrb").withDescription("Brazilian Portuguese (pt-br)"),
-                        AboutMenu.Credit.of("小蔡").withDescription("Traditional Chinese (zh-tw)"),
-                        AboutMenu.Credit.of("Ghost-chu").withDescription("Simplified Chinese (zh-cn)"),
-                        AboutMenu.Credit.of("DJelly4K").withDescription("Simplified Chinese (zh-cn)"),
-                        AboutMenu.Credit.of("Thourgard").withDescription("Ukrainian (uk-ua)"),
-                        AboutMenu.Credit.of("xF3d3").withDescription("Italian (it-it)"))
-                .addButtons(
-                        AboutMenu.Link.of("https://william278.net/docs/husksync").withText("Documentation").withIcon("⛏"),
-                        AboutMenu.Link.of("https://github.com/WiIIiam278/HuskSync/issues").withText("Issues").withIcon("❌").withColor("#ff9f0f"),
-                        AboutMenu.Link.of("https://discord.gg/tVYhJfyDWG").withText("Discord").withIcon("⭐").withColor("#6773f5"));
+        this.aboutMenu = AboutMenu.builder()
+                .title(Component.text("HuskSync"))
+                .description(Component.text("A modern, cross-server player data synchronization system"))
+                .version(implementor.getPluginVersion())
+                .credits("Author",
+                        AboutMenu.Credit.of("William278").description("Click to visit website").url("https://william278.net"))
+                .credits("Contributors",
+                        AboutMenu.Credit.of("HarvelsX").description("Code"),
+                        AboutMenu.Credit.of("HookWoods").description("Code"))
+                .credits("Translators",
+                        AboutMenu.Credit.of("Namiu").description("Japanese (ja-jp)"),
+                        AboutMenu.Credit.of("anchelthe").description("Spanish (es-es)"),
+                        AboutMenu.Credit.of("Melonzio").description("Spanish (es-es)"),
+                        AboutMenu.Credit.of("Ceddix").description("German (de-de)"),
+                        AboutMenu.Credit.of("Pukejoy_1").description("Bulgarian (bg-bg)"),
+                        AboutMenu.Credit.of("mateusneresrb").description("Brazilian Portuguese (pt-br)"),
+                        AboutMenu.Credit.of("小蔡").description("Traditional Chinese (zh-tw)"),
+                        AboutMenu.Credit.of("Ghost-chu").description("Simplified Chinese (zh-cn)"),
+                        AboutMenu.Credit.of("DJelly4K").description("Simplified Chinese (zh-cn)"),
+                        AboutMenu.Credit.of("Thourgard").description("Ukrainian (uk-ua)"),
+                        AboutMenu.Credit.of("xF3d3").description("Italian (it-it)"))
+                .buttons(
+                        AboutMenu.Link.of("https://william278.net/docs/husksync").text("Documentation").icon("⛏"),
+                        AboutMenu.Link.of("https://github.com/WiIIiam278/HuskSync/issues").text("Issues").icon("❌").color(TextColor.color(0xff9f0f)),
+                        AboutMenu.Link.of("https://discord.gg/tVYhJfyDWG").text("Discord").icon("⭐").color(TextColor.color(0x6773f5)))
+                .build();
     }
 
     @Override
@@ -175,6 +179,6 @@ public class HuskSyncCommand extends CommandBase implements TabCompletable, Cons
             plugin.getLocales().getLocale("error_no_permission").ifPresent(player::sendMessage);
             return;
         }
-        player.sendMessage(aboutMenu.toMineDown());
+        player.sendMessage(aboutMenu.toComponent());
     }
 }

common/src/main/java/net/william278/husksync/data/UserData.java

@@ -14,7 +14,7 @@
 package net.william278.husksync.data;
 
 import com.google.gson.annotations.SerializedName;
-import net.william278.desertwell.Version;
+import net.william278.desertwell.util.Version;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

common/src/main/java/net/william278/husksync/player/OnlineUser.java

@@ -14,7 +14,10 @@
 package net.william278.husksync.player;
 
 import de.themoep.minedown.adventure.MineDown;
-import net.william278.desertwell.Version;
+import de.themoep.minedown.adventure.MineDownParser;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.Component;
+import net.william278.desertwell.util.Version;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.config.Settings;
 import net.william278.husksync.data.*;
@@ -192,19 +195,44 @@ public abstract class OnlineUser extends User {
     @NotNull
     public abstract Version getMinecraftVersion();
 
+    /**
+     * Get the player's adventure {@link Audience}
+     *
+     * @return the player's {@link Audience}
+     */
+    @NotNull
+    public abstract Audience getAudience();
+
+    /**
+     * Send a message to this player
+     *
+     * @param component the {@link Component} message to send
+     */
+    public void sendMessage(@NotNull Component component) {
+        getAudience().sendMessage(component);
+    }
+
     /**
      * Dispatch a MineDown-formatted message to this player
      *
      * @param mineDown the parsed {@link MineDown} to send
      */
-    public abstract void sendMessage(@NotNull MineDown mineDown);
+    public void sendMessage(@NotNull MineDown mineDown) {
+        sendMessage(mineDown
+                .disable(MineDownParser.Option.SIMPLE_FORMATTING)
+                .replace().toComponent());
+    }
 
     /**
      * Dispatch a MineDown-formatted action bar message to this player
      *
      * @param mineDown the parsed {@link MineDown} to send
      */
-    public abstract void sendActionBar(@NotNull MineDown mineDown);
+    public void sendActionBar(@NotNull MineDown mineDown) {
+        getAudience().sendActionBar(mineDown
+                .disable(MineDownParser.Option.SIMPLE_FORMATTING)
+                .replace().toComponent());
+    }
 
     /**
      * Dispatch a toast message to this player
@@ -257,7 +285,7 @@ public abstract class OnlineUser extends User {
     public final CompletableFuture<Boolean> setData(@NotNull UserData data, @NotNull HuskSync plugin) {
         return CompletableFuture.supplyAsync(() -> {
             // Prevent synchronising user data from newer versions of Minecraft
-            if (Version.fromMinecraftVersionString(data.getMinecraftVersion()).compareTo(plugin.getMinecraftVersion()) > 0) {
+            if (Version.fromString(data.getMinecraftVersion()).compareTo(plugin.getMinecraftVersion()) > 0) {
                 plugin.log(Level.SEVERE, "Cannot set data for " + username +
                                          " because the Minecraft version of their user data (" + data.getMinecraftVersion() +
                                          ") is newer than the server's Minecraft version (" + plugin.getMinecraftVersion() + ").");