Merge pull request #4 from Grasscutters/development

Development

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

@@ -8,6 +8,8 @@ import emu.grasscutter.utils.Position;
 
 import java.util.List;
 
+import static emu.grasscutter.utils.Language.translate;
+
 @Command(label = "teleport", usage = "teleport <x> <y> <z> [scene id]", aliases = {"tp"},
         description = "Change the player's position.", permission = "player.teleport")
 public final class TeleportCommand implements CommandHandler {
@@ -26,7 +28,7 @@ public final class TeleportCommand implements CommandHandler {
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {
-            CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed);
+            CommandHandler.sendMessage(sender, translate("commands.execution.need_target"));
             return;
         }
 
@@ -41,7 +43,7 @@ public final class TeleportCommand implements CommandHandler {
                 try {
                     sceneId = Integer.parseInt(args.get(3));
                 }catch (NumberFormatException ignored) {
-                    CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Invalid_arguments);
+                    CommandHandler.sendMessage(sender, translate("commands.execution.argument_error"));
                 }  // Fallthrough
             case 3:
                 try {
@@ -49,20 +51,23 @@ public final class TeleportCommand implements CommandHandler {
                     y = parseRelative(args.get(1), y);
                     z = parseRelative(args.get(2), z);
                 } catch (NumberFormatException ignored) {
-                    CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_invalid_position);
+                    CommandHandler.sendMessage(sender, translate("commands.teleport.invalid_position"));
                 }
                 break;
             default:
-                CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_usage);
+                CommandHandler.sendMessage(sender, translate("commands.teleport.usage"));
                 return;
         }
 
         Position target_pos = new Position(x, y, z);
         boolean result = targetPlayer.getWorld().transferPlayerToScene(targetPlayer, sceneId, target_pos);
         if (!result) {
-            CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_invalid_position);
+            CommandHandler.sendMessage(sender, translate("commands.teleport.invalid_position"));
         } else {
-            CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Teleport_message.replace("{name}", targetPlayer.getNickname()).replace("{x}", Float.toString(x)).replace("{y}", Float.toString(y)).replace("{z}", Float.toString(z)).replace("{id}", Integer.toString(sceneId)));
+            CommandHandler.sendMessage(sender, translate("commands.teleport.success", 
+                    targetPlayer.getNickname(), Float.toString(x), Float.toString(y), 
+                    Float.toString(z), Integer.toString(sceneId))
+            );
         }
 
     }

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

@@ -9,6 +9,8 @@ import emu.grasscutter.server.packet.send.PacketSceneAreaWeatherNotify;
 
 import java.util.List;
 
+import static emu.grasscutter.utils.Language.translate;
+
 @Command(label = "weather", usage = "weather <weatherId> [climateId]",
         description = "Changes the weather.", aliases = {"w"}, permission = "player.weather")
 public final class WeatherCommand implements CommandHandler {
@@ -16,7 +18,7 @@ public final class WeatherCommand implements CommandHandler {
     @Override
     public void execute(Player sender, Player targetPlayer, List<String> args) {
         if (targetPlayer == null) {
-            CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Target_needed);
+            CommandHandler.sendMessage(sender, translate("commands.execution.need_target"));
             return;
         }
 
@@ -27,17 +29,17 @@ public final class WeatherCommand implements CommandHandler {
                 try {
                     climateId = Integer.parseInt(args.get(1));
                 } catch (NumberFormatException ignored) {
-                    CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_invalid_id);
+                        CommandHandler.sendMessage(sender, translate("commands.weather.invalid_id"));
                 }
             case 1:
                 try {
                     weatherId = Integer.parseInt(args.get(0));
                 } catch (NumberFormatException ignored) {
-                    CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_invalid_id);
+                    CommandHandler.sendMessage(sender, translate("commands.weather.invalid_id"));
                 }
                 break;
             default:
-                CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_usage);
+                CommandHandler.sendMessage(sender, translate("commands.weather.usage"));
                 return;
         }
 
@@ -46,7 +48,6 @@ public final class WeatherCommand implements CommandHandler {
         targetPlayer.getScene().setWeather(weatherId);
         targetPlayer.getScene().setClimate(climate);
         targetPlayer.getScene().broadcastPacket(new PacketSceneAreaWeatherNotify(targetPlayer));
-        CommandHandler.sendMessage(sender, Grasscutter.getLanguage().Weather_message.replace("{weatherId}", Integer.toString(weatherId)).replace("{climateId}", Integer.toString(climateId)));
-
+        CommandHandler.sendMessage(sender, translate("commands.weather.success", Integer.toString(weatherId), Integer.toString(climateId)));
     }
 }

src/main/java/emu/grasscutter/data/ResourceLoader.java

@@ -7,6 +7,7 @@ import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.google.gson.Gson;
 import emu.grasscutter.utils.Utils;
 import org.reflections.Reflections;
 
@@ -120,14 +121,15 @@ public class ResourceLoader {
 	
 	@SuppressWarnings({"rawtypes", "unchecked"})
 	protected static void loadFromResource(Class<?> c, String fileName, Int2ObjectMap map) throws Exception {
-		try (FileReader fileReader = new FileReader(Grasscutter.getConfig().RESOURCE_FOLDER + "ExcelBinOutput/" + fileName)) {
-			List list = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, c).getType());
-
-			for (Object o : list) {
-				GameResource res = (GameResource) o;
-				res.onLoad();
-				map.put(res.getId(), res);
-			}
+		FileReader fileReader = new FileReader(Grasscutter.getConfig().RESOURCE_FOLDER + "ExcelBinOutput/" + fileName);
+		Gson gson = Grasscutter.getGsonFactory();
+		List list = gson.fromJson(fileReader, List.class);
+
+		for (Object o : list) {
+			Map<String, Object> tempMap = Utils.switchPropertiesUpperLowerCase((Map<String, Object>) o, c);
+			GameResource res = gson.fromJson(gson.toJson(tempMap), TypeToken.get(c).getType());
+			res.onLoad();
+			map.put(res.getId(), res);
 		}
 	}
 

src/main/java/emu/grasscutter/game/expedition/ExpeditionInfo.java

+package emu.grasscutter.game.expedition;
+
+import dev.morphia.annotations.Entity;
+
+@Entity
+public class ExpeditionInfo {
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public int getExpId() {
+        return expId;
+    }
+
+    public void setExpId(int expId) {
+        this.expId = expId;
+    }
+
+    public int getHourTime() {
+        return hourTime;
+    }
+
+    public void setHourTime(int hourTime) {
+        this.hourTime = hourTime;
+    }
+
+    public int getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(int startTime) {
+        this.startTime = startTime;
+    }
+
+    private int state;
+    private int expId;
+    private int hourTime;
+    private int startTime;
+}

src/main/java/emu/grasscutter/game/expedition/ExpeditionManager.java

+package emu.grasscutter.game.expedition;
+
+import com.google.gson.reflect.TypeToken;
+import emu.grasscutter.Grasscutter;
+import emu.grasscutter.server.game.GameServer;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+import java.io.FileReader;
+import java.util.Collection;
+import java.util.List;
+
+public class ExpeditionManager {
+    public GameServer getGameServer() {
+        return gameServer;
+    }
+
+    private final GameServer gameServer;
+
+    public Int2ObjectMap<List<ExpeditionRewardDataList>> getExpeditionRewardDataList() { return expeditionRewardData; }
+
+    private final Int2ObjectMap<List<ExpeditionRewardDataList>> expeditionRewardData;
+
+    public ExpeditionManager(GameServer gameServer) {
+        this.gameServer = gameServer;
+        this.expeditionRewardData = new Int2ObjectOpenHashMap<>();
+        this.load();
+    }
+
+    public synchronized void load() {
+        try (FileReader fileReader = new FileReader(Grasscutter.getConfig().DATA_FOLDER + "ExpeditionReward.json")) {
+            getExpeditionRewardDataList().clear();
+            List<ExpeditionRewardInfo> banners = Grasscutter.getGsonFactory().fromJson(fileReader, TypeToken.getParameterized(Collection.class, ExpeditionRewardInfo.class).getType());
+            if(banners.size() > 0) {
+                for (ExpeditionRewardInfo di : banners) {
+                    getExpeditionRewardDataList().put(di.getExpId(), di.getExpeditionRewardDataList());
+                }
+                Grasscutter.getLogger().info("Expedition reward successfully loaded.");
+            } else {
+                Grasscutter.getLogger().error("Unable to load expedition reward. Expedition reward size is 0.");
+            }
+        } catch (Exception e) {
+            Grasscutter.getLogger().error("Unable to load expedition reward.", e);
+        }
+    }
+}

src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardData.java

+package emu.grasscutter.game.expedition;
+
+public class ExpeditionRewardData {
+    private int itemId;
+    private int minCount;
+    private int maxCount;
+
+    public int getItemId() {
+        return itemId;
+    }
+
+    public int getMinCount() { return minCount; }
+
+    public int getMaxCount() {
+        return maxCount;
+    }
+
+}

src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardDataList.java

+package emu.grasscutter.game.expedition;
+
+import java.util.List;
+
+public class ExpeditionRewardDataList {
+    public int getHourTime() {
+        return hourTime;
+    }
+    public List<ExpeditionRewardData> getExpeditionRewardData() {
+        return expeditionRewardData;
+    }
+
+    private int hourTime;
+    private List<ExpeditionRewardData> expeditionRewardData;
+}

src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardInfo.java

+package emu.grasscutter.game.expedition;
+
+import java.util.List;
+
+public class ExpeditionRewardInfo {
+    public int getExpId() {
+        return expId;
+    }
+
+    public List<ExpeditionRewardDataList> getExpeditionRewardDataList() {
+        return expeditionRewardDataList;
+    }
+
+    private int expId;
+    private List<ExpeditionRewardDataList> expeditionRewardDataList;
+}

src/main/java/emu/grasscutter/game/managers/MovementManager/MovementManager.java

@@ -60,6 +60,7 @@ public class MovementManager {
     private final Player player;
 
     private float landSpeed = 0;
+    private long landTimeMillisecond = 0;
     private Timer movementManagerTickTimer;
     private GameSession cachedSession = null;
     private GameEntity cachedEntity = null;
@@ -192,12 +193,20 @@ public class MovementManager {
         // cache land speed
         if (state == MotionState.MOTION_LAND_SPEED) {
             landSpeed = motionInfo.getSpeed().getY();
+            landTimeMillisecond = System.currentTimeMillis();
         }
         if (state == MotionState.MOTION_FALL_ON_GROUND) {
+            // if not received immediately after MOTION_LAND_SPEED, discard this packet.
+            // TODO: Test in high latency.
+            int maxDelay = 200;
+            if ((System.currentTimeMillis() - landTimeMillisecond) > maxDelay) {
+                Grasscutter.getLogger().debug("MOTION_FALL_ON_GROUND received after " + maxDelay + "ms, discard.");
+                return;
+            }
             float currentHP = cachedEntity.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
             float maxHP = cachedEntity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
             float damage = 0;
-//            Grasscutter.getLogger().debug("LandSpeed: " + landSpeed);
+            Grasscutter.getLogger().debug("LandSpeed: " + landSpeed);
             if (landSpeed < -23.5) {
                 damage = (float)(maxHP * 0.33);
             }
@@ -214,7 +223,7 @@ public class MovementManager {
             if (newHP < 0) {
                 newHP = 0;
             }
-//            Grasscutter.getLogger().debug("Max: " + maxHP + "\tCurr: " + currentHP + "\tDamage: " + damage + "\tnewHP: " + newHP);
+            Grasscutter.getLogger().debug("Max: " + maxHP + "\tCurr: " + currentHP + "\tDamage: " + damage + "\tnewHP: " + newHP);
             cachedEntity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, newHP);
             cachedEntity.getWorld().broadcastPacket(new PacketEntityFightPropUpdateNotify(cachedEntity, FightProperty.FIGHT_PROP_CUR_HP));
             if (newHP == 0) {
@@ -259,7 +268,7 @@ public class MovementManager {
             if (Grasscutter.getConfig().OpenStamina) {
                 boolean moving = isPlayerMoving();
                 if (moving || (getCurrentStamina() < getMaximumStamina())) {
-                    Grasscutter.getLogger().debug("Player moving: " + moving + ", stamina full: " + (getCurrentStamina() >= getMaximumStamina()) + ", recalculate stamina");
+                    // Grasscutter.getLogger().debug("Player moving: " + moving + ", stamina full: " + (getCurrentStamina() >= getMaximumStamina()) + ", recalculate stamina");
                     Consumption consumption = Consumption.None;
 
                     // TODO: refactor these conditions.
@@ -297,14 +306,16 @@ public class MovementManager {
                     } else if (MotionStatesCategorized.get("RUN").contains(currentState)) {
                         // RUN, DASH and WALK
                         // DASH
-                        if (currentState == MotionState.MOTION_DASH) {
-                            if (previousState == MotionState.MOTION_DASH) {
+                        if (currentState == MotionState.MOTION_DASH_BEFORE_SHAKE) {
+                            consumption = Consumption.DASH;
+                            if (previousState == MotionState.MOTION_DASH_BEFORE_SHAKE) {
+                                // only charge once
                                 consumption = Consumption.SPRINT;
-                            } else {
-                                // cost more to start dashing
-                                consumption = Consumption.DASH;
                             }
                         }
+                        if (currentState == MotionState.MOTION_DASH) {
+                            consumption = Consumption.SPRINT;
+                        }
                         // RUN
                         if (currentState == MotionState.MOTION_RUN) {
                             consumption = Consumption.RUN;
@@ -338,14 +349,13 @@ public class MovementManager {
                             staminaRecoverDelay = 0;
                         }
                         if (consumption.amount > 0) {
-                            if (staminaRecoverDelay < 5) {
+                            if (staminaRecoverDelay < 10) {
                                 staminaRecoverDelay++;
                                 consumption = Consumption.None;
                             }
                         }
                         int newStamina = updateStamina(cachedSession, consumption.amount);
                         cachedSession.send(new PacketPlayerPropNotify(player, PlayerProperty.PROP_CUR_PERSIST_STAMINA));
-
                         Grasscutter.getLogger().debug(player.getProperty(PlayerProperty.PROP_CUR_PERSIST_STAMINA) + "/" + player.getProperty(PlayerProperty.PROP_MAX_STAMINA) + "\t" + currentState + "\t" + "isMoving: " + isPlayerMoving() + "\t" + consumption + "(" + consumption.amount + ")");
                     }
                 }

src/main/java/emu/grasscutter/game/managers/SotSManager/SotSManager.java

@@ -2,9 +2,13 @@ package emu.grasscutter.game.managers.SotSManager;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.avatar.Avatar;
+import emu.grasscutter.game.entity.EntityAvatar;
+import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.managers.MovementManager.MovementManager;
 import emu.grasscutter.game.player.Player;
 import emu.grasscutter.game.props.FightProperty;
 import emu.grasscutter.game.props.PlayerProperty;
+import emu.grasscutter.game.world.World;
 import emu.grasscutter.net.proto.ChangeHpReasonOuterClass;
 import emu.grasscutter.net.proto.PropChangeReasonOuterClass;
 import emu.grasscutter.server.game.GameSession;
@@ -14,6 +18,8 @@ import emu.grasscutter.server.packet.send.PacketEntityFightPropChangeReasonNotif
 import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
 
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 
 // Statue of the Seven Manager
 public class SotSManager {
@@ -21,6 +27,7 @@ public class SotSManager {
     // NOTE: Spring volume balance *1  = fight prop HP *100
 
     private final Player player;
+    private Timer autoRecoverTimer;
 
     public SotSManager(Player player) {
         this.player = player;
@@ -46,26 +53,44 @@ public class SotSManager {
     public void autoRevive(GameSession session) {
         player.getTeamManager().getActiveTeam().forEach(entity -> {
             boolean isAlive = entity.isAlive();
+            float currentHP = entity.getAvatar().getFightProperty(FightProperty.FIGHT_PROP_CUR_HP);
+            float maxHP = entity.getAvatar().getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
+//            Grasscutter.getLogger().debug("" + entity.getAvatar().getAvatarData().getName() + "\t" + currentHP + "/" + maxHP + "\t" + (isAlive ? "ALIVE":"DEAD"));
+            float newHP = (float)(maxHP * 0.3);
+            if (currentHP < newHP) {
+                updateAvatarCurHP(session, entity, newHP);
+            }
             if (!isAlive) {
-                float maxHP = entity.getAvatar().getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
-                float newHP = (float)(maxHP * 0.3);
-                entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, newHP);
                 entity.getWorld().broadcastPacket(new PacketAvatarLifeStateChangeNotify(entity.getAvatar()));
             }
         });
     }
 
     public void scheduleAutoRecover(GameSession session) {
-        // TODO: play audio effects? possibly client side? - client automatically plays.
-        // delay 2.5 seconds
-        new Thread(() -> {
-            try {
-                Thread.sleep(2500);
-                autoRecover(session);
-            } catch (Exception e) {
-                Grasscutter.getLogger().error(e.getMessage());
-            }
-        }).start();
+        if (autoRecoverTimer == null) {
+            autoRecoverTimer = new Timer();
+            autoRecoverTimer.schedule(new AutoRecoverTimerTick(session), 2500);
+        }
+    }
+
+    public void cancelAutoRecover() {
+        if (autoRecoverTimer != null) {
+            autoRecoverTimer.cancel();
+            autoRecoverTimer = null;
+        }
+    }
+
+    private class AutoRecoverTimerTick extends TimerTask
+    {
+        private GameSession session;
+
+        public AutoRecoverTimerTick(GameSession session) {
+            this.session = session;
+        }
+        public void run() {
+            autoRecover(session);
+            cancelAutoRecover();
+        }
     }
 
     public void refillSpringVolume() {
@@ -124,24 +149,27 @@ public class SotSManager {
 
                     float newHP = currentHP + needSV / 100; // convert SV to HP
 
-                    // TODO: Figure out why client shows current HP instead of added HP.
-                    //    Say an avatar had 12000 and now has 14000, it should show "2000".
-                    //    The client always show "+14000" which is incorrect.
-
-                    entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, newHP);
-                    session.send(new PacketEntityFightPropChangeReasonNotify(entity, FightProperty.FIGHT_PROP_CUR_HP,
-                            newHP, List.of(3), PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_STATUE_RECOVER,
-                            ChangeHpReasonOuterClass.ChangeHpReason.ChangeHpAddStatue));
-                    session.send(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
-
-                    Avatar avatar = entity.getAvatar();
-                    avatar.setCurrentHp(newHP);
-                    session.send(new PacketAvatarFightPropUpdateNotify(avatar, FightProperty.FIGHT_PROP_CUR_HP));
-                    player.save();
+                    updateAvatarCurHP(session, entity, newHP);
                 }
             });
         }
     }
 
+    private void updateAvatarCurHP(GameSession session, EntityAvatar entity, float newHP) {
+        // TODO: Figure out why client shows current HP instead of added HP.
+        //    Say an avatar had 12000 and now has 14000, it should show "2000".
+        //    The client always show "+14000" which is incorrect.
+        entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, newHP);
+        session.send(new PacketEntityFightPropChangeReasonNotify(entity, FightProperty.FIGHT_PROP_CUR_HP,
+                newHP, List.of(3), PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_STATUE_RECOVER,
+                ChangeHpReasonOuterClass.ChangeHpReason.ChangeHpAddStatue));
+        session.send(new PacketEntityFightPropUpdateNotify(entity, FightProperty.FIGHT_PROP_CUR_HP));
+
+        Avatar avatar = entity.getAvatar();
+        avatar.setCurrentHp(newHP);
+        session.send(new PacketAvatarFightPropUpdateNotify(avatar, FightProperty.FIGHT_PROP_CUR_HP));
+        player.save();
+    }
+
 
 }

src/main/java/emu/grasscutter/game/player/Player.java

@@ -14,6 +14,7 @@ import emu.grasscutter.game.avatar.AvatarStorage;
 import emu.grasscutter.game.entity.EntityGadget;
 import emu.grasscutter.game.entity.EntityItem;
 import emu.grasscutter.game.entity.GameEntity;
+import emu.grasscutter.game.expedition.ExpeditionInfo;
 import emu.grasscutter.game.friends.FriendsList;
 import emu.grasscutter.game.friends.PlayerProfile;
 import emu.grasscutter.game.gacha.PlayerGachaInfo;
@@ -51,6 +52,7 @@ import emu.grasscutter.server.packet.send.*;
 import emu.grasscutter.utils.DateHelper;
 import emu.grasscutter.utils.Position;
 import emu.grasscutter.utils.MessageHandler;
+import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
@@ -102,6 +104,7 @@ public class Player {
 	private ArrayList<AvatarProfileData> shownAvatars;
 	private Set<Integer> rewardedLevels;
 	private ArrayList<ShopLimit> shopLimit;
+	private Map<Long, ExpeditionInfo> expeditionInfo;
 
 	private int sceneId;
 	private int regionId;
@@ -141,6 +144,7 @@ public class Player {
 		this.avatars = new AvatarStorage(this);
 		this.friendsList = new FriendsList(this);
 		this.mailHandler = new MailHandler(this);
+		this.towerManager = new TowerManager(this);
 		this.pos = new Position();
 		this.rotation = new Position();
 		this.properties = new HashMap<>();
@@ -171,6 +175,7 @@ public class Player {
 		this.moonCardGetTimes = new HashSet<>();
 
 		this.shopLimit = new ArrayList<>();
+		this.expeditionInfo = new HashMap<>();
 		this.messageHandler = null;
 		this.mapMarksManager = new MapMarksManager();
 		this.movementManager = new MovementManager(this);
@@ -186,7 +191,6 @@ public class Player {
 		this.nickname = "Traveler";
 		this.signature = "";
 		this.teamManager = new TeamManager(this);
-		this.towerManager = new TowerManager(this);
 		this.birthday = new PlayerBirthday();
 		this.setProperty(PlayerProperty.PROP_PLAYER_LEVEL, 1);
 		this.setProperty(PlayerProperty.PROP_IS_SPRING_AUTO_USE, 1);
@@ -674,6 +678,28 @@ public class Player {
 		session.send(new PacketCardProductRewardNotify(getMoonCardRemainDays()));
 	}
 
+	public Map<Long, ExpeditionInfo> getExpeditionInfo() {
+		return expeditionInfo;
+	}
+
+	public void addExpeditionInfo(long avaterGuid, int expId, int hourTime, int startTime){
+		ExpeditionInfo exp = new ExpeditionInfo();
+		exp.setExpId(expId);
+		exp.setHourTime(hourTime);
+		exp.setState(1);
+		exp.setStartTime(startTime);
+		expeditionInfo.put(avaterGuid, exp);
+	}
+
+	public void removeExpeditionInfo(long avaterGuid){
+		expeditionInfo.remove(avaterGuid);
+	}
+
+	public ExpeditionInfo getExpeditionInfo(long avaterGuid){
+		return expeditionInfo.get(avaterGuid);
+	}
+
+
 	public List<ShopLimit> getShopLimit() {
 		return shopLimit;
 	}
@@ -1030,6 +1056,22 @@ public class Player {
 				this.resetSendPlayerLocTime();
 			}
 		}
+		// Expedition
+		var timeNow = Utils.getCurrentSeconds();
+		var needNotify = false;
+		for (Long key : expeditionInfo.keySet()) {
+			ExpeditionInfo e = expeditionInfo.get(key);
+			if(e.getState() == 1){
+				if(timeNow - e.getStartTime() >= e.getHourTime() * 60 * 60){
+					e.setState(2);
+					needNotify = true;
+				}
+			}
+		}
+		if(needNotify){
+			this.save();
+			this.sendPacket(new PacketAvatarExpeditionDataNotify(this));
+		}
 	}
 
 
@@ -1057,9 +1099,6 @@ public class Player {
 		if (this.getProfile().getUid() == 0) {
 			this.getProfile().syncWithCharacter(this);
 		}
-		if (this.getTowerManager() == null) {
-			this.towerManager = new TowerManager(this);
-		}
 
 		// Check if player object exists in server
 		// TODO - optimize

src/main/java/emu/grasscutter/game/shop/ShopManager.java

@@ -4,13 +4,7 @@ import com.google.gson.reflect.TypeToken;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.data.GameData;
 import emu.grasscutter.data.common.ItemParamData;
-import emu.grasscutter.data.def.ItemData;
 import emu.grasscutter.data.def.ShopGoodsData;
-import emu.grasscutter.game.inventory.GameItem;
-import emu.grasscutter.game.managers.InventoryManager;
-import emu.grasscutter.game.props.ActionReason;
-import emu.grasscutter.net.proto.ItemParamOuterClass;
-import emu.grasscutter.net.proto.ShopGoodsOuterClass;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.utils.Utils;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -54,9 +48,9 @@ public class ShopManager {
 
 	public static int getShopNextRefreshTime(ShopInfo shopInfo) {
 		return switch (shopInfo.getShopRefreshType()) {
-			case SHOP_REFRESH_DAILY -> Utils.GetNextTimestampOfThisHour(REFRESH_HOUR, TIME_ZONE, shopInfo.getShopRefreshParam());
-			case SHOP_REFRESH_WEEKLY ->  Utils.GetNextTimestampOfThisHourInNextWeek(REFRESH_HOUR, TIME_ZONE, shopInfo.getShopRefreshParam());
-			case SHOP_REFRESH_MONTHLY -> Utils.GetNextTimestampOfThisHourInNextMonth(REFRESH_HOUR, TIME_ZONE, shopInfo.getShopRefreshParam());
+			case SHOP_REFRESH_DAILY -> Utils.getNextTimestampOfThisHour(REFRESH_HOUR, TIME_ZONE, shopInfo.getShopRefreshParam());
+			case SHOP_REFRESH_WEEKLY ->  Utils.getNextTimestampOfThisHourInNextWeek(REFRESH_HOUR, TIME_ZONE, shopInfo.getShopRefreshParam());
+			case SHOP_REFRESH_MONTHLY -> Utils.getNextTimestampOfThisHourInNextMonth(REFRESH_HOUR, TIME_ZONE, shopInfo.getShopRefreshParam());
 			default -> 0;
 		};
 	}

src/main/java/emu/grasscutter/languages/CNLanguage.java

-package emu.grasscutter.languages;
-
-public final class CNLanguage {
-    public String An_error_occurred_during_game_update = "游戏更新时发生了错误.";
-    public String Starting_Grasscutter = "正在开启Grasscutter...";
-    public String Invalid_server_run_mode = "无效的服务器运行模式. ";
-    public String Server_run_mode = "服务器运行模式必须为以下几种之一: 'HYBRID'(混合模式), 'DISPATCH_ONLY'(仅dispatch模式), 或 'GAME_ONLY'(仅游戏模式). 无法启动Grasscutter...";
-    public String Shutting_down = "正在停止....";
-    public String Start_done = "加载完成！需要指令帮助请输入 \"help\"";
-    public String Dispatch_mode_not_support_command = "仅dispatch模式无法使用指令。";
-    public String Command_error = "命令错误:";
-    public String Error = "出现错误.";
-    public String Grasscutter_is_free = "Grasscutter是免费软件，如果你是花钱买到的，你大概被骗了。主页: https://github.com/Grasscutters/Grasscutter";
-    public String Game_start_port = "游戏服务器已在端口 {port} 上开启。";
-    public String Client_connect = "来自 {address} 的客户端已连接。";
-    public String Client_disconnect = "来自 {address} 的客户端已断开。";
-    public String Client_request = "[Dispatch] 客户端 {ip} 请求:  {method} {url}";
-    public String Not_load_keystore = "[Dispatch] 无法加载证书，正在尝试默认密码...";
-    public String Use_default_keystore = "[Dispatch] 成功使用默认密码加载证书. 请考虑将config.json中的KeystorePassword项改为123456.";
-    public String Load_keystore_error = "[Dispatch] 加载证书时出现错误!";
-    public String Not_find_ssl_cert = "[Dispatch] 未找到SSL证书，正在回滚至HTTP模式。";
-    public String Welcome = "欢迎使用Grasscutter";
-    public String Potential_unhandled_request = "[Dispatch] 潜在的未处理请求: {method} {url}";
-    public String Client_login_token = "[Dispatch] 客户端 {ip} 正在尝试使用token登录...";
-    public String Client_token_login_failed = "[Dispatch] 客户端 {ip} 使用token登录失败。";
-    public String Client_login_in_token = "[Dispatch] 客户端 {ip} 使用token以 {uid} 的身份登录。";
-    public String Game_account_cache_error = "游戏账户缓存出现错误。";
-    public String Wrong_session_key = "会话密钥错误。";
-    public String Client_exchange_combo_token = "[Dispatch] 客户端 {ip} 成功交换token。";
-    public String Client_failed_exchange_combo_token = "[Dispatch] 客户端 {ip} 交换token失败。";
-    public String Dispatch_start_server_port = "[Dispatch] Dispatch服务器已在端口 {port} 上开启。";
-    public String Client_failed_login_account_create = "[Dispatch] 客户端 {ip} 登录失败: 已创建UID为 {uid} 的账户。";
-    public String Client_failed_login_account_create_failed = "[Dispatch] 客户端 {ip} 登录失败: 创建账户失败。";
-    public String Client_failed_login_account_no_found = "[Dispatch] 客户端 {ip} 登录失败: 未找到帐户。";
-    public String Client_login = "[Dispatch] 客户端 {ip} 以 {uid} 的身份登录。";
-    public String Username_not_found = "未找到此用户名.";
-    public String Username_not_found_create_failed = "未找到此用户名, 创建失败。.";
-
-    // Command
-    public String No_command_specified = "未指定命令.";
-    public String Unknown_command = "未知命令: ";
-    public String You_not_permission_run_command = "你没有权限运行此命令.";
-    public String This_command_can_only_run_from_console = "此命令只能在控制台运行.";
-    public String Run_this_command_in_game = "请在游戏内运行此命令.";
-    public String Invalid_playerId = "无效的玩家ID.";
-    public String Player_not_found = "未找到此玩家.";
-    public String Player_is_offline = "此玩家已离线.";
-    public String Invalid_amount = "无效的数量.";
-    public String Invalid_arguments = "无效的命令参数.";
-    public String Invalid_artifact_id = "无效的圣遗物ID.";
-    public String Invalid_avatar_id = "无效的角色ID.";
-    public String Invalid_avatar_level = "无效的角色等级.";
-    public String Invalid_entity_id = "无效的物品ID.";
-    public String Invalid_item_id = "无效的物品ID.";
-    public String Invalid_item_level = "无效的物品等级.";
-    public String Invalid_item_refinement = "无效的精炼等级.";
-    public String Invalid_UID = "无效的UID.";
-    public String Enabled = "启用";
-    public String Disabled = "禁用";
-    public String No_command_found = "未找到命令.";
-    public String Help = "帮助";
-    public String Player_not_found_or_offline = "此玩家不存在或已离线.";
-    public String Success = "成功";
-    public String Target_cleared = "已清除选择目标";
-    public String Target_set = "接下来的命令将默认以 @{uid} 为目标。输入命令时不必继续携带UID参数。";
-    public String Target_needed = "此命令需要指定一个目标用户. 输入命令时携带 <@UID> 参数或使用 /target @UID 来指定一个默认目标用户.";
-
-    // Help
-    public String Help_usage = "   用法: ";
-    public String Help_aliases = "   别名: ";
-    public String Help_available_command = " 可用命令:";
-
-    // Account
-    public String Modify_user_account = "修改用户帐户";
-    public String Account_exists = "账户已存在.";
-    public String Account_create_UID = "UID为 {uid} 的账户已创建.";
-    public String Account_delete = "已删除账户.";
-    public String Account_not_find = "账户不存在.";
-    public String Account_command_usage = "用法: account <create(创建)|delete(删除)> <用户名> [uid]";
-
-    // Broadcast
-    public String Broadcast_command_usage = "用法: broadcast <消息>";
-    public String Broadcast_message_sent = "消息已发送.";
-
-    // ChangeScene
-    public String Change_screen_usage = "用法: changescene <场景id>";
-    public String Change_screen_you_in_that_screen = "你已经在此场景中了";
-    public String Change_screen = "切换到场景 ";
-    public String Change_screen_not_exist = "此场景不存在。";
-
-    // Cleart_or_playerId
-    public String Clear_weapons = "已清除 {name} 的武器.";
-    public String Clear_artifacts = "已清除 {name} 的圣遗物 .";
-    public String Clear_materials = "已清除 {name} 的材料.";
-    public String Clear_furniture = "已清除 {name} 的摆设.";
-    public String Clear_displays = "已清除 {name} 的displays.";
-    public String Clear_virtuals = "已清除 {name} 的virtuals.";
-    public String Clear_everything = "已清除 {name} 的所有物品.";
-
-    // Coop
-    public String Coop_usage = "用法: coop <房主的UID>";
-    public String Coop_success = "已将{target}拉进{host}的世界.";
-    
-    // Drop
-    public String Drop_usage = "用法: drop <物品ID|物品名> [数量]";
-    public String Drop_dropped_of = "已在地上丢弃 {amount} 个 {item}.";
-
-    // EnterDungeon
-    public String EnterDungeon_usage = "用法: enterdungeon <副本 id>";
-    public String EnterDungeon_changed_to_dungeon = "已进入副本 ";
-    public String EnterDungeon_dungeon_not_found = "副本不存在";
-    public String EnterDungeon_you_in_that_dungeon = "你已经在此副本中了。";
-
-    // GiveAll
-    public String GiveAll_usage = "用法: giveall [数量]";
-    public String GiveAll_item = "正在给予所有物品...";
-    public String GiveAll_done = "完成。";
-
-    // GiveArtifact
-    public String GiveArtifact_usage = "用法: giveart|gart [玩家] <圣遗物Id> <主词条Id> [<副词条Id>[,<被强化次数>]]... [等级]";
-    public String GiveArtifact_given = "已将 {itemId} 给予 {target}.";
-
-    // GiveChar
-    public String GiveChar_usage = "用法: givechar <p玩家> <角色Id|角色名> [等级]";
-    public String GiveChar_given = "将等级为 {level} 的 {avatarId} 给予 {target}.";
-
-    // Give
-    public String Give_usage = "用法: give [玩家名] <物品ID|物品名> [数量] [等级] ";
-    public String Give_refinement_only_applicable_weapons = "精炼只对武器有效。";
-    public String Give_refinement_must_between_1_and_5 = "精炼等级必须在1和5之间。";
-    public String Give_given = "已将 {amount} 个 {item} 给与 {target}.";
-    public String Give_given_with_level_and_refinement = "已将 {amount} 个等级为 {lvl}, 精炼 {refinement} 的 {item} 给予 {target}.";
-    public String Give_given_level = "已将 {amount} 个等级为 {lvl} 的 {item} 给与 {target}.";
-
-    // GodMode
-    public String Godmode_usage = "用法: godmode [on|off|toggle]";
-    public String Godmode_status = "设置 {name} 的无敌模式为: {status}  ";
-
-    // Heal
-    public String Heal_message = "所有角色已被治疗。";
-
-    // Kick
-    public String Kick_player_kick_player = "玩家 [{sendUid}:{sendName}] 已踢出 [{kickUid}:{kickName}]";
-    public String Kick_server_player = "正在踢出玩家 [{kickUid}:{kickName}]";
-
-    // Kill
-    public String Kill_usage = "用法: killall [玩家UID] [场景ID]";
-    public String Kill_scene_not_found_in_player_world = "未在玩家世界中找到此场景";
-    public String Kill_kill_monsters_in_scene = "已杀死场景 {id} 中的 {size} 只怪物。 ";
-
-    // KillCharacter
-    public String KillCharacter_usage = "用法: /killcharacter [玩家Id]";
-    public String KillCharacter_kill_current_character = "已干掉 {name} 当前的场上角色.";
-
-    // List
-    public String List_message = "现有 {size} 名玩家在线:";
-
-    // Permission
-    public String Permission_usage = "用法: permission <add|remove> <权限名>";
-    public String Permission_add = "权限已添加。";
-    public String Permission_have_permission = "此玩家已拥有此权限!";
-    public String Permission_remove = "权限已移除。";
-    public String Permission_not_have_permission = "此玩家未拥有此权限!";
-
-    // Position
-    public String Position_message = "坐标: {x},{y},{z}\n场景: {id}";
-
-    // Reload
-    public String Reload_reload_start = "正在重新加载配置.";
-    public String Reload_reload_done = "完成.";
-
-    // ResetConst
-    public String ResetConst_reset_all = "重置你所有角色的命座。";
-    public String ResetConst_reset_all_done = "{name} 的命座已被重置。请重新登录。";
-
-    // ResetShopLimit
-    public String ResetShopLimit_usage = "用法: /resetshop <玩家id>";
-
-    // SendMail
-    public String SendMail_usage = "用法: give [player] <itemId|itemName> [amount]";
-    public String SendMail_user_not_exist = "不存在id为 '{id}' 的用户。";
-    public String SendMail_start_composition = "开始编辑邮件的组成部分.\n请使用 `/sendmail <标题>` 以继续.\n你可以在任何时候使用`/sendmail stop` 来停止编辑.";
-    public String SendMail_templates = "很快就会有邮件模板了.......";
-    public String SendMail_invalid_arguments = "无效的参数.\n用法： `/sendmail <用户Id|all|help> [模板Id]``";
-    public String SendMail_send_cancel = "已取消发送邮件。";
-    public String SendMail_send_done = "已向 {name} 发送邮件!";
-    public String SendMail_send_all_done = "已向所有玩家发送邮件!";
-    public String SendMail_not_composition_end = "邮件组成部分编辑尚未结束.\n请使用 `/sendmail {args}` 或 `/sendmail stop` 来停止编辑";
-    public String SendMail_Please_use = "请使用 `/sendmail {args}`";
-    public String SendMail_set_title = "邮件标题已设为 '{title}'.\n使用 '/sendmail <邮件正文>' 以继续.";
-    public String SendMail_set_contents = "邮件的正文如下:\n '{contents}'\n使用 '/sendmail <发送者署名>' 以继续.";
-    public String SendMail_set_message_sender = "邮件的发送者已设为 '{send}'.\n使用 '/sendmail <物品Id|物品名|finish(结束编辑并发送)> [数量] [等级]";
-    public String SendMail_send = "已将 {amount} 个 {item} (等级 {lvl}) 作为邮件附件.\n你可以继续添加附件，也可以使用 `/sendmail finish` 来停止编辑并发送邮件.";
-    public String SendMail_invalid_arguments_please_use = "无效的参数 \n 请使用 `/sendmail {args}`";
-    public String SendMail_title = "<标题>";
-    public String SendMail_message = "<正文>";
-    public String SendMail_sender = "<发送者>";
-    public String SendMail_arguments = "<物品Id|物品名|finish(结束编辑并发送)> [数量] [等级]";
-    public String SendMail_error = "错误:无效的编写阶段 {stage}. 需要stacktrace请看服务器命令行.";
-
-    // SendMessage
-    public String SendMessage_usage = "用法: sendmessage <玩家名> <消息>";
-    public String SenaMessage_message_sent = "已发送.";
-
-    // SetFetterLevel
-    public String SetFetterLevel_usage = "用法: setfetterlevel <等级>";
-    public String SetFetterLevel_fetter_level_must_between_0_and_10 = "设置的好感等级必须位于 0 和 10 之间。";
-    public String SetFetterLevel_fetter_set_level = "好感等级已设置为 {level}";
-    public String SetFetterLevel_invalid_fetter_level = "无效的好感等级。";
-
-    // SetStats
-    public String SetStats_usage = "用法: setstats|stats <stat> <value>";
-    public String SetStats_setstats_help_message = "用法: /setstats|stats <hp(生命值) | mhp(最大生命值) | def(防御力) | atk(攻击) | em(元素精通) | crate(暴击率) | cdmg(暴击伤害)> <数值> 基本属性(整数)";
-    public String SetStats_stats_help_message = "用法: /stats <er(元素充能) | epyro(火伤) | ecryo(冰伤) | ehydro(水伤) | eanemo(风伤) | egeo(岩伤) | edend(草伤) | eelec(雷伤) | ephys(物伤)> <数值> 元素属性(百分比)";
-    public String SetStats_set_max_hp = "最大生命值已设为 {int}.";
-    public String SetStats_set_max_hp_error = "无效的生命数值.";
-    public String SetStats_set_hp = "生命设置为 {int}.";
-    public String SetStats_set_hp_error = "无效的生命数值.";
-    public String SetStats_set_def = "防御力设置为 {int}.";
-    public String SetStats_set_def_error = "无效的防御力数值.";
-    public String SetStats_set_atk = "攻击力设置为 {int}.";
-    public String SetStats_set_atk_error = "无效的攻击力数值.";
-    public String SetStats_set_em = "元素精通设置为 {int}.";
-    public String SetStats_set_em_error = "无效的元素精通数值.";
-    public String SetStats_set_er = "元素充能设置为 {int}%.";
-    public String SetStats_set_er_error = "无效的元素充能数值.";
-    public String SetStats_set_cr = "暴击率设置为 {int}%.";
-    public String SetStats_set_cr_error = "无效的暴击率数值.";
-    public String SetStats_set_cd = "暴击伤害设置为 {int}%.";
-    public String SetStats_set_cd_error = "无效的暴击伤害数值.";
-    public String SetStats_set_pdb = "火伤设置为 {int}%.";
-    public String SetStats_set_pdb_error = "无效的火伤数值.";
-    public String SetStats_set_cdb = "冰伤设置为 {int}%.";
-    public String SetStats_set_cdb_error = "无效的冰伤数值.";
-    public String SetStats_set_hdb = "水伤设置为 {int}%.";
-    public String SetStats_set_hdb_error = "无效的水伤数值.";
-    public String SetStats_set_adb = "风伤设置为 {int}%.";
-    public String SetStats_set_adb_error = "无效的风伤数值.";
-    public String SetStats_set_gdb = "岩伤设置为 {int}%.";
-    public String SetStats_set_gdb_error = "无效的岩伤数值.";
-    public String SetStats_set_edb = "雷伤设置为 {int}%.";
-    public String SetStats_set_edb_error = "无效的雷伤数值.";
-    public String SetStats_set_physdb = "物伤设置为 {int}%.";
-    public String SetStats_set_physdb_error = "无效的物伤数值.";
-    public String SetStats_set_ddb = "草伤设置为 {int}%.";
-    public String SetStats_set_ddb_error = "无效的草伤数值.";
-
-    // SetWorldLevel
-    public String SetWorldLevel_usage = "用法: setworldlevel <level>";
-    public String SetWorldLevel_world_level_must_between_0_and_8 = "世界等级必须在0-8之间。";
-    public String SetWorldLevel_set_world_level = "世界等级已设置为 {level}.";
-    public String SetWorldLevel_invalid_world_level = "无效的世界等级.";
-
-    // Spawn
-    public String Spawn_usage = "用法: spawn <实体ID|实体名> [数量] [等级(仅限怪物)]";
-    public String Spawn_message = "已生成 {amount} 个 {id}.";
-
-    // Stop
-    public String Stop_message = "正在关闭服务器...";
-
-    // Talent
-    public String Talent_usage_1 = "设置技能等级: /talent set <技能ID> <数值>";
-    public String Talent_usage_2 = "另一种方式: /talent <n 或 e 或 q> <数值>";
-    public String Talent_usage_3 = "获取技能ID: /talent getid";
-    public String Talent_lower_16 = "技能等级应低于16。";
-    public String Talent_set_atk = "设置普通攻击等级为 {level}.";
-    public String Talent_set_e = "设置元素战技(e技能)等级为 {level}.";
-    public String Talent_set_q = "设置元素爆发(q技能)等级为 {level}.";
-    public String Talent_invalid_skill_id = "无效的技能ID。";
-    public String Talent_set_this = "技能等级已设为 {level}.";
-    public String Talent_set_id = "将技能 {id} 的等级设为 {level}.";
-    public String Talent_invalid_talent_level = "无效的技能等级。";
-    public String Talent_normal_attack_id = "普通攻击技能ID {id}.";
-    public String Talent_e_skill_id = "元素战技(e技能)ID {id}.";
-    public String Talent_q_skill_id = "元素爆发(q技能)ID {id}.";
-
-    // TeleportAll
-    public String TeleportAll_message = "此命令仅在多人游戏下可用。";
-
-    // Teleport
-    public String Teleport_usage_server = "用法: /tp  <x> <y> <z> [场景ID]";
-    public String Teleport_invalid_position = "无效的位置。";
-    public String Teleport_message = "已将 {name} 传送到场景 {id} ，坐标 {x},{y},{z}";
-
-    // Weather
-    public String Weather_usage = "用法: weather <天气ID> [气候ID]";
-    public String Weather_message = "已修改天气为 {weatherId} 气候为 {climateId}";
-    public String Weather_invalid_id = "无效的ID。";
-}

src/main/java/emu/grasscutter/languages/Language.java

-package emu.grasscutter.languages;
-
-public final class Language {
-    public String An_error_occurred_during_game_update = "An error occurred during game update.";
-    public String Starting_Grasscutter = "Starting Grasscutter...";
-    public String Invalid_server_run_mode = "Invalid server run mode.";
-    public String Server_run_mode = "Server run mode must be 'HYBRID', 'DISPATCH_ONLY', or 'GAME_ONLY'. Unable to start Grasscutter...";
-    public String Shutting_down = "Shutting down...";
-    public String Start_done = "Done! For help, type \"help\"";
-    public String Dispatch_mode_not_support_command = "Commands are not supported in dispatch only mode.";
-    public String Command_error = "Command error:";
-    public String Error = "An error occurred.";
-    public String Grasscutter_is_free = "Grasscutter is FREE software. If you have paid for this, you may have been scammed. Homepage: https://github.com/Grasscutters/Grasscutter";
-    public String Game_start_port = "Game Server started on port {port}";
-    public String Client_connect = "Client connected from {address}";
-    public String Client_disconnect = "Client disconnected from {address}";
-    public String Client_request = "[Dispatch] Client {ip} {method} request: {url}";
-    public String Not_load_keystore = "[Dispatch] Unable to load keystore. Trying default keystore password...";
-    public String Use_default_keystore = "[Dispatch] The default keystore password was loaded successfully. Please consider setting the password to 123456 in config.json.";
-    public String Load_keystore_error = "[Dispatch] Error while loading keystore!";
-    public String Not_find_ssl_cert = "[Dispatch] No SSL cert found! Falling back to HTTP server.";
-    public String Welcome = "Welcome to Grasscutter";
-    public String Potential_unhandled_request = "[Dispatch] Potential unhandled {method} request: {url}";
-    public String Client_try_login = "[Dispatch] Client {ip} is trying to log in";
-    public String Client_login_token = "[Dispatch] Client {ip} is trying to log in via token";
-    public String Client_token_login_failed = "[Dispatch] Client {ip} failed to log in via token";
-    public String Client_login_in_token = "[Dispatch] Client {ip} logged in via token as {uid}";
-    public String Game_account_cache_error = "Game account cache information error";
-    public String Wrong_session_key = "Wrong session key.";
-    public String Client_exchange_combo_token = "[Dispatch] Client {ip} succeed to exchange combo token";
-    public String Client_failed_exchange_combo_token = "[Dispatch] Client {ip} failed to exchange combo token";
-    public String Dispatch_start_server_port = "[Dispatch] Dispatch server started on port {port}";
-    public String Client_failed_login_account_create = "[Dispatch] Client {ip} failed to log in: Account {uid} created";
-    public String Client_failed_login_account_create_failed = "[Dispatch] Client {ip} failed to log in: Account create failed";
-    public String Client_failed_login_account_no_found = "[Dispatch] Client {ip} failed to log in: Account no found";
-    public String Client_login = "[Dispatch] Client {ip} logged in as {uid}";
-    public String Username_not_found = "Username not found.";
-    public String Username_not_found_create_failed = "Username not found, create failed.";
-    public String Create_resources_folder = "Creating resources folder...";
-    public String Place_copy = "Place a copy of 'BinOutput' and 'ExcelBinOutput' in the resources folder.";
-
-    // Command
-    public String No_command_specified = "No command specified.";
-    public String Unknown_command = "Unknown command: ";
-    public String You_not_permission_run_command = "You do not have permission to run this command.";
-    public String This_command_can_only_run_from_console = "This command can only be run from the console.";
-    public String Run_this_command_in_game = "Run this command in-game.";
-    public String Invalid_amount = "Invalid amount.";
-    public String Invalid_arguments = "Invalid arguments.";
-    public String Invalid_artifact_id = "Invalid artifact ID.";
-    public String Invalid_avatar_id = "Invalid avatar id.";
-    public String Invalid_avatar_level = "Invalid avatar level.";
-    public String Invalid_entity_id = "Invalid entity id.";
-    public String Invalid_item_id = "Invalid item id.";
-    public String Invalid_item_level = "Invalid item level.";
-    public String Invalid_item_refinement = "Invalid item refinement level.";
-    public String Invalid_playerId = "Invalid playerId.";
-    public String Invalid_UID = "Invalid UID.";
-    public String Player_not_found = "Player not found.";
-    public String Player_is_offline = "Player is offline.";
-    public String Enabled = "enabled";
-    public String Disabled = "disabled";
-    public String No_command_found = "No command found.";
-    public String Help = "Help";
-    public String Player_not_found_or_offline = "Player not found or offline.";
-    public String Success = "Success";
-    public String Target_cleared = "Target cleared.";
-    public String Target_set = "Subsequent commands will target @{uid} by default.";
-    public String Target_needed = "This command requires a target UID. Add a <@UID> argument or set a persistent target with /target @UID.";
-
-    // Help
-    public String Help_usage = "   Usage: ";
-    public String Help_aliases = "   Aliases: ";
-    public String Help_available_command = "Available commands:";
-
-    // Account
-    public String Modify_user_account = "Modify user accounts";
-    public String Account_exists = "Account already exists.";
-    public String Account_create_UID = "Account created with UID {uid}.";
-    public String Account_delete = "Account deleted.";
-    public String Account_not_find = "Account not found.";
-    public String Account_command_usage = "Usage: account <create|delete> <username> [uid]";
-
-    // Broadcast
-    public String Broadcast_command_usage = "Usage: broadcast <message>";
-    public String Broadcast_message_sent = "Message sent.";
-
-    // ChangeScene
-    public String Change_screen_usage = "Usage: changescene <scene id>";
-    public String Change_screen_you_in_that_screen = "You are already in that scene";
-    public String Change_screen = "Changed to scene ";
-    public String Change_screen_not_exist = "Scene does not exist";
-
-    // Clear
-    public String Clear_usage = "Usage: clear <all|wp|art|mat>";
-    public String Clear_weapons = "Cleared weapons for {name} .";
-    public String Clear_artifacts = "Cleared artifacts for {name} .";
-    public String Clear_materials = "Cleared materials for {name} .";
-    public String Clear_furniture = "Cleared furniture for {name} .";
-    public String Clear_displays = "Cleared displays for {name} .";
-    public String Clear_virtuals = "Cleared virtuals for {name} .";
-    public String Clear_everything = "Cleared everything for {name} .";
-
-    // Coop
-    public String Coop_usage = "Usage: coop <host UID>";
-    public String Coop_success = "Summoned {target} to {host}'s world.";
-
-    // Drop
-    public String Drop_usage = "Usage: drop <itemId|itemName> [amount]";
-    public String Drop_dropped_of = "Dropped {amount} of {item}.";
-
-    // EnterDungeon
-    public String EnterDungeon_usage = "Usage: enterdungeon <dungeon id>";
-    public String EnterDungeon_changed_to_dungeon = "Changed to dungeon ";
-    public String EnterDungeon_dungeon_not_found = "Dungeon does not exist";
-    public String EnterDungeon_you_in_that_dungeon = "You are already in that dungeon";
-
-    // GiveAll
-    public String GiveAll_usage = "Usage: giveall [amount]";
-    public String GiveAll_item = "Giving all items...";
-    public String GiveAll_done = "Giving all items done";
-
-    // GiveArtifact
-    public String GiveArtifact_usage = "Usage: giveart|gart [player] <artifactId> <mainPropId> [<appendPropId>[,<times>]]... [level]";
-    public String GiveArtifact_given = "Given {itemId} to {target}.";
-
-    // GiveChar
-    public String GiveChar_usage = "Usage: givechar <player> <itemId|itemName> [amount]";
-    public String GiveChar_given = "Given {avatarId} with level {level} to {target}.";
-
-    // Give
-    public String Give_usage = "Usage: give <player> <itemId|itemName> [amount] [level]";
-    public String Give_refinement_only_applicable_weapons = "Refinement is only applicable to weapons.";
-    public String Give_refinement_must_between_1_and_5 = "Refinement must be between 1 and 5.";
-    public String Give_given = "Given {amount} of {item} to {target}.";
-    public String Give_given_with_level_and_refinement = "Given {item} with level {lvl}, refinement {refinement} {amount} times to {target}";
-    public String Give_given_level = "Given {item} with level {lvl} {amount} times to {target}";
-
-    // GodMode
-    public String Godmode_usage = "Usage: godmode [on|off|toggle]";
-    public String Godmode_status = "Godmode is now {status} for {name}.";
-
-    // Heal
-    public String Heal_message = "All characters have been healed.";
-
-    // Kick
-    public String Kick_player_kick_player = "Player [{sendUid}:{sendName}] has kicked player [{kickUid}:{kickName}]";
-    public String Kick_server_player = "Kicking player [{kickUid}:{kickName}]";
-
-    // Kill
-    public String Kill_usage = "Usage: killall [playerUid] [sceneId]";
-    public String Kill_scene_not_found_in_player_world = "Scene not found in player world";
-    public String Kill_kill_monsters_in_scene = "Killing {size} monsters in scene {id}";
-
-    // KillCharacter
-    public String KillCharacter_usage = "Usage: /killcharacter [playerId]";
-    public String KillCharacter_kill_current_character = "Killed {name} current character.";
-
-    // List
-    public String List_message = "There are {size} player(s) online:";
-
-    // Permission
-    public String Permission_usage = "Usage: permission <add|remove> <permission>";
-    public String Permission_add = "Permission added.";
-    public String Permission_have_permission = "They already have this permission!";
-    public String Permission_remove = "Permission removed.";
-    public String Permission_not_have_permission = "They don't have this permission!";
-
-    // Position
-    public String Position_message = "Coord: {x}, {y}, {z}\nScene id: {id}";
-
-    // Reload
-    public String Reload_reload_start = "Reloading config.";
-    public String Reload_reload_done = "Reload complete.";
-
-    // ResetConst
-    public String ResetConst_reset_all = "Reset all avatars' constellations.";
-    public String ResetConst_reset_all_done = "Constellations for {name} have been reset. Please relog to see changes.";
-
-    // ResetShopLimit
-    public String ResetShopLimit_usage = "Usage: /resetshop <player id>";
-
-    // SendMail
-    public String SendMail_usage = "Usage: give [player] <itemId|itemName> [amount]";
-    public String SendMail_user_not_exist = "The user with an id of '{id}' does not exist";
-    public String SendMail_start_composition = "Starting composition of message.\nPlease use `/sendmail <title>` to continue.\nYou can use `/sendmail stop` at any time";
-    public String SendMail_templates = "Mail templates coming soon implemented...";
-    public String SendMail_invalid_arguments = "Invalid arguments.\nUsage `/sendmail <userId|all|help> [templateId]`";
-    public String SendMail_send_cancel = "Message sending cancelled";
-    public String SendMail_send_done = "Message sent to user {name}!";
-    public String SendMail_send_all_done = "Message sent to all users!";
-    public String SendMail_not_composition_end = "Message composition not at final stage.\nPlease use `/sendmail {args}` or `/sendmail stop` to cancel";
-    public String SendMail_please_use = "Please use `/sendmail {args}`";
-    public String SendMail_set_title = "Message title set as '{title}'.\nUse '/sendmail <content>' to continue.";
-    public String SendMail_set_contents = "Message contents set as '{contents}'.\nUse '/sendmail <sender>' to continue.";
-    public String SendMail_set_message_sender = "Message sender set as '{send}'.\nUse '/sendmail <itemId|itemName|finish> [amount] [level]' to continue.";
-    public String SendMail_send = "Attached {amount} of {item} (level {lvl}) to the message.\nContinue adding more items or use `/sendmail finish` to send the message.";
-    public String SendMail_invalid_arguments_please_use = "Invalid arguments \n Please use `/sendmail {args}`";
-    public String SendMail_title = "<title>";
-    public String SendMail_message = "<message>";
-    public String SendMail_sender = "<sender>";
-    public String SendMail_arguments = "<itemId|itemName|finish> [amount] [level]";
-    public String SendMail_error = "ERROR: invalid construction stage {stage}. Check console for stacktrace.";
-
-    // SendMessage
-    public String SendMessage_usage = "Usage: sendmessage <player> <message>";
-    public String SenaMessage_message_sent = "Message sent.";
-
-    // SetFetterLevel
-    public String SetFetterLevel_usage = "Usage: setfetterlevel <level>";
-    public String SetFetterLevel_fetter_level_must_between_0_and_10 = "Fetter level must be between 0 and 10.";
-    public String SetFetterLevel_fetter_set_level = "Fetter level set to {level}";
-    public String SetFetterLevel_invalid_fetter_level = "Invalid fetter level.";
-
-    // SetStats
-    public String SetStats_usage_console = "Usage: setstats|stats @<UID> <stat> <value>";
-    public String SetStats_usage_ingame = "Usage: setstats|stats [@UID] <stat> <value>";
-    public String SetStats_help_message = """
-        \n\tValues for <stat>: hp | maxhp | def | atk | em | er | crate | cdmg | cdr | heal | heali | shield | defi
-        \t(cont.) Elemental DMG Bonus: epyro | ecryo | ehydro | egeo | edendro | eelectro | ephys
-        \t(cont.) Elemental RES: respyro | rescryo | reshydro | resgeo | resdendro | reselectro | resphys
-        """;
-    public String SetStats_value_error = "Invalid stat value.";
-    public String SetStats_set_self = "{name} set to {value}.";
-    public String SetStats_set_for_uid = "{name} for {uid} set to {value}.";
-    public String Stats_FIGHT_PROP_MAX_HP = "Max HP";
-    public String Stats_FIGHT_PROP_CUR_HP = "Current HP";
-    public String Stats_FIGHT_PROP_CUR_ATTACK = "ATK";
-    public String Stats_FIGHT_PROP_BASE_ATTACK = "Base ATK";
-    public String Stats_FIGHT_PROP_DEFENSE = "DEF";
-    public String Stats_FIGHT_PROP_ELEMENT_MASTERY = "Elemental Mastery";
-    public String Stats_FIGHT_PROP_CHARGE_EFFICIENCY = "Energy Recharge";
-    public String Stats_FIGHT_PROP_CRITICAL = "Crit Rate";
-    public String Stats_FIGHT_PROP_CRITICAL_HURT = "Crit DMG";
-    public String Stats_FIGHT_PROP_ADD_HURT = "DMG Bonus";
-    public String Stats_FIGHT_PROP_WIND_ADD_HURT = "Anemo DMG Bonus";
-    public String Stats_FIGHT_PROP_ICE_ADD_HURT = "Cryo DMG Bonus";
-    public String Stats_FIGHT_PROP_GRASS_ADD_HURT = "Dendro DMG Bonus";
-    public String Stats_FIGHT_PROP_ELEC_ADD_HURT = "Electro DMG Bonus";
-    public String Stats_FIGHT_PROP_ROCK_ADD_HURT = "Geo DMG Bonus";
-    public String Stats_FIGHT_PROP_WATER_ADD_HURT = "Hydro DMG Bonus";
-    public String Stats_FIGHT_PROP_FIRE_ADD_HURT = "Pyro DMG Bonus";
-    public String Stats_FIGHT_PROP_PHYSICAL_ADD_HURT = "Physical DMG Bonus";
-    public String Stats_FIGHT_PROP_SUB_HURT = "DMG Reduction";
-    public String Stats_FIGHT_PROP_WIND_SUB_HURT = "Anemo RES";
-    public String Stats_FIGHT_PROP_ICE_SUB_HURT = "Cryo RES";
-    public String Stats_FIGHT_PROP_GRASS_SUB_HURT = "Dendro RES";
-    public String Stats_FIGHT_PROP_ELEC_SUB_HURT = "Electro RES";
-    public String Stats_FIGHT_PROP_ROCK_SUB_HURT = "Geo RES";
-    public String Stats_FIGHT_PROP_WATER_SUB_HURT = "Hydro RES";
-    public String Stats_FIGHT_PROP_FIRE_SUB_HURT = "Pyro RES";
-    public String Stats_FIGHT_PROP_PHYSICAL_SUB_HURT = "Physical RES";
-    public String Stats_FIGHT_PROP_SKILL_CD_MINUS_RATIO = "Cooldown Reduction";
-    public String Stats_FIGHT_PROP_HEAL_ADD = "Healing Bonus";
-    public String Stats_FIGHT_PROP_HEALED_ADD = "Incoming Healing Bonus";
-    public String Stats_FIGHT_PROP_SHIELD_COST_MINUS_RATIO = "Shield Strength";
-    public String Stats_FIGHT_PROP_DEFENCE_IGNORE_RATIO = "DEF Ignore";
-
-    // SetWorldLevel
-    public String SetWorldLevel_usage = "Usage: setworldlevel <level>";
-    public String SetWorldLevel_world_level_must_between_0_and_8 = "World level must be between 0-8";
-    public String SetWorldLevel_set_world_level = "World level set to {level}.";
-    public String SetWorldLevel_invalid_world_level = "Invalid world level.";
-
-    // Spawn
-    public String Spawn_usage = "Usage: spawn <entityId> [amount] [level(monster only)]";
-    public String Spawn_message = "Spawned {amount} of {id}.";
-
-    // Stop
-    public String Stop_message = "Server shutting down...";
-
-    // Talent
-    public String Talent_usage_1 = "To set talent level: /talent set <talentID> <value>";
-    public String Talent_usage_2 = "Another way to set talent level: /talent <n or e or q> <value>";
-    public String Talent_usage_3 = "To get talent ID: /talent getid";
-    public String Talent_lower_16 = "Invalid talent level. Level should be lower than 16";
-    public String Talent_set_id = "Set talent {id} to {level}.";
-    public String Talent_set_atk = "Set talent Normal ATK to {level}.";
-    public String Talent_set_e = "Set talent E to {level}.";
-    public String Talent_set_q = "Set talent Q to {level}.";
-    public String Talent_invalid_skill_id = "Invalid skill ID.";
-    public String Talent_set_this = "Set this talent to {level}.";
-    public String Talent_invalid_talent_level = "Invalid talent level.";
-    public String Talent_normal_attack_id = "Normal Attack ID {id}.";
-    public String Talent_e_skill_id = "E skill ID {id}.";
-    public String Talent_q_skill_id = "Q skill ID {id}.";
-
-    // TeleportAll
-    public String TeleportAll_message = "You only can use this command in MP mode.";
-
-    // Teleport
-    public String Teleport_usage = "Usage: /tp <x> <y> <z> [scene id]";
-    public String Teleport_invalid_position = "Invalid position.";
-    public String Teleport_message = "Teleported {name} to {x},{y},{z} in scene {id}";
-
-    // Weather
-    public String Weather_usage = "Usage: weather <weatherId> [climateId]";
-    public String Weather_message = "Changed weather to {weatherId} with climate {climateId}";
-    public String Weather_invalid_id = "Invalid ID.";
-}

src/main/java/emu/grasscutter/plugin/api/PlayerHook.java

@@ -28,6 +28,7 @@ public final class PlayerHook {
     
     /**
      * Kicks a player from the server.
+     * TODO: Refactor to kick using a packet.
      */
     public void kick() {
         this.player.getSession().close();

src/main/java/emu/grasscutter/plugin/api/README.md

-# Grasscutter Plugin API
-**Warning!** As of now, this is a work in progress and isn't completely documented.
\ No newline at end of file

src/main/java/emu/grasscutter/scripts/SceneScriptManager.java

@@ -166,7 +166,7 @@ public class SceneScriptManager {
 			List<SceneBlock> blocks = ScriptLoader.getSerializer().toList(SceneBlock.class, bindings.get("block_rects"));
 			
 			for (int i = 0; i < blocks.size(); i++) {
-				SceneBlock block = blocks.get(0);
+				SceneBlock block = blocks.get(i);
 				block.id = blockIds.get(i);
 				
 				loadBlockFromScript(block);

src/main/java/emu/grasscutter/server/dispatch/DispatchHttpJsonHandler.java

@@ -2,6 +2,7 @@ package emu.grasscutter.server.dispatch;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Objects;
 
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.Grasscutter.ServerDebugMode;
@@ -9,6 +10,8 @@ import express.http.HttpContextHandler;
 import express.http.Request;
 import express.http.Response;
 
+import static emu.grasscutter.utils.Language.translate;
+
 public final class DispatchHttpJsonHandler implements HttpContextHandler {
 	private final String response;
 	private final String[] missingRoutes = { // TODO: When http requests for theses routes are found please remove it from this list and update the route request type in the DispatchServer
@@ -31,8 +34,8 @@ public final class DispatchHttpJsonHandler implements HttpContextHandler {
 	@Override
 	public void handle(Request req, Response res) throws IOException {
 		// Checking for ALL here isn't required as when ALL is enabled enableDevLogging() gets enabled
-		if(Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING && Arrays.stream(missingRoutes).anyMatch(x -> x == req.baseUrl())) {
-			Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_request.replace("{ip}", req.ip()).replace("{method}", req.method()).replace("{url}", req.baseUrl()) + (Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING ? "(MISSING)" : ""));
+		if(Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING && Arrays.stream(missingRoutes).anyMatch(x -> Objects.equals(x, req.baseUrl()))) {
+			Grasscutter.getLogger().info(translate("messages.dispatch.request", req.ip(), req.method(), req.baseUrl()) + (Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING ? "(MISSING)" : ""));
 		}
 		res.send(response);
 	}

src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java

@@ -35,6 +35,8 @@ import java.io.*;
 import java.net.URLDecoder;
 import java.util.*;
 
+import static emu.grasscutter.utils.Language.translate;
+
 public final class DispatchServer {
 	public static String query_region_list = "";
 	public static String query_cur_region = "";
@@ -213,21 +215,21 @@ public final class DispatchServer {
 							sslContextFactory.setKeyStorePassword(Grasscutter.getConfig().getDispatchOptions().KeystorePassword);
 						} catch (Exception e) {
 							e.printStackTrace();
-							Grasscutter.getLogger().warn(Grasscutter.getLanguage().Not_load_keystore);
+							Grasscutter.getLogger().warn(translate("messages.dispatch.keystore.password_error"));
 
 							try {
 								sslContextFactory.setKeyStorePath(keystoreFile.getPath());
 								sslContextFactory.setKeyStorePassword("123456");
-								Grasscutter.getLogger().warn(Grasscutter.getLanguage().Use_default_keystore);
+								Grasscutter.getLogger().warn(translate("messages.dispatch.keystore.default_password"));
 							} catch (Exception e2) {
-								Grasscutter.getLogger().warn(Grasscutter.getLanguage().Load_keystore_error);
+								Grasscutter.getLogger().warn(translate("messages.dispatch.keystore.general_error"));
 								e2.printStackTrace();
 							}
 						}
 
 						serverConnector = new ServerConnector(server, sslContextFactory);
 					} else {
-						Grasscutter.getLogger().warn(Grasscutter.getLanguage().Not_find_ssl_cert);
+						Grasscutter.getLogger().warn(translate("messages.dispatch.keystore.no_keystore_error"));
 						Grasscutter.getConfig().getDispatchOptions().UseSSL = false;
 
 						serverConnector = new ServerConnector(server);
@@ -245,13 +247,16 @@ public final class DispatchServer {
 			if(Grasscutter.getConfig().DebugMode == ServerDebugMode.ALL) {
 				config.enableDevLogging();
 			}
+			if (Grasscutter.getConfig().getDispatchOptions().CORS){
+				if (Grasscutter.getConfig().getDispatchOptions().CORSAllowedOrigins.length > 0) config.enableCorsForOrigin(Grasscutter.getConfig().getDispatchOptions().CORSAllowedOrigins);
+				else config.enableCorsForAllOrigins();
+			}
 		});
-
-		httpServer.get("/", (req, res) -> res.send(Grasscutter.getLanguage().Welcome));
+		httpServer.get("/", (req, res) -> res.send(translate("messages.status.welcome")));
 
 		httpServer.raw().error(404, ctx -> {
 			if(Grasscutter.getConfig().DebugMode == ServerDebugMode.MISSING) {
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Potential_unhandled_request.replace("{method}", ctx.method()).replace("{url}", ctx.url()));
+				Grasscutter.getLogger().info(translate("messages.dispatch.unhandled_request_error", ctx.method(), ctx.url()));
 			}
 			ctx.contentType("text/html");
 			ctx.result("<!doctype html><html lang=\"en\"><body><img src=\"https://http.cat/404\" /></body></html>"); // I'm like 70% sure this won't break anything.
@@ -309,7 +314,7 @@ public final class DispatchServer {
 			if (requestData == null) {
 				return;
 			}
-			Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_try_login.replace("{ip}", req.ip()));
+			Grasscutter.getLogger().info(translate("messages.dispatch.account.login_attempt", req.ip()));
 
 			res.send(this.getAuthHandler().handleGameLogin(req, requestData));
 		});
@@ -329,7 +334,7 @@ public final class DispatchServer {
 				return;
 			}
 			LoginResultJson responseData = new LoginResultJson();
-			Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_login_token.replace("{ip}", req.ip()));
+			Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_attempt", req.ip()));
 
 			// Login
 			Account account = DatabaseHelper.getAccountById(requestData.uid);
@@ -337,16 +342,16 @@ public final class DispatchServer {
 			// Test
 			if (account == null || !account.getSessionKey().equals(requestData.token)) {
 				responseData.retcode = -111;
-				responseData.message = Grasscutter.getLanguage().Game_account_cache_error;
+				responseData.message = translate("messages.dispatch.account.account_cache_error");
 
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_token_login_failed.replace("{ip}", req.ip()));
+				Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_error", req.ip()));
 			} else {
 				responseData.message = "OK";
 				responseData.data.account.uid = requestData.uid;
 				responseData.data.account.token = requestData.token;
 				responseData.data.account.email = account.getEmail();
 
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_login_in_token.replace("{ip}", req.ip()).replace("{uid}", responseData.data.account.uid));
+				Grasscutter.getLogger().info(translate("messages.dispatch.account.login_token_success", req.ip(), requestData.uid));
 			}
 
 			res.send(responseData);
@@ -376,16 +381,16 @@ public final class DispatchServer {
 			// Test
 			if (account == null || !account.getSessionKey().equals(loginData.token)) {
 				responseData.retcode = -201;
-				responseData.message = Grasscutter.getLanguage().Wrong_session_key;
+				responseData.message = translate("messages.dispatch.account.session_key_error");
 
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_failed_exchange_combo_token.replace("{ip}", req.ip()));
+				Grasscutter.getLogger().info(translate("messages.dispatch.account.combo_token_error", req.ip()));
 			} else {
 				responseData.message = "OK";
 				responseData.data.open_id = loginData.uid;
 				responseData.data.combo_id = "157795300";
 				responseData.data.combo_token = account.generateLoginToken();
 
-				Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_exchange_combo_token.replace("{ip}", req.ip()));
+				Grasscutter.getLogger().info(translate("messages.dispatch.account.combo_token_success", req.ip()));
 			}
 
 			res.send(responseData);
@@ -458,7 +463,7 @@ public final class DispatchServer {
 		httpServer.raw().config.precompressStaticFiles = false; // If this isn't set to false, files such as images may appear corrupted when serving static files
 
 		httpServer.listen(Grasscutter.getConfig().getDispatchOptions().Port);
-		Grasscutter.getLogger().info(Grasscutter.getLanguage().Dispatch_start_server_port.replace("{port}", Integer.toString(httpServer.raw().port())));
+		Grasscutter.getLogger().info(translate("messages.dispatch.port_bind", Integer.toString(httpServer.raw().port())));
 	}
 
 	private Map<String, String> parseQueryString(String qs) {

src/main/java/emu/grasscutter/server/dispatch/authentication/DefaultAuthenticationHandler.java

@@ -8,6 +8,8 @@ import emu.grasscutter.server.dispatch.json.LoginResultJson;
 import express.http.Request;
 import express.http.Response;
 
+import static emu.grasscutter.utils.Language.translate;
+
 public class DefaultAuthenticationHandler implements AuthenticationHandler {
 
     @Override
@@ -34,11 +36,9 @@ public class DefaultAuthenticationHandler implements AuthenticationHandler {
 
         // Check if account exists, else create a new one.
         if (account == null) {
-            // Account doesnt exist, so we can either auto create it if the config value is
-            // set
+            // Account doesn't exist, so we can either auto create it if the config value is set.
             if (Grasscutter.getConfig().getDispatchOptions().AutomaticallyCreateAccounts) {
-                // This account has been created AUTOMATICALLY. There will be no permissions
-                // added.
+                // This account has been created AUTOMATICALLY. There will be no permissions added.
                 account = DatabaseHelper.createAccountWithId(requestData.account, 0);
 
                 for (String permission : Grasscutter.getConfig().getDispatchOptions().defaultPermissions) {
@@ -51,19 +51,18 @@ public class DefaultAuthenticationHandler implements AuthenticationHandler {
                     responseData.data.account.token = account.generateSessionKey();
                     responseData.data.account.email = account.getEmail();
 
-                    Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_failed_login_account_create.replace("{ip}", req.ip()).replace("{uid}", responseData.data.account.uid));
+                    Grasscutter.getLogger().info(translate("messages.dispatch.account.account_login_create_success", req.ip(), responseData.data.account.uid));
                 } else {
                     responseData.retcode = -201;
-                    responseData.message = Grasscutter.getLanguage().Username_not_found_create_failed;
+                    responseData.message = translate("messages.dispatch.account.username_create_error");
 
-                    Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_failed_login_account_no_found.replace("{ip}", req.ip()));
+                    Grasscutter.getLogger().info(translate("messages.dispatch.account.account_login_create_error", req.ip()));
                 }
             } else {
                 responseData.retcode = -201;
-                responseData.message = Grasscutter.getLanguage().Username_not_found;
+                responseData.message = translate("messages.dispatch.account.username_error");
 
-                Grasscutter.getLogger().info(String
-                        .format(Grasscutter.getLanguage().Client_failed_login_account_no_found, req.ip()));
+                Grasscutter.getLogger().info(translate("messages.dispatch.account.account_login_exist_error", req.ip()));
             }
         } else {
             // Account was found, log the player in
@@ -72,7 +71,7 @@ public class DefaultAuthenticationHandler implements AuthenticationHandler {
             responseData.data.account.token = account.generateSessionKey();
             responseData.data.account.email = account.getEmail();
 
-            Grasscutter.getLogger().info(Grasscutter.getLanguage().Client_login.replace("{ip}", req.ip()).replace("{uid}", responseData.data.account.uid));
+            Grasscutter.getLogger().info(translate("messages.dispatch.account.login_success", req.ip(), responseData.data.account.uid));
         }
 
         return responseData;