Merge branch 'dev'

Author: StarGate01

AUMInjector/AUMInjector.rc

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,21
- PRODUCTVERSION 1,0,0,21
+ FILEVERSION 1,0,0,22
+ PRODUCTVERSION 1,0,0,22
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Team ESDG"
             VALUE "FileDescription", "Among Us to Mumble VoIP adapter"
-            VALUE "FileVersion", "1.0.0.21"
+            VALUE "FileVersion", "1.0.0.22"
             VALUE "InternalName", "winhttp.dll"
             VALUE "LegalCopyright", "Copyright (C) Team ESDG 2021"
             VALUE "OriginalFilename", "winhttp.dll"
             VALUE "ProductName", "AmongUs-Mumble"
-            VALUE "ProductVersion", "1.0.0.21"
+            VALUE "ProductVersion", "1.0.0.22"
         END
     END
     BLOCK "VarFileInfo"

AUMInjector/deobfuscate/deobfuscate.h

@@ -30,12 +30,6 @@ using namespace app;
 	#include "2021_4_12s.h"
 #elif GAME_VERSION == GAME_VERSION_2021_4_14s
 	#include "2021_4_14s.h"
-#elif GAME_VERSION == GAME_VERSION_2021_5_10s
-	#include "unobfuscated.h"
-#elif GAME_VERSION == GAME_VERSION_2021_5_25s
-	#include "unobfuscated.h"
-#elif GAME_VERSION == GAME_VERSION_2021_6_15s
-	#include "unobfuscated.h"
 #else
-	#error Unknown game version!
+	#include "unobfuscated.h"
 #endif

AUMInjector/deobfuscate/unobfuscated.h

@@ -12,6 +12,7 @@ using HudOverrideTask = HudOverrideTask;
 using ChatController = ChatController;
 using AmongUsClient = AmongUsClient;
 using PlayerInfo = GameData_PlayerInfo;
+using ModManager = ModManager;
 #define PlayerControl_GetTruePosition_Trampoline PlayerControl_GetTruePosition
 #define PlayerControl_Die_Trampoline PlayerControl_Die
 #define PlayerControl_GetData_Trampoline PlayerControl_get_Data
@@ -42,4 +43,6 @@ __declspec(selectany) LightSource* PlayerControl__Fields::* MyLight = &PlayerCon
 #define HudOverrideTask_Initialize_Trampoline HudOverrideTask_Initialize
 #define HudOverrideTask_Complete_Trampoline HudOverrideTask_Complete
 #define MessageWriter_Write_Byte_Trampoline MessageWriter_Write_1
-#define AmongUsClient_OnPlayerJoined_Trampoline AmongUsClient_OnPlayerJoined
+#define AmongUsClient_OnPlayerJoined_Trampoline AmongUsClient_OnPlayerJoined
+#define ModManager_LateUpdate ModManager_LateUpdate
+#define ModManager_ShowModStamp ModManager_ShowModStamp

AUMInjector/deobfuscate/version.h

@@ -13,8 +13,9 @@
 #define GAME_VERSION_2021_5_10s 202105100
 #define GAME_VERSION_2021_5_25s 202105250
 #define GAME_VERSION_2021_6_15s 202106150
+#define GAME_VERSION_2021_6_30s 202106300
 #ifndef GAME_VERSION
-	#define GAME_VERSION GAME_VERSION_2021_6_15s
+	#define GAME_VERSION GAME_VERSION_2021_6_30s
 #endif
 
 #if GAME_VERSION == GAME_VERSION_2020_9_22s
@@ -47,6 +48,8 @@
 	#define version_text "2021.5.25s"
 #elif GAME_VERSION == GAME_VERSION_2021_6_15s
 	#define version_text "2021.6.15s"
+#elif GAME_VERSION == GAME_VERSION_2021_6_30s
+	#define version_text "2021.6.30s"
 #else
 	#error Unknown game version!
 #endif

AUMInjector/user/main.cpp

@@ -419,6 +419,12 @@ void InnerNetClient_HandleGameData_Hook(InnerNetClient* __this, MessageReader* r
     InnerNetClient_HandleGameData_Trampoline(__this, reader, method);
 }
 
+// Show mod stamp to conform to policy
+void ModManager_LateUpdate_Hook(ModManager* __this, MethodInfo* method)
+{
+    ModManager_LateUpdate(__this, method);
+    ModManager_ShowModStamp(__this, NULL);
+}
 
 // Entrypoint of the injected thread
 void Run()
@@ -501,6 +507,7 @@ void Run()
         DetourAttach(&(PVOID&)HudOverrideTask_Complete_Trampoline, HudOverrideTask_Complete_Hook);
         DetourAttach(&(PVOID&)AmongUsClient_OnPlayerJoined_Trampoline, AmongUsClient_OnPlayerJoined_Hook);
         DetourAttach(&(PVOID&)InnerNetClient_HandleGameData_Trampoline, InnerNetClient_HandleGameData_Hook);
+        DetourAttach(&(PVOID&)ModManager_LateUpdate, ModManager_LateUpdate_Hook);
 
         //dynamic_analysis_attach();
         LONG errDetour = DetourTransactionCommit();

decompile.bat

@@ -12,9 +12,9 @@ REM Decompile game data
 REM Copy c++ signatures to project
 XCOPY "cpp\appdata\*.*" "..\AUMInjector\appdata\" /K /D /H /Y
 
-REM Generate deobfuctation map
-dotnet build "..\AUMDeobfuscator\AUMDeobfuscator.csproj" -c "Release"
-"..\AUMDeobfuscator\bin\Release\net5.0\AUMDeobfuscator.exe" "cs" --gameversion "%AMONGUS_VERSION%" -o "..\AUMInjector\deobfuscate\generated_%AMONGUS_VERSION%.h"
+@REM REM Generate deobfuctation map
+@REM dotnet build "..\AUMDeobfuscator\AUMDeobfuscator.csproj" -c "Release"
+@REM "..\AUMDeobfuscator\bin\Release\net5.0\AUMDeobfuscator.exe" "cs" --gameversion "%AMONGUS_VERSION%" -o "..\AUMInjector\deobfuscate\generated_%AMONGUS_VERSION%.h"
 
 CD ..
 DEL /s /q tmp\*  >NUL 2>&1

setup.bat.example

@@ -4,7 +4,7 @@ REM set the path to your game folder
 SET "AMONGUS=C:\Steam\steamapps\common\Among Us"
 
 REM set the version of the generated deobfuscations
-SET "AMONGUS_VERSION=2021_6_15s"
+SET "AMONGUS_VERSION=2021_6_30s"
 
 REM set the path of tools
 SET "IL2CPPINSPECTOR=C:\Users\Christoph\Documents\GitHub\Il2CppInspector\Il2CppInspector.CLI\bin\Release\netcoreapp3.1\win-x64\publish\Il2CppInspector.exe"