Skip to content

chore: Move core code into core module #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RappyTV merged 1 commit into from
Apr 19, 2026
Merged

chore: Move core code into core module #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions ...ytv/betterfriends/BetterFriendsAddon.java → ...etterfriends/core/BetterFriendsAddon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...friends/command/BetterFriendsCommand.java → ...ds/core/command/BetterFriendsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...erfriends/config/BetterFriendsConfig.java → ...ends/core/config/BetterFriendsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...config/subconfig/FriendNoteTagConfig.java → ...config/subconfig/FriendNoteTagConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...iends/config/subconfig/PinIconConfig.java → .../core/config/subconfig/PinIconConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions .../subconfig/PrefixCustomizationConfig.java → .../subconfig/PrefixCustomizationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions .../interactions/FriendNoteEditorBullet.java → .../interactions/FriendNoteEditorBullet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...s/interactions/FriendTogglePinBullet.java → ...e/interactions/FriendTogglePinBullet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...riends/listeners/ChatReceiveListener.java → ...s/core/listeners/ChatReceiveListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ends/listeners/ConfigVersionListener.java → ...core/listeners/ConfigVersionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...tterfriends/listeners/FriendListener.java → ...riends/core/listeners/FriendListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ends/listeners/FriendRequestListener.java → ...core/listeners/FriendRequestListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ds/listeners/LabyChatReceiveListener.java → ...re/listeners/LabyChatReceiveListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...iends/listeners/TemporaryPinListener.java → .../core/listeners/TemporaryPinListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...etterfriends/ui/badge/FriendPinBadge.java → ...friends/core/ui/badge/FriendPinBadge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rfriends/ui/hud/FriendCountHudWidget.java → ...nds/core/ui/hud/FriendCountHudWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../IncomingFriendRequestCountHudWidget.java → .../IncomingFriendRequestCountHudWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ds/ui/hud/OnlineFriendCountHudWidget.java → ...re/ui/hud/OnlineFriendCountHudWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...friends/ui/hud/UnreadChatCountWidget.java → ...ds/core/ui/hud/UnreadChatCountWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...snapshot/BetterFriendsFriendSnapshot.java → ...snapshot/BetterFriendsFriendSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...BetterFriendsFriendSnapshotProcessor.java → ...BetterFriendsFriendSnapshotProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...riends/ui/snapshot/BetterFriendsKeys.java → ...s/core/ui/snapshot/BetterFriendsKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...napshot/BetterFriendsSnapshotFactory.java → ...napshot/BetterFriendsSnapshotFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...terfriends/ui/tags/FriendNoteNameTag.java → ...iends/core/ui/tags/FriendNoteNameTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...tterfriends/ui/tags/FriendPinIconTag.java → ...riends/core/ui/tags/FriendPinIconTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ui/widget/config/PrefixPreviewWidget.java → ...ui/widget/config/PrefixPreviewWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...terfriends/utils/DefaultFriendHelper.java → ...iends/core/utils/DefaultFriendHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...pytv/betterfriends/utils/GroupHelper.java → ...betterfriends/core/utils/GroupHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down