Fix merge conflict

src/main/java/emu/grasscutter/command/commands/Account.java → src/main/java/emu/grasscutter/command/commands/AccountCommand.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Command(label = "account", usage = "account <create|delete> <username> [uid]",
         description = "Modify user accounts")
-public class Account implements CommandHandler {
+public final class AccountCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Broadcast.java → src/main/java/emu/grasscutter/command/commands/BroadcastCommand.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Command(label = "broadcast", usage = "broadcast <message>",
         description = "Sends a message to all the players", aliases = {"b"}, permission = "server.broadcast")
-public class Broadcast implements CommandHandler {
+public final class BroadcastCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/ChangeScene.java → src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Command(label = "changescene", usage = "changescene <scene id>",
         description = "Changes your scene", aliases = {"scene"}, permission = "player.changescene")
-public class ChangeScene implements CommandHandler {
+public final class ChangeSceneCommand implements CommandHandler {
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {
         if (sender == null) {

src/main/java/emu/grasscutter/command/commands/ClearArtifacts.java → src/main/java/emu/grasscutter/command/commands/ClearArtifactsCommand.java

@@ -11,7 +11,7 @@ import java.util.List;
 @Command(label = "clearartifacts", usage = "clearartifacts",
         description = "Deletes all unequipped and unlocked level 0 artifacts, including yellow rarity ones from your inventory",
         aliases = {"clearart"}, permission = "player.clearartifacts")
-public class ClearArtifacts implements CommandHandler {
+public final class ClearArtifactsCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Drop.java → src/main/java/emu/grasscutter/command/commands/DropCommand.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 @Command(label = "drop", usage = "drop <itemId|itemName> [amount]",
         description = "Drops an item near you", aliases = {"d", "dropitem"}, permission = "server.drop")
-public class Drop implements CommandHandler {
+public final class DropCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/GiveChar.java → src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 @Command(label = "givechar", usage = "givechar <playerId> <avatarId> [level]",
         description = "Gives the player a specified character", aliases = {"givec"}, permission = "player.givechar")
-public class GiveChar implements CommandHandler {
+public final class GiveCharCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Give.java → src/main/java/emu/grasscutter/command/commands/GiveCommand.java

@@ -15,7 +15,7 @@ import java.util.List;
 
 @Command(label = "give", usage = "give [player] <itemId|itemName> [amount]",
         description = "Gives an item to you or the specified player", aliases = {"g", "item", "giveitem"}, permission = "player.give")
-public class Give implements CommandHandler {
+public final class GiveCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/GodMode.java → src/main/java/emu/grasscutter/command/commands/GodModeCommand.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Command(label = "godmode", usage = "godmode [playerId]",
         description = "Prevents you from taking damage", permission = "player.godmode")
-public class GodMode implements CommandHandler {
+public final class GodModeCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Help.java → src/main/java/emu/grasscutter/command/commands/HelpCommand.java

@@ -9,7 +9,7 @@ import java.util.*;
 
 @Command(label = "help", usage = "help [command]",
         description = "Sends the help message or shows information about a specified command")
-public class Help implements CommandHandler {
+public final class HelpCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer player, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Kick.java → src/main/java/emu/grasscutter/command/commands/KickCommand.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Command(label = "kick", usage = "kick <player>",
         description = "Kicks the specified player from the server (WIP)", permission = "server.kick")
-public class Kick implements CommandHandler {
+public final class KickCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/KillAll.java → src/main/java/emu/grasscutter/command/commands/KillAllCommand.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 @Command(label = "killall", usage = "killall [playerUid] [sceneId]",
         description = "Kill all entities", permission = "server.killall")
-public class KillAll implements CommandHandler {
+public final class KillAllCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Permission.java → src/main/java/emu/grasscutter/command/commands/PermissionCommand.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Command(label = "permission", usage = "permission <add|remove> <username> <permission>",
         description = "Grants or removes a permission for a user", permission = "*")
-public class Permission implements CommandHandler {
+public final class PermissionCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Pos.java → src/main/java/emu/grasscutter/command/commands/PositionCommand.java

@@ -6,9 +6,9 @@ import emu.grasscutter.game.GenshinPlayer;
 
 import java.util.List;
 
-@Command(label = "pos", usage = "pos",
+@Command(label = "position", usage = "position", aliases = {"pos"},
         description = "Get coordinates.")
-public class Pos implements CommandHandler {
+public final class PositionCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Reload.java → src/main/java/emu/grasscutter/command/commands/ReloadCommand.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Command(label = "reload", usage = "reload",
         description = "Reload server config", permission = "server.reload")
-public class Reload implements CommandHandler {
+public final class ReloadCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/ResetConst.java → src/main/java/emu/grasscutter/command/commands/ResetConstCommand.java

@@ -11,7 +11,7 @@ import java.util.List;
 @Command(label = "resetconst", usage = "resetconst [all]",
         description = "Resets the constellation level on your current active character, will need to relog after using the command to see any changes.",
         aliases = {"resetconstellation"}, permission = "player.resetconstellation")
-public class ResetConst implements CommandHandler {
+public final class ResetConstCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Restart.java → src/main/java/emu/grasscutter/command/commands/RestartCommand.java

@@ -7,7 +7,7 @@ import emu.grasscutter.game.GenshinPlayer;
 import java.util.List;
 
 @Command(label = "restart", usage = "restart - Restarts the current session")
-public class Restart implements CommandHandler {
+public final class RestartCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/SendMessage.java → src/main/java/emu/grasscutter/command/commands/SendMessageCommand.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Command(label = "say", usage = "say <player> <message>", description = "Sends a message to a player as the server",
         aliases = {"sendservmsg", "sendservermessage", "sendmessage"}, permission = "server.sendmessage")
-public class SendMessage implements CommandHandler {
+public final class SendMessageCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/SetStats.java → src/main/java/emu/grasscutter/command/commands/SetStatsCommand.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 @Command(label = "setstats", usage = "setstats|stats <stat> <value>",
         aliases = {"stats"})
-public class SetStats implements CommandHandler {
+public final class SetStatsCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/SetWorldLevel.java → src/main/java/emu/grasscutter/command/commands/SetWorldLevelCommand.java

@@ -10,7 +10,7 @@ import java.util.List;
 @Command(label = "setworldlevel", usage = "setworldlevel <level>",
         description = "Sets your world level (Relog to see proper effects)",
         aliases = {"setworldlvl"}, permission = "player.setworldlevel")
-public class SetWorldLevel implements CommandHandler {
+public final class SetWorldLevelCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {

src/main/java/emu/grasscutter/command/commands/Spawn.java → src/main/java/emu/grasscutter/command/commands/SpawnCommand.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 @Command(label = "spawn", usage = "spawn <entityId|entityName> [level] [amount]",
         description = "Spawns an entity near you", permission = "server.spawn")
-public class Spawn implements CommandHandler {
+public final class SpawnCommand implements CommandHandler {
 
     @Override
     public void execute(GenshinPlayer sender, List<String> args) {