teapot tes 1

proto/HomeAnimalData.proto

@@ -1,11 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
-
+// 4.7.0
-//obf: NJOKBNDHOJL
+//obf: KGGLMIJGNOH
 message HomeAnimalData {
-	Vector spawnRot = 10;
+	Vector spawn_rot = 3;
-	uint32 furniture_id = 14;
+	uint32 furniture_id = 13;
-	Vector spawn_pos = 15;
+	Vector spawn_pos = 8;
 }

proto/HomeBasicInfo.proto

@@ -1,16 +1,16 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "HomeLimitedShopInfo.proto";
-
+// 4.7.0
+// ?
 message HomeBasicInfo {
-	uint32 cur_room_scene_id = 2;
+	uint32 cur_room_scene_id = 12;
-	uint32 level = 3;
+	uint32 level = 2;
-	HomeLimitedShopInfo limited_shop_info = 4;
+	HomeLimitedShopInfo limited_shop_info = 10;
-	uint32 cur_module_id = 5;
+	uint32 cur_module_id = 4;
-	bool is_in_edit_mode = 9;
+	bool is_in_edit_mode = 5;
-	uint64 exp = 10;
+	uint64 exp = 11;
-	uint32 KFBPCHPPMEM = 11;
+	uint32 uk1 = 3;
-	uint32 home_owner_uid = 12;
+	uint32 home_owner_uid = 14;
-	string owner_nick_name = 13;
+	string owner_nick_name = 15;
 }

proto/HomeBasicInfoNotify.proto

@@ -1,9 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "HomeBasicInfo.proto";
-
+// 4.7.0
-// CmdId: 25591
+// CmdId: 2810
 message HomeBasicInfoNotify {
-	HomeBasicInfo basic_info = 8;
+	HomeBasicInfo basic_info = 3;
 }

proto/HomeBlockArrangementInfo.proto

@@ -10,19 +10,20 @@ import "HomeBlockFieldData.proto";
 import "HomeBlockDotPattern.proto";
 import "HomeFurnitureSuiteData.proto";
 import "WeekendDjinnInfo.proto";
-
+// 4.7.0 
+// PHDDAJFBBNH
 message HomeBlockArrangementInfo {
-	repeated HomeFurnitureGroupData furniture_group_list = 1;
+	repeated HomeFurnitureGroupData furniture_group_list = 9;
-	bool is_unlocked = 2;
+	bool is_unlocked = 7;
-	uint32 block_id = 4;
+	uint32 block_id = 4; // ok
-	repeated HomeFurnitureData deployFurniureList = 5;
+	repeated HomeFurnitureData deployFurniureList = 8;
-	repeated HomeAnimalData deploy_animal_list = 6;
+	repeated HomeAnimalData deploy_animal_list = 14;
-	repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 7;
+	repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 12;
-	repeated HomeNpcData deploy_npc_list = 8;
+	repeated HomeNpcData deploy_npc_list = 1;
-	uint32 comfort_value = 9;
+	uint32 comfort_value = 15;
-	repeated HomeBlockFieldData field_list = 10;
+	repeated HomeBlockFieldData field_list = 10; // ok
-	repeated HomeBlockDotPattern dot_pattern_list = 11;
+	repeated HomeBlockDotPattern dot_pattern_list = 5;
-	repeated HomeFurnitureData persistentFurnitureList = 13;
+	repeated HomeFurnitureData persistentFurnitureList = 13; //?
-	repeated HomeFurnitureSuiteData furniture_suite_list = 14;
+	repeated HomeFurnitureSuiteData furniture_suite_list = 11;
-	repeated WeekendDjinnInfo weekend_djinn_info_list = 15;
+	repeated WeekendDjinnInfo weekend_djinn_info_list = 2;
 }

proto/HomeBlockDotPattern.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-//obf: IEKCEGFNINF
+//obf: MGDMEIFPLON
 message HomeBlockDotPattern {
-	bytes data = 5;
+	bytes data = 12;
-	uint32 height = 9;
+	uint32 height = 7;
-	uint32 width = 11;
+	uint32 width = 5;
 }

proto/HomeBlockFieldData.proto

@@ -1,14 +1,13 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
 import "HomeBlockSubFieldData.proto";
-
+// 4.7.0
-//obf: ECDJBCPLCNO
+//obf: CGGMBENMCFB
 message HomeBlockFieldData {
-	uint32 guid = 4;
+	uint32 guid = 2;
-	repeated HomeBlockSubFieldData sub_field_list = 7;
+	repeated HomeBlockSubFieldData sub_field_list = 13;
-	uint32 furniture_id = 9;
+	uint32 furniture_id = 14;
-	Vector rot = 11;
+	Vector rot = 5;
-	Vector pos = 14;
+	Vector pos = 10;
 }

proto/HomeBlockSubFieldData.proto

@@ -1,10 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
-
+// 4.7.0
-//obf: DLGDKPKEOEG
+//obf: ?
 message HomeBlockSubFieldData {
 	Vector pos = 8;
-	Vector rot = 13;
+	Vector rot = 4;
 }

proto/HomeChangeEditModeReq.proto

@@ -1,23 +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: 8351
+// 4.7.0
-// Obf: ALGDHNPEBCO
+// CmdId: 23294
+// Obf: KNLANFFCNBA
 message HomeChangeEditModeReq {
-	bool is_enter_edit_mode = 2;
+	bool is_enter_edit_mode = 14;
 }

proto/HomeChangeEditModeRsp.proto

@@ -1,24 +1,9 @@
-// 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: 7491
+// 4.7.0
-// Obf: CICADGGFJOK
+// CmdId: 25696
+// Obf: NEAPAGMKHLL
 message HomeChangeEditModeRsp {
-	int32 retcode = 2;
+	int32 retcode = 10;
-	bool is_enter_edit_mode = 6;
+	bool is_enter_edit_mode = 8;
 }

proto/HomeChooseModuleReq.proto

@@ -1,6 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
+// CmdId: 3660
+// BKGMDIIPJNJ
 message HomeChooseModuleReq {
-	uint32 module_id = 9;
+	uint32 module_id = 7;
 }

proto/HomeChooseModuleRsp.proto

@@ -1,7 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
+// CmdId: 9238
+// EFJBIGCODCE
 message HomeChooseModuleRsp {
-	uint32 module_id = 6;
+	uint32 module_id = 14;
 	int32 retcode = 11;
 }

proto/HomeComfortInfoNotify.proto

@@ -1,8 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "HomeModuleComfortInfo.proto";
-
+// 4.7.0
+// cmdid: 7484
+// PHHFIFBIIHD
 message HomeComfortInfoNotify {
 	repeated HomeModuleComfortInfo module_info_list = 11;
 }

proto/HomeCustomFurnitureInfo.proto

@@ -1,24 +1,9 @@
-// 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";
 import "CustomCommonNodeInfo.proto";
-// Obf: CIJAJILMPEJ
+// 4.7.0
+// Obf: GKODCFFLIMO
 message HomeCustomFurnitureInfo {
-	uint32 guid = 9;
+	uint32 guid = 2;
-	repeated CustomCommonNodeInfo sub_furniture_list = 10;
+	repeated CustomCommonNodeInfo sub_furniture_list = 11;
 }

proto/HomeCustomFurnitureInfoNotify.proto

@@ -1,26 +1,10 @@
-// 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";
 import "HomeCustomFurnitureInfo.proto";
-// CmdId: 7355
+// CmdId: 24236
-// Obf: CJIKNHKLFEB
+// Obf: JMIFCBAMCAI
 message HomeCustomFurnitureInfoNotify {
-	repeated uint32 delete_custom_furniture_list = 8;
+	repeated uint32 delete_custom_furniture_list = 10; // ?
-	repeated HomeCustomFurnitureInfo custom_furniture_info_list = 12;
+	repeated HomeCustomFurnitureInfo custom_furniture_info_list = 9;
-	map<uint32, uint32> used_sub_furniture_count_map = 10;
+	map<uint32, uint32> used_sub_furniture_count_map = 8;
 }

proto/HomeEditCustomFurnitureReq.proto

@@ -1,24 +1,9 @@
-// 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";
 import "HomeCustomFurnitureInfo.proto";
-// CmdId: 27340
+// 4.7.0
-// Obf: NJACGFFNJGN
+// CmdId: 228
+// Obf: LCMFFKHCCDP
 message HomeEditCustomFurnitureReq {
-	HomeCustomFurnitureInfo custom_furniture_info = 14;
+	HomeCustomFurnitureInfo custom_furniture_info = 15;
 }

proto/HomeEditCustomFurnitureRsp.proto

@@ -1,25 +1,9 @@
-// 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";
 import "HomeCustomFurnitureInfo.proto";
-// CmdId: 23160
+// CmdId: 5009
-// Obf: OBEPJPMGCAE
+// Obf: IJDMHKEGHIE
 message HomeEditCustomFurnitureRsp {
-	HomeCustomFurnitureInfo custom_furniture_info = 7;
+	HomeCustomFurnitureInfo custom_furniture_info = 3;
-	int32 retcode = 6;
+	int32 retcode = 11;
 }

proto/HomeFurnitureCustomSuiteData.proto

@@ -1,11 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
-
+// 4.7.0
-//obf: ECIIKJIKNFC
+//obf: JOOLHBAEOAL?
 message HomeFurnitureCustomSuiteData {
-	uint32 guid = 9;
+	uint32 guid = 7;
-	repeated int32 included_furniture_index_list = 10;
+	repeated int32 included_furniture_index_list = 8;
-	Vector spawn_pos = 11;
+	Vector spawn_pos = 1;
 }

proto/HomeFurnitureData.proto

@@ -5,10 +5,10 @@ import "Vector.proto";
 
 //obf: DJKBKLKPFML
 message HomeFurnitureData {
-	uint32 version = 3;
+	uint32 version = 9;
-	int32 parent_furniture_index = 4;
+	int32 parent_furniture_index = 12;
-	Vector spawn_pos = 5;
+	Vector spawn_pos = 2; // 5
-	Vector spawnRot = 12;
+	Vector spawn_rot = 11; // 2
-	uint32 furniture_id = 14;
+	uint32 furniture_id = 10;
-	uint32 guid = 15;
+	uint32 guid = 5;
 }

proto/HomeFurnitureGroupData.proto

@@ -1,10 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "HomeFurnitureData.proto";
-
+// 4.7.0
-//obf: NFNCNNJLKJH
+//obf: EMFNHCMLIGF
 message HomeFurnitureGroupData {
-	repeated HomeFurnitureData virtual_furniure_list = 5;
+	repeated HomeFurnitureData virtual_furniure_list = 9;
-	uint32 group_furniture_index = 8;
+	uint32 group_furniture_index = 11;
 }

proto/HomeFurnitureSuiteData.proto

@@ -1,13 +1,12 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
-
+// 4.7.0
-//obf: JGGCDILKLJF
+//obf: GJMLNOHGMDG
 message HomeFurnitureSuiteData {
 	repeated int32 included_furniture_index_list = 1;
-	uint32 guid = 5;
+	uint32 guid = 2;
-	uint32 suite_id = 6;
+	uint32 suite_id = 7;
-	bool is_allow_summon = 8;
+	bool is_allow_summon = 13;
-	Vector spawn_pos = 11;
+	Vector spawn_pos = 12;
 }

proto/HomeGetArrangementInfoRsp.proto

@@ -1,25 +1,10 @@
-// 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";
 import "HomeSceneArrangementInfo.proto";
-// CmdId: 24303
+// 4.7.0
-// Obf: BHJNKKACMMH
+// CmdId: 5806
+// Obf: DNMDGOBMGGN
 message HomeGetArrangementInfoRsp {
 	repeated HomeSceneArrangementInfo scene_arrangement_info_list = 4;
-	int32 retcode = 12;
+	int32 retcode = 7;
 }

proto/HomeGetOnlineStatusRsp.proto

@@ -1,25 +1,10 @@
-// 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";
 import "OnlinePlayerInfo.proto";
-// CmdId: 8222
+// 4.7.0
-// Obf: AAFHDCLFODB
+// CmdId: 23465
+// Obf: ?
 message HomeGetOnlineStatusRsp {
 	int32 retcode = 10;
-	repeated OnlinePlayerInfo player_info_list = 6;
+	repeated OnlinePlayerInfo player_info_list = 9;
 }

proto/HomeGroupPlayerInfo.proto

@@ -1,28 +1,13 @@
-// 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";
 import "ProfilePicture.proto";
-// Obf: LJFHBAPBCDA
+// 4.7.0
+// Obf: PCAPDLBGOMG?PBFPMADNALI
 message HomeGroupPlayerInfo {
-	string nickname = 9;
+	string nickname = 14;
-	uint32 player_level = 14;
+	uint32 player_level = 5; // sus
-	ProfilePicture profile_picture = 13;
+	ProfilePicture profile_picture = 1;
-	uint32 uid = 15;
+	uint32 uid = 15; // ok
-	string psn_id = 5;
+	string psn_id = 11;
-	string online_id = 4;
+	string online_id = 7;
 }

proto/HomeLimitedShopInfo.proto

@@ -1,13 +1,12 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
-
+// 4.7.0
 message HomeLimitedShopInfo {
-	fixed32 end_time = 3;
+	fixed32 end_time = 3; // sus
-	Vector djinn_rot = 7;
+	Vector djinn_rot = 10; // ?
-	fixed32 start_time = 8;
+	fixed32 start_time = 6; // sus
-	fixed32 CPOCMEGMECF = 11;
+	fixed32 CPOCMEGMECF = 13; // sus
-	uint32 uid = 12;
+	uint32 uid = 5;
-	Vector djinn_pos = 13;
+	Vector djinn_pos = 14;
 }

proto/HomeMarkPointFurnitureData.proto

@@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
 import "HomeMarkPointNPCData.proto";
 import "HomeMarkPointSuiteData.proto";
-
+// 4.7.0
 message HomeMarkPointFurnitureData {
 	uint32 guid = 1;
 	uint32 furniture_id = 2;

proto/HomeMarkPointNPCData.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
 message HomeMarkPointNPCData {
 	uint32 avatar_id = 1;
 	uint32 costume_id = 2;

proto/HomeMarkPointNotify.proto

@@ -1,9 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "HomeMarkPointSceneData.proto";
-
+// 4.7.0
-// CmdId: 7160
+// CmdId: 7657
 message HomeMarkPointNotify {
-	repeated HomeMarkPointSceneData mark_point_data_list = 6;
+	repeated HomeMarkPointSceneData mark_point_data_list = 6; // ok
 }

proto/HomeMarkPointSceneData.proto

@@ -1,13 +1,13 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
 import "HomeMarkPointFurnitureData.proto";
-
+// 4.7.0
+// ?
 message HomeMarkPointSceneData {
-	Vector teapot_spirit_pos = 1;
+	Vector teapot_spirit_pos = 2;
-	Vector safe_point_pos = 2;
+	Vector safe_point_pos = 3;
-	uint32 module_id = 4;
+	uint32 module_id = 10;
-	uint32 scene_id = 12;
+	uint32 scene_id = 9;
-	repeated HomeMarkPointFurnitureData furniture_list = 14;
+	repeated HomeMarkPointFurnitureData furniture_list = 7;
 }

proto/HomeMarkPointSuiteData.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
 message HomeMarkPointSuiteData {
 	uint32 suite_id = 1;
 }

proto/HomeModuleComfortInfo.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// OHNKBFAMOHA
 message HomeModuleComfortInfo {
-	repeated uint32 world_scene_block_comfort_value_list = 6;
+	repeated uint32 world_scene_block_comfort_value_list = 4;
-	uint32 room_scene_comfort_value = 7;
+	uint32 room_scene_comfort_value = 12;
-	uint32 module_id = 8;
+	uint32 module_id = 11;
 }

proto/HomeNpcData.proto

@@ -1,12 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "Vector.proto";
-
+// 4.7.0
-//obf: EGLCPDHFGPB
+//obf: GBLBKCIOCLM?
 message HomeNpcData {
-	Vector spawnRot = 2;
+	Vector spawn_rot = 11;
-	uint32 costume_id = 5;
+	uint32 costume_id = 10;
-	Vector spawn_pos = 7;
+	Vector spawn_pos = 12;
-	uint32 avatar_id = 8;
+	uint32 avatar_id = 6;
 }

proto/HomePreChangeEditModeNotify.proto

@@ -1,23 +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: 27578
+// 4.7.0
-// Obf: AMAHNNLDPHO
+// CmdId: 25837
+// Obf: FAGGAOOAPGI
 message HomePreChangeEditModeNotify {
-	bool is_enter_edit_mode = 14;
+	bool is_enter_edit_mode = 2;
 }

proto/HomeResource.proto

@@ -1,8 +1,9 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
+// ?
 message HomeResource {
-	uint32 store_limit = 5;
+	uint32 store_limit = 1;
-	uint32 store_value = 9;
+	uint32 store_value = 5;
-	fixed32 next_refresh_time = 13;
+	fixed32 next_refresh_time = 14;
 }

proto/HomeResourceNotify.proto

@@ -1,10 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "HomeResource.proto";
-
+// 4.7.0
-// CmdId: 21381
+// CmdId: 28318
+// ?
 message HomeResourceNotify {
-	HomeResource home_coin = 7;
+	HomeResource home_coin = 11;
-	HomeResource fetter_exp = 10;
+	HomeResource fetter_exp = 2;
 }

proto/HomeResourceTakeFetterExpRsp.proto

@@ -1,25 +1,10 @@
-// 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";
 import "HomeResource.proto";
-// CmdId: 9922
+// 4.7.0
-// Obf: PPNDGEBJBKK
+// CmdId: 22038
+// Obf: OIFJMMECAJA
 message HomeResourceTakeFetterExpRsp {
-	int32 retcode = 10;
+	int32 retcode = 14;
-	HomeResource fetter_exp = 9;
+	HomeResource fetter_exp = 8;
 }

proto/HomeResourceTakeHomeCoinRsp.proto

@@ -1,12 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
 import "HomeResource.proto";
-
+// 4.7.0
-// 4.6.0
+// Obf: KBOCPFBFCHI
-// Obf: EMIEOHBGPEH
+// CmdId: 21855
-// CmdId: 841
 message HomeResourceTakeHomeCoinRsp {
-    int32 retcode = 2;
+    int32 retcode = 1;
-    HomeResource home_coin = 4;
+    HomeResource home_coin = 5;
 }

proto/HomeSaveArrangementNoChangeReq.proto

@@ -1,23 +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: 2521
+// 4.7.0
-// Obf: GPHNPONJLKO
+// CmdId: 23493
+// Obf: KOOFBAPIMEJ
 message HomeSaveArrangementNoChangeReq {
-	uint32 scene_id = 1;
+	uint32 scene_id = 4;
 }

proto/HomeSaveArrangementNoChangeRsp.proto

@@ -1,11 +1,9 @@
 syntax = "proto3";
-
 option java_package = "emu.grasscutter.net.proto";
-
+// CmdId: 6397,
-// CmdId: 24300
+// Version: 4.7.0
-// Version: 4.6.0
+// Obfs: ?
-// Obfs: OIODNALPKFD
 message HomeSaveArrangementNoChangeRsp {
-	uint32 scene_id = 6;
+	uint32 scene_id = 11;
-	int32 retcode = 10;
+	int32 retcode = 12;
 }

proto/HomeSceneArrangementInfo.proto

@@ -1,36 +1,21 @@
-// 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";
 import "HomeBlockArrangementInfo.proto";
 import "HomeFurnitureData.proto";
 import "Vector.proto";
-// Obf: LEMEOONDDGM
+// 4.7.0
+// Obf: KDCBFHPPKGF
 message HomeSceneArrangementInfo {
-	repeated HomeBlockArrangementInfo block_arrangement_info_list = 2;
+	repeated HomeBlockArrangementInfo block_arrangement_info_list = 8;
-	repeated HomeFurnitureData HDOFAHGPJGK = 7;
+	repeated HomeFurnitureData uk1 = 1;
-	repeated HomeFurnitureData MLECLIOFALA = 12;
+	repeated HomeFurnitureData uk2 = 6;
-	Vector born_rot = 9;
+	Vector born_rot = 1751; // or 5,4
-	uint32 scene_id = 8;
+	uint32 scene_id = 11;
-	uint32 bgm_id = 3;
+	uint32 bgm_id = 3; // 3
-	uint32 comfort_value = 5;
+	uint32 comfort_value = 2; // 2
-	HomeFurnitureData main_house = 6;
+	HomeFurnitureData main_house = 12;
-	uint32 tmp_version = 13;
+	uint32 tmp_version = 9;
-	bool is_set_born_pos = 1;
+	bool is_set_born_pos = 10; // or 14
-	Vector djinn_pos = 4;
+	Vector djinn_pos = 13; // 2
-	Vector born_pos = 10;
+	Vector born_pos = 15;
 }

proto/HomeSceneJumpReq.proto

@@ -1,9 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// 4.6.0
+// Obf: MLKLNEJBIBK
-// Obf: ACEKKHALOID
+// CmdId: 7730
-// CmdId: 24159
 message HomeSceneJumpReq {
-    bool is_enter_room_scene = 10;
+    bool is_enter_room_scene = 11;
 }

proto/HomeSeekFurniturePlayerScore.proto

@@ -1,24 +1,9 @@
-// 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";
 import "HomeGroupPlayerInfo.proto";
-// Obf: HGDAOFJDFAB
+// 4.7.0
+// Obf: GOKKCLHGJDC
 message HomeSeekFurniturePlayerScore {
-	HomeGroupPlayerInfo player_info = 5;
+	HomeGroupPlayerInfo player_info = 11;
-	uint32 score = 15;
+	uint32 score = 1;
 }

proto/HomeTransferReq.proto

@@ -1,9 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// CmdId: 3980
+// CmdId: 6539
+// NFKIMKIHCAE
 message HomeTransferReq {
-	bool is_transfer_to_safe_point = 1;
+	bool is_transfer_to_safe_point = 4;
-	bool is_transfer_to_main_house_point = 11;
+	bool is_transfer_to_main_house_point = 13;
 	uint32 guid = 12;
 }

proto/HomeUpdateArrangementInfoReq.proto

@@ -1,24 +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";
 import "HomeSceneArrangementInfo.proto";
-// CmdId: 4976
+// CmdId: 25486
-// Obf: LBFIBLCPDEL
+// Obf: ABILAIBDALL
 message HomeUpdateArrangementInfoReq {
-	HomeSceneArrangementInfo scene_arrangement_info = 15;
+	HomeSceneArrangementInfo scene_arrangement_info = 5;
 }

proto/OtherPlayerEnterHomeNotify.proto

@@ -1,14 +1,14 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// CmdId: 20379
+// CmdId: 28932
+// DLLMKEHEAKF
 message OtherPlayerEnterHomeNotify {
 	enum Reason {
 		INVALID = 0;
 		ENTER = 1;
 		LEAVE = 2;
 	}
-
+	Reason reason = 6;
-	Reason reason = 4;
+	string nickname = 8;
-	string nickname = 7;
 }

proto/PlayerQuitFromHomeNotify.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// CmdId: 20429
+// CmdId: 21403
+// DMHIGMMPDIN
 message PlayerQuitFromHomeNotify {
 	enum QuitReason {
 		INVALID = 0;
@@ -13,5 +14,5 @@ message PlayerQuitFromHomeNotify {
 		CUR_MODULE_CLOSED = 6;
 	}
 
-	QuitReason reason = 3;
+	QuitReason reason = 5;
 }

proto/TryEnterHomeReq.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// CmdId: 20306
+// CmdId: 24797
+// HJAKBGCDBIF
 message TryEnterHomeReq {
-	uint32 target_uid = 4;
+	uint32 target_uid = 5;
-	uint32 target_point = 5;
+	uint32 target_point = 14;
-	bool is_transfer_to_main_house_point = 10;
+	bool is_transfer_to_main_house_point = 15;
-	bool is_transfer_to_safe_point = 14;
+	bool is_transfer_to_safe_point = 7;
 }

proto/TryEnterHomeRsp.proto

@@ -1,9 +1,10 @@
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-
+// 4.7.0
-// CmdId: 25519
+// CmdId: 24318
+// MCFMMONGMMH
 message TryEnterHomeRsp {
 	uint32 target_uid = 11;
-	int32 retcode = 13;
+	int32 retcode = 7;
 	repeated uint32 param_list = 15;
 }