enter in-game work

proto/AbilityAppliedAbility.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "AbilityString.proto";
 import "AbilityScalarValueEntry.proto";
 
-// 4.7.0
 message AbilityAppliedAbility {
     AbilityString ability_name = 1;
     AbilityString ability_override = 2;

proto/AbilityAppliedModifier.proto

@@ -1,11 +1,12 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "AbilityString.proto";
 import "AbilityAttachedModifier.proto";
 import "ModifierDurability.proto";
 
-// 4.7.0
 message AbilityAppliedModifier {
     int32 modifier_local_id = 1;
     uint32 parent_ability_entity_id = 2;
@@ -20,5 +21,5 @@ message AbilityAppliedModifier {
     ModifierDurability modifier_durability = 11;
     uint32 sbuff_uid = 12;
     bool is_serverbuff_modifier = 13;
-	bool IILBHFODNKJ = 14;
+    bool NCEGKBANOBP = 14;
 }

proto/AbilityAttachedModifier.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 message AbilityAttachedModifier {
     bool is_invalid = 1;
     uint32 owner_entity_id = 2;

proto/AbilityControlBlock.proto

@@ -1,8 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "AbilityEmbryo.proto";
 
-// 4.7.0
 message AbilityControlBlock {
     repeated AbilityEmbryo ability_embryo_list = 1;
 }

proto/AbilityEmbryo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// 4.7.0
+// Version: 5.0
+
 message AbilityEmbryo {
     uint32 ability_id = 1;
     fixed32 ability_name_hash = 2;

proto/AbilityGadgetInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// 4.7.0
+// Version: 5.0
+
 message AbilityGadgetInfo {
     uint32 camp_id = 1;
     uint32 camp_target_type = 2;

proto/AbilityMixinRecoverInfo.proto

@@ -1,18 +1,19 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "MassivePropSyncInfo.proto";
 import "BreakoutSnapShot.proto";
-//import "DPJAFMMGPCK.proto";
+//import "DIGPMLGLILN.proto";
 
-// 4.7.0
 message AbilityMixinRecoverInfo {
     uint32 local_id = 3;
     repeated uint32 data_list = 4;
     bool is_serverbuff_modifier = 5;
     repeated MassivePropSyncInfo massive_prop_list = 6;
     BreakoutSnapShot breakout_snap_shot = 7;
-	//DPJAFMMGPCK IKBDKGFHKMA = 8;
+    //DIGPMLGLILN FJBMDPHICPF = 8;
     oneof Source {
         uint32 instanced_ability_id = 1;
         uint32 instanced_modifier_id = 2;

proto/AbilityScalarValueEntry.proto

@@ -1,11 +1,14 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "AbilityString.proto";
 import "AbilityScalarType.proto";
 
-// 4.7.0
 message AbilityScalarValueEntry {
+  // AbilityString key = 1;
+  // float float_value = 3;
   AbilityString key = 1;
   AbilityScalarType value_type = 2;
   oneof value {
@@ -15,9 +18,3 @@ message AbilityScalarValueEntry {
     uint32 uint_value = 6;
   }
 }
-/*
-message AbilityScalarValueEntry {
-	AbilityString key = 1;
-	float float_value = 3;
-}
-*/

proto/AbilityString.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 message AbilityString {
     oneof type {
         string str = 1;

proto/AbilitySyncStateInfo.proto

@@ -1,12 +1,13 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "AbilityScalarValueEntry.proto";
 import "AbilityAppliedAbility.proto";
 import "AbilityAppliedModifier.proto";
 import "AbilityMixinRecoverInfo.proto";
 
-// 4.7.0
 message AbilitySyncStateInfo {
     bool is_inited = 1;
     repeated AbilityScalarValueEntry dynamic_value_map = 2;

proto/AnimatorParameterValueInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: IGGDJDFNMAG
+// Version: 5.0
+
 message AnimatorParameterValueInfo {
     uint32 para_type = 1;
     oneof paraVal {

proto/AnimatorParameterValueInfoPair.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "AnimatorParameterValueInfo.proto";
-// Obf: CABIAHBAEHD
+
 message AnimatorParameterValueInfoPair {
     int32 name_id = 1;
     AnimatorParameterValueInfo animator_para = 2;

proto/AvatarDataNotify.proto

@@ -1,20 +1,22 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 23378
 
 import "AvatarInfo.proto";
 import "AvatarTeam.proto";
 import "AvatarRenameInfo.proto";
 
-// 4.7.0
-// CmdId: 26021
 message AvatarDataNotify {
-	repeated AvatarInfo avatar_list = 7;
+    repeated uint32 ONAODHDMILI = 2;
-	repeated uint32 owned_costume_list = 10;
+    repeated uint64 temp_avatar_guid_list = 4;
-	/* protected @ 0x30 */// repeated uint32 backup_avatar_team_order_list = 65535;
+    uint32 cur_avatar_team_id = 7;
-	map<uint32, AvatarTeam> avatar_team_map = 14;
+    repeated AvatarInfo avatar_list = 8;
-	/* protected @ 0x40 */// repeated uint64 temp_avatar_guid_list = 65535;
+    repeated uint32 backup_avatar_team_order_list = 9;
-	repeated AvatarRenameInfo avatar_rename_list = 11;
+    map<uint32, AvatarTeam> avatar_team_map = 10;
-	repeated uint32 owned_flycloak_list = 13;
+    repeated uint32 owned_flycloak_list = 11;
-	uint64 choose_avatar_guid = 8;
+    repeated uint32 owned_costume_list = 12;
-	uint32 cur_avatar_team_id = 5;
+    repeated AvatarRenameInfo avatar_rename_list = 13;
+    uint64 choose_avatar_guid = 14;
 }

proto/AvatarEnterSceneInfo.proto

@@ -1,17 +1,18 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "AbilitySyncStateInfo.proto";
 import "ServerBuff.proto";
 
-// 4.7.0
 message AvatarEnterSceneInfo {
-	uint32 avatar_entity_id = 3;
+    uint32 weapon_entity_id = 3;
-	uint64 avatar_guid = 4;
+    AbilitySyncStateInfo avatar_ability_info = 4;
-	uint32 weapon_entity_id = 5;
+    uint32 avatar_entity_id = 6;
     uint64 weapon_guid = 7;
-	AbilitySyncStateInfo avatar_ability_info = 10;
+    repeated ServerBuff server_buff_list = 8;
-	repeated uint32 buff_id_list = 12;
+    AbilitySyncStateInfo weapon_ability_info = 9;
-	repeated ServerBuff server_buff_list = 13;
+    repeated uint32 buff_id_list = 10;
-	AbilitySyncStateInfo weapon_ability_info = 14;
+    uint64 avatar_guid = 12;
 }

proto/AvatarEquipAffixInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: CFINPAOKBJN
+// Version: 5.0
+
 message AvatarEquipAffixInfo {
     uint32 equip_affix_id = 1;
     uint32 left_cd_time = 2;

proto/AvatarExcelInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: HGHGOIMIAMF
+// Version: 5.0
+
 message AvatarExcelInfo {
     uint64 prefab_path_hash = 1;
     uint64 prefab_path_remote_hash = 2;

proto/AvatarExpeditionState.proto

@@ -1,10 +1,12 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: OJBIHADNECN
+// Version: 5.0
+
 enum AvatarExpeditionState {
-	AVATAR_EXPEDITION_NONE = 0;
+    AVATAR_EXPEDITION_STATE_AVATAR_EXPEDITION_NONE = 0;
-	AVATAR_EXPEDITION_DOING = 1;
+    AVATAR_EXPEDITION_STATE_AVATAR_EXPEDITION_DOING = 1;
-	AVATAR_EXPEDITION_FINISH_WAIT_REWARD = 2;
+    AVATAR_EXPEDITION_STATE_AVATAR_EXPEDITION_FINISH_WAIT_REWARD = 2;
-	AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD = 3;
+    AVATAR_EXPEDITION_STATE_AVATAR_EXPEDITION_CALLBACK_WAIT_REWARD = 3;
-	AVATAR_EXPEDITION_LOCKED = 4;
+    AVATAR_EXPEDITION_STATE_AVATAR_EXPEDITION_LOCKED = 4;
 }

proto/AvatarFetterInfo.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "FetterData.proto";
-// Obf: BJIGILJGKAI
+
 message AvatarFetterInfo {
     uint32 exp_number = 1;
     uint32 exp_level = 2;

proto/AvatarInfo.proto

@@ -1,5 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "PropValue.proto";
 import "TrialAvatarInfo.proto";
 import "AvatarSkillInfo.proto";
@@ -7,7 +10,8 @@ import "AvatarFetterInfo.proto";
 import "AvatarExpeditionState.proto";
 import "AvatarEquipAffixInfo.proto";
 import "AvatarExcelInfo.proto";
-//import "JCDPOCOOGCI.proto";
+// import "JNHGJAIIMGJ.proto";
+
 message AvatarInfo {
     uint32 avatar_id = 1;
     uint64 guid = 2;
@@ -35,6 +39,8 @@ message AvatarInfo {
     uint32 costume_id = 25;
     AvatarExcelInfo excel_info = 26;
     uint32 anim_hash = 27;
-	//JCDPOCOOGCI PDGKJIIEPIO = 28;
+    // JNHGJAIIMGJ PINDEGAFOAE = 28;
-	uint32 GJFKDCJENJE = 29;
+    uint32 ABLFJPMKKDA = 29;
+    uint32 GCHGLANNHMC = 30;
+    uint32 KCINBOMOIGL = 31;
 }

proto/AvatarRenameInfo.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
-
-// 4.7.0
 message AvatarRenameInfo {
-	uint32 avatar_id = 3;
+    uint32 avatar_id = 13;
-	string avatar_name = 13;
+    string avatar_name = 15;
 }

proto/AvatarSkillInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: FKBNODHMBMG
+// Version: 5.0
+
 message AvatarSkillInfo {
     uint32 pass_cd_time = 1;
     repeated uint32 full_cd_time_list = 2;

proto/AvatarTeam.proto

@@ -1,8 +1,9 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 message AvatarTeam {
-  repeated uint64 avatar_guid_list = 5;
+    string team_name = 5;
-  string team_name = 1;
+    repeated uint64 avatar_guid_list = 10;
 }

proto/AvatarTeamAllDataNotify.proto

@@ -1,11 +1,14 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 22603
 
 import "AvatarTeam.proto";
 
-// 4.7.0
 message AvatarTeamAllDataNotify {
-  map<uint32, AvatarTeam> avatar_team_map = 4;
+    repeated uint64 temp_avatar_guid_list = 3;
-  repeated uint32 backup_avatar_team_order_list = 8;
+    map<uint32, AvatarTeam> avatar_team_map = 7;
-  repeated uint64 temp_avatar_guid_list = 1;
+    uint32 cur_avatar_team_id = 10;
+    repeated uint32 backup_avatar_team_order_list = 13;
 }

proto/AvatarTeamUpdateNotify.proto

@@ -1,10 +1,12 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 28759
 
 import "AvatarTeam.proto";
 
-// 4.7.0
 message AvatarTeamUpdateNotify {
-  map<uint32, AvatarTeam> avatar_team_map = 6;
+    repeated uint64 temp_avatar_guid_list = 10;
-  repeated uint64 temp_avatar_guid_list = 5;
+    map<uint32, AvatarTeam> avatar_team_map = 12;
 }

proto/BlockInfo.proto

@@ -1,22 +1,8 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: EGHIPFGJCJG
+// Version: 5.0
+
 message BlockInfo {
     uint32 block_id = 1;
     uint32 data_version = 2;

proto/BlossomChestInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: OGDABNFHACL
+// Version: 5.0
+
 message BlossomChestInfo {
     uint32 resin = 1;
     repeated uint32 qualify_uid_list = 2;

proto/BossChestInfo.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "WeeklyBossResinDiscountInfo.proto";
-// Obf: CBKAOHFJIND
+
 message BossChestInfo {
     uint32 monster_config_id = 1;
     uint32 resin = 2;

proto/BreakoutAction.proto

@@ -1,17 +1,12 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
+import "BreakoutActionType.proto";
 import "BreakoutVector2.proto";
 
-// 4.7.0
 message BreakoutAction {
-	enum BreakoutActionType {
-		ACTION_TYPE_NONE = 0;
-		ACTION_TYPE_LAUNCH_BALL = 1;
-		ACTION_TYPE_DESTROY_BALL = 2;
-		ACTION_TYPE_FALLING_OBJECT = 3;
-		ACTION_TYPE_MISSILE = 4;
-	}
     BreakoutActionType action_type = 1;
     uint64 client_game_time = 2;
     uint64 server_game_time = 3;
@@ -29,5 +24,5 @@ message BreakoutAction {
     BreakoutVector2 extra_ball_dir = 15;
     uint32 extra_ball_index = 16;
     int32 offset = 17;
-	uint64 HCFFMHEFMLJ = 18;
+    uint64 CLKEPICNJJD = 18;
 }

proto/BreakoutActionType.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
+enum BreakoutActionType {
+    BREAKOUT_ACTION_TYPE_ACTION_TYPE_NONE = 0;
+    BREAKOUT_ACTION_TYPE_ACTION_TYPE_LAUNCH_BALL = 1;
+    BREAKOUT_ACTION_TYPE_ACTION_TYPE_DESTROY_BALL = 2;
+    BREAKOUT_ACTION_TYPE_ACTION_TYPE_FALLING_OBJECT = 3;
+    BREAKOUT_ACTION_TYPE_ACTION_TYPE_MISSILE = 4;
+}

proto/BreakoutBrickInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: DGMFFJIKOKD
+// Version: 5.0
+
 message BreakoutBrickInfo {
     uint32 hp = 1;
     uint32 element_type = 2;

proto/BreakoutElementReactionCounter.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: KGJJJGIPNLE
+// Version: 5.0
+
 message BreakoutElementReactionCounter {
     uint32 element_reaction = 1;
     uint32 count = 2;

proto/BreakoutPhysicalObject.proto

@@ -1,9 +1,12 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "BreakoutVector2.proto";
 import "BreakoutPhysicalObjectModifier.proto";
 import "BreakoutBrickInfo.proto";
-// Obf: NFMHCAILCIF
+
 message BreakoutPhysicalObject {
     uint32 id = 1;
     uint32 index = 2;

proto/BreakoutPhysicalObjectModifier.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: NFKLEIMGKJD
+// Version: 5.0
+
 message BreakoutPhysicalObjectModifier {
     uint32 type = 1;
     uint32 id = 2;

proto/BreakoutSnapShot.proto

@@ -1,11 +1,14 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "BreakoutPhysicalObject.proto";
 import "BreakoutAction.proto";
 import "BreakoutSpawnPoint.proto";
 import "BreakoutElementReactionCounter.proto";
 import "BreakoutSyncConnectUidInfo.proto";
-// Obf: OLKOKCBEABM
+
 message BreakoutSnapShot {
     uint64 client_game_time = 1;
     uint64 server_game_time = 2;

proto/BreakoutSpawnPoint.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "BreakoutPhysicalObject.proto";
-// Obf: COLAAGNOBFN
+
 message BreakoutSpawnPoint {
     uint32 id = 1;
     uint32 brick_suite_id = 2;

proto/BreakoutSyncConnectUidInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: BKGOLPBLKMN
+// Version: 5.0
+
 message BreakoutSyncConnectUidInfo {
     uint32 uid = 1;
     repeated uint32 skill_id_list = 2;

proto/BreakoutVector2.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: FIGLCLAIOJM
+// Version: 5.0
+
 message BreakoutVector2 {
     int32 x = 1;
     int32 y = 2;

proto/ChangeAvatarReq.proto

@@ -1,13 +1,15 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 3470
 
 import "Vector.proto";
 
-// 4.7.0
 message ChangeAvatarReq {
-	Vector move_pos = 15;
+    Vector move_pos = 4;
-	uint64 guid = 2;
+    uint32 skill_id = 8;
-	bool is_move = 1;
+    bool IMPLCNKLFED = 9;
-	/* protected @ 0x31 */// bool FDHGMIPOKFE = 65535;
+    bool is_move = 5;
-	uint32 skill_id = 9;
+    uint64 guid = 10;
 }

proto/ChangeAvatarRsp.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
-// CmdId: 21804
+// Version: 5.0
+// CmdID: 2046
+
 message ChangeAvatarRsp {
-	uint64 cur_guid = 8;
+    int32 retcode = 3;
-	/* protected @ 0x28 */// uint32 skill_id = 65535;
+    uint64 cur_guid = 6;
-	/* protected @ 0x2C */// int32 retcode = 65535;
+    uint32 skill_id = 8;
 }

proto/ClientGadgetInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: KCPDCBKPNNL
+// Version: 5.0
+
 message ClientGadgetInfo {
     uint32 camp_id = 1;
     uint32 camp_type = 2;

proto/CoinCollectOperatorInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: NFEECFHHDLJ
+// Version: 5.0
+
 message CoinCollectOperatorInfo {
     uint32 level_id = 1;
 }

proto/CountDownDelete.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
+message CountDownDelete {
+    map<uint32, uint32> delete_time_num_map = 1;
+    uint32 config_count_down_time = 2;
+}

proto/CurVehicleInfo.proto

@@ -1,14 +1,15 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "Vector.proto";
 
-// 4.7.0
 message CurVehicleInfo {
     uint32 entity_id = 1;
     uint32 pos = 2;
     uint32 gadget_id = 3;
-	//Vector AOHJKFLAICK = 4;
+    Vector BNDOCLLEBEA = 4;
-	//uint32 FDCGDBELDGL = 5;
+    uint32 GIICKAOFKDB = 5;
-	//Vector EOMOABFFPAL = 6;
+    Vector BELIOKMDLGB = 6;
 }

proto/CustomCommonNodeInfo.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 message CustomCommonNodeInfo {
     int32 parent_index = 1;
     uint32 config_id = 2;

proto/CustomGadgetTreeInfo.proto

@@ -1,8 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "CustomCommonNodeInfo.proto";
-// 4.7.0
+
-// Obf: ?
 message CustomGadgetTreeInfo {
     repeated CustomCommonNodeInfo node_list = 1;
 }

proto/DateTimeDelete.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
+message DateTimeDelete {
+    uint32 delete_time = 1;
+}

proto/DelayWeekCountDownDelete.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
+message DelayWeekCountDownDelete {
+    map<uint32, uint32> delete_time_num_map = 1;
+    uint32 config_delay_week = 2;
+    uint32 config_count_down_time = 3;
+}

proto/DeshretObeliskGadgetInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: HBNLGHJLHNL
+// Version: 5.0
+
 message DeshretObeliskGadgetInfo {
     repeated uint32 argument_list = 1;
 }

proto/DoSetPlayerBornDataNotify.proto

@@ -1,22 +1,8 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 5710
+// Version: 5.0
-// Obf: JJKIDLCAPLA
+// CmdID: 5351
+
 message DoSetPlayerBornDataNotify {
 }

proto/EchoShellInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: KCHCJMNANCP
+// Version: 5.0
+
 message EchoShellInfo {
     uint32 shell_id = 1;
 }

proto/EnterSceneDoneReq.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 4561
+
 message EnterSceneDoneReq {
-  uint32 enter_scene_token = 13;
+    uint32 enter_scene_token = 8;
 }

proto/EnterSceneDoneRsp.proto

@@ -1,8 +1,10 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 793
+
 message EnterSceneDoneRsp {
+    int32 retcode = 10;
     uint32 enter_scene_token = 11;
-  int32 retcode = 15;
 }

proto/EnterScenePeerNotify.proto

@@ -1,10 +1,12 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 9626
+
 message EnterScenePeerNotify {
     uint32 enter_scene_token = 1;
-  uint32 peer_id = 10;
+    uint32 dest_scene_id = 7;
-  uint32 host_peer_id = 6;
+    uint32 peer_id = 8;
-  uint32 dest_scene_id = 15;
+    uint32 host_peer_id = 11;
 }

proto/EnterSceneReadyReq.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 20524
+
 message EnterSceneReadyReq {
-  uint32 enter_scene_token = 8;
+    uint32 enter_scene_token = 7;
 }

proto/EnterSceneReadyRsp.proto

@@ -1,9 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 7914
 
-
-// 4.7.0
 message EnterSceneReadyRsp {
-  uint32 enter_scene_token = 3;
+    int32 retcode = 9;
-  int32 retcode = 2;
+    uint32 enter_scene_token = 11;
 }

proto/EnterType.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: NMCABLGJJEK
+// Version: 5.0
+
 enum EnterType {
     ENTER_TYPE_NONE = 0;
     ENTER_TYPE_SELF = 1;

proto/EntityAuthorityInfo.proto

@@ -1,12 +1,15 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "AbilitySyncStateInfo.proto";
 import "EntityRendererChangedInfo.proto";
 import "SceneEntityAiInfo.proto";
 import "Vector.proto";
 import "AnimatorParameterValueInfoPair.proto";
 import "EntityClientExtraInfo.proto";
-// Obf: DHLPFKPHPNF
+
 message EntityAuthorityInfo {
     AbilitySyncStateInfo ability_info = 1;
     EntityRendererChangedInfo renderer_changed_info = 2;

proto/EntityClientData.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: GCALEOBNFFH
+// Version: 5.0
+
 message EntityClientData {
     uint32 wind_change_scene_time = 1;
     float windmill_sync_angle = 2;

proto/EntityClientExtraInfo.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "Vector.proto";
-// Obf: LCJDLMMKJCK
+
 message EntityClientExtraInfo {
     Vector skill_anchor_position = 1;
 }

proto/EntityEnvironmentInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: FDGMLNKHDKB
+// Version: 5.0
+
 message EntityEnvironmentInfo {
     uint32 json_climate_type = 1;
     uint32 climate_area_id = 2;

proto/EntityRendererChangedInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: OGLDMEEKHOB
+// Version: 5.0
+
 message EntityRendererChangedInfo {
     map<string, uint32> changed_renderers = 1;
     uint32 visibility_count = 2;

proto/Equip.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "Reliquary.proto";
 import "Weapon.proto";
 
-// 4.6.0
 message Equip {
     bool is_locked = 3;
     oneof detail {

proto/FeatureBlockInfo.proto

@@ -1,22 +1,8 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: NGEGAFNJIFO
+// Version: 5.0
+
 message FeatureBlockInfo {
     uint32 feature_type = 1;
     uint32 end_time = 2;

proto/FetterData.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: JFCHMJKBMBL
+// Version: 5.0
+
 message FetterData {
     uint32 fetter_id = 1;
     uint32 fetter_state = 2;

proto/FightPropPair.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: DKENFABIHAJ
+// Version: 5.0
+
 message FightPropPair {
     uint32 prop_type = 1;
     float prop_value = 2;

proto/FishPoolInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: NPDMIJKKJPA
+// Version: 5.0
+
 message FishPoolInfo {
     uint32 pool_id = 1;
     repeated uint32 fish_area_list = 2;

proto/FishtankFishInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: JEMIPJIOKME
+// Version: 5.0
+
 message FishtankFishInfo {
     float fish_distance_from_water = 1;
     float fish_scale = 2;

proto/ForceUpdateInfo.proto

@@ -1,22 +1,8 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: EBNFKOBKCHA
+// Version: 5.0
+
 message ForceUpdateInfo {
     string force_update_url = 1;
 }

proto/FoundationInfo.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "FoundationStatus.proto";
-// Obf: HJBPIEDJHAP
+
 message FoundationInfo {
     FoundationStatus status = 1;
     repeated uint32 uid_list = 2;

proto/FoundationStatus.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: HGKOLBGFAEC
+// Version: 5.0
+
 enum FoundationStatus {
     FOUNDATION_STATUS_NONE = 0;
     FOUNDATION_STATUS_INIT = 1;

proto/Furniture.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 message Furniture {
     uint32 count = 1;
 }

proto/GadgetBornType.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: GPODMAALLGC
+// Version: 5.0
+
 enum GadgetBornType {
     GADGET_BORN_TYPE_NONE = 0;
     GADGET_BORN_TYPE_IN_AIR = 1;

proto/GadgetCrucibleInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: LMEGMGDKNJL
+// Version: 5.0
+
 message GadgetCrucibleInfo {
     uint32 mp_play_id = 1;
     uint32 prepare_end_time = 2;

proto/GadgetGeneralRewardInfo.proto

@@ -1,7 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "ItemParam.proto";
-// Obf: AHGOAHBMENB
+
 message GadgetGeneralRewardInfo {
     uint32 resin = 1;
     uint32 dead_time = 2;

proto/GadgetPlayInfo.proto

@@ -1,9 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "GadgetCrucibleInfo.proto";
 
-// 4.7.0
 message GadgetPlayInfo {
     uint32 play_type = 1;
     uint32 duration = 2;
@@ -11,7 +12,6 @@ message GadgetPlayInfo {
     uint32 start_cd = 4;
     uint32 start_time = 5;
     uint32 progress = 6;
-    //optional GadgetCrucibleInfo crucible_info = 21;
     oneof play_info {
         GadgetCrucibleInfo crucible_info = 21;
     }

proto/GatherGadgetInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: IHPBLNPFECK
+// Version: 5.0
+
 message GatherGadgetInfo {
     uint32 item_id = 1;
     bool is_forbid_guest = 2;

proto/GetPlayerTokenReq.proto

@@ -1,23 +1,33 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 6013
+
 message GetPlayerTokenReq {
-  string client_rand_key = 204;
+    string HCJGLLHFCMA = 1304;
-  string account_uid = 10;
+    string KAMJIJOLFKJ = 13;
-  uint32 key_id = 220;
+    string BPFIMEKJANE = 9;
-  string account_token = 15;
+    string country_code = 1;
-  uint32 platform_type = 11;
+    string account_token = 4;
-  uint32 OGNFFAEKDBO = 1595;
+    string MMDPDOOCOCO = 10;
-  uint32 account_type = 41;
+    string JLCDDOJGKKG = 1528;
-  uint32 channel_id = 1311;
+    string account_uid = 3;
-  string psn_id = 12;
+    string client_rand_key = 94;
-  string online_id = 1;
+    string BDGFMEIEHOD = 5;
-  string client_ip_str = 14;
+    string CEMENPADOPP = 7;
-  uint32 sub_channel_id = 7;
+    string JCIMGDHMMLN = 594;
-  uint32 cloudClientIp = 177;
+    string ADFHNBPGAGM = 1804;
-  string birthday = 828;
+    uint32 platform_type = 2;
-  uint32 uid = 131;
+    uint32 IKKKLHICPMF = 12;
-  string country_code = 151;
+    uint32 account_type = 8;
-  bool is_guest = 6;
+    uint32 OCINFHOJCEA = 15;
+    uint32 CIJPMGMCJBA = 1776;
+    uint32 uid = 6;
+    uint32 MPGMOFLCEOF = 1730;
+    bool is_guest = 14;
+    uint32 KODKEFGJHAP = 168;
+    uint32 key_id = 1485;
+    uint32 KEKHAKAPMIN = 11;
+    uint32 JDHCKKAGBNL = 1686;
 }

proto/GetPlayerTokenRsp.proto

@@ -1,40 +1,48 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 24174
 
 import "StopServerInfo.proto";
 
-// 4.7.0
 message GetPlayerTokenRsp {
-  uint32 uid = 4;
+    int32 retcode = 1;
-  string account_uid = 9;
+    uint64 secret_key_seed = 2;
-  string server_rand_key = 910;
+    bool is_guest = 3;
-  string sign = 414;
+    bytes security_cmd_buffer = 4;
-  string country_code = 254;
-  bytes security_cmd_buffer = 3;
-  string client_ip_str = 1950;
-  string token = 2;
-  string psn_id = 1402;
-  uint32 platform_type = 14;
-  uint32 key_id = 720;
-  bool PELBMOHDKHJ = 1292;
-  bool ILGBPPMFHIF = 1962;
-  uint64 secret_key_seed = 13;
-  string client_version_random_key = 678;
-  StopServerInfo stop_server = 875;
-  uint32 channel_id = 259;
-  uint32 reg_platform = 1241;
-  uint32 tag = 1572;
-  string birthday = 1437;
-  int32 retcode = 11;
-  bool is_guest = 211;
-  repeated uint32 finish_collection_id_list = 451;
-  string msg = 12;
     bool is_proficient_player = 5;
-  uint32 account_type = 1585;
+    string account_uid = 6;
-  bytes extra_bin_data = 113;
+    uint32 black_uid_end_time = 7;
-  uint32 sub_channel_id = 141;
+    uint32 uid = 8;
-  string secret_key = 91;
+    bytes extra_bin_data = 9;
-  uint32 blackUidEndTime = 15;
+    uint32 gm_uid = 10;
-  uint32 KCFIGJAPNIB = 6;
+    string secret_key = 11;
-  uint32 cloudClientIp = 508;
+    uint32 account_type = 12;
+    uint32 platform_type = 13;
+    string msg = 14;
+    string token = 15;
+    string server_rand_key = 68;
+    bool AKODFAIGJCE = 206;
+    uint32 MPGMOFLCEOF = 267;
+    uint32 OCINFHOJCEA = 290;
+    uint32 key_id = 398;
+    bool GCDGEKAONGD = 440;
+    string KNCFLPGOMNI = 496;
+    string OLODGDMMPNF = 528;
+    StopServerInfo stop_server = 563;
+    bool HNBGEKMPFIB = 575;
+    uint32 JDHCKKAGBNL = 576;
+    uint32 KEKHAKAPMIN = 630;
+    uint32 CIJPMGMCJBA = 847;
+    uint32 tag = 853;
+    uint32 PLNNJPFPPAM = 1118;
+    string country_code = 1269;
+    string game_biz = 1670;
+    repeated uint32 finish_collection_id_list = 1684;
+    string JCIMGDHMMLN = 1735;
+    string CEMENPADOPP = 1871;
+    string sign = 1885;
+    string MMDPDOOCOCO = 1954;
+    string JLCDDOJGKKG = 2042;
 }

proto/HostPlayerNotify.proto

@@ -1,8 +1,10 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 2109
+
 message HostPlayerNotify {
-  uint32 host_uid = 3;
+    uint32 host_uid = 1;
-  uint32 host_peer_id = 10;
+    uint32 host_peer_id = 9;
 }

proto/Item.proto

@@ -1,11 +1,12 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "Material.proto";
 import "Equip.proto";
 import "Furniture.proto";
 
-// 4.6.0
 message Item {
     uint32 item_id = 1;
     uint64 guid = 2;

proto/ItemParam.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: GKCILFACLDH
+// Version: 5.0
+
 message ItemParam {
     uint32 item_id = 1;
     uint32 count = 2;

proto/MPLevelEntityInfo.proto

@@ -1,11 +1,12 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "AbilitySyncStateInfo.proto";
 
-// 4.7.0
 message MPLevelEntityInfo {
-  AbilitySyncStateInfo ability_info = 6;
+    AbilitySyncStateInfo ability_info = 8;
-  uint32 authority_peer_id = 9;
+    uint32 entity_id = 10;
-  uint32 entity_id = 13;
+    uint32 authority_peer_id = 15;
 }

proto/MapLayerInfo.proto

@@ -1,9 +1,10 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 message MapLayerInfo {
-  repeated uint32 unlocked_map_layer_id_list = 13;
+    repeated uint32 unlocked_map_layer_id_list = 2;
-  repeated uint32 unlocked_map_layer_floor_id_list = 4;
+    repeated uint32 unlocked_map_layer_floor_id_list = 3;
-  repeated uint32 unlocked_map_layer_group_id_list = 3;
+    repeated uint32 unlocked_map_layer_group_id_list = 12;
 }

proto/MassivePropParam.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 message MassivePropParam {
     int32 type = 1;
     repeated uint32 reaction_info_list = 2;

proto/MassivePropSyncInfo.proto

@@ -1,9 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "MassivePropParam.proto";
 
-// 4.6.0
 message MassivePropSyncInfo {
     int64 id = 1;
     repeated MassivePropParam prop_list = 2;

proto/Material.proto

@@ -1,9 +1,10 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "MaterialDeleteInfo.proto";
 
-// 4.6.0
 message Material {
     uint32 count = 1;
     MaterialDeleteInfo delete_info = 2;

proto/MaterialDeleteInfo.proto

@@ -1,24 +1,14 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
+import "CountDownDelete.proto";
+import "DateTimeDelete.proto";
+import "DelayWeekCountDownDelete.proto";
 
-// 4.6.0
 message MaterialDeleteInfo {
-	message CountDownDelete {
+    bool delete_time_num_map = 1;
-		map<uint32, uint32> delete_time_num_map = 1;
-		uint32 config_count_down_time = 2;
-	}
-
-	message DateTimeDelete {
-		uint32 delete_time = 1;
-	}
-
-	message DelayWeekCountDownDelete {
-		map<uint32, uint32> delete_time_num_map = 1;
-		uint32 config_delay_week = 2;
-		uint32 config_count_down_time = 3;
-	}
-
-	bool has_delete_config = 1;
     oneof delete_info {
         CountDownDelete count_down_delete = 2;
         DateTimeDelete date_delete = 3;

proto/MathQuaternion.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: IPIFDKJKEEJ
+// Version: 5.0
+
 message MathQuaternion {
     float x = 1;
     float y = 2;

proto/ModifierDurability.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.6.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 message ModifierDurability {
     float reduce_ratio = 1;
     float remaining_durability = 2;

proto/MonsterBornType.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: LNFJOAGMCEF
+// Version: 5.0
+
 enum MonsterBornType {
     MONSTER_BORN_TYPE_NONE = 0;
     MONSTER_BORN_TYPE_DEFAULT = 1;

proto/MonsterRoute.proto

@@ -1,14 +1,15 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
 
 import "RoutePoint.proto";
 
-// 4.7.0
 message MonsterRoute {
     repeated RoutePoint route_points = 1;
     uint32 speed_level = 2;
     uint32 route_type = 3;
     float arrive_range = 4;
-	bool GGOMEGCENEL = 5;
+    bool OFDFDKHNJGA = 5;
-	bool DCCIPKJBIEI = 6;
+    bool GPLDNOGEBDI = 6;
 }

proto/MotionInfo.proto

@@ -1,8 +1,11 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+
 import "Vector.proto";
 import "MotionState.proto";
-// Obf: LJEPKMPIOKJ
+
 message MotionInfo {
     Vector pos = 1;
     Vector rot = 2;
@@ -13,4 +16,6 @@ message MotionInfo {
     uint32 ref_id = 7;
     uint32 scene_time = 8;
     uint64 interval_velocity = 9;
+    uint32 BIMCAJGDDOI = 10;
+    uint32 HJCDICMBDKE = 11;
 }

proto/MotionState.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: KGHLDGDMFOB
+// Version: 5.0
+
 enum MotionState {
     MOTION_STATE_NONE = 0;
     MOTION_STATE_RESET = 1;
@@ -69,5 +71,46 @@ enum MotionState {
     MOTION_STATE_DIVE_SWIM_MOVE = 64;
     MOTION_STATE_DIVE_SWIM_IDLE = 65;
     MOTION_STATE_DIVE_SWIM_DASH = 66;
-	MOTION_STATE_NUM = 67;
+    MOTION_STATE_ARC_LIGHT = 67;
+    MOTION_STATE_ARC_LIGHT_SAFE = 68;
+    MOTION_STATE_VEHICLE_STANDBY = 69;
+    MOTION_STATE_VEHICLE_RUN = 70;
+    MOTION_STATE_VEHICLE_DASH = 71;
+    MOTION_STATE_VEHICLE_CLIMB = 72;
+    MOTION_STATE_VEHICLE_CLIMB_JUMP = 73;
+    MOTION_STATE_VEHICLE_STANDBY_TO_CLIMB = 74;
+    MOTION_STATE_VEHICLE_FIGHT = 75;
+    MOTION_STATE_VEHICLE_JUMP = 76;
+    MOTION_STATE_VEHICLE_DROP = 77;
+    MOTION_STATE_VEHICLE_FLY = 78;
+    MOTION_STATE_VEHICLE_SWIM_MOVE = 79;
+    MOTION_STATE_VEHICLE_SWIM_IDLE = 80;
+    MOTION_STATE_VEHICLE_SWIM_DASH = 81;
+    MOTION_STATE_VEHICLE_SLIP = 82;
+    MOTION_STATE_VEHICLE_GO_UPSTAIRS = 83;
+    MOTION_STATE_VEHICLE_FALL_ON_GROUND = 84;
+    MOTION_STATE_VEHICLE_JUMP_OFF_WALL = 85;
+    MOTION_STATE_VEHICLE_POWERED_FLY = 86;
+    MOTION_STATE_VEHICLE_DANGER_STANDBY = 87;
+    MOTION_STATE_VEHICLE_DANGER_RUN = 88;
+    MOTION_STATE_VEHICLE_DANGER_DASH = 89;
+    MOTION_STATE_VEHICLE_NOTIFY = 90;
+    MOTION_STATE_VEHICLE_LAND_SPEED = 91;
+    MOTION_STATE_VEHICLE_DASH_BEFORE_SHAKE = 92;
+    MOTION_STATE_VEHICLE_QUEST_FORCE_DRAG = 93;
+    MOTION_STATE_VEHICLE_FOLLOW_ROUTE = 94;
+    MOTION_STATE_VEHICLE_FLY_IDLE = 95;
+    MOTION_STATE_VEHICLE_FLY_SLOW = 96;
+    MOTION_STATE_VEHICLE_FLY_FAST = 97;
+    MOTION_STATE_VEHICLE_AIR_COMPENSATION = 98;
+    MOTION_STATE_VEHICLE_ARC_LIGHT = 99;
+    MOTION_STATE_VEHICLE_ARC_LIGHT_SAFE = 100;
+    MOTION_STATE_VEHICLE_DANGER_SWIM_MOVE = 101;
+    MOTION_STATE_VEHICLE_DANGER_SWIM_IDLE = 102;
+    MOTION_STATE_VEHICLE_DANGER_SWIM_DASH = 103;
+    MOTION_STATE_FOLLOW_CURVE_ROUTE = 104;
+    MOTION_STATE_VEHICLE_FOLLOW_CURVE_ROUTE = 105;
+    MOTION_STATE_NATSAURUS_NORMAL = 106;
+    MOTION_STATE_NATSAURUS_ENTERING = 107;
+    MOTION_STATE_NUM = 108;
 }

proto/MovingPlatformType.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: FMMMMIIKELD
+// Version: 5.0
+
 enum MovingPlatformType {
     MOVING_PLATFORM_TYPE_NONE = 0;
     MOVING_PLATFORM_TYPE_USE_CONFIG = 1;

proto/MpPlayRewardInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: BGGFBNKFLHN
+// Version: 5.0
+
 message MpPlayRewardInfo {
     uint32 resin = 1;
     repeated uint32 remain_uid_list = 2;

proto/NightCrowGadgetInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: OHIBCIDJNDB
+// Version: 5.0
+
 message NightCrowGadgetInfo {
     repeated uint32 argument_list = 1;
 }

proto/OfferingInfo.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// Obf: CDAACMGIFGG
+// Version: 5.0
+
 message OfferingInfo {
     uint32 offering_id = 1;
 }

proto/OpenStateChangeNotify.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 26658
+
 message OpenStateChangeNotify {
-  map<uint32, uint32> open_state_map = 11;
+    map<uint32, uint32> open_state_map = 7;
 }

proto/OpenStateUpdateNotify.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
-option java_package = "emu.grasscutter.net.proto";
 
-// 4.7.0
+option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 29093
+
 message OpenStateUpdateNotify {
-  map<uint32, uint32> open_state_map = 4;
+    map<uint32, uint32> open_state_map = 11;
 }

proto/PingReq.proto

@@ -1,12 +1,16 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+// Version: 5.0
+// CmdID: 5983
 
-
-// 4.7.0
 message PingReq {
-  bytes sc_data = 1;
+    bytes PDHFGJIBCLA = 13;
-  float ue_time = 3;
+    bytes IINPBFLAEEP = 2;
-  double total_tick_time = 11;
+    uint64 NHLLKPHMFGP = 3;
-  uint32 client_time = 9;
+    double total_tick_time = 7;
-  uint32 seq = 14;
+    uint32 client_time = 4;
+    float ue_time = 8;
+    uint32 DFALBBBCFMO = 10;
+    uint32 seq = 15;
 }