Skip to content

Commit 3deea5d

Browse files
RappyTVRappyTV
authored
Merge pull request #35 from RappyLabyAddons/development
chore: Move core code into core module
2 parents 7b50f77 + 9b8c237 commit 3deea5d

28 files changed

Lines changed: 75 additions & 75 deletions

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
package com.rappytv.betterfriends;
1+
package com.rappytv.betterfriends.core;
22

33
import com.rappytv.betterfriends.api.generated.ReferenceStorage;
4-
import com.rappytv.betterfriends.command.BetterFriendsCommand;
5-
import com.rappytv.betterfriends.config.BetterFriendsConfig;
6-
import com.rappytv.betterfriends.interactions.FriendNoteEditorBullet;
7-
import com.rappytv.betterfriends.interactions.FriendTogglePinBullet;
8-
import com.rappytv.betterfriends.listeners.ChatReceiveListener;
9-
import com.rappytv.betterfriends.listeners.ConfigVersionListener;
10-
import com.rappytv.betterfriends.listeners.FriendListener;
11-
import com.rappytv.betterfriends.listeners.FriendRequestListener;
12-
import com.rappytv.betterfriends.listeners.LabyChatReceiveListener;
13-
import com.rappytv.betterfriends.listeners.TemporaryPinListener;
14-
import com.rappytv.betterfriends.ui.badge.FriendPinBadge;
15-
import com.rappytv.betterfriends.ui.hud.FriendCountHudWidget;
16-
import com.rappytv.betterfriends.ui.hud.IncomingFriendRequestCountHudWidget;
17-
import com.rappytv.betterfriends.ui.hud.OnlineFriendCountHudWidget;
18-
import com.rappytv.betterfriends.ui.hud.UnreadChatCountWidget;
19-
import com.rappytv.betterfriends.ui.tags.FriendNoteNameTag;
20-
import com.rappytv.betterfriends.ui.tags.FriendPinIconTag;
4+
import com.rappytv.betterfriends.core.command.BetterFriendsCommand;
5+
import com.rappytv.betterfriends.core.config.BetterFriendsConfig;
6+
import com.rappytv.betterfriends.core.interactions.FriendNoteEditorBullet;
7+
import com.rappytv.betterfriends.core.interactions.FriendTogglePinBullet;
8+
import com.rappytv.betterfriends.core.listeners.ChatReceiveListener;
9+
import com.rappytv.betterfriends.core.listeners.ConfigVersionListener;
10+
import com.rappytv.betterfriends.core.listeners.FriendListener;
11+
import com.rappytv.betterfriends.core.listeners.FriendRequestListener;
12+
import com.rappytv.betterfriends.core.listeners.LabyChatReceiveListener;
13+
import com.rappytv.betterfriends.core.listeners.TemporaryPinListener;
14+
import com.rappytv.betterfriends.core.ui.badge.FriendPinBadge;
15+
import com.rappytv.betterfriends.core.ui.hud.FriendCountHudWidget;
16+
import com.rappytv.betterfriends.core.ui.hud.IncomingFriendRequestCountHudWidget;
17+
import com.rappytv.betterfriends.core.ui.hud.OnlineFriendCountHudWidget;
18+
import com.rappytv.betterfriends.core.ui.hud.UnreadChatCountWidget;
19+
import com.rappytv.betterfriends.core.ui.tags.FriendNoteNameTag;
20+
import com.rappytv.betterfriends.core.ui.tags.FriendPinIconTag;
2121
import net.labymod.api.Laby;
2222
import net.labymod.api.addon.LabyAddon;
2323
import net.labymod.api.client.component.Component;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.rappytv.betterfriends.command;
1+
package com.rappytv.betterfriends.core.command;
22

3-
import com.rappytv.betterfriends.BetterFriendsAddon;
3+
import com.rappytv.betterfriends.core.BetterFriendsAddon;
4+
import com.rappytv.betterfriends.core.listeners.LabyChatReceiveListener;
5+
import com.rappytv.betterfriends.core.utils.GroupHelper;
46
import java.util.ArrayList;
57
import java.util.Arrays;
68
import java.util.List;
79
import java.util.UUID;
8-
import com.rappytv.betterfriends.listeners.LabyChatReceiveListener;
9-
import com.rappytv.betterfriends.utils.GroupHelper;
1010
import net.labymod.api.Laby;
1111
import net.labymod.api.client.chat.command.Command;
1212
import net.labymod.api.client.chat.command.SubCommand;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.rappytv.betterfriends.config;
1+
package com.rappytv.betterfriends.core.config;
22

3-
import com.rappytv.betterfriends.config.subconfig.FriendNoteTagConfig;
4-
import com.rappytv.betterfriends.config.subconfig.PinIconConfig;
5-
import com.rappytv.betterfriends.config.subconfig.PrefixCustomizationConfig;
3+
import com.rappytv.betterfriends.core.config.subconfig.FriendNoteTagConfig;
4+
import com.rappytv.betterfriends.core.config.subconfig.PinIconConfig;
5+
import com.rappytv.betterfriends.core.config.subconfig.PrefixCustomizationConfig;
66
import java.util.ArrayList;
77
import java.util.List;
88
import java.util.UUID;

core/src/main/java/com/rappytv/betterfriends/config/subconfig/FriendNoteTagConfig.java renamed to core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/FriendNoteTagConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rappytv.betterfriends.config.subconfig;
1+
package com.rappytv.betterfriends.core.config.subconfig;
22

33
import net.labymod.api.client.entity.player.tag.PositionType;
44
import net.labymod.api.client.gui.screen.widget.widgets.input.SliderWidget.SliderSetting;

core/src/main/java/com/rappytv/betterfriends/config/subconfig/PinIconConfig.java renamed to core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/PinIconConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.rappytv.betterfriends.config.subconfig;
1+
package com.rappytv.betterfriends.core.config.subconfig;
22

33
import net.labymod.api.client.gui.screen.widget.widgets.input.SwitchWidget.SwitchSetting;
44
import net.labymod.api.configuration.loader.Config;

core/src/main/java/com/rappytv/betterfriends/config/subconfig/PrefixCustomizationConfig.java renamed to core/src/main/java/com/rappytv/betterfriends/core/config/subconfig/PrefixCustomizationConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.rappytv.betterfriends.config.subconfig;
1+
package com.rappytv.betterfriends.core.config.subconfig;
22

3-
import com.rappytv.betterfriends.ui.widget.config.PrefixPreviewWidget.PrefixPreviewSetting;
3+
import com.rappytv.betterfriends.core.ui.widget.config.PrefixPreviewWidget.PrefixPreviewSetting;
44
import net.labymod.api.client.component.Component;
55
import net.labymod.api.client.component.format.NamedTextColor;
66
import net.labymod.api.client.component.format.TextColor;

core/src/main/java/com/rappytv/betterfriends/interactions/FriendNoteEditorBullet.java renamed to core/src/main/java/com/rappytv/betterfriends/core/interactions/FriendNoteEditorBullet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.rappytv.betterfriends.interactions;
1+
package com.rappytv.betterfriends.core.interactions;
22

3-
import com.rappytv.betterfriends.BetterFriendsAddon;
3+
import com.rappytv.betterfriends.core.BetterFriendsAddon;
44
import net.labymod.api.Laby;
55
import net.labymod.api.Textures.SpriteCommon;
66
import net.labymod.api.client.component.Component;
@@ -15,7 +15,7 @@
1515
public class FriendNoteEditorBullet implements BulletPoint {
1616

1717
private final BetterFriendsAddon addon;
18-
private Friend friend = null;
18+
private final Friend friend = null;
1919

2020
public FriendNoteEditorBullet(BetterFriendsAddon addon) {
2121
this.addon = addon;

core/src/main/java/com/rappytv/betterfriends/interactions/FriendTogglePinBullet.java renamed to core/src/main/java/com/rappytv/betterfriends/core/interactions/FriendTogglePinBullet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.rappytv.betterfriends.interactions;
1+
package com.rappytv.betterfriends.core.interactions;
22

3-
import com.rappytv.betterfriends.BetterFriendsAddon;
3+
import com.rappytv.betterfriends.core.BetterFriendsAddon;
44
import net.labymod.api.Laby;
55
import net.labymod.api.Textures.SpriteCommon;
66
import net.labymod.api.client.component.Component;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.rappytv.betterfriends.listeners;
1+
package com.rappytv.betterfriends.core.listeners;
22

3-
import com.rappytv.betterfriends.BetterFriendsAddon;
3+
import com.rappytv.betterfriends.core.BetterFriendsAddon;
44
import java.util.UUID;
55
import net.labymod.api.Laby;
66
import net.labymod.api.client.component.Component;

core/src/main/java/com/rappytv/betterfriends/listeners/ConfigVersionListener.java renamed to core/src/main/java/com/rappytv/betterfriends/core/listeners/ConfigVersionListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.rappytv.betterfriends.listeners;
1+
package com.rappytv.betterfriends.core.listeners;
22

33
import com.google.gson.JsonObject;
4-
import com.rappytv.betterfriends.config.BetterFriendsConfig;
4+
import com.rappytv.betterfriends.core.config.BetterFriendsConfig;
55
import net.labymod.api.event.Subscribe;
66
import net.labymod.api.event.labymod.config.ConfigurationVersionUpdateEvent;
77

0 commit comments

Comments
 (0)