Release v1.0.1

api/src/main/java/com/rappytv/betterfriends/api/FriendHelper.java

@@ -0,0 +1,20 @@
+package com.rappytv.betterfriends.api;
+
+import java.util.UUID;
+import net.labymod.api.labyconnect.protocol.model.friend.Friend;
+import net.labymod.api.mojang.GameProfile;
+import net.labymod.api.reference.annotation.Referenceable;
+import org.jetbrains.annotations.Nullable;
+
+@Referenceable
+public interface FriendHelper {
+
+  @Nullable
+  default Friend getFriend(GameProfile profile) {
+    return this.getFriend(profile.getUniqueId());
+  }
+
+  @Nullable
+  Friend getFriend(UUID uuid);
+
+}

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 val versions = providers.gradleProperty("net.labymod.minecraft-versions").get().split(";")
 
 group = "org.example"
-version = providers.environmentVariable("VERSION").getOrElse("1.0.0")
+version = providers.environmentVariable("VERSION").getOrElse("1.0.1")
 
 labyMod {
     defaultPackageName = "com.rappytv.betterfriends"

core/src/main/java/com/rappytv/betterfriends/BetterFriendsAddon.java

@@ -1,5 +1,6 @@
 package com.rappytv.betterfriends;
 
+import com.rappytv.betterfriends.api.generated.ReferenceStorage;
 import com.rappytv.betterfriends.command.BetterFriendsCommand;
 import com.rappytv.betterfriends.config.BetterFriendsConfig;
 import com.rappytv.betterfriends.interactions.FriendNoteEditorBullet;
@@ -19,6 +20,7 @@
 import com.rappytv.betterfriends.ui.hud.UnreadChatCountWidget;
 import com.rappytv.betterfriends.ui.tags.FriendNoteNameTag;
 import com.rappytv.betterfriends.ui.tags.FriendPinIconTag;
+import com.rappytv.betterfriends.utils.GroupHelper;
 import net.labymod.api.Laby;
 import net.labymod.api.addon.LabyAddon;
 import net.labymod.api.client.component.Component;
@@ -30,17 +32,29 @@
 import net.labymod.api.client.entity.player.tag.PositionType;
 import net.labymod.api.client.gui.hud.binding.category.HudWidgetCategory;
 import net.labymod.api.models.addon.annotation.AddonMain;
+import net.labymod.api.revision.SimpleRevision;
+import net.labymod.api.util.version.SemanticVersion;
 
 @AddonMain
 public class BetterFriendsAddon extends LabyAddon<BetterFriendsConfig> {
 
-  private final LegacyComponentSerializer serializer = LegacyComponentSerializer.legacyAmpersand();
+  private static final LegacyComponentSerializer SERIALIZER = LegacyComponentSerializer.legacyAmpersand();
   private static BetterFriendsAddon instance;
 
+  @Override
+  protected void preConfigurationLoad() {
+    Laby.references().revisionRegistry().register(new SimpleRevision(
+        "betterfriends",
+        new SemanticVersion(1, 0, 1),
+        "2025-12-10"
+    ));
+  }
+
   @Override
   protected void enable() {
     instance = this;
     this.registerSettingCategory();
+    GroupHelper.registerGroupIds();
 
     this.registerCommand(new BetterFriendsCommand());
 
@@ -75,7 +89,7 @@ protected void enable() {
         "VoiceTag",
         "betterfriends_pin_icon",
         PositionType.RIGHT_TO_NAME,
-        new FriendPinIconTag(this)
+        new FriendPinIconTag()
     );
     Laby.references().badgeRegistry().registerBefore(
         "VoiceBadge",
@@ -90,6 +104,10 @@ protected Class<? extends BetterFriendsConfig> configurationClass() {
     return BetterFriendsConfig.class;
   }
 
+  public static ReferenceStorage references() {
+    return instance.referenceStorageAccessor();
+  }
+
   public static TextComponent getPrefix() {
     return Component.empty()
         .append(Component.text(
@@ -102,6 +120,6 @@ public static TextComponent getPrefix() {
   }
 
   public LegacyComponentSerializer getSerializer() {
-    return this.serializer;
+    return SERIALIZER;
   }
 }

core/src/main/java/com/rappytv/betterfriends/command/BetterFriendsCommand.java

@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.UUID;
 import com.rappytv.betterfriends.listeners.LabyChatReceiveListener;
-import com.rappytv.betterfriends.utils.NameHelper;
+import com.rappytv.betterfriends.utils.GroupHelper;
 import net.labymod.api.Laby;
 import net.labymod.api.client.chat.command.Command;
 import net.labymod.api.client.chat.command.SubCommand;
@@ -99,7 +99,7 @@ public boolean execute(String prefix, String[] arguments) {
                 .append(Component.translatable(
                     this.getTranslationKey("success.accept"),
                     NamedTextColor.GRAY,
-                    NameHelper.getColoredName(request.getName(), request.gameUser())
+                    GroupHelper.getColoredName(request.getName(), request.gameUser())
                 ))
         );
         return true;
@@ -160,7 +160,7 @@ public boolean execute(String prefix, String[] arguments) {
                 .append(Component.translatable(
                     this.getTranslationKey("success.decline"),
                     NamedTextColor.GRAY,
-                    NameHelper.getColoredName(request.getName(), request.gameUser())
+                    GroupHelper.getColoredName(request.getName(), request.gameUser())
                 ))
         );
         return true;

core/src/main/java/com/rappytv/betterfriends/config/BetterFriendsConfig.java

@@ -2,17 +2,23 @@
 
 import com.rappytv.betterfriends.config.subconfig.FriendNoteTagConfig;
 import com.rappytv.betterfriends.config.subconfig.PinIconConfig;
+import com.rappytv.betterfriends.ui.activities.config.FriendlistActivity;
+import com.rappytv.betterfriends.ui.widgets.FriendlistFriendWidget;
 import net.labymod.api.addon.AddonConfig;
+import net.labymod.api.client.gui.screen.activity.Activity;
+import net.labymod.api.client.gui.screen.widget.widgets.activity.settings.ActivitySettingWidget.ActivitySetting;
 import net.labymod.api.client.gui.screen.widget.widgets.input.SwitchWidget.SwitchSetting;
 import net.labymod.api.client.gui.screen.widget.widgets.input.TextFieldWidget.TextFieldSetting;
 import net.labymod.api.client.gui.screen.widget.widgets.input.color.ColorPickerWidget.ColorPickerSetting;
 import net.labymod.api.client.gui.screen.widget.widgets.input.dropdown.DropdownWidget.DropdownSetting;
+import net.labymod.api.configuration.loader.annotation.IntroducedIn;
 import net.labymod.api.configuration.loader.annotation.SpriteSlot;
 import net.labymod.api.configuration.loader.annotation.SpriteTexture;
 import net.labymod.api.configuration.loader.property.ConfigProperty;
 import net.labymod.api.configuration.settings.annotation.SettingRequires;
 import net.labymod.api.configuration.settings.annotation.SettingSection;
 import net.labymod.api.util.Color;
+import net.labymod.api.util.MethodOrder;
 
 @SpriteTexture("settings.png")
 public class BetterFriendsConfig extends AddonConfig {
@@ -21,13 +27,23 @@ public class BetterFriendsConfig extends AddonConfig {
   @SpriteSlot
   @SwitchSetting
   private final ConfigProperty<Boolean> enabled = new ConfigProperty<>(true);
+
   @SpriteSlot(x = 1)
   @ColorPickerSetting
   private final ConfigProperty<Color> prefixColor = new ConfigProperty<>(Color.ofRGB(255, 102, 0));
+
+  @MethodOrder(after = "prefixColor")
+  @ActivitySetting
+  public Activity advancedFriendlist() {
+    return new FriendlistActivity<>(FriendlistFriendWidget::new);
+  }
+
   @SpriteSlot(size = 8, x = 4)
   private final PinIconConfig pinIconConfig = new PinIconConfig();
+
   @SpriteSlot(x = 3)
   private final FriendNoteTagConfig friendNoteTagConfig = new FriendNoteTagConfig();
+
   @SpriteSlot(x = 4)
   @TextFieldSetting
   private final ConfigProperty<String> friendPrefix = new ConfigProperty<>("&aⒻ");
@@ -36,31 +52,43 @@ public class BetterFriendsConfig extends AddonConfig {
   @SpriteSlot(x = 5)
   @SwitchSetting
   private final ConfigProperty<Boolean> friendRequestNotifications = new ConfigProperty<>(true);
+
   @SettingRequires("friendRequestNotifications")
   @SpriteSlot(x = 6)
   @DropdownSetting
   private final ConfigProperty<FriendRequestReaction> automaticFriendRequestReaction = new ConfigProperty<>(
       FriendRequestReaction.NONE);
+
   @SpriteSlot(x = 7)
   @SwitchSetting
   private final ConfigProperty<Boolean> friendServerSwitchNotifications = new ConfigProperty<>(true);
+
   @SpriteSlot(y = 1)
   @SwitchSetting
   private final ConfigProperty<Boolean> friendStatusUpdateNotifications = new ConfigProperty<>(true);
+
   @SpriteSlot(x = 1, y = 1)
   @SwitchSetting
   private final ConfigProperty<Boolean> friendRemovalNotifications = new ConfigProperty<>(true);
+
   @SpriteSlot(x = 2, y = 1)
   @SwitchSetting
   private final ConfigProperty<Boolean> friendRequestRemovalNotifications = new ConfigProperty<>(true);
+
   @SpriteSlot(x = 3, y = 1)
   @SwitchSetting
   private final ConfigProperty<Boolean> labyChatMessageNotifications = new ConfigProperty<>(true);
+
   @SettingRequires("labyChatMessageNotifications")
   @SpriteSlot(x = 4, y = 1)
   @SwitchSetting
   private final ConfigProperty<Boolean> ownLabyChatMessages = new ConfigProperty<>(true);
 
+  @SettingRequires("labyChatMessageNotifications")
+  @IntroducedIn(namespace = "betterfriends", value = "1.0.1")
+  @SwitchSetting
+  private final ConfigProperty<Boolean> showInteractionButtons = new ConfigProperty<>(true);
+
   @SettingSection(value = "interactions", center = true)
 //  @SpriteSlot(x = 5, y = 1)
 //  @SwitchSetting
@@ -78,50 +106,65 @@ public class BetterFriendsConfig extends AddonConfig {
   public ConfigProperty<Boolean> enabled() {
     return this.enabled;
   }
+
   public ConfigProperty<Color> prefixColor() {
     return this.prefixColor;
   }
+
   public PinIconConfig pinIconConfig() {
     return this.pinIconConfig;
   }
   public FriendNoteTagConfig friendNoteTagConfig() {
     return this.friendNoteTagConfig;
   }
+
   public ConfigProperty<String> friendPrefix() {
     return this.friendPrefix;
   }
 
   public ConfigProperty<Boolean> friendRequestNotifications() {
     return this.friendRequestNotifications;
   }
+
   public ConfigProperty<FriendRequestReaction> automaticFriendRequestReaction() {
     return this.automaticFriendRequestReaction;
   }
+
   public ConfigProperty<Boolean> friendServerSwitchNotifications() {
     return this.friendServerSwitchNotifications;
   }
+
   public ConfigProperty<Boolean> friendStatusUpdateNotifications() {
     return this.friendStatusUpdateNotifications;
   }
+
   public ConfigProperty<Boolean> friendRemovalNotifications() {
     return this.friendRemovalNotifications;
   }
+
   public ConfigProperty<Boolean> friendRequestRemovalNotifications() {
     return this.friendRequestRemovalNotifications;
   }
+
   public ConfigProperty<Boolean> labyChatMessageNotifications() {
     return this.labyChatMessageNotifications;
   }
+
   public ConfigProperty<Boolean> ownLabyChatMessages() {
     return this.ownLabyChatMessages;
   }
 
+  public ConfigProperty<Boolean> showInteractionButtons() {
+    return this.showInteractionButtons;
+  }
+
 //  public ConfigProperty<Boolean> noteEditorBullet() {
 //    return this.noteEditorBullet;
 //  }
   public ConfigProperty<Boolean> togglePinBullet() {
     return this.togglePinBullet;
   }
+
   public ConfigProperty<Boolean> restartWhenMuted() {
     return this.restartWhenMuted;
   }

core/src/main/java/com/rappytv/betterfriends/listeners/ChatReceiveListener.java

@@ -47,8 +47,10 @@ public void onChatReceive(ChatReceiveEvent receiveEvent) {
     }
 
     receiveEvent.setMessage(
-        this.addon.getSerializer()
-            .deserialize(this.addon.configuration().friendPrefix().get())
+        Component.empty()
+            .append(this.addon.getSerializer().deserialize(
+                this.addon.configuration().friendPrefix().get()
+            ))
             .append(Component.space())
             .append(message)
     );

core/src/main/java/com/rappytv/betterfriends/listeners/FriendRemoveListener.java

@@ -1,7 +1,7 @@
 package com.rappytv.betterfriends.listeners;
 
 import com.rappytv.betterfriends.BetterFriendsAddon;
-import com.rappytv.betterfriends.utils.NameHelper;
+import com.rappytv.betterfriends.utils.GroupHelper;
 import net.labymod.api.client.component.Component;
 import net.labymod.api.client.gui.icon.Icon;
 import net.labymod.api.event.Subscribe;
@@ -25,7 +25,7 @@ public void onFriendRemove(LabyConnectFriendRemoveEvent event) {
         .title(Component.translatable("betterfriends.notifications.friendRemoval.title"))
         .text(Component.translatable(
             "betterfriends.notifications.friendRemoval.description",
-            NameHelper.getColoredName(event.friend())
+            GroupHelper.getColoredName(event.friend())
         ))
         .icon(Icon.head(event.friend().getUniqueId(), true))
         .duration(15000)

core/src/main/java/com/rappytv/betterfriends/listeners/FriendRequestReceiveListener.java

@@ -1,7 +1,7 @@
 package com.rappytv.betterfriends.listeners;
 
 import com.rappytv.betterfriends.BetterFriendsAddon;
-import com.rappytv.betterfriends.utils.NameHelper;
+import com.rappytv.betterfriends.utils.GroupHelper;
 import net.labymod.api.Laby;
 import net.labymod.api.client.component.Component;
 import net.labymod.api.client.component.event.ClickEvent;
@@ -25,7 +25,7 @@ public void onFriendRequestReceive(LabyConnectIncomingFriendRequestAddEvent even
       return;
     }
     IncomingFriendRequest request = event.request();
-    Component sender = NameHelper.getColoredName(request.getName(), request.gameUser())
+    Component sender = GroupHelper.getColoredName(request.getName(), request.gameUser())
         .hoverEvent(HoverEvent.showText(Component.translatable(
             "betterfriends.general.labynet",
             NamedTextColor.DARK_PURPLE

core/src/main/java/com/rappytv/betterfriends/listeners/FriendRequestRemoveListener.java

@@ -1,7 +1,7 @@
 package com.rappytv.betterfriends.listeners;
 
 import com.rappytv.betterfriends.BetterFriendsAddon;
-import com.rappytv.betterfriends.utils.NameHelper;
+import com.rappytv.betterfriends.utils.GroupHelper;
 import net.labymod.api.client.component.Component;
 import net.labymod.api.client.gui.icon.Icon;
 import net.labymod.api.event.Subscribe;
@@ -34,7 +34,7 @@ public void onFriendRequestRemove(LabyConnectOutgoingFriendRequestRemoveEvent ev
         .title(Component.translatable("betterfriends.notifications.friendRequestRemoval.title"))
         .text(Component.translatable(
             "betterfriends.notifications.friendRequestRemoval.description",
-            NameHelper.getColoredName(event.request().getName(), event.request().gameUser())
+            GroupHelper.getColoredName(event.request().getName(), event.request().gameUser())
         ))
         .icon(Icon.head(event.request().getUniqueId(), true))
         .duration(15000)

core/src/main/java/com/rappytv/betterfriends/listeners/FriendServerStateListener.java

@@ -1,7 +1,7 @@
 package com.rappytv.betterfriends.listeners;
 
 import com.rappytv.betterfriends.BetterFriendsAddon;
-import com.rappytv.betterfriends.utils.NameHelper;
+import com.rappytv.betterfriends.utils.GroupHelper;
 import net.labymod.api.client.component.Component;
 import net.labymod.api.client.component.event.ClickEvent;
 import net.labymod.api.client.component.event.HoverEvent;
@@ -68,7 +68,7 @@ public void onServerUpdate(LabyConnectFriendServerEvent event) {
     this.addon.displayMessage(
         Component.empty()
             .append(BetterFriendsAddon.getPrefix())
-            .append(NameHelper.getColoredName(friend))
+            .append(GroupHelper.getColoredName(friend))
             .append(Component.space())
             .append(text)
             .color(NamedTextColor.GRAY)

core/src/main/java/com/rappytv/betterfriends/listeners/FriendStatusUpdateListener.java

@@ -1,7 +1,7 @@
 package com.rappytv.betterfriends.listeners;
 
 import com.rappytv.betterfriends.BetterFriendsAddon;
-import com.rappytv.betterfriends.utils.NameHelper;
+import com.rappytv.betterfriends.utils.GroupHelper;
 import net.labymod.api.client.component.Component;
 import net.labymod.api.client.component.format.NamedTextColor;
 import net.labymod.api.event.Subscribe;
@@ -39,7 +39,7 @@ public void onStatusUpdate(LabyConnectFriendStatusEvent event) {
             .append(BetterFriendsAddon.getPrefix())
             .append(Component.translatable(
                 "betterfriends.notifications.statusUpdate.message",
-                NameHelper.getColoredName(event.friend()),
+                GroupHelper.getColoredName(event.friend()),
                 stateComponent
             ))
             .color(NamedTextColor.GRAY)