EnderdracheLP · michael-r-elp · Apr 26, 2025 · Feb 17, 2025 · Feb 17, 2025 · Mar 9, 2025
diff --git a/.github/workflows/buildModPR.yml b/.github/workflows/buildModPR.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       name: Checkout
       with:
         submodules: true
@@ -22,10 +22,10 @@ jobs:
     - name: Get Version
       shell: pwsh
       run: |
-        $branchParts = '${{ github.ref_name }}'.Split('/'); $branchMain = $branchParts[0]; if ($branchParts[0] -match "^\d+$") { $branchMain = 'pr'; $branchSub = "$($branchParts[0])." } elseif ($branchParts.Length -eq 2) { $branchSub = "$($branchParts[1].Replace('.', '-'))." }; echo "version=$((Get-Content ./qpm.shared.json -Raw | ConvertFrom-Json).config.info.version.Split('-')[0])-$($branchMain).${{ github.run_number }}+$($branchSub)ra${{ github.run_attempt }}.$($env:GITHUB_SHA.Substring(0, 7))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        $branchParts = '${{ github.ref_name }}'.Split('/'); $branchMain = $branchParts[0]; if ($branchParts[0] -match "^\d+$") { $branchMain = 'pr'; $branchSub = "$($branchParts[0])." } elseif ($branchParts.Length -eq 2) { $branchSub = "$($branchParts[1].Replace('.', '-'))." }; echo "qmodversion=$((Get-Content ./qpm.shared.json -Raw | ConvertFrom-Json).config.info.version.Split('-')[0])+$($branchMain).$($branchSub)r${{ github.run_number }}a${{ github.run_attempt }}.$($env:GITHUB_SHA.Substring(0, 7))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        $branchParts = '${{ github.ref_name }}'.Split('/'); $branchMain = $branchParts[0]; if ($branchParts[0] -match "^\d+$") { $branchMain = 'pr'; $branchSub = "$($branchParts[0])." } elseif ($branchParts.Length -eq 2) { $branchSub = "$($branchParts[1].Replace('.', '-'))." }; echo "version=$((Get-Content ./qpm.shared.json -Raw | ConvertFrom-Json).config.info.version.Replace('+', '-').Split('-')[0])-$($branchMain).${{ github.run_number }}+$($branchSub)ra${{ github.run_attempt }}.$($env:GITHUB_SHA.Substring(0, 7))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        $branchParts = '${{ github.ref_name }}'.Split('/'); $branchMain = $branchParts[0]; if ($branchParts[0] -match "^\d+$") { $branchMain = 'pr'; $branchSub = "$($branchParts[0])." } elseif ($branchParts.Length -eq 2) { $branchSub = "$($branchParts[1].Replace('.', '-'))." }; echo "qmodversion=$((Get-Content ./qpm.shared.json -Raw | ConvertFrom-Json).config.info.version.Replace('+', '-').Split('-')[0])+$($branchMain).$($branchSub)r${{ github.run_number }}a${{ github.run_attempt }}.$($env:GITHUB_SHA.Substring(0, 7))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-    - uses: seanmiddleditch/gha-setup-ninja@v3
+    - uses: seanmiddleditch/gha-setup-ninja@v5
 
     - name: Get QPM
       uses: Fernthedev/qpm-action@v1
@@ -77,15 +77,15 @@ jobs:
 
 
     - name: Upload non-debug artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ steps.libname.outputs.NAME }}
         path: ./build/${{ steps.libname.outputs.NAME }}
         if-no-files-found: error
 
 
     - name: Upload debug artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: debug_${{ steps.libname.outputs.NAME }}
         path: ./build/debug/${{ steps.libname.outputs.NAME }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,9 @@
 # include some defines automatically made by qpm
 include(qpm_defines.cmake)
 
+# Bump Android sdk version
+set(ANDROID_PLATFORM 29)
+
 # Enable link time optimization
 # In my experience, this can be highly unstable but it nets a huge size optimization and likely performance
 # However, the instability was seen using Android.mk/ndk-build builds. With Ninja + CMake, this problem seems to have been solved.
@@ -35,18 +38,12 @@ add_compile_definitions(CORDL_RUNTIME_FIELD_NULL_CHECKS)
 file(GLOB_RECURSE cpp_file_list ${SOURCE_DIR}/*.cpp)
 file(GLOB_RECURSE c_file_list ${SOURCE_DIR}/*.c)
 
-file(GLOB_RECURSE inline_hook_c ${EXTERN_DIR}/includes/beatsaber-hook/shared/inline-hook/*.c)
-file(GLOB_RECURSE inline_hook_cpp ${EXTERN_DIR}/includes/beatsaber-hook/shared/inline-hook/*.cpp)
-
 # add all src files to compile
 add_library(
         ${COMPILE_ID}
         SHARED
         ${cpp_file_list}
-        ${c_file_list}
-        ${inline_hook_c}
-        ${inline_hook_cpp}
-)
+        ${c_file_list})
 
 target_include_directories(${COMPILE_ID} PRIVATE .)
 
@@ -62,6 +59,13 @@ target_link_libraries(${COMPILE_ID} PRIVATE -llog ${COMPILE_ID}-assets)
 # add extern stuff like libs and other includes
 include(extern.cmake)
 
+# beatsaber hook inline hook
+RECURSE_FILES(src_inline_hook_beatsaber_hook_local_extra_c ${EXTERN_DIR}/includes/beatsaber-hook/shared/inline-hook/*.c)
+RECURSE_FILES(src_inline_hook_beatsaber_hook_local_extra_cpp ${EXTERN_DIR}/includes/beatsaber-hook/shared/inline-hook/*.cpp)
+target_sources(${COMPILE_ID} PRIVATE ${src_inline_hook_beatsaber_hook_local_extra_c})
+target_sources(${COMPILE_ID} PRIVATE ${src_inline_hook_beatsaber_hook_local_extra_cpp})
+
+
 add_custom_command(TARGET ${COMPILE_ID} POST_BUILD
         COMMAND ${CMAKE_STRIP} -d --strip-all
         "lib${COMPILE_ID}.so" -o "stripped_lib${COMPILE_ID}.so"

diff --git a/include/Installers/MpAppInstaller.hpp b/include/Installers/MpAppInstaller.hpp
@@ -3,7 +3,7 @@
 #include "custom-types/shared/macros.hpp"
 #include "Zenject/Installer.hpp"
 
-DECLARE_CLASS_CODEGEN(MultiplayerCore::Installers, MpAppInstaller, Zenject::Installer,
+DECLARE_CLASS_CODEGEN(MultiplayerCore::Installers, MpAppInstaller, ::Zenject::Installer) {
     DECLARE_OVERRIDE_METHOD_MATCH(void, InstallBindings, &::Zenject::Installer::InstallBindings);
     DECLARE_DEFAULT_CTOR();
-)
+};
diff --git a/include/Installers/MpMenuInstaller.hpp b/include/Installers/MpMenuInstaller.hpp
@@ -3,7 +3,7 @@
 #include "custom-types/shared/macros.hpp"
 #include "Zenject/Installer.hpp"
 
-DECLARE_CLASS_CODEGEN(MultiplayerCore::Installers, MpMenuInstaller, Zenject::Installer,
+DECLARE_CLASS_CODEGEN(MultiplayerCore::Installers, MpMenuInstaller, ::Zenject::Installer) {
     DECLARE_OVERRIDE_METHOD_MATCH(void, InstallBindings, &::Zenject::Installer::InstallBindings);
     DECLARE_DEFAULT_CTOR();
-)
+};
diff --git a/include/NodePoseSyncState/MpNodePoseSyncStateManager.hpp b/include/NodePoseSyncState/MpNodePoseSyncStateManager.hpp
@@ -9,7 +9,7 @@
 #include "System/IDisposable.hpp"
 #include "Zenject/IInitializable.hpp"
 
-DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::NodePoseSyncState, MpNodePoseSyncStateManager, GlobalNamespace::NodePoseSyncStateManager, std::vector<Il2CppClass*>({classof(Zenject::IInitializable*), classof(System::IDisposable*)}),
+DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::NodePoseSyncState, MpNodePoseSyncStateManager, GlobalNamespace::NodePoseSyncStateManager, ::Zenject::IInitializable*, System::IDisposable*) {
     DECLARE_INSTANCE_FIELD_PRIVATE(Networking::MpPacketSerializer*, _packetSerializer);
     DECLARE_INSTANCE_FIELD_PRIVATE(long, deltaUpdateFrequencyMs);
     DECLARE_INSTANCE_FIELD_PRIVATE(long, fullStateUpdateFrequencyMs);
@@ -26,4 +26,4 @@ DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::NodePoseSyncState, MpNodePoseS
 
     public:
         void HandleNodePoseSyncUpdateReceived(MpNodePoseSyncStatePacket* data, GlobalNamespace::IConnectedPlayer* player);
-)
+};
diff --git a/include/NodePoseSyncState/MpNodePoseSyncStatePacket.hpp b/include/NodePoseSyncState/MpNodePoseSyncStatePacket.hpp
@@ -2,12 +2,12 @@
 
 #include "Networking/Abstractions/MpPacket.hpp"
 
-DECLARE_CLASS_CUSTOM(MultiplayerCore::NodePoseSyncState, MpNodePoseSyncStatePacket, MultiplayerCore::Networking::Abstractions::MpPacket,
+DECLARE_CLASS_CUSTOM(MultiplayerCore::NodePoseSyncState, MpNodePoseSyncStatePacket, MultiplayerCore::Networking::Abstractions::MpPacket) {
     DECLARE_INSTANCE_FIELD(long, deltaUpdateFrequencyMs);
     DECLARE_INSTANCE_FIELD(long, fullStateUpdateFrequencyMs);
 
     DECLARE_OVERRIDE_METHOD_MATCH(void, Serialize, &LiteNetLib::Utils::INetSerializable::Serialize, LiteNetLib::Utils::NetDataWriter* writer);
     DECLARE_OVERRIDE_METHOD_MATCH(void, Deserialize, &LiteNetLib::Utils::INetSerializable::Deserialize, LiteNetLib::Utils::NetDataReader* reader);
 
     DECLARE_CTOR(ctor);
-)
+};  
diff --git a/include/Objects/BGNetDebugLogger.hpp b/include/Objects/BGNetDebugLogger.hpp
@@ -3,7 +3,8 @@
 #include "custom-types/shared/macros.hpp"
 #include "BGNet/Logging/Debug.hpp"
 
-DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Objects, BGNetDebugLogger, System::Object, classof(BGNet::Logging::Debug::ILogger*),
+// TODO: This doesn't work replace with Hooks!!!
+DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Objects, BGNetDebugLogger, System::Object, BGNet::Logging::Debug::ILogger*) {
     DECLARE_OVERRIDE_METHOD_MATCH(void, LogInfo, &::BGNet::Logging::Debug::ILogger::LogInfo, ::StringW message);
     DECLARE_OVERRIDE_METHOD_MATCH(void, LogError, &::BGNet::Logging::Debug::ILogger::LogError, ::StringW message);
     DECLARE_OVERRIDE_METHOD_MATCH(void, LogException, &::BGNet::Logging::Debug::ILogger::LogException, ::System::Exception* exception, ::StringW message);
@@ -12,4 +13,4 @@ DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Objects, BGNetDebugLogger, Sys
 
     public:
         BGNet::Logging::Debug::ILogger* i_ILogger() { return reinterpret_cast<BGNet::Logging::Debug::ILogger*>(this); }
-)
+};
diff --git a/include/Objects/MpPlayersDataModel.hpp b/include/Objects/MpPlayersDataModel.hpp
@@ -9,7 +9,7 @@
 #include "Beatmaps/Providers/MpBeatmapLevelProvider.hpp"
 #include "Beatmaps/Packets/MpBeatmapPacket.hpp"
 
-DECLARE_CLASS_CODEGEN(MultiplayerCore::Objects, MpPlayersDataModel, GlobalNamespace::LobbyPlayersDataModel,
+DECLARE_CLASS_CODEGEN(MultiplayerCore::Objects, MpPlayersDataModel, GlobalNamespace::LobbyPlayersDataModel) {
     DECLARE_INSTANCE_FIELD_PRIVATE(Networking::MpPacketSerializer*, _packetSerializer);
     DECLARE_INSTANCE_FIELD(Beatmaps::Providers::MpBeatmapLevelProvider*, _beatmapLevelProvider);
     using PacketDict = System::Collections::Generic::Dictionary_2<StringW, Beatmaps::Packets::MpBeatmapPacket*>;
@@ -35,4 +35,4 @@ DECLARE_CLASS_CODEGEN(MultiplayerCore::Objects, MpPlayersDataModel, GlobalNamesp
         void SendMpBeatmapPacket(GlobalNamespace::BeatmapKey beatmapKey, GlobalNamespace::IConnectedPlayer* player = nullptr);
     private:
         void PutPlayerPacket(StringW playerId, Beatmaps::Packets::MpBeatmapPacket* packet);
-)
+};
diff --git a/include/Patchers/BeatmapSelectionViewPatcher.hpp b/include/Patchers/BeatmapSelectionViewPatcher.hpp
@@ -8,7 +8,7 @@
 #include "GlobalNamespace/EditableBeatmapSelectionView.hpp"
 #include "Zenject/DiContainer.hpp"
 
-DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Patchers, BeatmapSelectionViewPatcher, System::Object, std::vector<Il2CppClass*>({classof(Zenject::IInitializable*), classof(System::IDisposable*)}),
+DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Patchers, BeatmapSelectionViewPatcher, System::Object, Zenject::IInitializable*, System::IDisposable*) {
     DECLARE_INSTANCE_FIELD_PRIVATE(GlobalNamespace::LobbySetupViewController*, _lobbySetupViewController);
     DECLARE_INSTANCE_FIELD_PRIVATE( GlobalNamespace::CenterStageScreenController*, _centerStageScreenController);
     DECLARE_INSTANCE_FIELD_PRIVATE(Zenject::DiContainer*, _container);
@@ -21,4 +21,4 @@ DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Patchers, BeatmapSelectionView
     DECLARE_OVERRIDE_METHOD_MATCH(void, Dispose, &::System::IDisposable::Dispose);
     DECLARE_OVERRIDE_METHOD_MATCH(void, Initialize, &::Zenject::IInitializable::Initialize);
     DECLARE_CTOR(ctor, GlobalNamespace::LobbySetupViewController* lobbySetupViewController, GlobalNamespace::CenterStageScreenController* centerStageScreenController, Zenject::DiContainer* container);
-)
+};
diff --git a/include/Patchers/ModeSelectionPatcher.hpp b/include/Patchers/ModeSelectionPatcher.hpp
@@ -4,7 +4,7 @@
 #include "GlobalNamespace/INetworkConfig.hpp"
 #include "System/IDisposable.hpp"
 
-DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Patchers, ModeSelectionPatcher, System::Object, classof(System::IDisposable*),
+DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Patchers, ModeSelectionPatcher, System::Object, System::IDisposable*) {
     DECLARE_INSTANCE_FIELD_PRIVATE(GlobalNamespace::INetworkConfig*, _networkConfig);
     DECLARE_INSTANCE_FIELD_PRIVATE(StringW, lastStatusUrl);
 
@@ -18,4 +18,4 @@ DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Patchers, ModeSelectionPatcher
         static ModeSelectionPatcher* get_instance();
     private:
         static ModeSelectionPatcher* instance;
-)
+};
diff --git a/include/Patchers/PlayerCountPatcher.hpp b/include/Patchers/PlayerCountPatcher.hpp
@@ -4,7 +4,7 @@
 #include "GlobalNamespace/INetworkConfig.hpp"
 #include "System/IDisposable.hpp"
 
-DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Patchers, PlayerCountPatcher, System::Object, classof(System::IDisposable*),
+DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Patchers, PlayerCountPatcher, System::Object, System::IDisposable*) {
     DECLARE_INSTANCE_FIELD_PRIVATE(GlobalNamespace::INetworkConfig*, _networkConfig);
 
     DECLARE_OVERRIDE_METHOD_MATCH(void, Dispose, &::System::IDisposable::Dispose);
@@ -24,4 +24,4 @@ DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::Patchers, PlayerCountPatcher,
         static PlayerCountPatcher* get_instance();
     private:
         static PlayerCountPatcher* instance;
-)
+};
diff --git a/include/ScoreSyncState/MpScoreSyncStateManager.hpp b/include/ScoreSyncState/MpScoreSyncStateManager.hpp
@@ -9,7 +9,7 @@
 #include "System/IDisposable.hpp"
 #include "Zenject/IInitializable.hpp"
 
-DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::ScoreSyncState, MpScoreSyncStateManager, GlobalNamespace::ScoreSyncStateManager, std::vector<Il2CppClass*>({classof(Zenject::IInitializable*), classof(System::IDisposable*)}),
+DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::ScoreSyncState, MpScoreSyncStateManager, GlobalNamespace::ScoreSyncStateManager, Zenject::IInitializable*, System::IDisposable*) {
     DECLARE_INSTANCE_FIELD_PRIVATE(Networking::MpPacketSerializer*, _packetSerializer);
     DECLARE_INSTANCE_FIELD_PRIVATE(long, deltaUpdateFrequencyMs);
     DECLARE_INSTANCE_FIELD_PRIVATE(long, fullStateUpdateFrequencyMs);
@@ -26,4 +26,4 @@ DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::ScoreSyncState, MpScoreSyncSta
 
     public:
         void HandleScoreSyncUpdateReceived(MpScoreSyncStatePacket* data, GlobalNamespace::IConnectedPlayer* player);
-)
+};
diff --git a/include/ScoreSyncState/MpScoreSyncStatePacket.hpp b/include/ScoreSyncState/MpScoreSyncStatePacket.hpp
@@ -2,12 +2,12 @@
 
 #include "Networking/Abstractions/MpPacket.hpp"
 
-DECLARE_CLASS_CUSTOM(MultiplayerCore::ScoreSyncState, MpScoreSyncStatePacket, MultiplayerCore::Networking::Abstractions::MpPacket,
+DECLARE_CLASS_CUSTOM(MultiplayerCore::ScoreSyncState, MpScoreSyncStatePacket, MultiplayerCore::Networking::Abstractions::MpPacket) {
     DECLARE_INSTANCE_FIELD(long, deltaUpdateFrequencyMs);
     DECLARE_INSTANCE_FIELD(long, fullStateUpdateFrequencyMs);
 
     DECLARE_OVERRIDE_METHOD_MATCH(void, Serialize, &LiteNetLib::Utils::INetSerializable::Serialize, LiteNetLib::Utils::NetDataWriter* writer);
     DECLARE_OVERRIDE_METHOD_MATCH(void, Deserialize, &LiteNetLib::Utils::INetSerializable::Deserialize, LiteNetLib::Utils::NetDataReader* reader);
 
     DECLARE_CTOR(ctor);
-)
+};
diff --git a/include/UI/CustomBeatmapSelectionView.hpp b/include/UI/CustomBeatmapSelectionView.hpp
@@ -9,7 +9,7 @@
 #include "Beatmaps/Providers/MpBeatmapLevelProvider.hpp"
 #include "GlobalNamespace/EditableBeatmapSelectionView.hpp"
 
-DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, CustomBeatmapSelectionView, GlobalNamespace::BeatmapSelectionView,
+DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, CustomBeatmapSelectionView, GlobalNamespace::BeatmapSelectionView) {
     DECLARE_INSTANCE_FIELD_PRIVATE(Objects::MpPlayersDataModel*, _mpPlayersDataModel);
     DECLARE_INSTANCE_FIELD_PRIVATE(Beatmaps::Providers::MpBeatmapLevelProvider*, _mpBeatmapLevelProvider);
 
@@ -19,4 +19,4 @@ DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, CustomBeatmapSelectionView, GlobalNam
 
     public:
     custom_types::Helpers::Coroutine SetBeatmapCoroutine(GlobalNamespace::BeatmapKey beatmapKey, std::string levelHash);
-)
+};
diff --git a/include/UI/CustomEditableBeatmapSelectionView.hpp b/include/UI/CustomEditableBeatmapSelectionView.hpp
@@ -9,7 +9,7 @@
 #include "Beatmaps/Providers/MpBeatmapLevelProvider.hpp"
 #include "GlobalNamespace/EditableBeatmapSelectionView.hpp"
 
-DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, CustomEditableBeatmapSelectionView, GlobalNamespace::EditableBeatmapSelectionView,
+DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, CustomEditableBeatmapSelectionView, GlobalNamespace::EditableBeatmapSelectionView) {
     DECLARE_INSTANCE_FIELD_PRIVATE(Objects::MpPlayersDataModel*, _mpPlayersDataModel);
     DECLARE_INSTANCE_FIELD_PRIVATE(Beatmaps::Providers::MpBeatmapLevelProvider*, _mpBeatmapLevelProvider);
 
@@ -19,4 +19,4 @@ DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, CustomEditableBeatmapSelectionView, G
 
     public:
     custom_types::Helpers::Coroutine SetBeatmapCoroutine(GlobalNamespace::BeatmapKey beatmapKey, std::string levelHash);
-)
+};
diff --git a/include/UI/GameServerPlayerTableCellCustomData.hpp b/include/UI/GameServerPlayerTableCellCustomData.hpp
@@ -10,16 +10,16 @@
 #include "GlobalNamespace/IConnectedPlayer.hpp"
 #include "GlobalNamespace/ILobbyPlayerData.hpp"
 
-DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, GameServerPlayerTableCellCustomData, UnityEngine::MonoBehaviour,
-        DECLARE_INJECT_METHOD(void, Inject, MultiplayerCore::Objects::MpPlayersDataModel* mpPlayersDataModel, MultiplayerCore::Beatmaps::Providers::MpBeatmapLevelProvider* beatmapLevelProvider);
-        DECLARE_INSTANCE_FIELD_PRIVATE(MultiplayerCore::Objects::MpPlayersDataModel*, _mpPlayersDataModel);
-        DECLARE_INSTANCE_FIELD(MultiplayerCore::Beatmaps::Providers::MpBeatmapLevelProvider*, _mpBeatmapLevelProvider);
-        DECLARE_INSTANCE_FIELD(GlobalNamespace::GameServerPlayerTableCell*, _gameServerPlayerTableCell);
+DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, GameServerPlayerTableCellCustomData, UnityEngine::MonoBehaviour) {
+    DECLARE_INJECT_METHOD(void, Inject, MultiplayerCore::Objects::MpPlayersDataModel* mpPlayersDataModel, MultiplayerCore::Beatmaps::Providers::MpBeatmapLevelProvider* beatmapLevelProvider);
+    DECLARE_INSTANCE_FIELD_PRIVATE(MultiplayerCore::Objects::MpPlayersDataModel*, _mpPlayersDataModel);
+    DECLARE_INSTANCE_FIELD(MultiplayerCore::Beatmaps::Providers::MpBeatmapLevelProvider*, _mpBeatmapLevelProvider);
+    DECLARE_INSTANCE_FIELD(GlobalNamespace::GameServerPlayerTableCell*, _gameServerPlayerTableCell);
 
-        DECLARE_INSTANCE_METHOD(void, Awake);
+    DECLARE_INSTANCE_METHOD(void, Awake);
     public:
         void SetData(GlobalNamespace::IConnectedPlayer* connectedPlayer, GlobalNamespace::ILobbyPlayerData* playerData, bool hasKickPermissions, bool allowSelection, System::Threading::Tasks::Task_1<GlobalNamespace::EntitlementStatus>* getLevelEntitlementTask);
         custom_types::Helpers::Coroutine SetDataCoroutine(GlobalNamespace::IConnectedPlayer* connectedPlayer, GlobalNamespace::ILobbyPlayerData* playerData, bool hasKickPermissions, bool allowSelection, System::Threading::Tasks::Task_1<GlobalNamespace::EntitlementStatus>* getLevelEntitlementTask);
     private:
         void SetLevelFoundValues(bool displayLevelText);
-)
+};
diff --git a/include/UI/MpColorsUI.hpp b/include/UI/MpColorsUI.hpp
@@ -11,7 +11,7 @@
 #include "UnityEngine/RectTransform.hpp"
 #include "UnityEngine/Vector3.hpp"
 
-DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, MpColorsUI, System::Object,
+DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, MpColorsUI, System::Object) {
     DECLARE_INSTANCE_FIELD_PRIVATE(GlobalNamespace::LobbySetupViewController*, _lobbySetupViewController);
     DECLARE_INSTANCE_FIELD_PRIVATE(GlobalNamespace::ColorSchemeView*, _colorSchemeView);
 
@@ -32,4 +32,4 @@ DECLARE_CLASS_CODEGEN(MultiplayerCore::UI, MpColorsUI, System::Object,
 
         void AcceptColors(Beatmaps::Abstractions::DifficultyColors const& colors);
         void AcceptColors(SongCore::CustomJSONData::CustomSaveDataInfo::BasicCustomDifficultyBeatmapDetails::CustomColors const& colors);
-)
+};
diff --git a/include/UI/MpLoadingIndicator.hpp b/include/UI/MpLoadingIndicator.hpp
@@ -17,8 +17,7 @@
 #include "Zenject/ITickable.hpp"
 #include "UnityEngine/GameObject.hpp"
 
-DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::UI, MpLoadingIndicator, System::Object,
-    std::vector<Il2CppClass*>({classof(::System::IDisposable*), classof(::Zenject::IInitializable*), classof(::Zenject::ITickable*)}),
+DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::UI, MpLoadingIndicator, System::Object, ::System::IDisposable*, ::Zenject::IInitializable*, ::Zenject::ITickable*) {
 
     DECLARE_INSTANCE_FIELD_PRIVATE(double, _downloadProgress);
     DECLARE_INSTANCE_FIELD_PRIVATE(bool, _isDownloading);
@@ -47,4 +46,4 @@ DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::UI, MpLoadingIndicator, System
 
     public:
         std::pair<int, int> OkAndTotalPlayerCountNoRequest();
-)
+};