refactor: code cleanup

.github/workflows/build.yml

@@ -20,9 +20,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: '17'
@@ -44,7 +44,7 @@ jobs:
       - name: Run Gradle
         run: ./gradlew -PskipHandbook=1 && ./gradlew jar -PskipHandbook=1
       - name: Upload build
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Grasscutter
           path: grasscutter-*.jar

src/main/java/emu/grasscutter/DebugConstants.java

@@ -1,12 +1,12 @@
 package emu.grasscutter;
 
 public final class DebugConstants {
-    public static boolean LOG_ABILITIES = false;
-    public static boolean LOG_LUA_SCRIPTS = false;
-    public static boolean LOG_QUEST_START = false;
-    public static boolean LOG_MISSING_ABILITIES = false;
-    public static boolean LOG_MISSING_LUA_SCRIPTS = false;
-    public static boolean LOG_MISSING_ABILITY_HANDLERS = false;
+    public static final boolean LOG_ABILITIES = false;
+    public static final boolean LOG_LUA_SCRIPTS = false;
+    public static final boolean LOG_QUEST_START = false;
+    public static final boolean LOG_MISSING_ABILITIES = false;
+    public static final boolean LOG_MISSING_LUA_SCRIPTS = false;
+    public static final boolean LOG_MISSING_ABILITY_HANDLERS = false;
 
     /**
      * WARNING: THIS IS A DANGEROUS SETTING. DO NOT ENABLE UNLESS YOU KNOW WHAT YOU ARE DOING. This

src/main/java/emu/grasscutter/GameConstants.java

@@ -7,8 +7,8 @@
 import java.util.Arrays;
 
 public final class GameConstants {
-    public static String VERSION = "4.0.0";
-    public static int[] VERSION_PARTS = {4, 0, 0};
+    public static final String VERSION = "4.0.0";
+    public static final int[] VERSION_PARTS = {4, 0, 0};
     public static boolean DEBUG = false;
 
     public static final int DEFAULT_TEAMS = 4;

src/main/java/emu/grasscutter/Grasscutter.java

@@ -312,7 +312,7 @@ public static LineReader getConsole() {
     public static void updateDayOfWeek() {
         Calendar calendar = Calendar.getInstance();
         Grasscutter.currentDayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
-        logger.debug("Set day of week to " + currentDayOfWeek);
+        logger.debug("Set day of week to {}", currentDayOfWeek);
     }
 
     public static void startConsole() {

src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java

@@ -103,7 +103,7 @@ public LoginResultJson authenticate(AuthenticationRequest request) {
                 KeyFactory keyFactory = KeyFactory.getInstance("RSA");
                 RSAPrivateKey private_key = (RSAPrivateKey) keyFactory.generatePrivate(keySpec);
 
-                Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
+                Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-256AndMGF1Padding");
 
                 cipher.init(Cipher.DECRYPT_MODE, private_key);
 

src/main/java/emu/grasscutter/command/CommandMap.java

@@ -53,7 +53,7 @@ private static int getUidFromString(String input) {
      * @return Instance chaining.
      */
     public CommandMap registerCommand(String label, CommandHandler command) {
-        Grasscutter.getLogger().trace("Registered command: " + label);
+        Grasscutter.getLogger().trace("Registered command: {}", label);
         label = label.toLowerCase();
 
         // Get command data.
@@ -76,7 +76,7 @@ public CommandMap registerCommand(String label, CommandHandler command) {
      * @return Instance chaining.
      */
     public CommandMap unregisterCommand(String label) {
-        Grasscutter.getLogger().trace("Un-registered command: " + label);
+        Grasscutter.getLogger().trace("Un-registered command: {}", label);
 
         CommandHandler handler = this.commands.get(label);
         if (handler == null) return this;
@@ -231,14 +231,12 @@ public void invoke(Player player, Player targetPlayer, String rawMessage) {
             if (player != null) {
                 Grasscutter.getLogger()
                         .info(
-                                "Command used by ["
-                                        + player.getAccount().getUsername()
-                                        + " (Player UID: "
-                                        + player.getUid()
-                                        + ")]: "
-                                        + rawMessage);
+                                "Command used by [{} (Player UID: {})]: {}",
+                                player.getAccount().getUsername(),
+                                player.getUid(),
+                                rawMessage);
             } else {
-                Grasscutter.getLogger().info("Command used by server console: " + rawMessage);
+                Grasscutter.getLogger().info("Command used by server console: {}", rawMessage);
             }
         }
 
@@ -350,11 +348,12 @@ private void scan() {
                             this.registerCommand(cmdData.label(), (CommandHandler) object);
                         else
                             Grasscutter.getLogger()
-                                    .error("Class " + annotated.getName() + " is not a CommandHandler!");
+                                    .error("Class {} is not a CommandHandler!", annotated.getName());
                     } catch (Exception exception) {
                         Grasscutter.getLogger()
                                 .error(
-                                        "Failed to register command handler for " + annotated.getSimpleName(),
+                                        "Failed to register command handler for {}",
+                                        annotated.getSimpleName(),
                                         exception);
                     }
                 });

src/main/java/emu/grasscutter/command/commands/AchievementCommand.java

@@ -69,7 +69,7 @@ private static void revokeAll(Player sender, Player targetPlayer, Achievements a
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() < 1) {
+        if (args.isEmpty()) {
             this.sendUsageMessage(sender);
             return;
         }
@@ -88,7 +88,7 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
 
     private void grant(
             Player sender, Player targetPlayer, Achievements achievements, List<String> args) {
-        if (args.size() < 1) {
+        if (args.isEmpty()) {
             this.sendUsageMessage(sender);
         }
 
@@ -109,7 +109,7 @@ private void grant(
 
     private void revoke(
             Player sender, Player targetPlayer, Achievements achievements, List<String> args) {
-        if (args.size() < 1) {
+        if (args.isEmpty()) {
             this.sendUsageMessage(sender);
         }
 
@@ -136,20 +136,19 @@ private void progress(
 
         parseInt(args.remove(0))
                 .ifPresentOrElse(
-                        integer -> {
-                            parseInt(args.remove(0))
-                                    .ifPresentOrElse(
-                                            progress -> {
-                                                var ret = achievements.progress(integer, progress);
-                                                switch (ret.getRet()) {
-                                                    case SUCCESS -> sendSuccessMessage(
-                                                            sender, "progress", targetPlayer.getNickname(), integer, progress);
-                                                    case ACHIEVEMENT_NOT_FOUND -> CommandHandler.sendTranslatedMessage(
-                                                            sender, ret.getRet().getKey());
-                                                }
-                                            },
-                                            () -> this.sendUsageMessage(sender));
-                        },
+                        integer ->
+                                parseInt(args.remove(0))
+                                        .ifPresentOrElse(
+                                                progress -> {
+                                                    var ret = achievements.progress(integer, progress);
+                                                    switch (ret.getRet()) {
+                                                        case SUCCESS -> sendSuccessMessage(
+                                                                sender, "progress", targetPlayer.getNickname(), integer, progress);
+                                                        case ACHIEVEMENT_NOT_FOUND -> CommandHandler.sendTranslatedMessage(
+                                                                sender, ret.getRet().getKey());
+                                                    }
+                                                },
+                                                () -> this.sendUsageMessage(sender)),
                         () -> this.sendUsageMessage(sender));
     }
 }

src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java

@@ -19,7 +19,7 @@ public final class AnnounceCommand implements CommandHandler {
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         var manager = Grasscutter.getGameServer().getAnnouncementSystem();
-        if (args.size() < 1) {
+        if (args.isEmpty()) {
             sendUsageMessage(sender);
             return;
         }

src/main/java/emu/grasscutter/command/commands/ClearCommand.java

@@ -51,7 +51,7 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
         // Extract any tagged int arguments (e.g. "lv90", "x100", "r5")
         parseIntParameters(args, param, intCommandHandlers);
 
-        if (args.size() < 1) {
+        if (args.isEmpty()) {
             sendUsageMessage(sender);
             return;
         }
@@ -93,9 +93,10 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
         }
     }
 
+    @Setter
     private static class ClearItemParameters {
-        @Setter public int lvl = 1;
-        @Setter public int refinement = 1;
-        @Setter public int rank = 4;
+        public int lvl = 1;
+        public int refinement = 1;
+        public int rank = 4;
     }
 }

src/main/java/emu/grasscutter/command/commands/EnterDungeonCommand.java

@@ -16,7 +16,7 @@ public final class EnterDungeonCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() < 1) {
+        if (args.isEmpty()) {
             sendUsageMessage(sender);
             return;
         }

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

@@ -3,16 +3,23 @@
 import static emu.grasscutter.GameConstants.*;
 import static emu.grasscutter.command.CommandHelpers.*;
 
-import emu.grasscutter.command.*;
-import emu.grasscutter.data.*;
+import emu.grasscutter.command.Command;
+import emu.grasscutter.command.CommandHandler;
+import emu.grasscutter.data.GameData;
+import emu.grasscutter.data.GameDepot;
 import emu.grasscutter.data.excels.ItemData;
 import emu.grasscutter.data.excels.avatar.AvatarData;
-import emu.grasscutter.data.excels.reliquary.*;
+import emu.grasscutter.data.excels.reliquary.ReliquaryAffixData;
+import emu.grasscutter.data.excels.reliquary.ReliquaryMainPropData;
 import emu.grasscutter.game.avatar.Avatar;
-import emu.grasscutter.game.inventory.*;
+import emu.grasscutter.game.inventory.GameItem;
+import emu.grasscutter.game.inventory.ItemType;
 import emu.grasscutter.game.player.Player;
-import emu.grasscutter.game.props.*;
-import java.util.*;
+import emu.grasscutter.game.props.ActionReason;
+import emu.grasscutter.game.props.FightProperty;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.regex.Pattern;
 import lombok.Setter;
@@ -279,7 +286,7 @@ private GiveItemParameters parseArgs(Player sender, List<String> args)
         parseIntParameters(args, param, intCommandHandlers);
 
         // At this point, first remaining argument MUST be itemId/avatarId
-        if (args.size() < 1) {
+        if (args.isEmpty()) {
             sendUsageMessage(sender); // Reachable if someone does `/give lv90` or similar
             throw new IllegalArgumentException();
         }
@@ -362,7 +369,7 @@ else if ((param.id > 1000) && (param.id < 1100))
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() < 1) { // *No args*
+        if (args.isEmpty()) { // *No args*
             sendUsageMessage(sender);
             return;
         }

src/main/java/emu/grasscutter/command/commands/GroupCommand.java

@@ -63,9 +63,7 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
 
                 CommandHandler.sendMessage(sender, translate(sender, "commands.group.refreshed", groupId));
             }
-            default -> {
-                sendUsageMessage(sender);
-            }
+            default -> sendUsageMessage(sender);
         }
     }
 }

src/main/java/emu/grasscutter/command/commands/ListCommand.java

@@ -19,14 +19,14 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
         Map<Integer, Player> playersMap = Grasscutter.getGameServer().getPlayers();
         boolean needUID = false;
 
-        if (args.size() > 0) {
+        if (!args.isEmpty()) {
             needUID = args.get(0).equals("uid");
         }
 
         CommandHandler.sendMessage(
                 sender, translate(sender, "commands.list.success", playersMap.size()));
 
-        if (playersMap.size() != 0) {
+        if (!playersMap.isEmpty()) {
             StringBuilder playerSet = new StringBuilder();
             boolean finalNeedUID = needUID;
 

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

@@ -18,7 +18,7 @@ public final class ResetConstCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() > 0 && args.get(0).equalsIgnoreCase("all")) {
+        if (!args.isEmpty() && args.get(0).equalsIgnoreCase("all")) {
             targetPlayer.getAvatars().forEach(this::resetConstellation);
             CommandHandler.sendMessage(sender, translate(sender, "commands.resetConst.reset_all"));
         } else {

src/main/java/emu/grasscutter/command/commands/SendMailCommand.java

@@ -24,8 +24,7 @@ public final class SendMailCommand implements CommandHandler {
     //  the command system (again). For now this will do
 
     // Key = User that is constructing the mail.
-    private static final HashMap<Integer, MailBuilder> mailBeingConstructed =
-            new HashMap<Integer, MailBuilder>();
+    private static final HashMap<Integer, MailBuilder> mailBeingConstructed = new HashMap<>();
 
     // Yes this is awful and I hate it.
     @Override
@@ -69,7 +68,7 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
         } else {
             MailBuilder mailBuilder = mailBeingConstructed.get(senderId);
 
-            if (args.size() >= 1) {
+            if (!args.isEmpty()) {
                 switch (args.get(0).toLowerCase()) {
                     case "stop" -> {
                         mailBeingConstructed.remove(senderId);
@@ -106,14 +105,12 @@ public void execute(Player sender, Player targetPlayer, List<String> args) {
                                             getConstructionArgs(mailBuilder.constructionStage, sender)));
                         }
                     }
-                    case "help" -> {
-                        CommandHandler.sendMessage(
-                                sender,
-                                translate(
-                                        sender,
-                                        "commands.sendMail.please_use",
-                                        getConstructionArgs(mailBuilder.constructionStage, sender)));
-                    }
+                    case "help" -> CommandHandler.sendMessage(
+                            sender,
+                            translate(
+                                    sender,
+                                    "commands.sendMail.please_use",
+                                    getConstructionArgs(mailBuilder.constructionStage, sender)));
                     default -> {
                         switch (mailBuilder.constructionStage) {
                             case 0 -> {

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

@@ -17,7 +17,7 @@ public final class SendMessageCommand implements CommandHandler {
 
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() == 0) {
+        if (args.isEmpty()) {
             sendUsageMessage(sender);
             return;
         }

src/main/java/emu/grasscutter/command/commands/SetConstCommand.java

@@ -17,7 +17,7 @@
 public final class SetConstCommand implements CommandHandler {
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
-        if (args.size() < 1) {
+        if (args.isEmpty()) {
             sendUsageMessage(sender);
             return;
         }

src/main/java/emu/grasscutter/command/commands/SetPropCommand.java

@@ -291,9 +291,9 @@ enum PseudoProp {
     }
 
     static class Prop {
-        String name;
-        PlayerProperty prop;
-        PseudoProp pseudoProp;
+        final String name;
+        final PlayerProperty prop;
+        final PseudoProp pseudoProp;
 
         public Prop(PlayerProperty prop) {
             this(prop.toString(), prop, PseudoProp.NONE);

src/main/java/emu/grasscutter/command/commands/SetSceneTagCommand.java

@@ -95,9 +95,8 @@ private void unlockAllSceneTags(Player targetPlayer) {
                 // Only remove for big world as some other scenes only have defaults
                 .filter(sceneTag -> sceneTag.getSceneId() == 3)
                 .forEach(
-                        sceneTag -> {
-                            targetPlayer.getSceneTags().get(sceneTag.getSceneId()).remove(sceneTag.getId());
-                        });
+                        sceneTag ->
+                                targetPlayer.getSceneTags().get(sceneTag.getSceneId()).remove(sceneTag.getId()));
 
         this.setSceneTags(targetPlayer);
     }