add nerddetector command

Reviewed-on: #44

.mvn/wrapper/maven-wrapper.properties

@@ -16,4 +16,4 @@
 # under the License.
 wrapperVersion=3.3.2
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build the application
-FROM maven:3.9.8-eclipse-temurin-17-alpine AS builder
+FROM maven:3.9.9-eclipse-temurin-17-alpine AS builder
 
 # Set the working directory
 WORKDIR /home/container
@@ -11,7 +11,7 @@ COPY . .
 RUN mvn package -q -Dmaven.test.skip -DskipTests -T2C
 
 # Stage 2: Create the final lightweight image
-FROM eclipse-temurin:17.0.12_7-jre-focal
+FROM eclipse-temurin:17.0.13_11-jre-focal
 
 # Set the working directory
 WORKDIR /home/container

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.2</version>
+		<version>3.4.1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -75,11 +75,6 @@
 			<id>jitpack.io</id>
 			<url>https://jitpack.io</url>
 		</repository>
-		<repository>
-			<id>fascinated-repo-public</id>
-			<name>Fascinated's Repository</name>
-			<url>https://repo.fascinated.cc/public</url>
-		</repository>
 	</repositories>
 
 	<dependencies>
@@ -99,26 +94,7 @@
 		<dependency>
 			<groupId>io.sentry</groupId>
 			<artifactId>sentry-spring-boot-starter-jakarta</artifactId>
-			<version>7.13.0</version>
-		</dependency>
-		<dependency>
-			<groupId>io.mongock</groupId>
-			<artifactId>mongock-bom</artifactId>
-			<version>5.4.4</version>
-			<type>pom</type>
-			<scope>import</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.mongock</groupId>
-			<artifactId>mongock-springboot-v3</artifactId>
-			<version>5.4.4</version>
-            <scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.mongock</groupId>
-			<artifactId>mongodb-springdata-v4-driver</artifactId>
-			<version>5.4.4</version>
-            <scope>compile</scope>
+			<version>7.16.0</version>
 		</dependency>
 
 		<!-- Redis for caching -->
@@ -160,25 +136,13 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.3.1</version>
+			<version>5.4.1</version>
             <scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.jodah</groupId>
 			<artifactId>expiringmap</artifactId>
 			<version>0.5.11</version>
-            <scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>se.michaelthelin.spotify</groupId>
-			<artifactId>spotify-web-api-java</artifactId>
-			<version>8.4.1</version>
-            <scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>uk.co.conoregan</groupId>
-			<artifactId>themoviedbapi</artifactId>
-			<version>2.1.1</version>
             <scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -186,11 +150,6 @@
 			<artifactId>commons-text</artifactId>
 			<version>1.12.0</version>
 		</dependency>
-		<dependency>
-			<groupId>xyz.mcutils</groupId>
-			<artifactId>mcutils-java-library</artifactId>
-			<version>1.2.4</version>
-		</dependency>
 		<dependency>
 			<groupId>com.github.Steppschuh</groupId>
 			<artifactId>Java-Markdown-Generator</artifactId>

src/main/java/cc/fascinated/bat/BatApplication.java

@@ -5,7 +5,6 @@ import cc.fascinated.bat.event.EventListener;
 import cc.fascinated.bat.service.EventService;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import io.mongock.runner.springboot.EnableMongock;
 import lombok.NonNull;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j2;
@@ -21,7 +20,6 @@ import java.util.Objects;
 
 @EnableScheduling
 @SpringBootApplication
-@EnableMongock
 @Log4j2(topic = "Bat")
 public class BatApplication {
     public static Gson GSON = new GsonBuilder().create();

src/main/java/cc/fascinated/bat/afk/AfkFeature.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.afk;
+package cc.fascinated.bat.afk;
 
-import cc.fascinated.bat.features.Feature;
-import cc.fascinated.bat.features.FeatureProfile;
-import cc.fascinated.bat.features.afk.command.AfkCommand;
+import cc.fascinated.bat.common.feature.Feature;
+import cc.fascinated.bat.common.feature.FeatureProfile;
+import cc.fascinated.bat.afk.command.AfkCommand;
 import cc.fascinated.bat.service.CommandService;
 import lombok.NonNull;
 import org.springframework.context.ApplicationContext;

src/main/java/cc/fascinated/bat/afk/AfkMentionListener.java

@@ -1,9 +1,9 @@
-package cc.fascinated.bat.features.afk;
+package cc.fascinated.bat.afk;
 
 import cc.fascinated.bat.event.EventListener;
-import cc.fascinated.bat.features.afk.profile.AfkProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.afk.profile.AfkProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.User;

src/main/java/cc/fascinated/bat/afk/AfkReturnListener.java

@@ -1,9 +1,9 @@
-package cc.fascinated.bat.features.afk;
+package cc.fascinated.bat.afk;
 
 import cc.fascinated.bat.event.EventListener;
-import cc.fascinated.bat.features.afk.profile.AfkProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.afk.profile.AfkProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.springframework.stereotype.Component;

src/main/java/cc/fascinated/bat/afk/command/AfkCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.afk.command;
+package cc.fascinated.bat.afk.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.MemberUtils;
-import cc.fascinated.bat.features.afk.profile.AfkProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.afk.profile.AfkProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/afk/profile/AfkProfile.java

@@ -1,7 +1,7 @@
-package cc.fascinated.bat.features.afk.profile;
+package cc.fascinated.bat.afk.profile;
 
 import cc.fascinated.bat.common.Serializable;
-import cc.fascinated.bat.model.BatGuild;
+import cc.fascinated.bat.common.model.BatGuild;
 import com.google.gson.Gson;
 import lombok.NoArgsConstructor;
 import net.dv8tion.jda.api.entities.Guild;

src/main/java/cc/fascinated/bat/autorole/AutoRoleFeature.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.autorole;
+package cc.fascinated.bat.autorole;
 
-import cc.fascinated.bat.features.Feature;
-import cc.fascinated.bat.features.FeatureProfile;
-import cc.fascinated.bat.features.autorole.command.AutoRoleCommand;
+import cc.fascinated.bat.common.feature.Feature;
+import cc.fascinated.bat.common.feature.FeatureProfile;
+import cc.fascinated.bat.autorole.command.AutoRoleCommand;
 import cc.fascinated.bat.service.CommandService;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cc/fascinated/bat/autorole/AutoRoleListener.java

@@ -1,9 +1,9 @@
-package cc.fascinated.bat.features.autorole;
+package cc.fascinated.bat.autorole;
 
 import cc.fascinated.bat.event.EventListener;
-import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.service.FeatureService;
 import lombok.NonNull;
 import lombok.extern.log4j.Log4j2;

src/main/java/cc/fascinated/bat/autorole/command/AddSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.autorole.command;
+package cc.fascinated.bat.autorole.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.RoleUtils;
-import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/autorole/command/AutoRoleCommand.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.autorole.command;
+package cc.fascinated.bat.autorole.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import lombok.NonNull;
 import net.dv8tion.jda.api.Permission;
 import org.springframework.context.ApplicationContext;

src/main/java/cc/fascinated/bat/autorole/command/ClearSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.autorole.command;
+package cc.fascinated.bat.autorole.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/autorole/command/ListSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.autorole.command;
+package cc.fascinated.bat.autorole.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/autorole/command/RemoveSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.autorole.command;
+package cc.fascinated.bat.autorole.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/autorole/command/SyncSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.autorole.command;
+package cc.fascinated.bat.autorole.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.DescriptionBuilder;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import lombok.extern.log4j.Log4j2;
 import net.dv8tion.jda.api.entities.Guild;

src/main/java/cc/fascinated/bat/autorole/profile/AutoRoleProfile.java

@@ -1,7 +1,7 @@
-package cc.fascinated.bat.features.autorole.profile;
+package cc.fascinated.bat.autorole.profile;
 
 import cc.fascinated.bat.common.Serializable;
-import cc.fascinated.bat.model.BatGuild;
+import cc.fascinated.bat.common.model.BatGuild;
 import cc.fascinated.bat.service.DiscordService;
 import com.google.gson.Gson;
 import lombok.Getter;

src/main/java/cc/fascinated/bat/base/BaseFeature.java

@@ -1,20 +1,19 @@
-package cc.fascinated.bat.features.base;
+package cc.fascinated.bat.base;
 
-import cc.fascinated.bat.features.Feature;
-import cc.fascinated.bat.features.FeatureProfile;
-import cc.fascinated.bat.features.base.commands.botadmin.BotAdminCommand;
-import cc.fascinated.bat.features.base.commands.fun.EightBallCommand;
-import cc.fascinated.bat.features.base.commands.fun.PPSizeCommand;
-import cc.fascinated.bat.features.base.commands.fun.image.ImageCommand;
-import cc.fascinated.bat.features.base.commands.general.*;
-import cc.fascinated.bat.features.base.commands.general.avatar.AvatarCommand;
-import cc.fascinated.bat.features.base.commands.general.banner.BannerCommand;
-import cc.fascinated.bat.features.base.commands.server.MemberCountCommand;
-import cc.fascinated.bat.features.base.commands.server.PremiumCommand;
-import cc.fascinated.bat.features.base.commands.server.channel.ChannelCommand;
-import cc.fascinated.bat.features.base.commands.server.feature.FeatureCommand;
-import cc.fascinated.bat.features.base.commands.utility.PastebinCommand;
-import cc.fascinated.bat.features.base.commands.utility.lookup.LookupCommand;
+import cc.fascinated.bat.base.commands.fun.*;
+import cc.fascinated.bat.common.feature.Feature;
+import cc.fascinated.bat.common.feature.FeatureProfile;
+import cc.fascinated.bat.base.commands.botadmin.BotAdminCommand;
+import cc.fascinated.bat.base.commands.fun.image.ImageCommand;
+import cc.fascinated.bat.base.commands.general.*;
+import cc.fascinated.bat.base.commands.general.avatar.AvatarCommand;
+import cc.fascinated.bat.base.commands.general.banner.BannerCommand;
+import cc.fascinated.bat.base.commands.server.MemberCountCommand;
+import cc.fascinated.bat.base.commands.server.PremiumCommand;
+import cc.fascinated.bat.base.commands.server.channel.ChannelCommand;
+import cc.fascinated.bat.base.commands.server.feature.FeatureCommand;
+import cc.fascinated.bat.base.commands.utility.PastebinCommand;
+import cc.fascinated.bat.base.commands.utility.lookup.LookupCommand;
 import cc.fascinated.bat.service.CommandService;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,5 +46,8 @@ public class BaseFeature extends Feature {
         super.registerCommand(commandService, context.getBean(LookupCommand.class));
         super.registerCommand(commandService, context.getBean(PPSizeCommand.class));
         super.registerCommand(commandService, context.getBean(PastebinCommand.class));
+        super.registerCommand(commandService, context.getBean(CoinFlipCommand.class));
+        super.registerCommand(commandService, context.getBean(HowGayCommand.class));
+        super.registerCommand(commandService, context.getBean(NerdDetectorCommand.class));
     }
 }

src/main/java/cc/fascinated/bat/base/commands/botadmin/BotAdminCommand.java

@@ -1,9 +1,9 @@
-package cc.fascinated.bat.features.base.commands.botadmin;
+package cc.fascinated.bat.base.commands.botadmin;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
-import cc.fascinated.bat.features.base.commands.botadmin.premium.PremiumRemoveSubCommand;
-import cc.fascinated.bat.features.base.commands.botadmin.premium.PremiumSetSubCommand;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
+import cc.fascinated.bat.base.commands.botadmin.premium.PremiumRemoveSubCommand;
+import cc.fascinated.bat.base.commands.botadmin.premium.PremiumSetSubCommand;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumRemoveSubCommand.java

@@ -1,9 +1,9 @@
-package cc.fascinated.bat.features.base.commands.botadmin.premium;
+package cc.fascinated.bat.base.commands.botadmin.premium;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.premium.PremiumProfile;
 import cc.fascinated.bat.service.GuildService;
 import lombok.NonNull;

src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumSetSubCommand.java

@@ -1,9 +1,9 @@
-package cc.fascinated.bat.features.base.commands.botadmin.premium;
+package cc.fascinated.bat.base.commands.botadmin.premium;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.premium.PremiumProfile;
 import cc.fascinated.bat.service.GuildService;
 import lombok.NonNull;

src/main/java/cc/fascinated/bat/base/commands/fun/CoinFlipCommand.java

@@ -0,0 +1,40 @@
+package cc.fascinated.bat.base.commands.fun;
+
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
+import lombok.NonNull;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
+import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
+import org.springframework.stereotype.Component;
+
+import java.util.Random;
+
+/**
+ * @author Fascinated (fascinated7)
+ */
+@CommandInfo(
+        name = "coinflip",
+        description = "Flips a coin",
+        userInstall = true
+)
+@Component
+public class CoinFlipCommand extends BatCommand {
+    @Override
+    public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member,
+                        Message commandMessage, String[] arguments, SlashCommandInteraction event) {
+        event.reply("%s, you flipped a coin and got **%s**!".formatted(user.getDiscordUser().getAsMention(), flip())).queue();
+    }
+
+    /**
+     * Flips a coin
+     *
+     * @return The result of the coin flip
+     */
+    public String flip() {
+        return new Random().nextBoolean() ? "heads" : "tails";
+    }
+}

src/main/java/cc/fascinated/bat/base/commands/fun/EightBallCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.base.commands.fun;
+package cc.fascinated.bat.base.commands.fun;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/fun/HowGayCommand.java

@@ -0,0 +1,52 @@
+package cc.fascinated.bat.base.commands.fun;
+
+import cc.fascinated.bat.common.DescriptionBuilder;
+import cc.fascinated.bat.common.EmbedUtils;
+import cc.fascinated.bat.common.MathUtils;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
+import lombok.NonNull;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
+import net.dv8tion.jda.api.interactions.commands.OptionMapping;
+import net.dv8tion.jda.api.interactions.commands.OptionType;
+import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
+import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Fascinated (fascinated7)
+ */
+@Component
+@CommandInfo(
+        name = "howgay",
+        description = "Checks how gay someone is",
+        userInstall = true,
+        category = Category.FUN
+)
+public class HowGayCommand extends BatCommand {
+    public HowGayCommand() {
+        super.addOptions(new OptionData(OptionType.USER, "user", "The user you want to check the gayness of", true));
+    }
+
+    @Override
+    public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, Message commandMessage, String[] arguments, SlashCommandInteraction event) {
+        OptionMapping userOption = event.getOption("user");
+        assert userOption != null; // This should never be null
+        User target = userOption.getAsUser();
+
+        event.replyEmbeds(EmbedUtils.genericEmbed()
+                .setDescription(new DescriptionBuilder("How Gay?")
+                        .appendLine("%s is %s%% gay".formatted(
+                                target.getAsMention(),
+                                (int) MathUtils.random(0, 100)
+                        ), false)
+                        .build())
+                .build()).queue();
+    }
+}

src/main/java/cc/fascinated/bat/base/commands/fun/NerdDetectorCommand.java

@@ -0,0 +1,52 @@
+package cc.fascinated.bat.base.commands.fun;
+
+import cc.fascinated.bat.common.DescriptionBuilder;
+import cc.fascinated.bat.common.EmbedUtils;
+import cc.fascinated.bat.common.MathUtils;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
+import lombok.NonNull;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
+import net.dv8tion.jda.api.interactions.commands.OptionMapping;
+import net.dv8tion.jda.api.interactions.commands.OptionType;
+import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
+import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Fascinated (fascinated7)
+ */
+@Component
+@CommandInfo(
+        name = "nerddetector",
+        description = "Checks how much of a nerd someone is",
+        userInstall = true,
+        category = Category.FUN
+)
+public class NerdDetectorCommand extends BatCommand {
+    public NerdDetectorCommand() {
+        super.addOptions(new OptionData(OptionType.USER, "user", "The user you want to check how much of a nerd they are", true));
+    }
+
+    @Override
+    public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, Message commandMessage, String[] arguments, SlashCommandInteraction event) {
+        OptionMapping userOption = event.getOption("user");
+        assert userOption != null; // This should never be null
+        User target = userOption.getAsUser();
+
+        event.replyEmbeds(EmbedUtils.genericEmbed()
+                .setDescription(new DescriptionBuilder("Nerd Detector")
+                        .appendLine("%s is %s%% nerd 🤓".formatted(
+                                target.getAsMention(),
+                                (int) MathUtils.random(0, 100)
+                        ), false)
+                        .build())
+                .build()).queue();
+    }
+}

src/main/java/cc/fascinated/bat/base/commands/fun/PPSizeCommand.java

@@ -1,13 +1,13 @@
-package cc.fascinated.bat.features.base.commands.fun;
+package cc.fascinated.bat.base.commands.fun;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.DescriptionBuilder;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.MathUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Component;
         category = Category.FUN
 )
 public class PPSizeCommand extends BatCommand {
+
     public PPSizeCommand() {
         super.addOptions(new OptionData(OptionType.USER, "user", "The user you want to get the pp size of", true));
     }
@@ -40,15 +41,17 @@ public class PPSizeCommand extends BatCommand {
         assert userOption != null; // This should never be null
         User target = userOption.getAsUser();
 
-        int size = (int) MathUtils.random(1, 12);
+        int maxSize = 12;
+        int size = (int) MathUtils.random(1, maxSize);
         event.replyEmbeds(EmbedUtils.genericEmbed()
                 .setDescription(new DescriptionBuilder("PP Size")
                         .appendLine("""
-                                The size of %s's pp is %s inches
+                                The size of %s's pp is %s inches%s
                                 **8%sD**
                                 """.formatted(
                                 target.getAsMention(),
                                 size,
+                                size == maxSize ? " 😳" : "",
                                 "=".repeat(size)
                         ), false)
                         .build())

src/main/java/cc/fascinated/bat/base/commands/fun/image/CatSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.base.commands.fun.image;
+package cc.fascinated.bat.base.commands.fun.image;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.WebRequest;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
-import cc.fascinated.bat.model.token.thecatapi.CatImageToken;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
+import cc.fascinated.bat.common.model.token.thecatapi.CatImageToken;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/fun/image/DogSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.base.commands.fun.image;
+package cc.fascinated.bat.base.commands.fun.image;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.WebRequest;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
-import cc.fascinated.bat.model.token.dogceo.RandomImage;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
+import cc.fascinated.bat.common.model.token.dogceo.RandomImage;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/fun/image/DuckSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.base.commands.fun.image;
+package cc.fascinated.bat.base.commands.fun.image;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.WebRequest;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
-import cc.fascinated.bat.model.token.randomd.RandomDuck;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
+import cc.fascinated.bat.common.model.token.randomd.RandomDuck;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/fun/image/FoxSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.base.commands.fun.image;
+package cc.fascinated.bat.base.commands.fun.image;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.WebRequest;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
-import cc.fascinated.bat.model.token.randomfox.RandomFoxToken;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
+import cc.fascinated.bat.common.model.token.randomfox.RandomFoxToken;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/fun/image/ImageCommand.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.base.commands.fun.image;
+package cc.fascinated.bat.base.commands.fun.image;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

src/main/java/cc/fascinated/bat/base/commands/general/BotStatsCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.base.commands.general;
+package cc.fascinated.bat.base.commands.general;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.*;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.service.DiscordService;
 import cc.fascinated.bat.service.GuildService;
 import cc.fascinated.bat.service.UserService;

src/main/java/cc/fascinated/bat/base/commands/general/HelpCommand.java

@@ -1,16 +1,16 @@
-package cc.fascinated.bat.features.base.commands.general;
+package cc.fascinated.bat.base.commands.general;
 
 import cc.fascinated.bat.Consts;
 import cc.fascinated.bat.Emojis;
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.DescriptionBuilder;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.InteractionBuilder;
 import cc.fascinated.bat.event.EventListener;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.service.CommandService;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
@@ -88,7 +88,10 @@ public class HelpCommand extends BatCommand implements EventListener {
         }
 
 
-        event.replyEmbeds(createHomeEmbed(event.isFromGuild())).addComponents(interactionBuilder.build()).queue();
+        event.replyEmbeds(createHomeEmbed(event.isFromGuild()))
+                .addComponents(interactionBuilder.build())
+                .setEphemeral(true)
+                .queue();
     }
 
     /**
@@ -103,7 +106,7 @@ public class HelpCommand extends BatCommand implements EventListener {
                 continue;
             }
             long commandCount = commandService.getCommandsByCategory(category, ranInsideGuild).size();
-            categories.append("➜  %s - **%s Command%s**\n".formatted(
+            categories.append("-  %s: **%s Command%s**\n".formatted(
                     category.getName(),
                     commandCount,
                     commandCount == 1 ? "" : "s"
@@ -112,13 +115,15 @@ public class HelpCommand extends BatCommand implements EventListener {
 
         return EmbedUtils.genericEmbed()
                 .setDescription("""
-                        **Welcome to the Bat Help Menu!**%s
+                        **Welcome to the Bat Help Menu!**
                         
-                        %s
+                        Bat is a multi-purpose bot that has a variety of features to help you with your server. You can change the category be clicking on the category name in the list below.
+                        
+                        %s%s
                         *View our [TOS](%s) and [Privacy Policy](%s) for more information.*
                         """.formatted(
-                        !ranInsideGuild ? "\n*guild only commands won't be shown here*" : "",
                         categories.toString(),
+                        !ranInsideGuild ? "\n*guild only commands won't be shown here*" : "",
                         Consts.TERMS_OF_SERVICE_URL,
                         Consts.PRIVACY_POLICY_URL
                 ))

src/main/java/cc/fascinated/bat/base/commands/general/InviteCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.base.commands.general;
+package cc.fascinated.bat.base.commands.general;
 
 import cc.fascinated.bat.Consts;
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/general/PingCommand.java

@@ -1,10 +1,10 @@
-package cc.fascinated.bat.features.base.commands.general;
+package cc.fascinated.bat.base.commands.general;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.service.DiscordService;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/base/commands/general/VoteCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.base.commands.general;
+package cc.fascinated.bat.base.commands.general;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.DescriptionBuilder;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/general/avatar/AvatarCommand.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.base.commands.general.avatar;
+package cc.fascinated.bat.base.commands.general.avatar;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

src/main/java/cc/fascinated/bat/base/commands/general/avatar/GuildSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.base.commands.general.avatar;
+package cc.fascinated.bat.base.commands.general.avatar;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/general/avatar/UserSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.base.commands.general.avatar;
+package cc.fascinated.bat.base.commands.general.avatar;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/general/banner/BannerCommand.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.base.commands.general.banner;
+package cc.fascinated.bat.base.commands.general.banner;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

src/main/java/cc/fascinated/bat/base/commands/general/banner/GuildSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.base.commands.general.banner;
+package cc.fascinated.bat.base.commands.general.banner;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/general/banner/UserSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.base.commands.general.banner;
+package cc.fascinated.bat.base.commands.general.banner;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/server/MemberCountCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.base.commands.server;
+package cc.fascinated.bat.base.commands.server;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.NumberFormatter;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/base/commands/server/PremiumCommand.java

@@ -1,10 +1,10 @@
-package cc.fascinated.bat.features.base.commands.server;
+package cc.fascinated.bat.base.commands.server;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.premium.PremiumProfile;
 import lombok.NonNull;
 import net.dv8tion.jda.api.EmbedBuilder;

src/main/java/cc/fascinated/bat/base/commands/server/channel/ChannelCommand.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.base.commands.server.channel;
+package cc.fascinated.bat.base.commands.server.channel;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

src/main/java/cc/fascinated/bat/base/commands/server/channel/RemoveTopicSubCommand.java

@@ -1,10 +1,10 @@
-package cc.fascinated.bat.features.base.commands.server.channel;
+package cc.fascinated.bat.base.commands.server.channel;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/base/commands/server/channel/SetTopicSubCommand.java

@@ -1,10 +1,10 @@
-package cc.fascinated.bat.features.base.commands.server.channel;
+package cc.fascinated.bat.base.commands.server.channel;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/base/commands/server/channel/ViewTopicSubCommand.java

@@ -1,10 +1,10 @@
-package cc.fascinated.bat.features.base.commands.server.channel;
+package cc.fascinated.bat.base.commands.server.channel;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/server/feature/DisableSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.base.commands.server.feature;
+package cc.fascinated.bat.base.commands.server.feature;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.Feature;
-import cc.fascinated.bat.features.FeatureProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.feature.Feature;
+import cc.fascinated.bat.common.feature.FeatureProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.service.FeatureService;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/base/commands/server/feature/EnableSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.base.commands.server.feature;
+package cc.fascinated.bat.base.commands.server.feature;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.Feature;
-import cc.fascinated.bat.features.FeatureProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.feature.Feature;
+import cc.fascinated.bat.common.feature.FeatureProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.service.FeatureService;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/base/commands/server/feature/FeatureCommand.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.base.commands.server.feature;
+package cc.fascinated.bat.base.commands.server.feature;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import lombok.NonNull;
 import net.dv8tion.jda.api.Permission;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cc/fascinated/bat/base/commands/server/feature/ListSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.base.commands.server.feature;
+package cc.fascinated.bat.base.commands.server.feature;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.Feature;
-import cc.fascinated.bat.features.FeatureProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.feature.Feature;
+import cc.fascinated.bat.common.feature.FeatureProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.service.FeatureService;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/base/commands/utility/PastebinCommand.java

@@ -1,13 +1,13 @@
-package cc.fascinated.bat.features.base.commands.utility;
+package cc.fascinated.bat.base.commands.utility;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.DescriptionBuilder;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.PasteUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/base/commands/utility/lookup/LookupCommand.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.base.commands.utility.lookup;
+package cc.fascinated.bat.base.commands.utility.lookup;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

src/main/java/cc/fascinated/bat/base/commands/utility/lookup/UserSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.base.commands.utility.lookup;
+package cc.fascinated.bat.base.commands.utility.lookup;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.DescriptionBuilder;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.service.UserService;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/birthday/BirthdayFeature.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.birthday;
+package cc.fascinated.bat.birthday;
 
 import cc.fascinated.bat.event.EventListener;
-import cc.fascinated.bat.features.Feature;
-import cc.fascinated.bat.features.FeatureProfile;
-import cc.fascinated.bat.features.birthday.command.BirthdayCommand;
-import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
-import cc.fascinated.bat.model.BatGuild;
+import cc.fascinated.bat.common.feature.Feature;
+import cc.fascinated.bat.common.feature.FeatureProfile;
+import cc.fascinated.bat.birthday.command.BirthdayCommand;
+import cc.fascinated.bat.birthday.profile.BirthdayProfile;
+import cc.fascinated.bat.common.model.BatGuild;
 import cc.fascinated.bat.service.CommandService;
 import cc.fascinated.bat.service.DiscordService;
 import cc.fascinated.bat.service.GuildService;

src/main/java/cc/fascinated/bat/birthday/UserBirthday.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.features.birthday;
+package cc.fascinated.bat.birthday;
 
 import cc.fascinated.bat.common.Serializable;
 import com.google.gson.Gson;

src/main/java/cc/fascinated/bat/birthday/command/BirthdayCommand.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.birthday.command;
+package cc.fascinated.bat.birthday.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.Category;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.Category;
+import cc.fascinated.bat.common.command.CommandInfo;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

src/main/java/cc/fascinated/bat/birthday/command/ChannelSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.birthday.command;
+package cc.fascinated.bat.birthday.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
 import cc.fascinated.bat.common.TextChannelUtils;
-import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.birthday.profile.BirthdayProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/birthday/command/MessageSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.birthday.command;
+package cc.fascinated.bat.birthday.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.birthday.profile.BirthdayProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/birthday/command/PrivateSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.birthday.command;
+package cc.fascinated.bat.birthday.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.birthday.UserBirthday;
-import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.birthday.UserBirthday;
+import cc.fascinated.bat.birthday.profile.BirthdayProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/birthday/command/RemoveSubCommand.java

@@ -1,11 +1,11 @@
-package cc.fascinated.bat.features.birthday.command;
+package cc.fascinated.bat.birthday.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.birthday.profile.BirthdayProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/birthday/command/SetSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.birthday.command;
+package cc.fascinated.bat.birthday.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.birthday.UserBirthday;
-import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.birthday.UserBirthday;
+import cc.fascinated.bat.birthday.profile.BirthdayProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/cc/fascinated/bat/birthday/command/ViewSubCommand.java

@@ -1,12 +1,12 @@
-package cc.fascinated.bat.features.birthday.command;
+package cc.fascinated.bat.birthday.command;
 
-import cc.fascinated.bat.command.BatCommand;
-import cc.fascinated.bat.command.CommandInfo;
+import cc.fascinated.bat.common.command.BatCommand;
+import cc.fascinated.bat.common.command.CommandInfo;
 import cc.fascinated.bat.common.EmbedUtils;
-import cc.fascinated.bat.features.birthday.UserBirthday;
-import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.birthday.UserBirthday;
+import cc.fascinated.bat.birthday.profile.BirthdayProfile;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import cc.fascinated.bat.service.UserService;
 import lombok.NonNull;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/birthday/profile/BirthdayProfile.java

@@ -1,9 +1,9 @@
-package cc.fascinated.bat.features.birthday.profile;
+package cc.fascinated.bat.birthday.profile;
 
 import cc.fascinated.bat.common.ChannelUtils;
 import cc.fascinated.bat.common.Serializable;
-import cc.fascinated.bat.features.birthday.UserBirthday;
-import cc.fascinated.bat.model.BatGuild;
+import cc.fascinated.bat.birthday.UserBirthday;
+import cc.fascinated.bat.common.model.BatGuild;
 import com.google.gson.Gson;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cc/fascinated/bat/common/DateUtils.java

@@ -3,12 +3,18 @@ package cc.fascinated.bat.common;
 import lombok.experimental.UtilityClass;
 
 import java.time.Instant;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.Locale;
 
 @UtilityClass
 public class DateUtils {
+    private static final ZoneId ZONE_ID = ZoneId.of("Europe/London");
     private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_INSTANT;
+    private static final DateTimeFormatter SIMPLE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss z")
+            .withLocale(Locale.UK)
+            .withZone(ZONE_ID);
 
     /**
      * Gets the date from a string.
@@ -19,4 +25,14 @@ public class DateUtils {
     public static Date getDateFromString(String date) {
         return Date.from(Instant.from(FORMATTER.parse(date)));
     }
+
+    /**
+     * Formats a date to a string.
+     *
+     * @param date The date to format.
+     * @return The formatted date.
+     */
+    public String formatDate(Date date) {
+        return SIMPLE_FORMATTER.format(date.toInstant());
+    }
 }

src/main/java/cc/fascinated/bat/common/InteractionBuilder.java

@@ -1,25 +1,14 @@
 package cc.fascinated.bat.common;
 
-import cc.fascinated.bat.event.EventListener;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
 import cc.fascinated.bat.service.InteractionService;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NonNull;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
-import net.dv8tion.jda.api.interactions.components.ActionComponent;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
-import net.dv8tion.jda.api.interactions.components.ComponentInteraction;
-import net.dv8tion.jda.api.interactions.components.ItemComponent;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
 import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
-import net.dv8tion.jda.api.utils.data.SerializableData;
-import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,8 +16,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
-import static net.dv8tion.jda.api.interactions.components.Component.Type.STRING_SELECT;
-
 /**
  * @author Fascinated (fascinated7)
  */

src/main/java/cc/fascinated/bat/common/MemberUtils.java

@@ -1,7 +1,7 @@
 package cc.fascinated.bat.common;
 
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;

src/main/java/cc/fascinated/bat/common/PasteUtils.java

@@ -1,7 +1,7 @@
 package cc.fascinated.bat.common;
 
 import cc.fascinated.bat.BatApplication;
-import cc.fascinated.bat.model.token.paste.PasteUploadToken;
+import cc.fascinated.bat.common.model.token.paste.PasteUploadToken;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import lombok.extern.log4j.Log4j2;
@@ -18,7 +18,7 @@ import java.net.http.HttpResponse;
 @Log4j2(topic = "PasteUtils")
 public class PasteUtils {
     private static final String PASTE_URL = "https://paste.fascinated.cc/";
-    private static final String PASTE_UPLOAD_URL = PASTE_URL + "api/upload";
+    private static final String PASTE_UPLOAD_URL = PASTE_URL + "api/upload?expires=" + 60 * 60 * 24 * 30; // 30 days
     private static final HttpClient httpClient = HttpClient.newHttpClient();
 
     /**

src/main/java/cc/fascinated/bat/common/RoleUtils.java

@@ -1,6 +1,6 @@
 package cc.fascinated.bat.common;
 
-import cc.fascinated.bat.model.BatGuild;
+import cc.fascinated.bat.common.model.BatGuild;
 import lombok.experimental.UtilityClass;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;

src/main/java/cc/fascinated/bat/common/SpotifyUtils.java

@@ -1,71 +0,0 @@
-package cc.fascinated.bat.common;
-
-import cc.fascinated.bat.model.BatUser;
-import cc.fascinated.bat.service.SpotifyService;
-import lombok.NonNull;
-import lombok.experimental.UtilityClass;
-import lombok.extern.log4j.Log4j2;
-import se.michaelthelin.spotify.model_objects.miscellaneous.CurrentlyPlaying;
-import se.michaelthelin.spotify.model_objects.specification.Track;
-
-/**
- * @author Fascinated (fascinated7)
- */
-@UtilityClass
-@Log4j2(topic = "Spotify Utils")
-public class SpotifyUtils {
-    /**
-     * Gets the URL of the track that is currently playing.
-     *
-     * @param currentlyPlaying The currently playing object.
-     * @return The URL of the track that is currently playing.
-     */
-    public static String getTrackUrl(CurrentlyPlaying currentlyPlaying) {
-        return "https://open.spotify.com/track/" + currentlyPlaying.getItem().getId();
-    }
-
-    /**
-     * Gets the formatted time of the currently playing track
-     *
-     * @param currentlyPlaying the currently playing track
-     * @return the formatted time
-     */
-    public static String getFormattedTime(@NonNull CurrentlyPlaying currentlyPlaying) {
-        Track track = (Track) currentlyPlaying.getItem();
-        int currentMinutes = currentlyPlaying.getProgress_ms() / 1000 / 60;
-        int currentSeconds = currentlyPlaying.getProgress_ms() / 1000 % 60;
-        int totalMinutes = track.getDurationMs() / 1000 / 60;
-        int totalSeconds = track.getDurationMs() / 1000 % 60;
-
-        return "`%02d:%02d`/`%02d:%02d`".formatted(currentMinutes, currentSeconds, totalMinutes, totalSeconds);
-    }
-
-    /**
-     * Get the next track that is playing
-     *
-     * @param user    The user to get the track for
-     * @param oldName The name of the old track
-     * @return The new track
-     */
-    public static CurrentlyPlaying getNewTrack(@NonNull SpotifyService spotifyService, @NonNull BatUser user, @NonNull String oldName) {
-        int checks = 0;
-
-        try {
-            Thread.sleep(150);
-            while (checks < 10) {
-                CurrentlyPlaying currentlyPlaying = spotifyService.getCurrentlyPlayingTrack(user);
-                Track track = (Track) currentlyPlaying.getItem();
-                if (track.getName().equals(oldName)) {
-                    Thread.sleep(250);
-                    checks++;
-                } else {
-                    log.info("Found new track \"{}\" in {} check{}", track.getName(), checks, checks == 1 ? "" : "s");
-                    return currentlyPlaying;
-                }
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}

src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/Leaderboard.java

@@ -1,22 +0,0 @@
-package cc.fascinated.bat.common.beatsaber.leaderboard;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor @Getter
-public class Leaderboard {
-    /**
-     * The name of the leaderboard.
-     */
-    private final String name;
-
-    /**
-     * The version of the leaderboard.
-     */
-    private int curveVersion;
-
-    /**
-     * The curve of the leaderboard.
-     */
-    private final LeaderboardCurvePoint[] curve;
-}

src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/LeaderboardCurvePoint.java

@@ -1,10 +0,0 @@
-package cc.fascinated.bat.common.beatsaber.leaderboard;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter @AllArgsConstructor
-public class LeaderboardCurvePoint {
-    private final double a;
-    private final double b;
-}

src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/impl/ScoreSaberLeaderboard.java

@@ -1,167 +0,0 @@
-package cc.fascinated.bat.common.beatsaber.leaderboard.impl;
-
-import cc.fascinated.bat.common.MathUtils;
-import cc.fascinated.bat.common.beatsaber.leaderboard.Leaderboard;
-import cc.fascinated.bat.common.beatsaber.leaderboard.LeaderboardCurvePoint;
-import cc.fascinated.bat.model.token.beatsaber.scoresaber.ScoreSaberScoreToken;
-import lombok.extern.log4j.Log4j2;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Log4j2(topic = "ScoreSaber Leaderboard")
-public class ScoreSaberLeaderboard extends Leaderboard {
-    public static final ScoreSaberLeaderboard INSTANCE = new ScoreSaberLeaderboard();
-
-    /**
-     * The base multiplier for stars.
-     */
-    private final double starMultiplier = 42.11;
-
-    /**
-     * no idea, ngl
-     */
-    private final double weightCoefficient = 0.965;
-
-    public ScoreSaberLeaderboard() {
-        super("ScoreSaber", 1, new LeaderboardCurvePoint[] {
-                new LeaderboardCurvePoint(1.0, 5.367394282890631),
-                new LeaderboardCurvePoint(0.9995, 5.019543595874787),
-                new LeaderboardCurvePoint(0.999, 4.715470646416203),
-                new LeaderboardCurvePoint(0.99825, 4.325027383589547),
-                new LeaderboardCurvePoint(0.9975, 3.996793606763322),
-                new LeaderboardCurvePoint(0.99625, 3.5526145337555373),
-                new LeaderboardCurvePoint(0.995, 3.2022017597337955),
-                new LeaderboardCurvePoint(0.99375, 2.9190155639254955),
-                new LeaderboardCurvePoint(0.9925, 2.685667856592722),
-                new LeaderboardCurvePoint(0.99125, 2.4902905794106913),
-                new LeaderboardCurvePoint(0.99, 2.324506282149922),
-                new LeaderboardCurvePoint(0.9875, 2.058947159052738),
-                new LeaderboardCurvePoint(0.985, 1.8563887693647105),
-                new LeaderboardCurvePoint(0.9825, 1.697536248647543),
-                new LeaderboardCurvePoint(0.98, 1.5702410055532239),
-                new LeaderboardCurvePoint(0.9775, 1.4664726399289512),
-                new LeaderboardCurvePoint(0.975, 1.3807102743105126),
-                new LeaderboardCurvePoint(0.9725, 1.3090333065057616),
-                new LeaderboardCurvePoint(0.97, 1.2485807759957321),
-                new LeaderboardCurvePoint(0.965, 1.1552120359501035),
-                new LeaderboardCurvePoint(0.96, 1.0871883573850478),
-                new LeaderboardCurvePoint(0.955, 1.0388633331418984),
-                new LeaderboardCurvePoint(0.95, 1.0),
-                new LeaderboardCurvePoint(0.94, 0.9417362980580238),
-                new LeaderboardCurvePoint(0.93, 0.9039994071865736),
-                new LeaderboardCurvePoint(0.92, 0.8728710341448851),
-                new LeaderboardCurvePoint(0.91, 0.8488375988124467),
-                new LeaderboardCurvePoint(0.9, 0.825756123560842),
-                new LeaderboardCurvePoint(0.875, 0.7816934560296046),
-                new LeaderboardCurvePoint(0.85, 0.7462290664143185),
-                new LeaderboardCurvePoint(0.825, 0.7150465663454271),
-                new LeaderboardCurvePoint(0.8, 0.6872268862950283),
-                new LeaderboardCurvePoint(0.75, 0.6451808210101443),
-                new LeaderboardCurvePoint(0.7, 0.6125565959114954),
-                new LeaderboardCurvePoint(0.65, 0.5866010012767576),
-                new LeaderboardCurvePoint(0.6, 0.18223233667439062),
-                new LeaderboardCurvePoint(0.0, 0.0)
-        });
-    }
-
-    /**
-     * Gets the modifier for the given accuracy.
-     *
-     * @param accuracy The accuracy.
-     * @return The modifier.
-     */
-    public double getModifier(double accuracy) {
-        accuracy = MathUtils.clamp(accuracy, 0, 100) / 100;
-
-        LeaderboardCurvePoint prev = this.getCurve()[1];
-        for (LeaderboardCurvePoint point : this.getCurve()) {
-            if (point.getA() <= accuracy) {
-                double distance = (prev.getA() - accuracy) / (prev.getA() - point.getA());
-                return MathUtils.lerp(prev.getB(), point.getB(), distance);
-            }
-            prev = point;
-        }
-        return 0;
-    }
-
-    /**
-     * Gets the pp for the given accuracy and stars.
-     *
-     * @param accuracy The accuracy.
-     * @param stars The stars.
-     * @return The pp.
-     */
-    public double getPP(double accuracy, double stars) {
-        double pp = stars * this.starMultiplier;
-        double modifier = this.getModifier(accuracy);
-        return modifier * pp;
-    }
-
-    /**
-     * Gets the total pp for the given scores.
-     *
-     * @param scores The scores.
-     * @return The total pp.
-     */
-    private double getTotalPP(List<ScoreSaberScoreToken> scores, int startIdx) {
-        double totalPP = 0;
-        for (int i = 0; i < scores.size(); i++) {
-            totalPP += Math.pow(this.weightCoefficient, i + startIdx) * scores.get(i).getPp();
-        }
-        return totalPP;
-    }
-
-    /**
-     * Gets the pp at the given index for the given scores.
-     *
-     * @param bottomScores The scores.
-     * @param idx The index.
-     * @return The pp.
-     */
-    private double getRawPPAtIdx(List<ScoreSaberScoreToken> bottomScores, int idx, double expected) {
-        double oldBottomPP = this.getTotalPP(bottomScores, idx);
-        double newBottomPP = this.getTotalPP(bottomScores, idx + 1);
-
-        return (expected + oldBottomPP - newBottomPP) / Math.pow(this.weightCoefficient, idx);
-    }
-
-    /**
-     * Gets the raw pp per global pp for the given scores.
-     *
-     * @param scores The scores.
-     * @param expectedPP The expected pp.
-     * @return The raw pp per global pp.
-     */
-    public double getRawPerGlobalPP(List<ScoreSaberScoreToken> scores, double expectedPP) {
-        int left = 0;
-        int right = scores.size() - 1;
-        int boundaryIdx = -1;
-
-        // Sort by PP
-        scores.sort((a, b) -> Double.compare(b.getPp(), a.getPp()));
-
-        while (left <= right) {
-            int mid = (left + right) / 2;
-            double bottomPP = this.getTotalPP(scores.subList(mid, scores.size()), mid);
-
-            List<ScoreSaberScoreToken> bottomSlice = new ArrayList<>(scores.subList(mid, scores.size()));
-            bottomSlice.add(0, scores.get(mid));
-            double modifiedBottomPP = this.getTotalPP(bottomSlice, mid);
-            double diff = modifiedBottomPP - bottomPP;
-
-            if (diff > expectedPP) {
-                boundaryIdx = mid;
-                left = mid + 1;
-            } else {
-                right = mid - 1;
-            }
-        }
-
-        if (boundaryIdx == -1) {
-            return this.getRawPPAtIdx(scores, 0, expectedPP);
-        } else {
-            return this.getRawPPAtIdx(scores.subList(boundaryIdx + 1, scores.size()), boundaryIdx + 1, expectedPP);
-        }
-    }
-}

src/main/java/cc/fascinated/bat/common/command/BatCommand.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.command;
+package cc.fascinated.bat.common.command;
 
-import cc.fascinated.bat.features.Feature;
-import cc.fascinated.bat.model.BatGuild;
-import cc.fascinated.bat.model.BatUser;
+import cc.fascinated.bat.common.feature.Feature;
+import cc.fascinated.bat.common.model.BatGuild;
+import cc.fascinated.bat.common.model.BatUser;
 import lombok.*;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Member;
@@ -14,10 +14,12 @@ import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
-import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
 import net.dv8tion.jda.internal.interactions.CommandDataImpl;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Braydon

src/main/java/cc/fascinated/bat/common/command/Category.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.command;
+package cc.fascinated.bat.common.command;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/cc/fascinated/bat/common/command/CommandInfo.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.command;
+package cc.fascinated.bat.common.command;
 
 import net.dv8tion.jda.api.Permission;
 

src/main/java/cc/fascinated/bat/common/command/InternalCommandInfo.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.command;
+package cc.fascinated.bat.common.command;
 
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/java/cc/fascinated/bat/common/feature/Feature.java

@@ -1,6 +1,6 @@
-package cc.fascinated.bat.features;
+package cc.fascinated.bat.common.feature;
 
-import cc.fascinated.bat.command.BatCommand;
+import cc.fascinated.bat.common.command.BatCommand;
 import cc.fascinated.bat.service.CommandService;
 import lombok.Getter;
 import lombok.NonNull;

src/main/java/cc/fascinated/bat/common/feature/FeatureProfile.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.features;
+package cc.fascinated.bat.common.feature;
 
 import cc.fascinated.bat.common.Serializable;
 import com.google.gson.Gson;

src/main/java/cc/fascinated/bat/common/model/BatGuild.java

@@ -1,19 +1,18 @@
-package cc.fascinated.bat.model;
+package cc.fascinated.bat.common.model;
 
 import cc.fascinated.bat.BatApplication;
 import cc.fascinated.bat.common.ProfileHolder;
 import cc.fascinated.bat.common.Serializable;
-import cc.fascinated.bat.features.FeatureProfile;
-import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
-import cc.fascinated.bat.features.counter.CounterProfile;
-import cc.fascinated.bat.features.leveling.LevelingProfile;
-import cc.fascinated.bat.features.logging.LogProfile;
-import cc.fascinated.bat.features.minecraft.MinecraftProfile;
-import cc.fascinated.bat.features.moderation.punish.PunishmentProfile;
-import cc.fascinated.bat.features.namehistory.profile.guild.NameHistoryProfile;
-import cc.fascinated.bat.features.reminder.ReminderProfile;
-import cc.fascinated.bat.features.statschannel.StatsChannelProfile;
-import cc.fascinated.bat.features.welcomer.WelcomerProfile;
+import cc.fascinated.bat.common.feature.FeatureProfile;
+import cc.fascinated.bat.birthday.profile.BirthdayProfile;
+import cc.fascinated.bat.counter.CounterProfile;
+import cc.fascinated.bat.leveling.LevelingProfile;
+import cc.fascinated.bat.logging.LogProfile;
+import cc.fascinated.bat.moderation.punish.PunishmentProfile;
+import cc.fascinated.bat.namehistory.profile.guild.NameHistoryProfile;
+import cc.fascinated.bat.reminder.ReminderProfile;
+import cc.fascinated.bat.statschannel.StatsChannelProfile;
+import cc.fascinated.bat.welcomer.WelcomerProfile;
 import cc.fascinated.bat.premium.PremiumProfile;
 import cc.fascinated.bat.service.DiscordService;
 import cc.fascinated.bat.service.MongoService;
@@ -23,8 +22,6 @@ import lombok.NonNull;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
 import net.dv8tion.jda.api.entities.Guild;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.annotation.Id;
 
 import java.util.Date;
@@ -182,15 +179,6 @@ public class BatGuild extends ProfileHolder {
         return getProfile(LevelingProfile.class);
     }
 
-    /**
-     * Gets the minecraft profile
-     *
-     * @return the minecraft profile
-     */
-    public MinecraftProfile getMinecraftProfile() {
-        return getProfile(MinecraftProfile.class);
-    }
-
     /**
      * Gets the stats channel profile
      *

src/main/java/cc/fascinated/bat/common/model/BatUser.java

@@ -1,11 +1,10 @@
-package cc.fascinated.bat.model;
+package cc.fascinated.bat.common.model;
 
 import cc.fascinated.bat.BatApplication;
 import cc.fascinated.bat.common.ProfileHolder;
 import cc.fascinated.bat.common.Serializable;
 import cc.fascinated.bat.common.UserUtils;
-import cc.fascinated.bat.features.namehistory.profile.user.NameHistoryProfile;
-import cc.fascinated.bat.features.scoresaber.profile.user.ScoreSaberProfile;
+import cc.fascinated.bat.namehistory.profile.user.NameHistoryProfile;
 import cc.fascinated.bat.service.DiscordService;
 import cc.fascinated.bat.service.MongoService;
 import com.mongodb.client.model.ReplaceOptions;
@@ -87,15 +86,6 @@ public class BatUser extends ProfileHolder {
         return user;
     }
 
-    /**
-     * Gets the user's ScoreSaber profile
-     *
-     * @return the user's ScoreSaber profile
-     */
-    public ScoreSaberProfile getScoreSaberProfile() {
-        return getProfile(ScoreSaberProfile.class);
-    }
-
     /**
      * Gets the user's name history profile
      *

src/main/java/cc/fascinated/bat/common/model/DiscordMessage.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model;
+package cc.fascinated.bat.common.model;
 
 import cc.fascinated.bat.common.ChannelUtils;
 import cc.fascinated.bat.common.UserUtils;

src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.beatsaber.scoresaber;
+package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.beatsaber.scoresaber;
+package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
 
 import lombok.Getter;
 import lombok.ToString;

src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.beatsaber.scoresaber;
+package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
 
 import lombok.Getter;
 import lombok.ToString;

src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.beatsaber.scoresaber;
+package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
 
 import lombok.Getter;
 import lombok.ToString;

src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.beatsaber.scoresaber;
+package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
 
 import lombok.Getter;
 import lombok.ToString;

src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.beatsaber.scoresaber;
+package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/cc/fascinated/bat/common/model/token/dogceo/RandomImage.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.dogceo;
+package cc.fascinated.bat.common.model.token.dogceo;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/cc/fascinated/bat/common/model/token/paste/PasteUploadToken.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.paste;
+package cc.fascinated.bat.common.model.token.paste;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/cc/fascinated/bat/common/model/token/randomd/RandomDuck.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.randomd;
+package cc.fascinated.bat.common.model.token.randomd;
 
 import lombok.Getter;
 

src/main/java/cc/fascinated/bat/common/model/token/randomfox/RandomFoxToken.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.randomfox;
+package cc.fascinated.bat.common.model.token.randomfox;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/cc/fascinated/bat/common/model/token/thecatapi/CatImageToken.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.model.token.thecatapi;
+package cc.fascinated.bat.common.model.token.thecatapi;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/cc/fascinated/bat/controller/SpotifyController.java

@@ -1,33 +0,0 @@
-package cc.fascinated.bat.controller;
-
-import cc.fascinated.bat.service.SpotifyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Fascinated (fascinated7)
- */
-@RestController
-@RequestMapping(value = "/spotify")
-public class SpotifyController {
-    private final SpotifyService spotifyService;
-
-    @Autowired
-    public SpotifyController(SpotifyService spotifyService) {
-        this.spotifyService = spotifyService;
-    }
-
-    /**
-     * A GET request to authorize the user with Spotify.
-     *
-     * @return the response entity
-     */
-    @GetMapping(value = "/callback")
-    public ResponseEntity<String> authorizationCallback(@RequestParam(required = false) String code) {
-        return ResponseEntity.ok(spotifyService.authorize(code));
-    }
-}

src/main/java/cc/fascinated/bat/counter/CounterChannel.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.features.counter;
+package cc.fascinated.bat.counter;
 
 import cc.fascinated.bat.common.ChannelUtils;
 import cc.fascinated.bat.common.NumberUtils;

src/main/java/cc/fascinated/bat/counter/CounterFeature.java

@@ -1,8 +1,8 @@
-package cc.fascinated.bat.features.counter;
+package cc.fascinated.bat.counter;
 
-import cc.fascinated.bat.features.Feature;
-import cc.fascinated.bat.features.FeatureProfile;
-import cc.fascinated.bat.features.counter.command.CounterCommand;
+import cc.fascinated.bat.common.feature.Feature;
+import cc.fascinated.bat.common.feature.FeatureProfile;
+import cc.fascinated.bat.counter.command.CounterCommand;
 import cc.fascinated.bat.service.CommandService;
 import lombok.NonNull;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cc/fascinated/bat/counter/CounterProfile.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.features.counter;
+package cc.fascinated.bat.counter;
 
 import cc.fascinated.bat.common.Serializable;
 import com.google.gson.Gson;

src/main/java/cc/fascinated/bat/counter/CounterResult.java

@@ -1,4 +1,4 @@
-package cc.fascinated.bat.features.counter;
+package cc.fascinated.bat.counter;
 
 /**
  * @author Fascinated (fascinated7)