From 8441df5c4525e5c725c0e32af7c73a1b299fae98 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:00:24 +0000 Subject: [PATCH 1/2] Format code [skip actions] --- .../commands/TrialAvatarActivityCommand.java | 4 +- .../command/commands/WindyCommand.java | 2 - .../game/ability/AbilityManager.java | 23 ++-- .../actions/ActionExecuteGadgetLua.java | 25 ++--- .../grasscutter/game/gacha/GachaSystem.java | 5 +- .../game/managers/energy/EnergyManager.java | 1 - .../grasscutter/net/packet/PacketOpcodes.java | 11 +- .../net/packet/PacketOpcodesUtils.java | 6 +- .../server/game/GameServerPacketHandler.java | 2 +- .../grasscutter/server/game/GameSession.java | 3 - .../server/http/dispatch/RegionHandler.java | 66 ++++++------ .../recv/HandlerEvtDoSkillSuccNotify.java | 4 +- .../packet/recv/HandlerGadgetInteractReq.java | 4 - .../packet/recv/HandlerGetPlayerTokenReq.java | 25 ++--- .../recv/HandlerGetProfilePictureDataReq.java | 3 +- .../packet/recv/HandlerItemGivingReq.java | 40 +++---- .../packet/recv/HandlerPlayerLoginReq.java | 17 ++- .../packet/send/PacketGadgetInteractRsp.java | 10 +- .../packet/send/PacketGetPlayerTokenRsp.java | 100 +++++++++--------- .../send/PacketGetProfilePictureDataRsp.java | 1 - .../packet/send/PacketPlayerLoginRsp.java | 1 - 21 files changed, 171 insertions(+), 182 deletions(-) diff --git a/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java b/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java index 5aab85112f5..a0711b31aa0 100644 --- a/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/TrialAvatarActivityCommand.java @@ -99,7 +99,7 @@ public void execute(Player sender, Player targetPlayer, List args) { translate( sender, "commands.trialAvatarActivity.success_dungeon", Integer.parseInt(param))); } else { - if (!"all".equals(param)) { + if (!"all".equals(param)) { CommandHandler.sendMessage( sender, translate(sender, "commands.trialAvatarActivity.invalid_param")); return; @@ -131,7 +131,7 @@ public void execute(Player sender, Player targetPlayer, List args) { translate( sender, "commands.trialAvatarActivity.success_reward", Integer.parseInt(param))); } else { - if (!"all".equals(param.toLowerCase())) { + if (!"all".equals(param.toLowerCase())) { CommandHandler.sendMessage( sender, translate(sender, "commands.trialAvatarActivity.invalid_param")); return; diff --git a/src/main/java/emu/grasscutter/command/commands/WindyCommand.java b/src/main/java/emu/grasscutter/command/commands/WindyCommand.java index 25a60933560..004fb0197c7 100644 --- a/src/main/java/emu/grasscutter/command/commands/WindyCommand.java +++ b/src/main/java/emu/grasscutter/command/commands/WindyCommand.java @@ -4,7 +4,6 @@ import emu.grasscutter.command.CommandHandler; import emu.grasscutter.game.player.Player; import emu.grasscutter.server.packet.send.PacketWindSeedClientNotify; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; @@ -30,5 +29,4 @@ public void execute(Player sender, Player targetPlayer, List args) { CommandHandler.sendMessage(sender, "Error reading Lua script: " + e.getMessage()); } } - } diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java index 19d66e71d2e..a4671b5f147 100644 --- a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java +++ b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java @@ -16,7 +16,6 @@ import emu.grasscutter.net.proto.AbilityMetaModifierChangeOuterClass.AbilityMetaModifierChange; import emu.grasscutter.net.proto.AbilityMetaReInitOverrideMapOuterClass.AbilityMetaReInitOverrideMap; import emu.grasscutter.net.proto.AbilityMetaSetKilledStateOuterClass.AbilityMetaSetKilledState; -import emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType; import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry; import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction; import emu.grasscutter.server.event.player.PlayerUseSkillEvent; @@ -95,17 +94,17 @@ private void onPossibleElementalBurst(Ability ability, AbilityModifier modifier, // TODO: fix the check // if (this.burstCasterId == entityId - // && (ability.getAvatarSkillStartIds().contains(this.burstSkillId) || skillInvincibility)) { - Grasscutter.getLogger() - .trace( - "Caster ID's {} burst successful, clearing energy and setting invulnerability", - entityId); - this.abilityInvulnerable = true; - this.player - .getEnergyManager() - .handleEvtDoSkillSuccNotify( - this.player.getSession(), this.burstSkillId, this.burstCasterId); - this.removePendingEnergyClear(); + // && (ability.getAvatarSkillStartIds().contains(this.burstSkillId) || skillInvincibility)) { + Grasscutter.getLogger() + .trace( + "Caster ID's {} burst successful, clearing energy and setting invulnerability", + entityId); + this.abilityInvulnerable = true; + this.player + .getEnergyManager() + .handleEvtDoSkillSuccNotify( + this.player.getSession(), this.burstSkillId, this.burstCasterId); + this.removePendingEnergyClear(); // } } diff --git a/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java b/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java index 22b552064a6..50b4a33ee2e 100644 --- a/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java +++ b/src/main/java/emu/grasscutter/game/ability/actions/ActionExecuteGadgetLua.java @@ -10,18 +10,19 @@ public class ActionExecuteGadgetLua extends AbilityActionHandler { @Override public boolean execute( Ability ability, AbilityModifierAction action, ByteString abilityData, GameEntity target) { -// GameEntity owner = ability.getOwner(); -// -// // Investigate if we need to use target -// -// if (owner.getEntityController() != null) { -// owner -// .getEntityController() -// .onClientExecuteRequest(owner, action.param1, action.param2, action.param3); -// return true; -// } -// -// return false; + // GameEntity owner = ability.getOwner(); + // + // // Investigate if we need to use target + // + // if (owner.getEntityController() != null) { + // owner + // .getEntityController() + // .onClientExecuteRequest(owner, action.param1, action.param2, + // action.param3); + // return true; + // } + // + // return false; return true; } diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaSystem.java b/src/main/java/emu/grasscutter/game/gacha/GachaSystem.java index 2846d762477..6141175dc20 100644 --- a/src/main/java/emu/grasscutter/game/gacha/GachaSystem.java +++ b/src/main/java/emu/grasscutter/game/gacha/GachaSystem.java @@ -2,7 +2,6 @@ import static emu.grasscutter.config.Configuration.GAME_OPTIONS; -import com.sun.nio.file.SensitivityWatchEventModifier; import emu.grasscutter.Grasscutter; import emu.grasscutter.data.*; import emu.grasscutter.data.common.ItemParamData; @@ -425,9 +424,7 @@ private synchronized void startWatcher(GameServer server) { try { this.watchService = FileSystems.getDefault().newWatchService(); FileUtils.getDataUserPath("") - .register( - watchService, - new WatchEvent.Kind[]{StandardWatchEventKinds.ENTRY_MODIFY}); + .register(watchService, new WatchEvent.Kind[] {StandardWatchEventKinds.ENTRY_MODIFY}); } catch (Exception e) { Grasscutter.getLogger() .error( diff --git a/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java b/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java index 86c7ddb866e..e4ba4132b82 100644 --- a/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java +++ b/src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java @@ -8,7 +8,6 @@ import emu.grasscutter.data.excels.ItemData; import emu.grasscutter.data.excels.avatar.AvatarSkillDepotData; import emu.grasscutter.data.excels.monster.MonsterData.HpDrops; -import emu.grasscutter.game.ability.Ability; import emu.grasscutter.game.avatar.Avatar; import emu.grasscutter.game.entity.*; import emu.grasscutter.game.player.*; diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java index 4b77efaf808..2e4a3baa194 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java @@ -166,7 +166,7 @@ public class PacketOpcodes { public static final int GetAllUnlockNameCardReq = 1; public static final int GetAllUnlockNameCardRsp = 1; public static final int SetPlayerBirthdayReq = 1; - public static final int SetPlayerBirthdayRsp = 1; + public static final int SetPlayerBirthdayRsp = 1; public static final int GalleryWillStartCountdownNotify = 1; public static final int GetWidgetSlotRsp = 1; public static final int AvatarExpeditionDataNotify = 1; @@ -2458,8 +2458,9 @@ public class PacketOpcodes { public static final int WorldOwnerDailyTaskNotify = 1; // Unknown - public static final HashSet BANNED_PACKETS = new HashSet<>() { - { - } - }; + public static final HashSet BANNED_PACKETS = + new HashSet<>() { + { + } + }; } diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java index 9e24942e6ee..6549a52b7ac 100644 --- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java +++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java @@ -10,9 +10,7 @@ public class PacketOpcodesUtils { public static final Set LOOP_PACKETS = Set.of( - PacketOpcodes.PingReq, - PacketOpcodes.PingRsp, - PacketOpcodes.WorldPlayerRTTNotify + PacketOpcodes.PingReq, PacketOpcodes.PingRsp, PacketOpcodes.WorldPlayerRTTNotify // PacketOpcodes.UnionCmdNotify, // PacketOpcodes.SceneTimeNotify, // PacketOpcodes.QueryPathReq, @@ -27,7 +25,7 @@ public class PacketOpcodesUtils { // PacketOpcodes.PlayerGameTimeNotify, // PacketOpcodes.AvatarPropNotify, // PacketOpcodes.AvatarSatiationDataNotify - ); + ); private static final Int2ObjectMap opcodeMap; static { diff --git a/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java b/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java index f8284ef5c7c..4382c4101f0 100644 --- a/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java +++ b/src/main/java/emu/grasscutter/server/game/GameServerPacketHandler.java @@ -89,7 +89,7 @@ public void handle(GameSession session, int opcode, byte[] header, byte[] payloa // Log unhandled packets if (GAME_INFO.logPackets == ServerDebugMode.MISSING - /* || GAME_INFO.logPackets == ServerDebugMode.ALL */) { + /* || GAME_INFO.logPackets == ServerDebugMode.ALL */ ) { Grasscutter.getLogger() .info( "Unhandled packet (" diff --git a/src/main/java/emu/grasscutter/server/game/GameSession.java b/src/main/java/emu/grasscutter/server/game/GameSession.java index e7d4e733856..6eff135e77b 100644 --- a/src/main/java/emu/grasscutter/server/game/GameSession.java +++ b/src/main/java/emu/grasscutter/server/game/GameSession.java @@ -14,9 +14,6 @@ import java.io.File; import java.net.InetSocketAddress; import java.nio.file.Path; -import java.util.Arrays; -import java.util.List; - import lombok.*; public class GameSession implements GameSessionManager.KcpChannel { diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java index 0db2c89858d..fbe13434651 100644 --- a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java +++ b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java @@ -259,12 +259,15 @@ private static void queryCurrentRegion(Context ctx) { if (!Grasscutter.getConfig().server.game.useXorEncryption) { if (versionName != null) { if (versionName.startsWith("CN")) { - ctx.result("{\"content\":\"v4ODcIe6c8I+UGyDOIzudWuTk+DcH4znJAdvK7oksJg77KetHm9hbFXmUc5mDUy72ovfOCNoW+Ln8GRwitL/6fliDFSP/6P92wv+5b+/u2Yk6ShuGMi7XBDMZkVbun1bTqck+2hOb/zEKMfYmlbCpnTvIfFIU23PxNDEgVvGKFfdiFnQP24SK2/iN6tpzaKVnT/c26GJD6mZv76ipcUtS9+agWv5ntaiYYd1BW7VmWp6Me1ujS9wViTs/1WsPDOezhKtn2fisweFCscko5WW4rkuUXaJ+qeCVUnV/+tgkLPA7J7NwwleE2IbkmLpXnOmHAsxUzwnSFt9QKTAitJ49A==\",\"sign\":\"ZF7e0DvBxozhNCQ4zNvfO3dOgN5X3vn4/FuPSEWYY9bfmuJQL39alQPZgX+l9WI62haIswUBk1NjzwMIOo074mxv8pAbJsEGzwHdF7cwS5Mv3yRvdNsX20mClkrpNd9VWjbyXquX8LxZ52lDigAsHkEBoITcWHVt28uFWRSuhq9GznGS7A7Fo2XLbNi8qqNvtIRDCRk+p7/qFDyABXayr4rVDot8NtOrspmt5P77OCm870IxXUhMwfpiBd3mbS/cC8FbnztU8LxdyhHAmO2aaJcLobBuwtmnki3PyYOddOwBPu8Vi7wQaeEVq1uDUWTOXE30tVXZkFnAEV+YGFzStQ==\"}"); + ctx.result( + "{\"content\":\"v4ODcIe6c8I+UGyDOIzudWuTk+DcH4znJAdvK7oksJg77KetHm9hbFXmUc5mDUy72ovfOCNoW+Ln8GRwitL/6fliDFSP/6P92wv+5b+/u2Yk6ShuGMi7XBDMZkVbun1bTqck+2hOb/zEKMfYmlbCpnTvIfFIU23PxNDEgVvGKFfdiFnQP24SK2/iN6tpzaKVnT/c26GJD6mZv76ipcUtS9+agWv5ntaiYYd1BW7VmWp6Me1ujS9wViTs/1WsPDOezhKtn2fisweFCscko5WW4rkuUXaJ+qeCVUnV/+tgkLPA7J7NwwleE2IbkmLpXnOmHAsxUzwnSFt9QKTAitJ49A==\",\"sign\":\"ZF7e0DvBxozhNCQ4zNvfO3dOgN5X3vn4/FuPSEWYY9bfmuJQL39alQPZgX+l9WI62haIswUBk1NjzwMIOo074mxv8pAbJsEGzwHdF7cwS5Mv3yRvdNsX20mClkrpNd9VWjbyXquX8LxZ52lDigAsHkEBoITcWHVt28uFWRSuhq9GznGS7A7Fo2XLbNi8qqNvtIRDCRk+p7/qFDyABXayr4rVDot8NtOrspmt5P77OCm870IxXUhMwfpiBd3mbS/cC8FbnztU8LxdyhHAmO2aaJcLobBuwtmnki3PyYOddOwBPu8Vi7wQaeEVq1uDUWTOXE30tVXZkFnAEV+YGFzStQ==\"}"); } else { - ctx.result("{\"content\":\"Gw9hSPdjoJe34l9OC58Q+/qfzt5R8DkJYkg1plgG0ZAGUkrZbJhnPD9htFxBTR0tXSQJA3chVLsIgr55GY+J27k8P3HKkj6sQsZ2isRTqqQnLZKruHCLZmrWmbhmx3ioh3mbo7OHJd1V+s7W/HSHe7mknUC9xKKqYHBnpYKBE5m5afUc3mlUqxFbwfZpOIItlnBWqxiXJqI3M7ux1Go4Fs0ZSvstvxw4lGTYUyLtBG1b/tMpahUAazG0G+WJbU22JOY7JRGlXXU+LaJPTqAHksFF7Hj1tOdQnw0clNbe62nyjObdixJxkRhKsxBory1OJQqZVA8z5ZeZn7hXzzkeRQ==\",\"sign\":\"AW6F2n8+EobiwQ3ZHeW3xHR9krFDpseGewxTA9yfreWLCmoXG5bXRDp60oO464VSeEFT885yOqwidLeE2umA4TGXcRu0aJBGT/7Olse6l5M4LyltuL/xIlPMUC/pq0dMmG3fY13NfgFFfd9rQ3vuY3QuH8J+XsKBkicFrpyqd9QvtxiQe3GHqIW7AobARmIYzdhuBG5fFtxe/scKUxTh1UUtbT8BTpUO7VcaXFBxXqva5ghUiKa1a7QoEMVL232D8t6nz74KOeZKZCcn8bGbO4PzkbcfkDmGL0fuEbhgh5e2+w+NQpAsX5TdO7NCYR8dKP+alTHnaeCdqXPkcauAAg==\"}"); + ctx.result( + "{\"content\":\"Gw9hSPdjoJe34l9OC58Q+/qfzt5R8DkJYkg1plgG0ZAGUkrZbJhnPD9htFxBTR0tXSQJA3chVLsIgr55GY+J27k8P3HKkj6sQsZ2isRTqqQnLZKruHCLZmrWmbhmx3ioh3mbo7OHJd1V+s7W/HSHe7mknUC9xKKqYHBnpYKBE5m5afUc3mlUqxFbwfZpOIItlnBWqxiXJqI3M7ux1Go4Fs0ZSvstvxw4lGTYUyLtBG1b/tMpahUAazG0G+WJbU22JOY7JRGlXXU+LaJPTqAHksFF7Hj1tOdQnw0clNbe62nyjObdixJxkRhKsxBory1OJQqZVA8z5ZeZn7hXzzkeRQ==\",\"sign\":\"AW6F2n8+EobiwQ3ZHeW3xHR9krFDpseGewxTA9yfreWLCmoXG5bXRDp60oO464VSeEFT885yOqwidLeE2umA4TGXcRu0aJBGT/7Olse6l5M4LyltuL/xIlPMUC/pq0dMmG3fY13NfgFFfd9rQ3vuY3QuH8J+XsKBkicFrpyqd9QvtxiQe3GHqIW7AobARmIYzdhuBG5fFtxe/scKUxTh1UUtbT8BTpUO7VcaXFBxXqva5ghUiKa1a7QoEMVL232D8t6nz74KOeZKZCcn8bGbO4PzkbcfkDmGL0fuEbhgh5e2+w+NQpAsX5TdO7NCYR8dKP+alTHnaeCdqXPkcauAAg==\"}"); } } else { - ctx.result("{\"content\":\"Gw9hSPdjoJe34l9OC58Q+/qfzt5R8DkJYkg1plgG0ZAGUkrZbJhnPD9htFxBTR0tXSQJA3chVLsIgr55GY+J27k8P3HKkj6sQsZ2isRTqqQnLZKruHCLZmrWmbhmx3ioh3mbo7OHJd1V+s7W/HSHe7mknUC9xKKqYHBnpYKBE5m5afUc3mlUqxFbwfZpOIItlnBWqxiXJqI3M7ux1Go4Fs0ZSvstvxw4lGTYUyLtBG1b/tMpahUAazG0G+WJbU22JOY7JRGlXXU+LaJPTqAHksFF7Hj1tOdQnw0clNbe62nyjObdixJxkRhKsxBory1OJQqZVA8z5ZeZn7hXzzkeRQ==\",\"sign\":\"AW6F2n8+EobiwQ3ZHeW3xHR9krFDpseGewxTA9yfreWLCmoXG5bXRDp60oO464VSeEFT885yOqwidLeE2umA4TGXcRu0aJBGT/7Olse6l5M4LyltuL/xIlPMUC/pq0dMmG3fY13NfgFFfd9rQ3vuY3QuH8J+XsKBkicFrpyqd9QvtxiQe3GHqIW7AobARmIYzdhuBG5fFtxe/scKUxTh1UUtbT8BTpUO7VcaXFBxXqva5ghUiKa1a7QoEMVL232D8t6nz74KOeZKZCcn8bGbO4PzkbcfkDmGL0fuEbhgh5e2+w+NQpAsX5TdO7NCYR8dKP+alTHnaeCdqXPkcauAAg==\"}"); + ctx.result( + "{\"content\":\"Gw9hSPdjoJe34l9OC58Q+/qfzt5R8DkJYkg1plgG0ZAGUkrZbJhnPD9htFxBTR0tXSQJA3chVLsIgr55GY+J27k8P3HKkj6sQsZ2isRTqqQnLZKruHCLZmrWmbhmx3ioh3mbo7OHJd1V+s7W/HSHe7mknUC9xKKqYHBnpYKBE5m5afUc3mlUqxFbwfZpOIItlnBWqxiXJqI3M7ux1Go4Fs0ZSvstvxw4lGTYUyLtBG1b/tMpahUAazG0G+WJbU22JOY7JRGlXXU+LaJPTqAHksFF7Hj1tOdQnw0clNbe62nyjObdixJxkRhKsxBory1OJQqZVA8z5ZeZn7hXzzkeRQ==\",\"sign\":\"AW6F2n8+EobiwQ3ZHeW3xHR9krFDpseGewxTA9yfreWLCmoXG5bXRDp60oO464VSeEFT885yOqwidLeE2umA4TGXcRu0aJBGT/7Olse6l5M4LyltuL/xIlPMUC/pq0dMmG3fY13NfgFFfd9rQ3vuY3QuH8J+XsKBkicFrpyqd9QvtxiQe3GHqIW7AobARmIYzdhuBG5fFtxe/scKUxTh1UUtbT8BTpUO7VcaXFBxXqva5ghUiKa1a7QoEMVL232D8t6nz74KOeZKZCcn8bGbO4PzkbcfkDmGL0fuEbhgh5e2+w+NQpAsX5TdO7NCYR8dKP+alTHnaeCdqXPkcauAAg==\"}"); } } else { String regionName = ctx.pathParam("region"); @@ -283,8 +286,8 @@ private static void queryCurrentRegion(Context ctx) { var versionFix = Integer.parseInt(versionCode[2]); if (versionMajor >= 3 - || (versionMajor == 2 && versionMinor == 7 && versionFix >= 50) - || (versionMajor == 2 && versionMinor == 8)) { + || (versionMajor == 2 && versionMinor == 7 && versionFix >= 50) + || (versionMajor == 2 && versionMinor == 8)) { try { QueryCurrentRegionEvent event = new QueryCurrentRegionEvent(regionData); event.call(); @@ -292,37 +295,38 @@ private static void queryCurrentRegion(Context ctx) { String key_id = ctx.queryParam("key_id"); if (versionMajor != GameConstants.VERSION_PARTS[0] - || versionMinor != GameConstants.VERSION_PARTS[1] - // The 'fix' or 'patch' version is not checked because it is only used - // when miHoYo is desperate and fucks up big time. + || versionMinor != GameConstants.VERSION_PARTS[1] + // The 'fix' or 'patch' version is not checked because it is only used + // when miHoYo is desperate and fucks up big time. ) { // Reject clients when there is a version mismatch boolean updateClient = GameConstants.VERSION.compareTo(clientVersion) > 0; QueryCurrRegionHttpRsp rsp = - QueryCurrRegionHttpRsp.newBuilder() - .setRetcode(Retcode.RET_STOP_SERVER_VALUE) - .setMsg("Connection Failed!") - .setRegionInfo(RegionInfo.newBuilder()) - .setStopServer( - StopServerInfo.newBuilder() - .setUrl("https://discord.gg/T5vZU6UyeG") - .setStopBeginTime((int) Instant.now().getEpochSecond()) - .setStopEndTime((int) Instant.now().getEpochSecond() + 1) - .setContentMsg( - updateClient - ? "\nVersion mismatch outdated client! \n\nServer version: %s\nClient version: %s" - .formatted(GameConstants.VERSION, clientVersion) - : "\nVersion mismatch outdated server! \n\nServer version: %s\nClient version: %s" - .formatted(GameConstants.VERSION, clientVersion)) - .build()) - .buildPartial(); + QueryCurrRegionHttpRsp.newBuilder() + .setRetcode(Retcode.RET_STOP_SERVER_VALUE) + .setMsg("Connection Failed!") + .setRegionInfo(RegionInfo.newBuilder()) + .setStopServer( + StopServerInfo.newBuilder() + .setUrl("https://discord.gg/T5vZU6UyeG") + .setStopBeginTime((int) Instant.now().getEpochSecond()) + .setStopEndTime((int) Instant.now().getEpochSecond() + 1) + .setContentMsg( + updateClient + ? "\nVersion mismatch outdated client! \n\nServer version: %s\nClient version: %s" + .formatted(GameConstants.VERSION, clientVersion) + : "\nVersion mismatch outdated server! \n\nServer version: %s\nClient version: %s" + .formatted(GameConstants.VERSION, clientVersion)) + .build()) + .buildPartial(); Grasscutter.getLogger() - .debug( - String.format( - "Connection denied for %s due to %s.", - Utils.address(ctx), updateClient ? "outdated client!" : "outdated server!")); + .debug( + String.format( + "Connection denied for %s due to %s.", + Utils.address(ctx), + updateClient ? "outdated client!" : "outdated server!")); ctx.json(Crypto.encryptAndSignRegionData(rsp.toByteArray(), key_id)); return; @@ -354,9 +358,7 @@ private static void queryCurrentRegion(Context ctx) { } } Grasscutter.getLogger() - .info( - String.format( - "Client %s request: query_cur_region/%s", Utils.address(ctx), "")); + .info(String.format("Client %s request: query_cur_region/%s", Utils.address(ctx), "")); } /** Region data container. */ diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java index d4e79d2f809..225b576df28 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEvtDoSkillSuccNotify.java @@ -21,7 +21,9 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex // Handle skill notify in other managers. player.getStaminaManager().handleEvtDoSkillSuccNotify(session, skillId, casterId); - player.getEnergyManager().handleEvtDoSkillSuccNotify(session, skillId, casterId); // TODO: fix invoke + player + .getEnergyManager() + .handleEvtDoSkillSuccNotify(session, skillId, casterId); // TODO: fix invoke player.getQuestManager().queueEvent(QuestContent.QUEST_CONTENT_SKILL, skillId); } } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java index be542727c90..ff833f92737 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGadgetInteractReq.java @@ -1,13 +1,9 @@ package emu.grasscutter.server.packet.recv; -import emu.grasscutter.game.entity.EntityBaseGadget; import emu.grasscutter.game.quest.enums.QuestContent; import emu.grasscutter.net.packet.*; import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq; -import emu.grasscutter.net.proto.InterOpTypeOuterClass; -import emu.grasscutter.net.proto.InteractTypeOuterClass; import emu.grasscutter.server.game.GameSession; -import emu.grasscutter.server.packet.send.PacketGadgetInteractRsp; @Opcodes(PacketOpcodes.GadgetInteractReq) public class HandlerGadgetInteractReq extends PacketHandler { diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java index 746d1535382..401ee47f6f8 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetPlayerTokenReq.java @@ -54,7 +54,7 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex exists.onLogout(); // must save immediately , or the below will load old data existsSession.close(); Grasscutter.getLogger() - .warn("Player {} was kicked due to duplicated login", account.getUsername()); + .warn("Player {} was kicked due to duplicated login", account.getUsername()); kicked = true; } } @@ -65,7 +65,7 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex if (!kicked) { // Max players limit if (ACCOUNT.maxPlayer > -1 - && Grasscutter.getGameServer().getPlayers().size() >= ACCOUNT.maxPlayer) { + && Grasscutter.getGameServer().getPlayers().size() >= ACCOUNT.maxPlayer) { session.close(); return; } @@ -80,11 +80,11 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex if (player == null) { var nextPlayerUid = - DatabaseHelper.getNextPlayerId(session.getAccount().getReservedPlayerUid()); + DatabaseHelper.getNextPlayerId(session.getAccount().getReservedPlayerUid()); // Create player instance from event. player = - event.getPlayerClass().getDeclaredConstructor(GameSession.class).newInstance(session); + event.getPlayerClass().getDeclaredConstructor(GameSession.class).newInstance(session); // Save to db DatabaseHelper.generatePlayerUid(player, nextPlayerUid); @@ -97,8 +97,8 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex if (session.getAccount().isBanned()) { session.setState(SessionState.ACCOUNT_BANNED); session.send( - new PacketGetPlayerTokenRsp( - session, 21, "FORBID_CHEATING_PLUGINS", session.getAccount().getBanEndTime())); + new PacketGetPlayerTokenRsp( + session, 21, "FORBID_CHEATING_PLUGINS", session.getAccount().getBanEndTime())); return; } @@ -130,11 +130,11 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex privateSignature.update(seedBytes); session.send( - new PacketGetPlayerTokenRsp( - session, - Utils.base64Encode(seedEncrypted), - Utils.base64Encode(privateSignature.sign()), - req.getKeyId())); + new PacketGetPlayerTokenRsp( + session, + Utils.base64Encode(seedEncrypted), + Utils.base64Encode(privateSignature.sign()), + req.getKeyId())); } catch (Exception ignored) { // Only UA Patch users will have exception var clientBytes = Utils.base64Decode(req.getClientRandKey()); @@ -142,7 +142,8 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex Crypto.xor(clientBytes, seed); var base64str = Utils.base64Encode(clientBytes); - session.send(new PacketGetPlayerTokenRsp(session, base64str, "bm90aGluZyBoZXJl", req.getKeyId())); + session.send( + new PacketGetPlayerTokenRsp(session, base64str, "bm90aGluZyBoZXJl", req.getKeyId())); } } else { // Send packet diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetProfilePictureDataReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetProfilePictureDataReq.java index 927190481a4..c7cbcfdbd8b 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetProfilePictureDataReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerGetProfilePictureDataReq.java @@ -11,7 +11,6 @@ public class HandlerGetProfilePictureDataReq extends PacketHandler { @Override public void handle(GameSession session, byte[] header, byte[] payload) throws Exception { - session.send( - new PacketGetProfilePictureDataRsp(session.getPlayer())); + session.send(new PacketGetProfilePictureDataRsp(session.getPlayer())); } } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java index bab34e62b07..9180208d7e5 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerItemGivingReq.java @@ -61,28 +61,28 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex // Resolve potential item IDs. var groupData = GameData.getGivingGroupDataMap(); data.getGivingGroupIds().stream() - .map(groupId -> groupData.get((int) groupId)) - .filter(Objects::nonNull) - .forEach( - group -> { - var itemIds = group.getItemIds(); + .map(groupId -> groupData.get((int) groupId)) + .filter(Objects::nonNull) + .forEach( + group -> { + var itemIds = group.getItemIds(); - // Match item stacks to the group items. - items.forEach( - param -> { - // Get the item instance. - var itemInstance = inventory.getFirstItem(param.getItemId()); - if (itemInstance == null) return; + // Match item stacks to the group items. + items.forEach( + param -> { + // Get the item instance. + var itemInstance = inventory.getFirstItem(param.getItemId()); + if (itemInstance == null) return; - // Get the item ID. - var itemId = itemInstance.getItemId(); - if (!itemIds.contains(itemId)) return; + // Get the item ID. + var itemId = itemInstance.getItemId(); + if (!itemIds.contains(itemId)) return; - // Add the item to the given items. - givenItems.put(itemId, param.getCount()); - matchedGroups.add(group.getId()); + // Add the item to the given items. + givenItems.put(itemId, param.getCount()); + matchedGroups.add(group.getId()); + }); }); - }); // Check if the player has any items. if (givenItems.isEmpty() && matchedGroups.isEmpty()) { @@ -99,9 +99,9 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex questManager.markCompleted(giveId); // Queue the content and condition actions. questManager.queueEvent( - QuestContent.QUEST_CONTENT_FINISH_ITEM_GIVING, giveId, matchedGroups.get(0)); + QuestContent.QUEST_CONTENT_FINISH_ITEM_GIVING, giveId, matchedGroups.get(0)); questManager.queueEvent( - QuestCond.QUEST_COND_ITEM_GIVING_FINISHED, giveId, matchedGroups.get(0)); + QuestCond.QUEST_COND_ITEM_GIVING_FINISHED, giveId, matchedGroups.get(0)); } } } diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java index 161136a608c..076301875d3 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerPlayerLoginReq.java @@ -1,17 +1,15 @@ package emu.grasscutter.server.packet.recv; +import static emu.grasscutter.config.Configuration.GAME_OPTIONS; + import emu.grasscutter.data.GameData; import emu.grasscutter.game.avatar.Avatar; import emu.grasscutter.game.player.Player; import emu.grasscutter.net.packet.*; -import emu.grasscutter.net.proto.AvatarTypeOuterClass; import emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq; import emu.grasscutter.server.game.GameSession; -import emu.grasscutter.server.game.GameSession.SessionState; import emu.grasscutter.server.packet.send.PacketPlayerLoginRsp; -import static emu.grasscutter.config.Configuration.GAME_OPTIONS; - @Opcodes(PacketOpcodes.PlayerLoginReq) // Sends initial data packets public class HandlerPlayerLoginReq extends PacketHandler { @@ -49,8 +47,7 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex // Check if the default Anemo skill should be given. if (!GAME_OPTIONS.questing.enabled) { - mainCharacter.setSkillDepotData( - GameData.getAvatarSkillDepotDataMap().get(704)); + mainCharacter.setSkillDepotData(GameData.getAvatarSkillDepotDataMap().get(704)); } // Manually handle adding to team @@ -58,10 +55,10 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex player.setMainCharacterId(avatarId); player.setHeadImage(avatarId); player - .getTeamManager() - .getCurrentSinglePlayerTeamInfo() - .getAvatars() - .add(mainCharacter.getAvatarId()); + .getTeamManager() + .getCurrentSinglePlayerTeamInfo() + .getAvatars() + .add(mainCharacter.getAvatarId()); player.save(); // TODO save player team in different object // Login done diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetInteractRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetInteractRsp.java index a479ae63cd5..800467b9a9d 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetInteractRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGadgetInteractRsp.java @@ -30,14 +30,14 @@ public PacketGadgetInteractRsp( } public PacketGadgetInteractRsp( - int gadgetId, int gadgetEntityId, InteractType interact, InterOpType opType) { + int gadgetId, int gadgetEntityId, InteractType interact, InterOpType opType) { super(PacketOpcodes.GadgetInteractRsp); var proto = - GadgetInteractRsp.newBuilder() - .setGadgetEntityId(gadgetEntityId) - .setInteractType(interact) - .setGadgetId(gadgetId); + GadgetInteractRsp.newBuilder() + .setGadgetEntityId(gadgetEntityId) + .setInteractType(interact) + .setGadgetId(gadgetId); if (opType != null) { proto.setOpType(opType); diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java index 27f987c133e..7af2f46c413 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetPlayerTokenRsp.java @@ -19,31 +19,35 @@ public PacketGetPlayerTokenRsp(GameSession session, int keyId) { if (!Grasscutter.getConfig().server.game.useXorEncryption) { if (keyId == 4) { // CN Rand Key and Sign - serverRandKey = "Lsu2ERvY+NHM//Ur94+JVUhf+nRj26mmUcP4/SkfnQq/lIGzwgxwYg38qWSMvwqx/xzrrWCoLPyfHj0UwpiBdN5JuVSlwumObpH0NjwCbBhKU1SOrbw48E7EVvGcDKuZrGGy5xPZFaWMtJ6I26ApjdWwVolqYK+zuF2doBkGD00OlZwl6oQMb+nPY2BDrWVW4Uf35/EscvLNfNk1YFhze1ieUCNbAnVjVD0Z0gVRn0cB69MRDrUa5QHI8gePSDIZxYKW4lNxk25lCtbt4fIkhf5iV0dSYuZukJbKYog5zDDTymNUfJLNmlJktvNW3TNyIirTXtl76f9WOJA7mOhsUw=="; - sign = "kwTHFK/78ZEzlYYwIUwt/fw7CBNc/+a7qI7QVk8rym2wsuUz4pk/LbUnd40G4auMJ4yR0pWv5a2yzPJjspD3T/sTAx8uJZN7g15zXKyT2o2zCZV0MzcBUd3pKDcCAFdX1lkK3tphRXUZV62qatVL+ZYTV5ZB5ecxQrZD9MD+omV867YwLExia91YmtnhSLBZ1tfc2m7dn12/3Bl4EIavednhyHYZcCqagnw8mHjTtMz6NHq0/qXNfq8XtCbkA+Ue09veiijvDo9WL1Vz0dosjer3wv3w89CQ+Q5nBDZuY93GiQ6V50WR+737CaIuXB8HOT2RW6eLhPtUmwPWesX86A=="; + serverRandKey = + "Lsu2ERvY+NHM//Ur94+JVUhf+nRj26mmUcP4/SkfnQq/lIGzwgxwYg38qWSMvwqx/xzrrWCoLPyfHj0UwpiBdN5JuVSlwumObpH0NjwCbBhKU1SOrbw48E7EVvGcDKuZrGGy5xPZFaWMtJ6I26ApjdWwVolqYK+zuF2doBkGD00OlZwl6oQMb+nPY2BDrWVW4Uf35/EscvLNfNk1YFhze1ieUCNbAnVjVD0Z0gVRn0cB69MRDrUa5QHI8gePSDIZxYKW4lNxk25lCtbt4fIkhf5iV0dSYuZukJbKYog5zDDTymNUfJLNmlJktvNW3TNyIirTXtl76f9WOJA7mOhsUw=="; + sign = + "kwTHFK/78ZEzlYYwIUwt/fw7CBNc/+a7qI7QVk8rym2wsuUz4pk/LbUnd40G4auMJ4yR0pWv5a2yzPJjspD3T/sTAx8uJZN7g15zXKyT2o2zCZV0MzcBUd3pKDcCAFdX1lkK3tphRXUZV62qatVL+ZYTV5ZB5ecxQrZD9MD+omV867YwLExia91YmtnhSLBZ1tfc2m7dn12/3Bl4EIavednhyHYZcCqagnw8mHjTtMz6NHq0/qXNfq8XtCbkA+Ue09veiijvDo9WL1Vz0dosjer3wv3w89CQ+Q5nBDZuY93GiQ6V50WR+737CaIuXB8HOT2RW6eLhPtUmwPWesX86A=="; } else if (keyId == 5) { // OS Rand Key and Sign - serverRandKey = "CfO2d7eEYha5bJRXdCfoiemPNAtXDpyNTQ3ObeTt5a7SSHz6GAEO1WPiTQ7fR6OG8LqhVN3ZTxH9Bnkc09BnCxud+kn0+PiGv1PTOuWK0LkQQ1xmg89zA9IHS+OJd1yKT2BBmJf4sN61gi+WtT7aFwRlzku3kGCk6p2wiPo2enE7UwCFi/GiD4vq/m3hNZiKBjitAvheaqbSLjMpBax+c8HXoY5G09ap1PjEnUQPIK0xZRRQKpnrWcCyP4j8N3WwYYQGDW+OYOJjBvJdv+D6XSdEi+4IsZASYVpu9V8UZ570Cakbc+IjUm0UZJXghcR7izIjKtoNHf2Fmc26DEp1Jw=="; - sign = "mMx/Klovbzq1QxQvVgm30nYhj0jDOykyo9aparyWRNz3ACxV/2gIdLpyM/SMerWMTcx26NapQ9HsKK7BRK7Yx+nMR0O83BkBlxfl+NEarYr6kj9lBKAxZYXTXFRYA4sRynvwa/MOPmGwYMNl6aVvMohhvrsTopsRvIuGFtnCVL2wBfbxcNnbVfP5k+DxPuQnxa/vi+ju8TogW2R+r0p9zQ5NJe1oaYe4xYbyhefFVv11FA/JQHwMHLEyrEdPqTzdN75CUmE09yLuAoeJzoJ1vwwjwfcH9dMDPxsewNJBGiylVHYf56kF4HypNkYNjtxbghgLBaHg0ZoeYHTOJ7YUTQ=="; + serverRandKey = + "CfO2d7eEYha5bJRXdCfoiemPNAtXDpyNTQ3ObeTt5a7SSHz6GAEO1WPiTQ7fR6OG8LqhVN3ZTxH9Bnkc09BnCxud+kn0+PiGv1PTOuWK0LkQQ1xmg89zA9IHS+OJd1yKT2BBmJf4sN61gi+WtT7aFwRlzku3kGCk6p2wiPo2enE7UwCFi/GiD4vq/m3hNZiKBjitAvheaqbSLjMpBax+c8HXoY5G09ap1PjEnUQPIK0xZRRQKpnrWcCyP4j8N3WwYYQGDW+OYOJjBvJdv+D6XSdEi+4IsZASYVpu9V8UZ570Cakbc+IjUm0UZJXghcR7izIjKtoNHf2Fmc26DEp1Jw=="; + sign = + "mMx/Klovbzq1QxQvVgm30nYhj0jDOykyo9aparyWRNz3ACxV/2gIdLpyM/SMerWMTcx26NapQ9HsKK7BRK7Yx+nMR0O83BkBlxfl+NEarYr6kj9lBKAxZYXTXFRYA4sRynvwa/MOPmGwYMNl6aVvMohhvrsTopsRvIuGFtnCVL2wBfbxcNnbVfP5k+DxPuQnxa/vi+ju8TogW2R+r0p9zQ5NJe1oaYe4xYbyhefFVv11FA/JQHwMHLEyrEdPqTzdN75CUmE09yLuAoeJzoJ1vwwjwfcH9dMDPxsewNJBGiylVHYf56kF4HypNkYNjtxbghgLBaHg0ZoeYHTOJ7YUTQ=="; } } GetPlayerTokenRsp p = - GetPlayerTokenRsp.newBuilder() - .setUid(session.getPlayer().getUid()) - .setToken(session.getAccount().getToken()) - .setAccountType(1) - .setIsProficientPlayer( - session.getPlayer().getAvatars().getAvatarCount() > 0) // Not sure where this goes - .setPlatformType(3) - .setChannelId(1) - .setCountryCode("US") - .setRegPlatform(3) - .setKeyId(keyId) - .setTag(5) - .setServerRandKey(serverRandKey) - .setSign(sign) - .build(); + GetPlayerTokenRsp.newBuilder() + .setUid(session.getPlayer().getUid()) + .setToken(session.getAccount().getToken()) + .setAccountType(1) + .setIsProficientPlayer( + session.getPlayer().getAvatars().getAvatarCount() > 0) // Not sure where this goes + .setPlatformType(3) + .setChannelId(1) + .setCountryCode("US") + .setRegPlatform(3) + .setKeyId(keyId) + .setTag(5) + .setServerRandKey(serverRandKey) + .setSign(sign) + .build(); this.setData(p.toByteArray()); } @@ -54,45 +58,45 @@ public PacketGetPlayerTokenRsp(GameSession session, int retcode, String msg, int this.setUseDispatchKey(true); GetPlayerTokenRsp p = - GetPlayerTokenRsp.newBuilder() - .setUid(session.getPlayer().getUid()) - .setIsProficientPlayer(session.getPlayer().getAvatars().getAvatarCount() > 0) - .setRetcode(retcode) - .setMsg(msg) - .setBlackUidEndTime(blackEndTime) - .setRegPlatform(3) - .setCountryCode("US") - .setTag(5) - .build(); + GetPlayerTokenRsp.newBuilder() + .setUid(session.getPlayer().getUid()) + .setIsProficientPlayer(session.getPlayer().getAvatars().getAvatarCount() > 0) + .setRetcode(retcode) + .setMsg(msg) + .setBlackUidEndTime(blackEndTime) + .setRegPlatform(3) + .setCountryCode("US") + .setTag(5) + .build(); this.setData(p.toByteArray()); } public PacketGetPlayerTokenRsp( - GameSession session, String encryptedSeed, String encryptedSeedSign, int keyId) { + GameSession session, String encryptedSeed, String encryptedSeedSign, int keyId) { super(PacketOpcodes.GetPlayerTokenRsp, true); this.setUseDispatchKey(true); GetPlayerTokenRsp p = - GetPlayerTokenRsp.newBuilder() - .setUid(session.getPlayer().getUid()) - .setToken(session.getAccount().getToken()) - .setAccountType(1) - .setIsProficientPlayer( - session.getPlayer().getAvatars().getAvatarCount() > 0) // Not sure where this goes - .setSecretKeySeed(session.getEncryptSeed()) - .setSecurityCmdBuffer(ByteString.copyFrom(Crypto.ENCRYPT_SEED_BUFFER)) - .setKeyId(keyId) - .setPlatformType(3) - .setChannelId(1) - .setCountryCode("US") - .setClientVersionRandomKey("c25-314dd05b0b5f") - .setRegPlatform(3) - .setClientIpStr(session.getAddress().getAddress().getHostAddress()) - .setServerRandKey(encryptedSeed) - .setSign(encryptedSeedSign) - .build(); + GetPlayerTokenRsp.newBuilder() + .setUid(session.getPlayer().getUid()) + .setToken(session.getAccount().getToken()) + .setAccountType(1) + .setIsProficientPlayer( + session.getPlayer().getAvatars().getAvatarCount() > 0) // Not sure where this goes + .setSecretKeySeed(session.getEncryptSeed()) + .setSecurityCmdBuffer(ByteString.copyFrom(Crypto.ENCRYPT_SEED_BUFFER)) + .setKeyId(keyId) + .setPlatformType(3) + .setChannelId(1) + .setCountryCode("US") + .setClientVersionRandomKey("c25-314dd05b0b5f") + .setRegPlatform(3) + .setClientIpStr(session.getAddress().getAddress().getHostAddress()) + .setServerRandKey(encryptedSeed) + .setSign(encryptedSeedSign) + .build(); this.setData(p.toByteArray()); } diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetProfilePictureDataRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetProfilePictureDataRsp.java index 48b91465abc..8a9ad4131fb 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetProfilePictureDataRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetProfilePictureDataRsp.java @@ -1,6 +1,5 @@ package emu.grasscutter.server.packet.send; -import emu.grasscutter.data.GameData; import emu.grasscutter.game.player.Player; import emu.grasscutter.net.packet.BasePacket; import emu.grasscutter.net.packet.PacketOpcodes; diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java index c6398d62a28..6db0767fd4d 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketPlayerLoginRsp.java @@ -9,7 +9,6 @@ import emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp; import emu.grasscutter.net.proto.QueryCurrRegionHttpRspOuterClass; import emu.grasscutter.net.proto.RegionInfoOuterClass.RegionInfo; -import emu.grasscutter.net.proto.ResVersionConfigOuterClass; import emu.grasscutter.server.game.GameSession; import emu.grasscutter.server.http.dispatch.RegionHandler; import emu.grasscutter.utils.Crypto; From 375a6c0e896757fbada93b03760d3eec391eedde Mon Sep 17 00:00:00 2001 From: Amireux <113855835+Deuteriunt@users.noreply.github.com> Date: Mon, 21 Oct 2024 18:11:55 +0800 Subject: [PATCH 2/2] Update 5.1 hotfix --- .../server/http/dispatch/hotfix.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/hotfix.java b/src/main/java/emu/grasscutter/server/http/dispatch/hotfix.java index af67955161d..251df08cc93 100644 --- a/src/main/java/emu/grasscutter/server/http/dispatch/hotfix.java +++ b/src/main/java/emu/grasscutter/server/http/dispatch/hotfix.java @@ -3,28 +3,26 @@ public class hotfix { public static class ResVersionConfig { - public int version = 26458901; + public int version = 27462100; public String md5 = - "{\"remoteName\": \"res_versions_external\", \"md5\": \"5f1ba25c0da41520d3d3057b1a32fd29\", \"hash\": \"ed66319e5bf7ec7e\", \"fileSize\": 153828}\r\n{\"remoteName\": \"res_versions_medium\", \"md5\": \"5907101204778f6b2f4bf3d8e4251d42\", \"hash\": \"5369f779aa07021d\", \"fileSize\": 8988}\r\n{\"remoteName\": \"res_versions_streaming\", \"md5\": \"bb50a573cbe1c9a5360578f006016a78\", \"hash\": \"a12089af1c385746\", \"fileSize\": 1833}\r\n{\"remoteName\": \"base_revision\", \"md5\": \"149cad27b543e345df504a496949ec7d\", \"hash\": \"8bb70126e5cd8ba0\", \"fileSize\": 19}\r\n{\"remoteName\": \"patch_node_versions\", \"md5\": \"68df81e80dd3e13bb8b55d4794b9948e\", \"hash\": \"38e59d29a11bdeaf\", \"fileSize\": 1751}\r\n{\"remoteName\": \"audio_diff_versions_26458901-24822834\", \"md5\": \"8d3b4e9a18b8ef5932287fc68106e63e\", \"hash\": \"6d6877dd57e08f73\", \"fileSize\": 36439}"; - public String releaseTotalSize = "0"; - public String versionSuffix = "befdda25ff"; - public String branch = "5.0_live"; + "{\"remoteName\": \"res_versions_external\", \"md5\": \"e77b6fe9721084d090192ecdd02834b3\", \"hash\": \"7524340ad5389e98\", \"fileSize\": 225777}\r\n{\"remoteName\": \"res_versions_medium\", \"md5\": \"7e207aa54d87487c4f1e380c7bc0a116\", \"hash\": \"050c0c315f029b49\", \"fileSize\": 143029}\r\n{\"remoteName\": \"res_versions_streaming\", \"md5\": \"f5233549c6c4d8d6594a9bdb51f7176d\", \"hash\": \"1d4b6079c06f88bf\", \"fileSize\": 130764}\r\n{\"remoteName\": \"base_revision\", \"md5\": \"624e2652c9dec9d593bdb8e2a655f87c\", \"hash\": \"81fac9c629364770\", \"fileSize\": 19}\r\n{\"remoteName\": \"patch_node_versions\", \"md5\": \"364387f95f037cc87874225eaac1248d\", \"hash\": \"78e46d3389e2f5eb\", \"fileSize\": 2577}", public String releaseTotalSize = "0"; + public String versionSuffix = "72287fac61"; + public String branch = "5.1_live"; } public static class Resource { - public String resourceUrl = "https://autopatchhk.yuanshen.com/client_game_res/5.0_live"; - public String dataUrl = "https://autopatchhk.yuanshen.com/client_design_data/5.0_live"; - public String resourceUrlBak = "5.0_live"; - public int clientDataVersion = 26487341; - public int clientSilenceDataVersion = 26368837; + public String resourceUrl = "https://autopatchhk.yuanshen.com/client_game_res/5.1_live"; + public String dataUrl = "https://autopatchhk.yuanshen.com/client_design_data/5.1_live"; + public String resourceUrlBak = "5.1_live"; + public int clientDataVersion = 27787359; + public int clientSilenceDataVersion = 27760956; public String clientDataMd5 = - "{\"remoteName\": \"data_versions\", \"md5\": \"88a0d1f6825ec3b6aaf9ea39a02f78da\", \"hash\": \"a72baf3b5c76f0ac\", \"fileSize\": 68545}\r\n{\"remoteName\": \"data_versions_medium\", \"md5\": \"9429b4e9dd8cbdaf19c41ff05f18b384\", \"hash\": \"a79950c775cf1630\", \"fileSize\": 6662}"; - public String clientSilenceDataMd5 = - "{\"remoteName\": \"data_versions\", \"md5\": \"8ae3d12ddeffa27349ab306ce05ec0b7\", \"hash\": \"ef8cb53633584c7a\", \"fileSize\": 522}"; + "{\"remoteName\": \"data_versions\", \"md5\": \"79591908993f065a54e943fe83827963\", \"hash\": \"6938dd03b8759fc9\", \"fileSize\": 68578}\r\n{\"remoteName\": \"data_versions_medium\", \"md5\": \"8f94e0936e1c38dc8e1ede1646de9b89\", \"hash\": \"0ab1c86ac0e9b9ba\", \"fileSize\": 6664}", public String clientSilenceDataMd5 = + "{\"remoteName\": \"data_versions\", \"md5\": \"e1a639c0ab1e41e8db0cd4bf7a9798b2\", \"hash\": \"623fc7528efb10a5\", \"fileSize\": 523}", public ResVersionConfig resVersionConfig = new ResVersionConfig(); - public String clientVersionSuffix = "57a90bbd52"; - public String clientSilenceVersionSuffix = "0af120923b"; - public String nextResourceUrl = "https://autopatchhk.yuanshen.com/client_game_res/5.0_live"; + public String clientVersionSuffix = "c3a3d67960"; + public String clientSilenceVersionSuffix = "1a3d165f06"; + public String nextResourceUrl = "https://autopatchhk.yuanshen.com/client_game_res/5.1_live"; public ResVersionConfig nextResVersionConfig = new ResVersionConfig(); } }