Update to 2021.4.14s

StarGate01 · Apr 16, 2021 · 2f4e837 · 2f4e837
1 parent 1b9f757
commit 2f4e837
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 7 deletions.
diff --git a/AUMInjector/AUMInjector.rc b/AUMInjector/AUMInjector.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,17
- PRODUCTVERSION 1,0,0,17
+ FILEVERSION 1,0,0,18
+ PRODUCTVERSION 1,0,0,18
  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.17"
+            VALUE "FileVersion", "1.0.0.18"
             VALUE "InternalName", "winhttp.dll"
             VALUE "LegalCopyright", "Copyright (C) Team ESDG 2021"
             VALUE "OriginalFilename", "winhttp.dll"
             VALUE "ProductName", "AmongUs-Mumble"
-            VALUE "ProductVersion", "1.0.0.17"
+            VALUE "ProductVersion", "1.0.0.18"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/AUMInjector/AUMInjector.vcxproj b/AUMInjector/AUMInjector.vcxproj
@@ -77,6 +77,7 @@
     <ClInclude Include="deobfuscate\2021_3_31_3s.h" />
     <ClInclude Include="deobfuscate\2021_3_5s.h" />
     <ClInclude Include="deobfuscate\2021_4_12s.h" />
+    <ClInclude Include="deobfuscate\2021_4_14s.h" />
     <ClInclude Include="deobfuscate\deobfuscate.h" />
     <ClInclude Include="deobfuscate\version.h" />
     <ClInclude Include="framework\helpers.h" />

diff --git a/AUMInjector/AUMInjector.vcxproj.filters b/AUMInjector/AUMInjector.vcxproj.filters
@@ -272,6 +272,9 @@
     <ClInclude Include="deobfuscate\2021_4_12s.h">
       <Filter>Deobfuscate</Filter>
     </ClInclude>
+    <ClInclude Include="deobfuscate\2021_4_14s.h">
+      <Filter>Deobfuscate</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="AUMInjector.rc">

diff --git a/AUMInjector/deobfuscate/2021_4_14s.h b/AUMInjector/deobfuscate/2021_4_14s.h
@@ -0,0 +1,45 @@
+using InnerNetClient = InnerNetClient;
+using InnerNetClient_GameState__Enum = InnerNetClient_GCDONLGCMIL__Enum;
+using InnerNet_DisconnectReasons__Enum = GABADEGMIHF__Enum;
+using Player_Die_Reason__Enum = EGHDCAKGMKI__Enum;
+using PlayerControl = PlayerControl;
+#define PlayerControl__TypeInfo PlayerControl__TypeInfo
+using GameData = GameData;
+#define Palette__TypeInfo BLMBFIODBKL__TypeInfo
+using MeetingHud = MeetingHud;
+using HqHudOverrideTask = HqHudOverrideTask;
+using HudOverrideTask = HudOverrideTask;
+using ChatController = ChatController;
+using AmongUsClient = AmongUsClient;
+using PlayerInfo = GameData_LGBOMGHJELL;
+#define PlayerControl_GetTruePosition_Trampoline PlayerControl_GetTruePosition
+#define PlayerControl_Die_Trampoline PlayerControl_Die
+#define PlayerControl_GetData_Trampoline PlayerControl_get_Data
+#define PlayerControl_FixedUpdate_Trampoline PlayerControl_FixedUpdate
+
+__declspec(selectany) InnerNetClient_GameState__Enum InnerNetClient_GameState__Enum_Joined = InnerNetClient_GCDONLGCMIL__Enum::Joined;
+__declspec(selectany) InnerNetClient_GameState__Enum InnerNetClient_GameState__Enum_Started = InnerNetClient_GCDONLGCMIL__Enum::Started;
+__declspec(selectany) InnerNetClient_GameState__Enum InnerNetClient_GameState__Enum_Ended = InnerNetClient_GCDONLGCMIL__Enum::Ended;
+__declspec(selectany) bool GameData_LGBOMGHJELL__Fields::* IsImposter = &GameData_LGBOMGHJELL__Fields::FDNMBJOAPFL;
+__declspec(selectany) int32_t GameData_LGBOMGHJELL__Fields::* ColorId = &GameData_LGBOMGHJELL__Fields::IMMNCAGJJJC;
+__declspec(selectany) Color32__Array* BLMBFIODBKL__StaticFields::* PlayerColors = &BLMBFIODBKL__StaticFields::AEDCMKGJKAG;
+__declspec(selectany) LightSource* PlayerControl__Fields::* MyLight = &PlayerControl__Fields::KBDBCKAPGMK;
+
+#define GameData_Awake_Trampoline GameData_Awake
+#define GameData_GetPlayerById_Trampoline GameData_GetPlayerById
+#define GameData_UpdateColor_Trampoline GameData_UpdateColor
+#define GameData_GetPlayerCount_Trampoline GameData_get_PlayerCount
+#define GameData_HandleDisconnect_Trampoline GameData_HandleDisconnect
+#define GameData_CompleteTask_Trampoline GameData_CompleteTask
+#define InnerNetClient_FixedUpdate_Trampoline InnerNetClient_FixedUpdate
+#define InnerNetClient_Disconnect_Trampoline InnerNetClient_JCCBAEDEIPE
+#define InnerNetClient_HandleGameData_Trampoline InnerNetClient_CJOLFPHJDGL
+#define InnerNetClient_StartRpc_Trampoline InnerNetClient_StartRpc
+#define MeetingHud_Close_Trampoline MeetingHud_Close
+#define MeetingHud_Start_Trampoline MeetingHud_Start
+#define HqHudOverrideTask_Initialize_Trampoline HqHudOverrideTask_Initialize
+#define HqHudOverrideTask_Complete_Trampoline HqHudOverrideTask_Complete
+#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_DNCMILBBAJH
diff --git a/AUMInjector/deobfuscate/deobfuscate.h b/AUMInjector/deobfuscate/deobfuscate.h
@@ -28,6 +28,8 @@ using namespace app;
 	#include "2021_3_31_3s.h"
 #elif GAME_VERSION == GAME_VERSION_2021_4_12s
 	#include "2021_4_12s.h"
+#elif GAME_VERSION == GAME_VERSION_2021_4_14s
+	#include "2021_4_14s.h"
 #else
 	#error Unknown game version!
 #endif
diff --git a/AUMInjector/deobfuscate/version.h b/AUMInjector/deobfuscate/version.h
@@ -9,8 +9,9 @@
 #define GAME_VERSION_2021_3_5s 202103050
 #define GAME_VERSION_2021_3_31_3s 202103313
 #define GAME_VERSION_2021_4_12s 202104120
+#define GAME_VERSION_2021_4_12s 202104140
 #ifndef GAME_VERSION
-	#define GAME_VERSION GAME_VERSION_2021_4_12s
+	#define GAME_VERSION GAME_VERSION_2021_4_14s
 #endif
 
 #if GAME_VERSION == GAME_VERSION_2020_9_22s
@@ -35,6 +36,8 @@
 	#define version_text "2021.3.31.3s"
 #elif GAME_VERSION == GAME_VERSION_2021_4_12s
 	#define version_text "2021.4.12s"
+#elif GAME_VERSION == GAME_VERSION_2021_4_14s
+	#define version_text "2021.4.14s"
 #else
 	#error Unknown game version!
 #endif

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Patch versions refer to unmarked Steam updates where the game version did not ch
 
 **Use the installer:** Download: [Latest release](https://github.com/StarGate01/AmongUs-Mumble/releases/download/v1.0.0.14/AmongUs-Mumble-Installer.exe)
 
-**Latest mod version:**  Release 2021.4.12s, Mod manual download: [1.0.0.17](https://github.com/StarGate01/AmongUs-Mumble/releases/tag/v1.0.0.17)
+**Latest mod version:**  Release 2021.4.14s, Mod manual download: [1.0.0.18](https://github.com/StarGate01/AmongUs-Mumble/releases/tag/v1.0.0.18)
 
 **Older versions:** [Versions table](https://github.com/StarGate01/AmongUs-Mumble/wiki/Versions)
 

diff --git a/setup.bat.example b/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_4_12s"
+SET "AMONGUS_VERSION=2021_4_14s"
 
 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"