Install NodePose and ScoreSyncStateManager in AppInstaller, keep orig…

…inal intact
EnderdracheLP · Aug 30, 2024 · d54b4dc · d54b4dc
1 parent e010565
commit d54b4dc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/Hooks/MainSystemBinderHooks.cpp b/src/Hooks/MainSystemBinderHooks.cpp
@@ -12,8 +12,8 @@
 #include "Zenject/ConcreteIdBinderNonGeneric.hpp"
 #include "Zenject/FromBinderNonGeneric.hpp"
 #include "Objects/MpEntitlementChecker.hpp"
-#include "NodePoseSyncState/MpNodePoseSyncStateManager.hpp"
-#include "ScoreSyncState/MpScoreSyncStateManager.hpp"
+// #include "NodePoseSyncState/MpNodePoseSyncStateManager.hpp"
+// #include "ScoreSyncState/MpScoreSyncStateManager.hpp"
 
 MAKE_AUTO_HOOK_ORIG_MATCH(MainSystemInit_InstallBindings, &::GlobalNamespace::MainSystemInit::InstallBindings, void, GlobalNamespace::MainSystemInit* self, Zenject::DiContainer* container, bool isRunningFromTests) {
     MainSystemInit_InstallBindings(self, container, isRunningFromTests);
@@ -23,17 +23,17 @@ MAKE_AUTO_HOOK_ORIG_MATCH(MainSystemInit_InstallBindings, &::GlobalNamespace::Ma
     auto toarray = Lapiz::ArrayUtils::TypeArray<MultiplayerCore::Objects::MpEntitlementChecker*>();
     container->Bind(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(bindarray.convert()))->To(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(toarray.convert()))->FromNewComponentOnRoot()->AsSingle()->NonLazy();
 
-    container->Unbind<GlobalNamespace::NodePoseSyncStateManager*>();
-    container->Unbind<GlobalNamespace::INodePoseSyncStateManager*>();
+    // container->Unbind<GlobalNamespace::NodePoseSyncStateManager*>();
+    // container->Unbind<GlobalNamespace::INodePoseSyncStateManager*>();
 
-    bindarray = Lapiz::ArrayUtils::TypeArray<MultiplayerCore::NodePoseSyncState::MpNodePoseSyncStateManager*, GlobalNamespace::NodePoseSyncStateManager*, GlobalNamespace::INodePoseSyncStateManager*, Zenject::IInitializable*, System::IDisposable*>();
-    toarray = Lapiz::ArrayUtils::TypeArray<MultiplayerCore::NodePoseSyncState::MpNodePoseSyncStateManager*>();
-    container->Bind(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(bindarray.convert()))->To(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(toarray.convert()))->FromNewComponentOnRoot()->AsSingle();
+    // bindarray = Lapiz::ArrayUtils::TypeArray<MultiplayerCore::NodePoseSyncState::MpNodePoseSyncStateManager*, GlobalNamespace::NodePoseSyncStateManager*, GlobalNamespace::INodePoseSyncStateManager*, Zenject::IInitializable*, System::IDisposable*>();
+    // toarray = Lapiz::ArrayUtils::TypeArray<MultiplayerCore::NodePoseSyncState::MpNodePoseSyncStateManager*>();
+    // container->Bind(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(bindarray.convert()))->To(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(toarray.convert()))->FromNewComponentOnRoot()->AsSingle();
 
-    container->Unbind<GlobalNamespace::ScoreSyncStateManager*>();
-    container->Unbind<GlobalNamespace::IScoreSyncStateManager*>();
+    // container->Unbind<GlobalNamespace::ScoreSyncStateManager*>();
+    // container->Unbind<GlobalNamespace::IScoreSyncStateManager*>();
 
-    bindarray = Lapiz::ArrayUtils::TypeArray<MultiplayerCore::ScoreSyncState::MpScoreSyncStateManager*, GlobalNamespace::ScoreSyncStateManager*, GlobalNamespace::IScoreSyncStateManager*, Zenject::IInitializable*, System::IDisposable*>();
-    toarray = Lapiz::ArrayUtils::TypeArray<MultiplayerCore::ScoreSyncState::MpScoreSyncStateManager*>();
-    container->Bind(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(bindarray.convert()))->To(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(toarray.convert()))->FromNewComponentOnRoot()->AsSingle();
+    // bindarray = Lapiz::ArrayUtils::TypeArray<MultiplayerCore::ScoreSyncState::MpScoreSyncStateManager*, GlobalNamespace::ScoreSyncStateManager*, GlobalNamespace::IScoreSyncStateManager*, Zenject::IInitializable*, System::IDisposable*>();
+    // toarray = Lapiz::ArrayUtils::TypeArray<MultiplayerCore::ScoreSyncState::MpScoreSyncStateManager*>();
+    // container->Bind(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(bindarray.convert()))->To(reinterpret_cast<::System::Collections::Generic::IEnumerable_1<System::Type*>*>(toarray.convert()))->FromNewComponentOnRoot()->AsSingle();
 }
diff --git a/src/Installers/MpAppInstaller.cpp b/src/Installers/MpAppInstaller.cpp
@@ -9,6 +9,7 @@
 #include "Patchers/PlayerCountPatcher.hpp"
 #include "Repositories/MpStatusRepository.hpp"
 #include "NodePoseSyncState/MpNodePoseSyncStateManager.hpp"
+#include "ScoreSyncState/MpScoreSyncStateManager.hpp"
 
 #include "Zenject/DiContainer.hpp"
 #include "Zenject/FromBinderNonGeneric.hpp"
@@ -23,6 +24,7 @@ using namespace MultiplayerCore::Patchers;
 using namespace MultiplayerCore::Beatmaps::Providers;
 using namespace MultiplayerCore::Repositories;
 using namespace MultiplayerCore::NodePoseSyncState;
+using namespace MultiplayerCore::ScoreSyncState;
 
 namespace MultiplayerCore::Installers {
     void MpAppInstaller::InstallBindings() {
@@ -33,6 +35,7 @@ namespace MultiplayerCore::Installers {
         // player stuff
         container->BindInterfacesAndSelfTo<MpPlayerManager*>()->AsSingle();
         container->BindInterfacesAndSelfTo<MpNodePoseSyncStateManager*>()->AsSingle();
+        container->BindInterfacesAndSelfTo<MpScoreSyncStateManager*>()->AsSingle();
 
         // beatmap stuff
         container->Bind<MpLevelDownloader*>()->ToSelf()->AsSingle();