Update to 2022.10.25s(2449) (#438)

cddjr · web-flow · commit ce9404d44b68 · 2022-10-21T16:58:12.000+02:00
* Update to 2022.10.25s

Compatible with 2022.10.18e

* fix Hook

* Deprecated SaveManager_XXX functions
diff --git a/appdata/il2cpp-classes.h b/appdata/il2cpp-classes.h
@@ -8,6 +8,6 @@ DO_APP_CLASS(ShipStatus, "Assembly-CSharp, ShipStatus");
 DO_APP_CLASS(GameOptionsData, "Assembly-CSharp, GameOptionsData");
 DO_APP_CLASS(Camera, "UnityEngine.CoreModule, UnityEngine.Camera");
 DO_APP_CLASS(LobbyBehaviour, "Assembly-CSharp, LobbyBehaviour");
-DO_APP_CLASS(SaveManager, "Assembly-CSharp, SaveManager");
+//DO_APP_CLASS(SaveManager, "Assembly-CSharp, SaveManager");
 DO_APP_CLASS(MeetingHud, "Assembly-CSharp, MeetingHud");
 //DO_APP_CLASS(DestroyableSingleton_1_RoleManager_, "Assembly-CSharp, DestroyableSingleton_1_RoleManager_");
diff --git a/appdata/il2cpp-functions.h b/appdata/il2cpp-functions.h
@@ -202,6 +202,11 @@ DO_APP_FUNC(void, InnerNetClient_DisconnectInternal, (InnerNetClient* __this, Di
 
 DO_APP_FUNC(void, PlayerPhysics_FixedUpdate, (PlayerPhysics* __this, MethodInfo* method), "Assembly-CSharp, System.Void PlayerPhysics::FixedUpdate()");
 
+// deprecated
+DO_APP_FUNC(String*, SaveManager_get_PlayerName, (MethodInfo* method), "Assembly-CSharp, System.String SaveManager::get_PlayerName()");
+// deprecated
+DO_APP_FUNC(void, SaveManager_set_PlayerName, (String* value, MethodInfo* method), "Assembly-CSharp, System.Void SaveManager::set_PlayerName(System.String)");
+// deprecated
 DO_APP_FUNC(bool, SaveManager_GetPurchase, (String* itemKey, String* bundleKey, MethodInfo* method), "Assembly-CSharp, System.Boolean SaveManager::GetPurchase(System.String, System.String)");
 
 DO_APP_FUNC(void, PlayerControl_TurnOnProtection, (PlayerControl* __this, bool visible, int32_t colorId, MethodInfo* method), "Assembly-CSharp, System.Void PlayerControl::TurnOnProtection(System.Boolean, System.Int32)");
@@ -216,4 +221,10 @@ DO_APP_FUNC(String*, GameData_PlayerOutfit_get_PlayerName, (GameData_PlayerOutfi
 DO_APP_FUNC(String*, GameData_PlayerInfo_get_PlayerName, (GameData_PlayerInfo* __this, MethodInfo* method), "Assembly-CSharp, System.String GameData+PlayerInfo::get_PlayerName()");
 
 DO_APP_FUNC(void, AccountManager_UpdateKidAccountDisplay, (AccountManager* __this, MethodInfo* method), "Assembly-CSharp, System.Void AccountManager::UpdateKidAccountDisplay()");
-DO_APP_FUNC(void, PlayerStorageManager_OnReadPlayerPrefsComplete, (PlayerStorageManager* __this, void* data, MethodInfo* method), "Assembly-CSharp, System.Void PlayerStorageManager::OnReadPlayerPrefsComplete(Epic.OnlineServices.PlayerDataStorage.ReadFileCallbackInfo)");
+DO_APP_FUNC(void, PlayerStorageManager_OnReadPlayerPrefsComplete, (PlayerStorageManager* __this, void* data, MethodInfo* method), "Assembly-CSharp, System.Void PlayerStorageManager::OnReadPlayerPrefsComplete(Epic.OnlineServices.PlayerDataStorage.ReadFileCallbackInfo)");
+
+// 2022.10.25s
+DO_APP_FUNC(PlayerData*, DataManager_get_Player, (MethodInfo* method), "Assembly-CSharp, AmongUs.Data.Player.PlayerData AmongUs.Data.DataManager::get_Player()");
+DO_APP_FUNC(String*, PlayerCustomizationData_get_Name, (PlayerCustomizationData* __this, MethodInfo* method), "Assembly-CSharp, System.String AmongUs.Data.Player.PlayerCustomizationData::get_Name()");
+DO_APP_FUNC(void, PlayerCustomizationData_set_Name, (PlayerCustomizationData* __this, String* value, MethodInfo* method), "Assembly-CSharp, System.Void AmongUs.Data.Player.PlayerCustomizationData::set_Name(System.String)");
+DO_APP_FUNC(bool, PlayerPurchasesData_GetPurchase, (PlayerPurchasesData* __this, String* itemKey, String* bundleKey, MethodInfo* method), "Assembly-CSharp, System.Boolean PlayerPurchasesData::GetPurchase(System.String, System.String)");
diff --git a/appdata/il2cpp-types.h b/appdata/il2cpp-types.h
@@ -12187,96 +12187,9 @@ struct RoleEffectAnimation__Array {
     };
 
     struct SaveManager {
-        struct SaveManager__Class* klass;
+        Il2CppClass* klass;
         MonitorData* monitor;
     };
-
-    struct SaveManager__VTable {
-        VirtualInvokeData Equals;
-        VirtualInvokeData Finalize;
-        VirtualInvokeData GetHashCode;
-        VirtualInvokeData ToString;
-    };
-
-    struct SaveManager__StaticFields {
-        int32_t lastSchemaVersion;
-        bool loaded;
-        bool loadedStats;
-        bool loadedAnnounce;
-        bool loadedQCFavorites;
-        bool loadedStoreTabViewDates;
-        bool loadedCachedPurchases;
-        void* OnColorBlindChanged;
-        void* OnStreamerModeChanged;
-        struct String* lastPlayerName;
-        uint32_t colorConfig;
-        struct String* lastPet;
-        struct String* lastHat;
-        struct String* lastSkin;
-        struct String* lastVisor;
-        struct String* lastNamePlate;
-        bool showOnlineHelp;
-        bool warnedAboutGuestModeProgression;
-        int32_t privacyPolicyVersion;
-        bool askRedeemDLC;
-        bool showMinPlayerWarning;
-        void* purchases;
-        struct String* lastCosmicube;
-        struct String* storeBundlesViewDate;
-        struct String* storeHatsViewDate;
-        struct String* storeOutfitsViewDate;
-        struct String* storeVisorsViewDate;
-        struct String* storePetsViewDate;
-        struct String* storeNameplatesViewDate;
-        struct String* storeCosmicubeViewDate;
-        int32_t accountLoginStatus;
-        bool hasLoggedIn;
-        bool isGuest;
-        struct String* guardianEmail;
-        struct String* epicAccountId;
-        bool deleteDeviceIDFailed;
-        struct String* dobInfo;
-        struct String* birthDateSetDate;
-        int32_t birthDateDay;
-        int32_t birthDateMonth;
-        int32_t birthDateYear;
-        uint32_t playerLevel;
-        uint32_t playerXp;
-        uint32_t playerXpRequiredForNextLevel;
-        struct Announcement lastAnnounce;
-        void* quickChatFavorites;
-        int32_t chatModeType;
-        struct GameOptionsData* hostOptionsData;
-        struct GameOptionsData* searchOptionsData;
-        uint8_t showAdsScreen;
-        bool screenshake;
-        bool censorChat;
-        bool enableFriendsListInvites;
-        bool crossplayAllPlatforms;
-        bool streamerMode;
-        bool colorblindMode;
-        uint8_t sfxVolume;
-        uint8_t musicVolume;
-        bool vsync;
-        uint32_t lastLanguage;
-#if defined(_CPLUSPLUS_)
-        ControlTypes__Enum touchConfig;
-#else
-        int32_t touchConfig;
-#endif
-        bool enableMouseMovement;
-        float joyStickSize;
-        void* purchaseFile;
-    };
-
-    struct SaveManager__Class {
-        Il2CppClass_0 _0;
-        Il2CppRuntimeInterfaceOffsetPair* interfaceOffsets;
-        struct SaveManager__StaticFields* static_fields;
-        const Il2CppRGCTXData* rgctx_data;
-        Il2CppClass_1 _1;
-        struct SaveManager__VTable vtable;
-    };
 #pragma endregion
 
 #pragma region DestroyableSingleton_1_RoleManager_
@@ -12557,4 +12470,8 @@ struct RoleEffectAnimation__Array {
     };
 #pragma endregion
 
+    typedef Il2CppObject PlayerData;
+    typedef Il2CppObject PlayerCustomizationData;
+    typedef Il2CppObject PlayerPurchasesData;
+
 }
diff --git a/framework/il2cpp-helpers.cpp b/framework/il2cpp-helpers.cpp
@@ -276,20 +276,21 @@ void output_assembly_methods(const Il2CppAssembly* assembly) {
 	}
 }
 
-class ScopedThreadAttacher
-{
-public:
-	ScopedThreadAttacher() : m_AttachedThread(nullptr) {
+ScopedThreadAttacher::ScopedThreadAttacher() : m_AttachedThread(nullptr) {
+	if (il2cpp_thread_current() == nullptr)
 		m_AttachedThread = il2cpp_thread_attach(il2cpp_domain_get());
-	}
-	~ScopedThreadAttacher() {
-		if (m_AttachedThread)
-			il2cpp_thread_detach(m_AttachedThread);
-	}
+}
 
-private:
-	Il2CppThread* m_AttachedThread;
-};
+ScopedThreadAttacher::~ScopedThreadAttacher() {
+	detach();
+}
+
+void ScopedThreadAttacher::detach() {
+	if (m_AttachedThread) {
+		il2cpp_thread_detach(m_AttachedThread);
+		m_AttachedThread = nullptr;
+	}
+}
 
 bool cctor_finished(Il2CppClass* klass)
 {
diff --git a/framework/il2cpp-helpers.h b/framework/il2cpp-helpers.h
@@ -102,4 +102,14 @@ namespace app {
 			E* _Ptr;
 		};
 	}
-}
+}
+
+class ScopedThreadAttacher {
+public:
+	ScopedThreadAttacher();
+	~ScopedThreadAttacher();
+
+	void detach();
+private:
+	Il2CppThread* m_AttachedThread;
+};
diff --git a/gui/esp.hpp b/gui/esp.hpp
@@ -50,7 +50,7 @@ static ImVec2 WorldToScreen(Vector2 pos)
 	return value;
 }
 
-struct PlayerData
+struct EspPlayerData
 {
 	ImVec2 Position = { 0.0f, 0.0f };
 	ImVec4 Color{ 0.0f, 0.0f, 0.0f, 0.0f };
@@ -67,7 +67,7 @@ typedef struct Drawing
 {
 	std::mutex m_DrawingMutex;
 
-	std::array<PlayerData, Game::MAX_PLAYERS> m_Players;
+	std::array<EspPlayerData, Game::MAX_PLAYERS> m_Players;
 
 	ImVec2 LocalPosition{ 0.0f, 0.0f };
 } drawing_t;
diff --git a/hooks/AirshipStatus.cpp b/hooks/AirshipStatus.cpp
@@ -28,7 +28,7 @@ void dAirshipStatus_OnEnable(AirshipStatus* __this, MethodInfo* method)
 
 	State.mapType = Settings::MapType::Airship;
 
-	State.userName = convert_from_string(SaveManager__TypeInfo->static_fields->lastPlayerName);
+	State.userName = GetPlayerName();
 	ResetOriginalAppearance();
 }
 
diff --git a/hooks/Chat.cpp b/hooks/Chat.cpp
@@ -51,7 +51,5 @@ void dChatBubble_SetName(ChatBubble* __this, String* playerName, bool isDead, bo
 
 void dChatController_Update(ChatController* __this, MethodInfo* method)
 {
-	//SaveManager__TypeInfo->static_fields->chatModeType = (int32_t)QuickChatModes__Enum::FreeChatOrQuickChat;
-	SaveManager__TypeInfo->static_fields->isGuest = false;
 	ChatController_Update(__this, method);
 }
diff --git a/hooks/EOSManager.cpp b/hooks/EOSManager.cpp
@@ -26,8 +26,6 @@ void dEOSManager_InitializePlatformInterface(EOSManager* __this, MethodInfo* met
 bool dEOSManager_IsFreechatAllowed(EOSManager* __this, MethodInfo* method)
 {
 	return app::EOSManager_IsFreechatAllowed(__this, method);
-	//SaveManager__TypeInfo->static_fields->chatModeType = (uint32_t)QuickChatModes__Enum::FreeChatOrQuickChat;
-	//return true;
 }
 
 void dEOSManager_UpdatePermissionKeys(EOSManager* __this, void* callback, MethodInfo* method) {
diff --git a/hooks/InnerNetClient.cpp b/hooks/InnerNetClient.cpp
@@ -110,8 +110,8 @@ void dInnerNetClient_Update(InnerNetClient* __this, MethodInfo* method)
     static int nameChangeCycleDelay = 0; //If we spam too many name changes, we're banned
 
     if (nameChangeCycleDelay <= 0 && !State.activeImpersonation) {
-        if ((convert_from_string(SaveManager__TypeInfo->static_fields->lastPlayerName) != State.userName) && !State.userName.empty()) {
-            SaveManager__TypeInfo->static_fields->lastPlayerName = convert_to_string(State.userName);
+        if ((GetPlayerName() != State.userName) && !State.userName.empty()) {
+            SetPlayerName(State.userName);
             LOG_INFO("Name mismatch, setting name to \"" + State.userName + "\"");
             if (IsInGame())
                 State.rpcQueue.push(new RpcSetName(State.userName));
diff --git a/hooks/PlayerControl.cpp b/hooks/PlayerControl.cpp
@@ -211,7 +211,7 @@ void dPlayerControl_FixedUpdate(PlayerControl* __this, MethodInfo* method) {
 				Profiler::EndSample("WalkEventCreation");
 			}
 			app::GameData_PlayerOutfit* outfit = GetPlayerOutfit(playerData);
-			PlayerData espPlayerData;
+			EspPlayerData espPlayerData;
 			espPlayerData.Position = WorldToScreen(playerPos);
 			if (outfit != NULL)
 			{
diff --git a/hooks/PolusShipStatus.cpp b/hooks/PolusShipStatus.cpp
@@ -30,6 +30,6 @@ void dPolusShipStatus_OnEnable(PolusShipStatus* __this, MethodInfo* method)
 
 	State.mapType = Settings::MapType::Pb;
 
-	State.userName = convert_from_string(SaveManager__TypeInfo->static_fields->lastPlayerName);
+	State.userName = GetPlayerName();
 	ResetOriginalAppearance();
 }
diff --git a/hooks/SaveManager.cpp b/hooks/SaveManager.cpp
@@ -3,7 +3,13 @@
 #include "state.hpp"
 #include "game.h"
 
+// deprecated
 bool dSaveManager_GetPurchase(String* itemKey, String* bundleKey, MethodInfo* method)
 {
 	return true;
+}
+
+// v2022.10.25s
+bool dPlayerPurchasesData_GetPurchase(PlayerPurchasesData* __this, String* itemKey, String* bundleKey, MethodInfo* method) {
+	return true;
 }
diff --git a/hooks/ShipStatus.cpp b/hooks/ShipStatus.cpp
@@ -41,6 +41,6 @@ void dShipStatus_OnEnable(ShipStatus* __this, MethodInfo* method) {
 
 	State.mapType = (Settings::MapType)(__this->fields.Type);
 
-	State.userName = convert_from_string(SaveManager__TypeInfo->static_fields->lastPlayerName);
+	State.userName = GetPlayerName();
 	ResetOriginalAppearance();
 }
diff --git a/hooks/_hooks.cpp b/hooks/_hooks.cpp
@@ -151,7 +151,10 @@ void DetourInitilization() {
 	HOOKFUNC(ChatController_Update);
 	HOOKFUNC(InnerNetClient_EnqueueDisconnect);
 	HOOKFUNC(PlayerPhysics_FixedUpdate);
-	HOOKFUNC(SaveManager_GetPurchase);
+	if (SaveManager_GetPurchase != nullptr)
+		HOOKFUNC(SaveManager_GetPurchase);
+	if (PlayerPurchasesData_GetPurchase != nullptr) // v2022.10.25s
+		HOOKFUNC(PlayerPurchasesData_GetPurchase);
 	HOOKFUNC(PlayerControl_TurnOnProtection);
 	HOOKFUNC(AmongUsClient_OnGameEnd);
 	HOOKFUNC(InnerNetClient_DisconnectInternal);
@@ -170,7 +173,11 @@ void DetourUninitialization()
 	DetourTransactionBegin();
 	DetourUpdateThread(GetCurrentThread());
 
-	UNHOOKFUNC(SaveManager_GetPurchase);
+
+	if (SaveManager_GetPurchase != nullptr)
+		UNHOOKFUNC(SaveManager_GetPurchase);
+	if (PlayerPurchasesData_GetPurchase != nullptr) // v2022.10.25s
+		UNHOOKFUNC(PlayerPurchasesData_GetPurchase);
 	UNHOOKFUNC(PlayerPhysics_FixedUpdate);
 	UNHOOKFUNC(GameObject_SetActive);
 	UNHOOKFUNC(SceneManager_Internal_ActiveSceneChanged);
diff --git a/hooks/_hooks.h b/hooks/_hooks.h
@@ -73,4 +73,5 @@ bool dSaveManager_GetPurchase(String* itemKey, String* bundleKey, MethodInfo* me
 void dPlayerControl_TurnOnProtection(PlayerControl* __this, bool visible, int32_t colorId, MethodInfo* method);
 void dAmongUsClient_OnGameEnd(AmongUsClient* __this, Object* endGameResult, MethodInfo* method);
 void dAccountManager_UpdateKidAccountDisplay(AccountManager* __this, MethodInfo* method);
-void dPlayerStorageManager_OnReadPlayerPrefsComplete(PlayerStorageManager* __this, void* data, MethodInfo* method);
+void dPlayerStorageManager_OnReadPlayerPrefsComplete(PlayerStorageManager* __this, void* data, MethodInfo* method);
+bool dPlayerPurchasesData_GetPurchase(PlayerPurchasesData* __this, String* itemKey, String* bundleKey, MethodInfo* method);
diff --git a/used_types.txt b/used_types.txt
@@ -212,7 +212,6 @@ RoleEffectAnimation__Fields
 PlayerControl__Fields
 PlayerMaterial_Properties
 CosmeticsLayer__Fields
-SaveManager__StaticFields
 DestroyableSingleton_1_AccountManager___Fields
 AccountManager__Fields
 KWSPermissionStatus__Enum
diff --git a/user/logger.h b/user/logger.h
@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <fstream>
 #include <sstream>
+#include <assert.h>
 
 class AUMLogger {
 public:
@@ -42,6 +43,7 @@ class AUMLogger {
 #define LOG_ASSERT(EXPR) \
 	if (!(EXPR)) { \
 		STREAM_ERROR("(" << #EXPR << ") Assert failed."); \
+		assert(EXPR); \
 		exit(1); \
 	}
 
diff --git a/user/main.cpp b/user/main.cpp
@@ -83,6 +83,7 @@ void Run(LPVOID lpParam) {
 	}
 	hModule = (HMODULE)lpParam;
 	init_il2cpp();
+	ScopedThreadAttacher managedThreadAttached;
 	{
 		std::ostringstream ss;
 		ss << "\n\tAmongUsMenu - " << __DATE__ << " - " << __TIME__ << std::endl; // Log amongusmenu info
@@ -117,12 +118,12 @@ void Run(LPVOID lpParam) {
 	GAME_STATIC_POINTER(Game::pShipStatus, app::ShipStatus, Instance);
 	GAME_STATIC_POINTER(Game::pLobbyBehaviour, app::LobbyBehaviour, Instance);
 	//GAME_STATIC_POINTER(Game::pRoleManager, app::DestroyableSingleton_1_RoleManager_, _instance);
-	assert(cctor_finished(app::SaveManager__TypeInfo->_0.klass));
-	State.userName = convert_from_string(app::SaveManager__TypeInfo->static_fields->lastPlayerName);
+	State.userName = GetPlayerName();
 
 	Game::scanGameFunctions();
 	DetourInitilization();
 #if _DEBUG
+	managedThreadAttached.detach();
 	DWORD dwWaitResult = WaitForSingleObject(hUnloadEvent, INFINITE);
 	if (dwWaitResult != WAIT_OBJECT_0) {
 		STREAM_ERROR("Failed to watch unload signal! dwWaitResult = " << dwWaitResult << " Error " << GetLastError());
diff --git a/user/utility.cpp b/user/utility.cpp
diff --git a/user/utility.h b/user/utility.h

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ static ImVec2 WorldToScreen(Vector2 pos)`
`50`	`50`	`return value;`
`51`	`51`	`}`
`52`	`52`
`53`		`-struct PlayerData`
	`53`	`+struct EspPlayerData`
`54`	`54`	`{`
`55`	`55`	`ImVec2 Position = { 0.0f, 0.0f };`
`56`	`56`	`ImVec4 Color{ 0.0f, 0.0f, 0.0f, 0.0f };`
`@@ -67,7 +67,7 @@ typedef struct Drawing`
`67`	`67`	`{`
`68`	`68`	`std::mutex m_DrawingMutex;`
`69`	`69`
`70`		`- std::array<PlayerData, Game::MAX_PLAYERS> m_Players;`
	`70`	`+ std::array<EspPlayerData, Game::MAX_PLAYERS> m_Players;`
`71`	`71`
`72`	`72`	`ImVec2 LocalPosition{ 0.0f, 0.0f };`
`73`	`73`	`} drawing_t;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ void dAirshipStatus_OnEnable(AirshipStatus* __this, MethodInfo* method)`
`28`	`28`
`29`	`29`	`State.mapType = Settings::MapType::Airship;`
`30`	`30`
`31`		`- State.userName = convert_from_string(SaveManager__TypeInfo->static_fields->lastPlayerName);`
	`31`	`+ State.userName = GetPlayerName();`
`32`	`32`	`ResetOriginalAppearance();`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,5 @@ void dChatBubble_SetName(ChatBubble* __this, String* playerName, bool isDead, bo`
`51`	`51`
`52`	`52`	`void dChatController_Update(ChatController* __this, MethodInfo* method)`
`53`	`53`	`{`
`54`		`- //SaveManager__TypeInfo->static_fields->chatModeType = (int32_t)QuickChatModes__Enum::FreeChatOrQuickChat;`
`55`		`- SaveManager__TypeInfo->static_fields->isGuest = false;`
`56`	`54`	`ChatController_Update(__this, method);`
`57`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ void dEOSManager_InitializePlatformInterface(EOSManager* __this, MethodInfo* met`
`26`	`26`	`bool dEOSManager_IsFreechatAllowed(EOSManager* __this, MethodInfo* method)`
`27`	`27`	`{`
`28`	`28`	`return app::EOSManager_IsFreechatAllowed(__this, method);`
`29`		`- //SaveManager__TypeInfo->static_fields->chatModeType = (uint32_t)QuickChatModes__Enum::FreeChatOrQuickChat;`
`30`		`- //return true;`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`void dEOSManager_UpdatePermissionKeys(EOSManager* __this, void* callback, MethodInfo* method) {`