From 9b8c237a045077de9e346c79d1100b660f14297a Mon Sep 17 00:00:00 2001 From: RappyTV Date: Sun, 19 Apr 2026 23:04:46 +0200 Subject: [PATCH] chore: Move core code into core module --- .../{ => core}/BetterFriendsAddon.java | 36 +++++++++---------- .../command/BetterFriendsCommand.java | 8 ++--- .../config/BetterFriendsConfig.java | 8 ++--- .../config/subconfig/FriendNoteTagConfig.java | 2 +- .../config/subconfig/PinIconConfig.java | 2 +- .../subconfig/PrefixCustomizationConfig.java | 4 +-- .../interactions/FriendNoteEditorBullet.java | 6 ++-- .../interactions/FriendTogglePinBullet.java | 4 +-- .../listeners/ChatReceiveListener.java | 4 +-- .../listeners/ConfigVersionListener.java | 4 +-- .../{ => core}/listeners/FriendListener.java | 6 ++-- .../listeners/FriendRequestListener.java | 6 ++-- .../listeners/LabyChatReceiveListener.java | 6 ++-- .../listeners/TemporaryPinListener.java | 6 ++-- .../{ => core}/ui/badge/FriendPinBadge.java | 4 +-- .../ui/hud/FriendCountHudWidget.java | 2 +- .../IncomingFriendRequestCountHudWidget.java | 2 +- .../ui/hud/OnlineFriendCountHudWidget.java | 2 +- .../ui/hud/UnreadChatCountWidget.java | 2 +- .../snapshot/BetterFriendsFriendSnapshot.java | 6 ++-- .../BetterFriendsFriendSnapshotProcessor.java | 2 +- .../ui/snapshot/BetterFriendsKeys.java | 2 +- .../BetterFriendsSnapshotFactory.java | 4 +-- .../{ => core}/ui/tags/FriendNoteNameTag.java | 8 ++--- .../{ => core}/ui/tags/FriendPinIconTag.java | 6 ++-- .../ui/widget/config/PrefixPreviewWidget.java | 4 +-- .../{ => core}/utils/DefaultFriendHelper.java | 2 +- .../{ => core}/utils/GroupHelper.java | 2 +- 28 files changed, 75 insertions(+), 75 deletions(-) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/BetterFriendsAddon.java (72%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/command/BetterFriendsCommand.java (98%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/config/BetterFriendsConfig.java (95%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/config/subconfig/FriendNoteTagConfig.java (96%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/config/subconfig/PinIconConfig.java (92%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/config/subconfig/PrefixCustomizationConfig.java (95%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/interactions/FriendNoteEditorBullet.java (90%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/interactions/FriendTogglePinBullet.java (93%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/listeners/ChatReceiveListener.java (94%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/listeners/ConfigVersionListener.java (86%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/listeners/FriendListener.java (97%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/listeners/FriendRequestListener.java (96%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/listeners/LabyChatReceiveListener.java (95%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/listeners/TemporaryPinListener.java (94%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/badge/FriendPinBadge.java (90%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/hud/FriendCountHudWidget.java (97%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/hud/IncomingFriendRequestCountHudWidget.java (97%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/hud/OnlineFriendCountHudWidget.java (96%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/hud/UnreadChatCountWidget.java (96%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/snapshot/BetterFriendsFriendSnapshot.java (82%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/snapshot/BetterFriendsFriendSnapshotProcessor.java (94%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/snapshot/BetterFriendsKeys.java (82%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/snapshot/BetterFriendsSnapshotFactory.java (86%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/tags/FriendNoteNameTag.java (91%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/tags/FriendPinIconTag.java (81%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/ui/widget/config/PrefixPreviewWidget.java (95%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/utils/DefaultFriendHelper.java (93%) rename core/src/main/java/com/rappytv/betterfriends/{ => core}/utils/GroupHelper.java (90%) diff --git a/core/src/main/java/com/rappytv/betterfriends/BetterFriendsAddon.java b/core/src/main/java/com/rappytv/betterfriends/core/BetterFriendsAddon.java similarity index 72% rename from core/src/main/java/com/rappytv/betterfriends/BetterFriendsAddon.java rename to core/src/main/java/com/rappytv/betterfriends/core/BetterFriendsAddon.java index ce0e43a..ed47049 100644 --- a/core/src/main/java/com/rappytv/betterfriends/BetterFriendsAddon.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/BetterFriendsAddon.java @@ -1,23 +1,23 @@ -package com.rappytv.betterfriends; +package com.rappytv.betterfriends.core; 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; -import com.rappytv.betterfriends.interactions.FriendTogglePinBullet; -import com.rappytv.betterfriends.listeners.ChatReceiveListener; -import com.rappytv.betterfriends.listeners.ConfigVersionListener; -import com.rappytv.betterfriends.listeners.FriendListener; -import com.rappytv.betterfriends.listeners.FriendRequestListener; -import com.rappytv.betterfriends.listeners.LabyChatReceiveListener; -import com.rappytv.betterfriends.listeners.TemporaryPinListener; -import com.rappytv.betterfriends.ui.badge.FriendPinBadge; -import com.rappytv.betterfriends.ui.hud.FriendCountHudWidget; -import com.rappytv.betterfriends.ui.hud.IncomingFriendRequestCountHudWidget; -import com.rappytv.betterfriends.ui.hud.OnlineFriendCountHudWidget; -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.core.command.BetterFriendsCommand; +import com.rappytv.betterfriends.core.config.BetterFriendsConfig; +import com.rappytv.betterfriends.core.interactions.FriendNoteEditorBullet; +import com.rappytv.betterfriends.core.interactions.FriendTogglePinBullet; +import com.rappytv.betterfriends.core.listeners.ChatReceiveListener; +import com.rappytv.betterfriends.core.listeners.ConfigVersionListener; +import com.rappytv.betterfriends.core.listeners.FriendListener; +import com.rappytv.betterfriends.core.listeners.FriendRequestListener; +import com.rappytv.betterfriends.core.listeners.LabyChatReceiveListener; +import com.rappytv.betterfriends.core.listeners.TemporaryPinListener; +import com.rappytv.betterfriends.core.ui.badge.FriendPinBadge; +import com.rappytv.betterfriends.core.ui.hud.FriendCountHudWidget; +import com.rappytv.betterfriends.core.ui.hud.IncomingFriendRequestCountHudWidget; +import com.rappytv.betterfriends.core.ui.hud.OnlineFriendCountHudWidget; +import com.rappytv.betterfriends.core.ui.hud.UnreadChatCountWidget; +import com.rappytv.betterfriends.core.ui.tags.FriendNoteNameTag; +import com.rappytv.betterfriends.core.ui.tags.FriendPinIconTag; import net.labymod.api.Laby; import net.labymod.api.addon.LabyAddon; import net.labymod.api.client.component.Component; diff --git a/core/src/main/java/com/rappytv/betterfriends/command/BetterFriendsCommand.java b/core/src/main/java/com/rappytv/betterfriends/core/command/BetterFriendsCommand.java similarity index 98% rename from core/src/main/java/com/rappytv/betterfriends/command/BetterFriendsCommand.java rename to core/src/main/java/com/rappytv/betterfriends/core/command/BetterFriendsCommand.java index 0401b9b..1dc1a6f 100644 --- a/core/src/main/java/com/rappytv/betterfriends/command/BetterFriendsCommand.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/command/BetterFriendsCommand.java @@ -1,12 +1,12 @@ -package com.rappytv.betterfriends.command; +package com.rappytv.betterfriends.core.command; -import com.rappytv.betterfriends.BetterFriendsAddon; +import com.rappytv.betterfriends.core.BetterFriendsAddon; +import com.rappytv.betterfriends.core.listeners.LabyChatReceiveListener; +import com.rappytv.betterfriends.core.utils.GroupHelper; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.UUID; -import com.rappytv.betterfriends.listeners.LabyChatReceiveListener; -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; diff --git a/core/src/main/java/com/rappytv/betterfriends/config/BetterFriendsConfig.java b/core/src/main/java/com/rappytv/betterfriends/core/config/BetterFriendsConfig.java similarity index 95% rename from core/src/main/java/com/rappytv/betterfriends/config/BetterFriendsConfig.java rename to core/src/main/java/com/rappytv/betterfriends/core/config/BetterFriendsConfig.java index 56e89ca..6e3f045 100644 --- a/core/src/main/java/com/rappytv/betterfriends/config/BetterFriendsConfig.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/config/BetterFriendsConfig.java @@ -1,8 +1,8 @@ -package com.rappytv.betterfriends.config; +package com.rappytv.betterfriends.core.config; -import com.rappytv.betterfriends.config.subconfig.FriendNoteTagConfig; -import com.rappytv.betterfriends.config.subconfig.PinIconConfig; -import com.rappytv.betterfriends.config.subconfig.PrefixCustomizationConfig; +import com.rappytv.betterfriends.core.config.subconfig.FriendNoteTagConfig; +import com.rappytv.betterfriends.core.config.subconfig.PinIconConfig; +import com.rappytv.betterfriends.core.config.subconfig.PrefixCustomizationConfig; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/core/src/main/java/com/rappytv/betterfriends/config/subconfig/FriendNoteTagConfig.java b/core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/FriendNoteTagConfig.java similarity index 96% rename from core/src/main/java/com/rappytv/betterfriends/config/subconfig/FriendNoteTagConfig.java rename to core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/FriendNoteTagConfig.java index e897917..f8ae08b 100644 --- a/core/src/main/java/com/rappytv/betterfriends/config/subconfig/FriendNoteTagConfig.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/FriendNoteTagConfig.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.config.subconfig; +package com.rappytv.betterfriends.core.config.subconfig; import net.labymod.api.client.entity.player.tag.PositionType; import net.labymod.api.client.gui.screen.widget.widgets.input.SliderWidget.SliderSetting; diff --git a/core/src/main/java/com/rappytv/betterfriends/config/subconfig/PinIconConfig.java b/core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/PinIconConfig.java similarity index 92% rename from core/src/main/java/com/rappytv/betterfriends/config/subconfig/PinIconConfig.java rename to core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/PinIconConfig.java index 9039395..f2b813a 100644 --- a/core/src/main/java/com/rappytv/betterfriends/config/subconfig/PinIconConfig.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/PinIconConfig.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.config.subconfig; +package com.rappytv.betterfriends.core.config.subconfig; import net.labymod.api.client.gui.screen.widget.widgets.input.SwitchWidget.SwitchSetting; import net.labymod.api.configuration.loader.Config; diff --git a/core/src/main/java/com/rappytv/betterfriends/config/subconfig/PrefixCustomizationConfig.java b/core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/PrefixCustomizationConfig.java similarity index 95% rename from core/src/main/java/com/rappytv/betterfriends/config/subconfig/PrefixCustomizationConfig.java rename to core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/PrefixCustomizationConfig.java index 0105f90..38891aa 100644 --- a/core/src/main/java/com/rappytv/betterfriends/config/subconfig/PrefixCustomizationConfig.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/PrefixCustomizationConfig.java @@ -1,6 +1,6 @@ -package com.rappytv.betterfriends.config.subconfig; +package com.rappytv.betterfriends.core.config.subconfig; -import com.rappytv.betterfriends.ui.widget.config.PrefixPreviewWidget.PrefixPreviewSetting; +import com.rappytv.betterfriends.core.ui.widget.config.PrefixPreviewWidget.PrefixPreviewSetting; import net.labymod.api.client.component.Component; import net.labymod.api.client.component.format.NamedTextColor; import net.labymod.api.client.component.format.TextColor; diff --git a/core/src/main/java/com/rappytv/betterfriends/interactions/FriendNoteEditorBullet.java b/core/src/main/java/com/rappytv/betterfriends/core/interactions/FriendNoteEditorBullet.java similarity index 90% rename from core/src/main/java/com/rappytv/betterfriends/interactions/FriendNoteEditorBullet.java rename to core/src/main/java/com/rappytv/betterfriends/core/interactions/FriendNoteEditorBullet.java index c0c7f27..26570db 100644 --- a/core/src/main/java/com/rappytv/betterfriends/interactions/FriendNoteEditorBullet.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/interactions/FriendNoteEditorBullet.java @@ -1,6 +1,6 @@ -package com.rappytv.betterfriends.interactions; +package com.rappytv.betterfriends.core.interactions; -import com.rappytv.betterfriends.BetterFriendsAddon; +import com.rappytv.betterfriends.core.BetterFriendsAddon; import net.labymod.api.Laby; import net.labymod.api.Textures.SpriteCommon; import net.labymod.api.client.component.Component; @@ -15,7 +15,7 @@ public class FriendNoteEditorBullet implements BulletPoint { private final BetterFriendsAddon addon; - private Friend friend = null; + private final Friend friend = null; public FriendNoteEditorBullet(BetterFriendsAddon addon) { this.addon = addon; diff --git a/core/src/main/java/com/rappytv/betterfriends/interactions/FriendTogglePinBullet.java b/core/src/main/java/com/rappytv/betterfriends/core/interactions/FriendTogglePinBullet.java similarity index 93% rename from core/src/main/java/com/rappytv/betterfriends/interactions/FriendTogglePinBullet.java rename to core/src/main/java/com/rappytv/betterfriends/core/interactions/FriendTogglePinBullet.java index eec1bf1..9a4ebe1 100644 --- a/core/src/main/java/com/rappytv/betterfriends/interactions/FriendTogglePinBullet.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/interactions/FriendTogglePinBullet.java @@ -1,6 +1,6 @@ -package com.rappytv.betterfriends.interactions; +package com.rappytv.betterfriends.core.interactions; -import com.rappytv.betterfriends.BetterFriendsAddon; +import com.rappytv.betterfriends.core.BetterFriendsAddon; import net.labymod.api.Laby; import net.labymod.api.Textures.SpriteCommon; import net.labymod.api.client.component.Component; diff --git a/core/src/main/java/com/rappytv/betterfriends/listeners/ChatReceiveListener.java b/core/src/main/java/com/rappytv/betterfriends/core/listeners/ChatReceiveListener.java similarity index 94% rename from core/src/main/java/com/rappytv/betterfriends/listeners/ChatReceiveListener.java rename to core/src/main/java/com/rappytv/betterfriends/core/listeners/ChatReceiveListener.java index 2d9054b..b393679 100644 --- a/core/src/main/java/com/rappytv/betterfriends/listeners/ChatReceiveListener.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/listeners/ChatReceiveListener.java @@ -1,6 +1,6 @@ -package com.rappytv.betterfriends.listeners; +package com.rappytv.betterfriends.core.listeners; -import com.rappytv.betterfriends.BetterFriendsAddon; +import com.rappytv.betterfriends.core.BetterFriendsAddon; import java.util.UUID; import net.labymod.api.Laby; import net.labymod.api.client.component.Component; diff --git a/core/src/main/java/com/rappytv/betterfriends/listeners/ConfigVersionListener.java b/core/src/main/java/com/rappytv/betterfriends/core/listeners/ConfigVersionListener.java similarity index 86% rename from core/src/main/java/com/rappytv/betterfriends/listeners/ConfigVersionListener.java rename to core/src/main/java/com/rappytv/betterfriends/core/listeners/ConfigVersionListener.java index 0cd4e55..3b5822e 100644 --- a/core/src/main/java/com/rappytv/betterfriends/listeners/ConfigVersionListener.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/listeners/ConfigVersionListener.java @@ -1,7 +1,7 @@ -package com.rappytv.betterfriends.listeners; +package com.rappytv.betterfriends.core.listeners; import com.google.gson.JsonObject; -import com.rappytv.betterfriends.config.BetterFriendsConfig; +import com.rappytv.betterfriends.core.config.BetterFriendsConfig; import net.labymod.api.event.Subscribe; import net.labymod.api.event.labymod.config.ConfigurationVersionUpdateEvent; diff --git a/core/src/main/java/com/rappytv/betterfriends/listeners/FriendListener.java b/core/src/main/java/com/rappytv/betterfriends/core/listeners/FriendListener.java similarity index 97% rename from core/src/main/java/com/rappytv/betterfriends/listeners/FriendListener.java rename to core/src/main/java/com/rappytv/betterfriends/core/listeners/FriendListener.java index a4c2e06..45f6791 100644 --- a/core/src/main/java/com/rappytv/betterfriends/listeners/FriendListener.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/listeners/FriendListener.java @@ -1,7 +1,7 @@ -package com.rappytv.betterfriends.listeners; +package com.rappytv.betterfriends.core.listeners; -import com.rappytv.betterfriends.BetterFriendsAddon; -import com.rappytv.betterfriends.utils.GroupHelper; +import com.rappytv.betterfriends.core.BetterFriendsAddon; +import com.rappytv.betterfriends.core.utils.GroupHelper; import net.labymod.addons.voicechat.api.audio.stream.AudioStreamState; import net.labymod.addons.voicechat.api.client.VoiceConnector; import net.labymod.addons.voicechat.core.VoiceChatAddon; diff --git a/core/src/main/java/com/rappytv/betterfriends/listeners/FriendRequestListener.java b/core/src/main/java/com/rappytv/betterfriends/core/listeners/FriendRequestListener.java similarity index 96% rename from core/src/main/java/com/rappytv/betterfriends/listeners/FriendRequestListener.java rename to core/src/main/java/com/rappytv/betterfriends/core/listeners/FriendRequestListener.java index 21b0713..398ddea 100644 --- a/core/src/main/java/com/rappytv/betterfriends/listeners/FriendRequestListener.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/listeners/FriendRequestListener.java @@ -1,7 +1,7 @@ -package com.rappytv.betterfriends.listeners; +package com.rappytv.betterfriends.core.listeners; -import com.rappytv.betterfriends.BetterFriendsAddon; -import com.rappytv.betterfriends.utils.GroupHelper; +import com.rappytv.betterfriends.core.BetterFriendsAddon; +import com.rappytv.betterfriends.core.utils.GroupHelper; import net.labymod.api.Laby; import net.labymod.api.client.component.Component; import net.labymod.api.client.component.event.ClickEvent; diff --git a/core/src/main/java/com/rappytv/betterfriends/listeners/LabyChatReceiveListener.java b/core/src/main/java/com/rappytv/betterfriends/core/listeners/LabyChatReceiveListener.java similarity index 95% rename from core/src/main/java/com/rappytv/betterfriends/listeners/LabyChatReceiveListener.java rename to core/src/main/java/com/rappytv/betterfriends/core/listeners/LabyChatReceiveListener.java index c9b7ebc..7243d60 100644 --- a/core/src/main/java/com/rappytv/betterfriends/listeners/LabyChatReceiveListener.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/listeners/LabyChatReceiveListener.java @@ -1,7 +1,7 @@ -package com.rappytv.betterfriends.listeners; +package com.rappytv.betterfriends.core.listeners; -import com.rappytv.betterfriends.BetterFriendsAddon; -import com.rappytv.betterfriends.utils.GroupHelper; +import com.rappytv.betterfriends.core.BetterFriendsAddon; +import com.rappytv.betterfriends.core.utils.GroupHelper; import java.util.HashMap; import java.util.Map; import java.util.UUID; diff --git a/core/src/main/java/com/rappytv/betterfriends/listeners/TemporaryPinListener.java b/core/src/main/java/com/rappytv/betterfriends/core/listeners/TemporaryPinListener.java similarity index 94% rename from core/src/main/java/com/rappytv/betterfriends/listeners/TemporaryPinListener.java rename to core/src/main/java/com/rappytv/betterfriends/core/listeners/TemporaryPinListener.java index 86f8eff..3cca8c8 100644 --- a/core/src/main/java/com/rappytv/betterfriends/listeners/TemporaryPinListener.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/listeners/TemporaryPinListener.java @@ -1,7 +1,7 @@ -package com.rappytv.betterfriends.listeners; +package com.rappytv.betterfriends.core.listeners; -import com.rappytv.betterfriends.BetterFriendsAddon; -import com.rappytv.betterfriends.config.BetterFriendsConfig; +import com.rappytv.betterfriends.core.BetterFriendsAddon; +import com.rappytv.betterfriends.core.config.BetterFriendsConfig; import java.util.UUID; import net.labymod.api.event.Subscribe; import net.labymod.api.event.labymod.labyconnect.LabyConnectEvent; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/badge/FriendPinBadge.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/badge/FriendPinBadge.java similarity index 90% rename from core/src/main/java/com/rappytv/betterfriends/ui/badge/FriendPinBadge.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/badge/FriendPinBadge.java index 0267336..881e9fa 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/badge/FriendPinBadge.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/badge/FriendPinBadge.java @@ -1,6 +1,6 @@ -package com.rappytv.betterfriends.ui.badge; +package com.rappytv.betterfriends.core.ui.badge; -import com.rappytv.betterfriends.BetterFriendsAddon; +import com.rappytv.betterfriends.core.BetterFriendsAddon; import net.labymod.api.Textures; import net.labymod.api.client.entity.player.badge.renderer.BadgeRenderer; import net.labymod.api.client.gui.screen.ScreenContext; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/hud/FriendCountHudWidget.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/hud/FriendCountHudWidget.java similarity index 97% rename from core/src/main/java/com/rappytv/betterfriends/ui/hud/FriendCountHudWidget.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/hud/FriendCountHudWidget.java index 9aaccc9..09b5012 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/hud/FriendCountHudWidget.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/hud/FriendCountHudWidget.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.ui.hud; +package com.rappytv.betterfriends.core.ui.hud; import net.labymod.api.Laby; import net.labymod.api.client.component.Component; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/hud/IncomingFriendRequestCountHudWidget.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/hud/IncomingFriendRequestCountHudWidget.java similarity index 97% rename from core/src/main/java/com/rappytv/betterfriends/ui/hud/IncomingFriendRequestCountHudWidget.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/hud/IncomingFriendRequestCountHudWidget.java index 60a1fd0..8fa2a19 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/hud/IncomingFriendRequestCountHudWidget.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/hud/IncomingFriendRequestCountHudWidget.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.ui.hud; +package com.rappytv.betterfriends.core.ui.hud; import net.labymod.api.Laby; import net.labymod.api.Textures.SpriteCommon; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/hud/OnlineFriendCountHudWidget.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/hud/OnlineFriendCountHudWidget.java similarity index 96% rename from core/src/main/java/com/rappytv/betterfriends/ui/hud/OnlineFriendCountHudWidget.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/hud/OnlineFriendCountHudWidget.java index 4835dd7..0aa7b3a 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/hud/OnlineFriendCountHudWidget.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/hud/OnlineFriendCountHudWidget.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.ui.hud; +package com.rappytv.betterfriends.core.ui.hud; import net.labymod.api.Laby; import net.labymod.api.Textures.SpriteCommon; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/hud/UnreadChatCountWidget.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/hud/UnreadChatCountWidget.java similarity index 96% rename from core/src/main/java/com/rappytv/betterfriends/ui/hud/UnreadChatCountWidget.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/hud/UnreadChatCountWidget.java index 34995af..7cd60e9 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/hud/UnreadChatCountWidget.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/hud/UnreadChatCountWidget.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.ui.hud; +package com.rappytv.betterfriends.core.ui.hud; import net.labymod.api.Laby; import net.labymod.api.Textures.SpriteCommon; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsFriendSnapshot.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsFriendSnapshot.java similarity index 82% rename from core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsFriendSnapshot.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsFriendSnapshot.java index 5e289ca..760665d 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsFriendSnapshot.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsFriendSnapshot.java @@ -1,7 +1,7 @@ -package com.rappytv.betterfriends.ui.snapshot; +package com.rappytv.betterfriends.core.ui.snapshot; -import com.rappytv.betterfriends.BetterFriendsAddon; -import com.rappytv.betterfriends.config.BetterFriendsConfig; +import com.rappytv.betterfriends.core.BetterFriendsAddon; +import com.rappytv.betterfriends.core.config.BetterFriendsConfig; import net.labymod.api.client.entity.player.Player; import net.labymod.api.laby3d.renderer.snapshot.AbstractLabySnapshot; import net.labymod.api.laby3d.renderer.snapshot.Extras; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsFriendSnapshotProcessor.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsFriendSnapshotProcessor.java similarity index 94% rename from core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsFriendSnapshotProcessor.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsFriendSnapshotProcessor.java index b74bba5..f9075c3 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsFriendSnapshotProcessor.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsFriendSnapshotProcessor.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.ui.snapshot; +package com.rappytv.betterfriends.core.ui.snapshot; import net.labymod.api.client.entity.Entity; import net.labymod.api.client.entity.player.Player; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsKeys.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsKeys.java similarity index 82% rename from core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsKeys.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsKeys.java index c41fd0a..0adb7c8 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsKeys.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsKeys.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.ui.snapshot; +package com.rappytv.betterfriends.core.ui.snapshot; import net.labymod.api.laby3d.renderer.snapshot.ExtraKey; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsSnapshotFactory.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsSnapshotFactory.java similarity index 86% rename from core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsSnapshotFactory.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsSnapshotFactory.java index 92aeba7..d547a00 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/snapshot/BetterFriendsSnapshotFactory.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/snapshot/BetterFriendsSnapshotFactory.java @@ -1,6 +1,6 @@ -package com.rappytv.betterfriends.ui.snapshot; +package com.rappytv.betterfriends.core.ui.snapshot; -import com.rappytv.betterfriends.BetterFriendsAddon; +import com.rappytv.betterfriends.core.BetterFriendsAddon; import net.labymod.api.client.entity.player.Player; import net.labymod.api.laby3d.renderer.snapshot.Extras; import net.labymod.api.laby3d.renderer.snapshot.LabySnapshotFactory; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/tags/FriendNoteNameTag.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/tags/FriendNoteNameTag.java similarity index 91% rename from core/src/main/java/com/rappytv/betterfriends/ui/tags/FriendNoteNameTag.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/tags/FriendNoteNameTag.java index 4efa265..d357ceb 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/tags/FriendNoteNameTag.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/tags/FriendNoteNameTag.java @@ -1,8 +1,8 @@ -package com.rappytv.betterfriends.ui.tags; +package com.rappytv.betterfriends.core.ui.tags; -import com.rappytv.betterfriends.BetterFriendsAddon; -import com.rappytv.betterfriends.ui.snapshot.BetterFriendsFriendSnapshot; -import com.rappytv.betterfriends.ui.snapshot.BetterFriendsKeys; +import com.rappytv.betterfriends.core.BetterFriendsAddon; +import com.rappytv.betterfriends.core.ui.snapshot.BetterFriendsFriendSnapshot; +import com.rappytv.betterfriends.core.ui.snapshot.BetterFriendsKeys; import java.util.Collections; import java.util.List; import net.labymod.api.client.component.Component; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/tags/FriendPinIconTag.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/tags/FriendPinIconTag.java similarity index 81% rename from core/src/main/java/com/rappytv/betterfriends/ui/tags/FriendPinIconTag.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/tags/FriendPinIconTag.java index cf90ee9..2daa403 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/tags/FriendPinIconTag.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/tags/FriendPinIconTag.java @@ -1,7 +1,7 @@ -package com.rappytv.betterfriends.ui.tags; +package com.rappytv.betterfriends.core.ui.tags; -import com.rappytv.betterfriends.ui.snapshot.BetterFriendsFriendSnapshot; -import com.rappytv.betterfriends.ui.snapshot.BetterFriendsKeys; +import com.rappytv.betterfriends.core.ui.snapshot.BetterFriendsFriendSnapshot; +import com.rappytv.betterfriends.core.ui.snapshot.BetterFriendsKeys; import net.labymod.api.Textures; import net.labymod.api.client.entity.player.tag.tags.IconTag; import net.labymod.api.labyconnect.protocol.model.friend.Friend; diff --git a/core/src/main/java/com/rappytv/betterfriends/ui/widget/config/PrefixPreviewWidget.java b/core/src/main/java/com/rappytv/betterfriends/core/ui/widget/config/PrefixPreviewWidget.java similarity index 95% rename from core/src/main/java/com/rappytv/betterfriends/ui/widget/config/PrefixPreviewWidget.java rename to core/src/main/java/com/rappytv/betterfriends/core/ui/widget/config/PrefixPreviewWidget.java index 708b0c7..ddb5a5c 100644 --- a/core/src/main/java/com/rappytv/betterfriends/ui/widget/config/PrefixPreviewWidget.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/ui/widget/config/PrefixPreviewWidget.java @@ -1,6 +1,6 @@ -package com.rappytv.betterfriends.ui.widget.config; +package com.rappytv.betterfriends.core.ui.widget.config; -import com.rappytv.betterfriends.config.subconfig.PrefixCustomizationConfig; +import com.rappytv.betterfriends.core.config.subconfig.PrefixCustomizationConfig; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/main/java/com/rappytv/betterfriends/utils/DefaultFriendHelper.java b/core/src/main/java/com/rappytv/betterfriends/core/utils/DefaultFriendHelper.java similarity index 93% rename from core/src/main/java/com/rappytv/betterfriends/utils/DefaultFriendHelper.java rename to core/src/main/java/com/rappytv/betterfriends/core/utils/DefaultFriendHelper.java index 89d0558..78c65c1 100644 --- a/core/src/main/java/com/rappytv/betterfriends/utils/DefaultFriendHelper.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/utils/DefaultFriendHelper.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.utils; +package com.rappytv.betterfriends.core.utils; import com.rappytv.betterfriends.api.FriendHelper; import java.util.UUID; diff --git a/core/src/main/java/com/rappytv/betterfriends/utils/GroupHelper.java b/core/src/main/java/com/rappytv/betterfriends/core/utils/GroupHelper.java similarity index 90% rename from core/src/main/java/com/rappytv/betterfriends/utils/GroupHelper.java rename to core/src/main/java/com/rappytv/betterfriends/core/utils/GroupHelper.java index 35604bc..26b1764 100644 --- a/core/src/main/java/com/rappytv/betterfriends/utils/GroupHelper.java +++ b/core/src/main/java/com/rappytv/betterfriends/core/utils/GroupHelper.java @@ -1,4 +1,4 @@ -package com.rappytv.betterfriends.utils; +package com.rappytv.betterfriends.core.utils; import net.labymod.api.client.component.Component; import net.labymod.api.labyconnect.protocol.model.friend.Friend;