From 8441195f1653836b638efe4a52a77fb22b3574e4 Mon Sep 17 00:00:00 2001
From: Josiah Glosson <soujournme@gmail.com>
Date: Fri, 19 Jul 2024 19:01:53 -0500
Subject: [PATCH] Rework some UI stuff

---
 .../worldhost/gui/screen/AddFriendScreen.java | 119 ++++++++-------
 .../worldhost/gui/screen/FriendsScreen.java   |  20 +--
 .../worldhost/gui/widget/UserListWidget.java  | 141 +++++++++++-------
 .../worldhost/plugin/FriendAdder.java         |  11 +-
 .../worldhost/plugin/FriendListFriend.java    |   4 +
 .../plugin/vanilla/WorldHostFriendAdder.java  |  28 ++--
 .../vanilla/WorldHostFriendListFriend.java    |   5 +
 .../protocol/WorldHostS2CMessage.java         |   2 +-
 .../worldhost/versions/ButtonBuilder.java     |   7 +-
 9 files changed, 189 insertions(+), 148 deletions(-)

diff --git a/src/main/java/io/github/gaming32/worldhost/gui/screen/AddFriendScreen.java b/src/main/java/io/github/gaming32/worldhost/gui/screen/AddFriendScreen.java
index bcb48f44..02b930cf 100644
--- a/src/main/java/io/github/gaming32/worldhost/gui/screen/AddFriendScreen.java
+++ b/src/main/java/io/github/gaming32/worldhost/gui/screen/AddFriendScreen.java
@@ -1,13 +1,11 @@
 package io.github.gaming32.worldhost.gui.screen;
 
 import io.github.gaming32.worldhost.WorldHost;
-import io.github.gaming32.worldhost.gui.widget.FriendAdderSelectorButton;
 import io.github.gaming32.worldhost.gui.widget.UserListWidget;
 import io.github.gaming32.worldhost.plugin.FriendAdder;
 import io.github.gaming32.worldhost.plugin.FriendListFriend;
 import io.github.gaming32.worldhost.versions.Components;
 import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
@@ -16,8 +14,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Consumer;
+import java.util.function.BiConsumer;
 
 //#if MC >= 1.20.0
 import net.minecraft.client.gui.GuiGraphics;
@@ -27,26 +26,29 @@
 
 public class AddFriendScreen extends WorldHostScreen {
     private static final Component FRIEND_USERNAME_TEXT = Components.translatable("world-host.add_friend.enter_username");
+    private static final Component ADD_FRIEND_TEXT = Component.literal("+");
+    private static final Component ADD_FRIEND_SILENT_TEXT = Component.literal("+\ud83d\udd08");
+    private static final Component ADD_FRIEND_NOTIFY_TEXT = Component.literal("+\ud83d\udd0a");
+    private static final Component ADD_FRIEND_SILENT_TOOLTIP = Components.translatable("world-host.add_friend.tooltip");
+    private static final Component ADD_FRIEND_NOTIFY_TOOLTIP = Components.translatable("world-host.friends.add_silently.tooltip");
 
     private final Screen parent;
-    private final Consumer<FriendListFriend> addAction;
+    private final BiConsumer<FriendListFriend, Boolean> addAction;
     private FriendListFriend prefilledFriend;
 
     private final List<FriendAdder> friendAdders = WorldHost.getFriendAdders();
-    private FriendAdder friendAdder = friendAdders.getFirst();
 
     private int maxFriends;
     private UserListWidget userList;
     private EditBox nameField;
     private long lastTyping;
-    private boolean delayedFriendUpdate;
-    private int reloadCount;
+    private Runnable delayedLookup;
 
     public AddFriendScreen(
         Screen parent,
         Component title,
         @Nullable FriendListFriend prefilledFriend,
-        Consumer<FriendListFriend> addAction
+        BiConsumer<FriendListFriend, Boolean> addAction
     ) {
         super(title);
         this.parent = parent;
@@ -54,18 +56,17 @@ public AddFriendScreen(
         this.prefilledFriend = prefilledFriend;
     }
 
-    private void resolveFriends(String name) {
-        final int currentReloadCount = ++reloadCount;
-        friendAdder.searchFriends(name, maxFriends)
-            .thenAcceptAsync(friends -> {
-                if (reloadCount == currentReloadCount && userList != null) {
-                    userList.setUsers(friends);
+    private void resolveFriends(FriendAdder adder, String name) {
+        assert minecraft != null;
+        adder.searchFriends(
+            name,
+            maxFriends - userList.getUsersCount(),
+            friend -> minecraft.execute(() -> {
+                if (nameField.getValue().equals(name)) {
+                    userList.addUser(friend);
                 }
-            }, Minecraft.getInstance())
-            .exceptionally(t -> {
-                WorldHost.LOGGER.error("Failed to request friend with name '{}'", name, t);
-                return null;
-            });
+            })
+        );
     }
 
     @Override
@@ -83,31 +84,29 @@ protected void init() {
         //#endif
         nameField.setResponder(name -> {
             lastTyping = Util.getMillis();
-            if (friendAdder.delayLookup(name)) {
-                delayedFriendUpdate = true;
+            userList.clearUsers();
+            final List<FriendAdder> delayedAdders = new ArrayList<>();
+            for (final FriendAdder adder : friendAdders) {
+                if (adder.delayLookup(name)) {
+                    delayedAdders.add(adder);
+                } else {
+                    resolveFriends(adder, name);
+                }
+            }
+            if (!delayedAdders.isEmpty()) {
+                delayedLookup = () -> {
+                    for (final FriendAdder adder : delayedAdders) {
+                        resolveFriends(adder, name);
+                    }
+                };
             } else {
-                delayedFriendUpdate = false;
-                resolveFriends(name);
+                delayedLookup = null;
             }
         });
 
         final int widgetsX = width / 2 - 100;
         final int widgetsWidth = 200;
 
-        int topWidgetsY = 90;
-        if (showFriendAddersButton()) {
-            addRenderableWidget(new FriendAdderSelectorButton(
-                widgetsX, topWidgetsY, widgetsWidth, 20,
-                Components.translatable("world-host.add_friend.friend_adder"),
-                button -> {
-                    friendAdder = button.getValue();
-                    resolveFriends(nameField.getValue());
-                },
-                friendAdders.toArray(FriendAdder[]::new)
-            ));
-            topWidgetsY += 24;
-        }
-
         int cancelY = 216;
         while (cancelY + 24 < height / 4 + 156) {
             cancelY += 24;
@@ -120,17 +119,11 @@ protected void init() {
         );
 
         maxFriends = (cancelY - 90) / 24;
-        if (showFriendAddersButton()) {
-            maxFriends--;
-        }
 
         userList = addRenderableWidget(new UserListWidget(
             font,
-            widgetsX, topWidgetsY, widgetsWidth, cancelY - topWidgetsY,
-            friend -> {
-                addAction.accept(friend);
-                minecraft.setScreen(parent);
-            },
+            widgetsX, 90, widgetsWidth, cancelY - 90,
+            this::getActions,
             userList
         ));
         if (prefilledFriend != null) {
@@ -139,17 +132,31 @@ protected void init() {
         }
     }
 
-    @Override
-    public void resize(Minecraft minecraft, int width, int height) {
-        final int oldMaxFriends = maxFriends;
-        super.resize(minecraft, width, height);
-        if (maxFriends != oldMaxFriends) {
-            resolveFriends(nameField.getValue());
+    private List<UserListWidget.Action> getActions(FriendListFriend user) {
+        if (user.supportsNotifyAdd()) {
+            return List.of(
+                new UserListWidget.Action(
+                    ADD_FRIEND_NOTIFY_TEXT, ADD_FRIEND_NOTIFY_TOOLTIP,
+                    getAddRunnable(user, true)
+                ),
+                new UserListWidget.Action(
+                    ADD_FRIEND_SILENT_TEXT, ADD_FRIEND_SILENT_TOOLTIP,
+                    getAddRunnable(user, false)
+                )
+            );
+        } else {
+            return List.of(
+                new UserListWidget.Action(ADD_FRIEND_TEXT, getAddRunnable(user, false))
+            );
         }
     }
 
-    private boolean showFriendAddersButton() {
-        return friendAdders.size() > 1;
+    private Runnable getAddRunnable(FriendListFriend user, boolean notify) {
+        assert minecraft != null;
+        return () -> {
+            addAction.accept(user, notify);
+            minecraft.setScreen(parent);
+        };
     }
 
     @Override
@@ -168,9 +175,9 @@ public void tick() {
         //#if MC < 1.20.2
         //$$ nameField.tick();
         //#endif
-        if (Util.getMillis() - 300 > lastTyping && delayedFriendUpdate) {
-            delayedFriendUpdate = false;
-            resolveFriends(nameField.getValue());
+        if (Util.getMillis() - 300 > lastTyping && delayedLookup != null) {
+            delayedLookup.run();
+            delayedLookup = null;
         }
     }
 
diff --git a/src/main/java/io/github/gaming32/worldhost/gui/screen/FriendsScreen.java b/src/main/java/io/github/gaming32/worldhost/gui/screen/FriendsScreen.java
index 136cef99..c4490bad 100644
--- a/src/main/java/io/github/gaming32/worldhost/gui/screen/FriendsScreen.java
+++ b/src/main/java/io/github/gaming32/worldhost/gui/screen/FriendsScreen.java
@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.gaming32.worldhost.WorldHost;
 import io.github.gaming32.worldhost.WorldHostComponents;
+import io.github.gaming32.worldhost.gui.widget.UserListWidget;
 import io.github.gaming32.worldhost.plugin.FriendListFriend;
 import io.github.gaming32.worldhost.plugin.InfoTextsCategory;
 import io.github.gaming32.worldhost.plugin.ProfileInfo;
@@ -25,7 +26,6 @@
 
 public class FriendsScreen extends ScreenWithInfoTexts {
     public static final Component ADD_FRIEND_TEXT = Components.translatable("world-host.add_friend");
-    private static final Component ADD_SILENTLY_TEXT = Components.translatable("world-host.friends.add_silently");
 
     private final Screen parent;
     private Button removeButton;
@@ -61,24 +61,17 @@ protected void init() {
                 assert minecraft != null;
                 minecraft.setScreen(new AddFriendScreen(
                     this, ADD_FRIEND_TEXT, null,
-                    friend -> friend.addFriend(true, refresher)
+                    (friend, notify) -> friend.addFriend(notify, refresher)
                 ));
             }).width(152)
                 .pos(width / 2 - 154, height - 54)
-                .tooltip(Components.translatable("world-host.add_friend.tooltip"))
                 .build()
         );
 
         addRenderableWidget(
-            button(ADD_SILENTLY_TEXT, button -> {
-                assert minecraft != null;
-                minecraft.setScreen(new AddFriendScreen(
-                    this, ADD_SILENTLY_TEXT, null,
-                    friend -> friend.addFriend(false, refresher)
-                ));
+            button(Component.empty(), button -> {
             }).width(152)
                 .pos(width / 2 - 154, height - 30)
-                .tooltip(Components.translatable("world-host.friends.add_silently.tooltip"))
                 .build()
         );
 
@@ -190,12 +183,7 @@ public Component getNarration() {
         }
 
         public Component getNameWithTag() {
-            return friend.tag()
-                .map(component -> Components.translatable(
-                    "world-host.friends.tagged_friend",
-                    profile.name(), component
-                ))
-                .orElseGet(() -> Components.literal(profile.name()));
+            return UserListWidget.getNameWithTag(friend, profile);
         }
 
         @Override
diff --git a/src/main/java/io/github/gaming32/worldhost/gui/widget/UserListWidget.java b/src/main/java/io/github/gaming32/worldhost/gui/widget/UserListWidget.java
index a00b8ca6..0a44493b 100644
--- a/src/main/java/io/github/gaming32/worldhost/gui/widget/UserListWidget.java
+++ b/src/main/java/io/github/gaming32/worldhost/gui/widget/UserListWidget.java
@@ -5,19 +5,24 @@
 import io.github.gaming32.worldhost.plugin.FriendListFriend;
 import io.github.gaming32.worldhost.plugin.ProfileInfo;
 import io.github.gaming32.worldhost.toast.IconRenderer;
+import io.github.gaming32.worldhost.versions.Components;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.components.AbstractContainerWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.locale.Language;
+import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.util.FormattedCharSequence;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Consumer;
+import java.util.function.Function;
 
 import static io.github.gaming32.worldhost.gui.screen.WorldHostScreen.button;
 import static io.github.gaming32.worldhost.gui.screen.WorldHostScreen.drawString;
@@ -29,28 +34,31 @@
 //#endif
 
 public final class UserListWidget extends AbstractContainerWidget {
-    private final List<FriendListFriend> users = new ArrayList<>();
-    private final List<Button> addButtons = new ArrayList<>();
-    private final List<CachedProfile> userProfiles = new ArrayList<>();
+    private final List<UserInfo> users = new ArrayList<>();
+    private final List<Button> actionButtons = new ArrayList<>();
     private final Font font;
-    private final Consumer<FriendListFriend> doneAction;
+    private final Function<FriendListFriend, List<Action>> getApplicableActions;
 
-    public UserListWidget(Font font, int x, int y, int width, int height, Consumer<FriendListFriend> doneAction) {
-        this(font, x, y, width, height, doneAction, null);
+    public UserListWidget(
+        Font font,
+        int x, int y, int width, int height,
+        Function<FriendListFriend, List<Action>> getApplicableActions
+    ) {
+        this(font, x, y, width, height, getApplicableActions, null);
     }
 
     public UserListWidget(
-        Font font, int x, int y, int width, int height,
-        Consumer<FriendListFriend> doneAction,
+        Font font,
+        int x, int y, int width, int height,
+        Function<FriendListFriend, List<Action>> getApplicableActions,
         @Nullable UserListWidget old
     ) {
         super(x, y, width, height, Component.empty());
         this.font = font;
-        this.doneAction = doneAction;
+        this.getApplicableActions = getApplicableActions;
         if (old != null && !old.users.isEmpty()) {
             users.addAll(old.users);
-            initButtons();
-            userProfiles.addAll(old.userProfiles);
+            addButtons(0);
         }
     }
 
@@ -67,50 +75,65 @@ protected void renderWidget(
         final int x = getX();
         int y = getY();
         for (int i = 0; i < getVisibleCount(); i++) {
-            final Button addButton = addButtons.get(i);
-            final CachedProfile profile = userProfiles.get(i);
-            profile.getIcon().draw(context, x, y, 20, 20);
+            final var user = users.get(i);
+            user.getIcon().draw(context, x, y, 20, 20);
             RenderSystem.disableBlend();
-            drawString(context, font, profile.getName(), x + 24, y + textYOffset, 0xffffff, true);
-            addButton.render(context, mouseX, mouseY, partialTick);
+            drawString(context, font, user.getName(), x + 24, y + textYOffset, 0xffffff, true);
             y += 24;
         }
+        for (final Button button : actionButtons) {
+            button.render(context, mouseX, mouseY, partialTick);
+        }
     }
 
     @Override
     protected void updateWidgetNarration(NarrationElementOutput narrationElementOutput) {
     }
 
-    public List<FriendListFriend> getUsers() {
-        return users;
+    public int getUsersCount() {
+        return users.size();
+    }
+
+    public void clearUsers() {
+        users.clear();
+        actionButtons.clear();
     }
 
     public void setUsers(List<? extends FriendListFriend> users) {
         this.users.clear();
-        this.users.addAll(users);
-        initButtons();
-        initUserProfiles();
+        actionButtons.clear();
+        addUsers(users);
     }
 
-    private void initButtons() {
-        addButtons.clear();
-        int y = getY();
-        for (int i = 0; i < getVisibleCount(); i++) {
-            final FriendListFriend user = users.get(i);
-            addButtons.add(
-                button(Component.literal("+"), b -> doneAction.accept(user))
-                    .pos(getRight() - 20, y)
-                    .size(20, 20)
-                    .build()
-            );
-            y += 24;
+    public void addUsers(List<? extends FriendListFriend> users) {
+        final int oldSize = this.users.size();
+        for (final FriendListFriend user : users) {
+            this.users.add(new UserInfo(user));
         }
+        addButtons(oldSize);
     }
 
-    private void initUserProfiles() {
-        userProfiles.clear();
-        for (final FriendListFriend user : users) {
-            userProfiles.add(new CachedProfile(user));
+    public void addUser(FriendListFriend user) {
+        users.add(new UserInfo(user));
+        addButtons(users.size() - 1);
+    }
+
+    private void addButtons(int fromI) {
+        int y = getY() + fromI * 24;
+        for (int i = fromI; i < getVisibleCount(); i++) {
+            final UserInfo user = users.get(i);
+            int x = getRight() - 24 * user.actions.size() + 4;
+            for (final Action action : user.actions) {
+                actionButtons.add(
+                    button(action.text, b -> action.apply.run())
+                        .tooltip(action.tooltip)
+                        .pos(x, y)
+                        .size(20, 20)
+                        .build()
+                );
+                x += 24;
+            }
+            y += 24;
         }
     }
 
@@ -120,7 +143,7 @@ public int getVisibleCount() {
 
     @Override
     public @NotNull List<? extends GuiEventListener> children() {
-        return addButtons;
+        return actionButtons;
     }
 
     //#if MC < 1.19.4
@@ -133,10 +156,23 @@ public int getVisibleCount() {
     //$$ }
     //#endif
 
-    private final class CachedProfile {
+    public static Component getNameWithTag(FriendListFriend user, ProfileInfo profile) {
+        return user.tag()
+            .map(component -> Components.translatable(
+                "world-host.friends.tagged_friend",
+                profile.name(), component
+            ))
+            .orElseGet(() -> Components.literal(profile.name()));
+    }
+
+    private final class UserInfo {
+        final FriendListFriend user;
+        final List<Action> actions;
         private ProfileInfo profile;
 
-        CachedProfile(FriendListFriend user) {
+        UserInfo(FriendListFriend user) {
+            this.user = user;
+            actions = getApplicableActions.apply(user);
             profile = user.fallbackProfileInfo();
             user.profileInfo()
                 .thenAcceptAsync(ready -> profile = ready, Minecraft.getInstance())
@@ -146,23 +182,24 @@ private final class CachedProfile {
                 });
         }
 
-        String getName() {
-            return fitName(profile.name());
+        FormattedCharSequence getName() {
+            final Component name = getNameWithTag(user, profile);
+            final int maxWidth = width - 24 - 24 * actions.size();
+            if (font.width(name) <= maxWidth) {
+                return name.getVisualOrderText();
+            }
+            final FormattedText clipped = font.substrByWidth(name, maxWidth - font.width(CommonComponents.ELLIPSIS));
+            return Language.getInstance().getVisualOrder(FormattedText.composite(clipped, CommonComponents.ELLIPSIS));
         }
 
         IconRenderer getIcon() {
             return profile.iconRenderer();
         }
+    }
 
-        private String fitName(String name) {
-            final int nameWidth = font.width(name);
-            final int maxWidth = width - 48;
-            if (nameWidth <= maxWidth) {
-                return name;
-            }
-            final String ellipses = "...";
-            final String clipped = font.plainSubstrByWidth(name, maxWidth - font.width(ellipses));
-            return clipped + ellipses;
+    public record Action(Component text, @Nullable Component tooltip, Runnable apply) {
+        public Action(Component text, Runnable apply) {
+            this(text, null, apply);
         }
     }
 }
diff --git a/src/main/java/io/github/gaming32/worldhost/plugin/FriendAdder.java b/src/main/java/io/github/gaming32/worldhost/plugin/FriendAdder.java
index 91938860..0a2400c8 100644
--- a/src/main/java/io/github/gaming32/worldhost/plugin/FriendAdder.java
+++ b/src/main/java/io/github/gaming32/worldhost/plugin/FriendAdder.java
@@ -2,13 +2,18 @@
 
 import net.minecraft.network.chat.Component;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
 
 public interface FriendAdder {
     Component label();
 
-    CompletableFuture<List<? extends FriendListFriend>> searchFriends(String name, int maxResults);
+    /**
+     * Search for users by name.
+     * @param name The search query
+     * @param maxResults A hint at the maximum result count. May more be returned, but might not be shown.
+     * @param friendConsumer The {@link Consumer} to pass found users. This may be called from any thread.
+     */
+    void searchFriends(String name, int maxResults, Consumer<FriendListFriend> friendConsumer);
 
     boolean delayLookup(String name);
 }
diff --git a/src/main/java/io/github/gaming32/worldhost/plugin/FriendListFriend.java b/src/main/java/io/github/gaming32/worldhost/plugin/FriendListFriend.java
index 31cb5574..6dccae54 100644
--- a/src/main/java/io/github/gaming32/worldhost/plugin/FriendListFriend.java
+++ b/src/main/java/io/github/gaming32/worldhost/plugin/FriendListFriend.java
@@ -11,6 +11,10 @@ public interface FriendListFriend extends Profilable {
     default void addFriend(boolean notify, Runnable refresher) {
     }
 
+    default boolean supportsNotifyAdd() {
+        return false;
+    }
+
     void removeFriend(Runnable refresher);
 
     default Optional<Component> tag() {
diff --git a/src/main/java/io/github/gaming32/worldhost/plugin/vanilla/WorldHostFriendAdder.java b/src/main/java/io/github/gaming32/worldhost/plugin/vanilla/WorldHostFriendAdder.java
index 51d2ba25..51cae966 100644
--- a/src/main/java/io/github/gaming32/worldhost/plugin/vanilla/WorldHostFriendAdder.java
+++ b/src/main/java/io/github/gaming32/worldhost/plugin/vanilla/WorldHostFriendAdder.java
@@ -8,10 +8,8 @@
 import net.minecraft.network.chat.Component;
 
 import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
 import java.util.regex.Pattern;
 
 public class WorldHostFriendAdder implements FriendAdder {
@@ -24,25 +22,21 @@ public Component label() {
     }
 
     @Override
-    public CompletableFuture<List<? extends FriendListFriend>> searchFriends(String name, int maxResults) {
+    public void searchFriends(String name, int maxResults, Consumer<FriendListFriend> friendConsumer) {
         if (VALID_USERNAME.matcher(name).matches()) {
-            final CompletableFuture<Optional<GameProfile>> result = new CompletableFuture<>();
-            WorldHost.getMaybeAsync(WorldHost.getProfileCache(), name, result::complete);
-            return result.thenApply(p -> p.map(WorldHostFriendListFriend::new).map(List::of).orElse(List.of()));
-        }
-        if (VALID_UUID.matcher(name).matches()) {
-            return CompletableFuture.completedFuture(List.of(
-                new WorldHostFriendListFriend(UUID.fromString(name))
-            ));
-        }
-        if (name.startsWith("o:")) {
+            WorldHost.getMaybeAsync(
+                WorldHost.getProfileCache(), name,
+                profile -> profile.map(WorldHostFriendListFriend::new).ifPresent(friendConsumer)
+            );
+        } else if (VALID_UUID.matcher(name).matches()) {
+            friendConsumer.accept(new WorldHostFriendListFriend(UUID.fromString(name)));
+        } else if (name.startsWith("o:")) {
             final String actualName = name.substring(2);
             // TODO: Use createOfflinePlayerUUID when 1.19.2+ becomes the minimum, and createOfflineProfile in 1.20.4+
-            return CompletableFuture.completedFuture(List.of(new WorldHostFriendListFriend(new GameProfile(
+            friendConsumer.accept(new WorldHostFriendListFriend(new GameProfile(
                 UUID.nameUUIDFromBytes(("OfflinePlayer:" + actualName).getBytes(StandardCharsets.UTF_8)), actualName
-            ))));
+            )));
         }
-        return CompletableFuture.completedFuture(List.of());
     }
 
     @Override
diff --git a/src/main/java/io/github/gaming32/worldhost/plugin/vanilla/WorldHostFriendListFriend.java b/src/main/java/io/github/gaming32/worldhost/plugin/vanilla/WorldHostFriendListFriend.java
index 3fa08cff..9be46039 100644
--- a/src/main/java/io/github/gaming32/worldhost/plugin/vanilla/WorldHostFriendListFriend.java
+++ b/src/main/java/io/github/gaming32/worldhost/plugin/vanilla/WorldHostFriendListFriend.java
@@ -28,6 +28,11 @@ public void addFriend(boolean notify, Runnable refresher) {
         }
     }
 
+    @Override
+    public boolean supportsNotifyAdd() {
+        return true;
+    }
+
     @Override
     public void removeFriend(Runnable refresher) {
         WorldHost.CONFIG.getFriends().remove(uuid);
diff --git a/src/main/java/io/github/gaming32/worldhost/protocol/WorldHostS2CMessage.java b/src/main/java/io/github/gaming32/worldhost/protocol/WorldHostS2CMessage.java
index 0c11f373..964be140 100644
--- a/src/main/java/io/github/gaming32/worldhost/protocol/WorldHostS2CMessage.java
+++ b/src/main/java/io/github/gaming32/worldhost/protocol/WorldHostS2CMessage.java
@@ -121,7 +121,7 @@ public void handle(ProtocolClient client) {
                         minecraft.screen,
                         FriendsScreen.ADD_FRIEND_TEXT,
                         new WorldHostFriendListFriend(fromUser),
-                        friend -> friend.addFriend(true, () -> {})
+                        (friend, notify) -> friend.addFriend(notify, () -> {})
                     ));
                 }
             );
diff --git a/src/main/java/io/github/gaming32/worldhost/versions/ButtonBuilder.java b/src/main/java/io/github/gaming32/worldhost/versions/ButtonBuilder.java
index 0e88a074..39221e69 100644
--- a/src/main/java/io/github/gaming32/worldhost/versions/ButtonBuilder.java
+++ b/src/main/java/io/github/gaming32/worldhost/versions/ButtonBuilder.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.Nullable;
 
 //#if MC >= 1.19.4
 import net.minecraft.client.gui.components.Tooltip;
@@ -70,11 +71,11 @@ public ButtonBuilder bounds(int x, int y, int width, int height) {
         return this;
     }
 
-    public ButtonBuilder tooltip(Component tooltip) {
+    public ButtonBuilder tooltip(@Nullable Component tooltip) {
         //#if MC >= 1.19.4
-        builder.tooltip(Tooltip.create(tooltip));
+        builder.tooltip(tooltip != null ? Tooltip.create(tooltip) : null);
         //#else
-        //$$ onTooltip = WorldHostScreen.onTooltip(tooltip);
+        //$$ onTooltip = tooltip != null ? WorldHostScreen.onTooltip(tooltip) : Button.NO_TOOLTIP;
         //#endif
         return this;
     }