Tweak show disabled toggle when not party owner, fix toggle dissapear…

…ing with ready/start button, remove some unnecessary checks
EnderdracheLP · Aug 8, 2024 · cf8b0ae · cf8b0ae
1 parent c1be5ad
commit cf8b0ae
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 33 deletions.
diff --git a/assets/MpPerPlayerToggles.bsml b/assets/MpPerPlayerToggles.bsml
@@ -1,4 +1,5 @@
-<horizontal>
+<horizontal id="ppth">
+  <vertical min-width='45' horizontal-fit='MinSize'> </vertical>
   <vertical min-width='45' horizontal-fit='MinSize'> </vertical>
   <vertical min-width='45' horizontal-fit='MinSize'>
     <toggle-setting id='ppdt' value='PerPlayerDifficulty' apply-on-change='true' text='Per Player Difficulty' hover-hint='Allows each player to select their own difficulty!' bind-value='true'/>

diff --git a/include/UI/MpPerPlayerUI.hpp b/include/UI/MpPerPlayerUI.hpp
@@ -12,6 +12,7 @@
 #include "Zenject/IInitializable.hpp"
 
 #include "UnityEngine/UI/VerticalLayoutGroup.hpp"
+#include "UnityEngine/UI/HorizontalLayoutGroup.hpp"
 #include "UnityEngine/CanvasGroup.hpp"
 
 #include "HMUI/TextSegmentedControl.hpp"
@@ -68,6 +69,7 @@ DECLARE_CLASS_CODEGEN_INTERFACES(MultiplayerCore::UI, MpPerPlayerUI, System::Obj
 
     // UI Elements
     DECLARE_INSTANCE_FIELD(UnityEngine::UI::VerticalLayoutGroup*, segmentVert);
+    DECLARE_INSTANCE_FIELD(UnityEngine::UI::HorizontalLayoutGroup*, ppth);
     DECLARE_INSTANCE_FIELD(HMUI::TextSegmentedControl*, difficultyControl);
     DECLARE_INSTANCE_FIELD(BSML::ToggleSetting*, ppdt);
     DECLARE_INSTANCE_FIELD(BSML::ToggleSetting*, ppmt);

diff --git a/src/UI/MpPerPlayerUI.cpp b/src/UI/MpPerPlayerUI.cpp
@@ -66,10 +66,10 @@ namespace MultiplayerCore::UI {
         if (segmentVert) _difficultyCanvasGroup = segmentVert->gameObject->AddComponent<UnityEngine::CanvasGroup*>();
 
         // PerPlayerToggles
-        BSML::parse_and_construct(Assets::MpPerPlayerToggles_bsml, _lobbyViewController->_startGameReadyButton->gameObject->transform, this);
+        BSML::parse_and_construct(Assets::MpPerPlayerToggles_bsml, _lobbyViewController->transform, this);
 
         // Check if UI Elements were created
-        if (!segmentVert || !ppdt || !ppmt || !difficultyControl || !_difficultyCanvasGroup) {
+        if (!segmentVert || !ppdt || !ppmt || !difficultyControl || !_difficultyCanvasGroup || !ppth) {
             CRITICAL("Failed to create UI Elements, UI will not function!");
             return;
         }
@@ -155,14 +155,13 @@ namespace MultiplayerCore::UI {
             }
         }
 
-        if (_lobbyViewController && _lobbyViewController->_isPartyOwner && ppdt && ppmt)
-        {
-            ppdt->gameObject->SetActive(true);
-            ppmt->gameObject->SetActive(true);
-        } else if (ppdt && ppmt) {
-            ppdt->gameObject->SetActive(false);
-            ppmt->gameObject->SetActive(false);
-        } else ERROR("Toggle Settings are null, returning...");
+        ppdt->set_interactable(_lobbyViewController->_isPartyOwner);
+        ppdt->text->alpha = _lobbyViewController->_isPartyOwner ? 1.0f : 0.25f;
+        ppmt->set_interactable(_lobbyViewController->_isPartyOwner);
+        ppmt->text->alpha = _lobbyViewController->_isPartyOwner ? 1.0f : 0.25f;
+
+        auto locposition = _lobbyViewController->_startGameReadyButton->gameObject->transform->localPosition;
+        ppth->gameObject->transform->localPosition = locposition;
     }
 
     void MpPerPlayerUI::DidDeactivate(bool removedFromHierarchy, bool screenSystemDisabling) {
@@ -199,44 +198,44 @@ namespace MultiplayerCore::UI {
 
     void MpPerPlayerUI::UpdateButtonsEnabled() {
         // UpdateButtonsEnabled
-        if (_lobbyViewController && _lobbyViewController->_isPartyOwner && ppdt && ppmt)
-        {
-            ppdt->gameObject->SetActive(true);
-            ppmt->gameObject->SetActive(true);
-
-            _multiplayerSessionManager->Send(Players::Packets::GetMpPerPlayerPacket::New_ctor());
-        } else if (ppdt && ppmt) {
-            ppdt->gameObject->SetActive(false);
-            ppmt->gameObject->SetActive(false);
-        } else ERROR("Toggle Settings are null, returning...");
+        ppdt->set_interactable(_lobbyViewController->_isPartyOwner);
+        ppdt->text->alpha = _lobbyViewController->_isPartyOwner ? 1.0f : 0.25f;
+        ppmt->set_interactable(_lobbyViewController->_isPartyOwner);
+        ppmt->text->alpha = _lobbyViewController->_isPartyOwner ? 1.0f : 0.25f;
+
+        // Request updated button states from server
+        _multiplayerSessionManager->Send(Players::Packets::GetMpPerPlayerPacket::New_ctor());
     }
 
     void MpPerPlayerUI::SetLobbyState(GlobalNamespace::MultiplayerLobbyState state) {
         // SetLobbyState
         DEBUG("Current Lobby State {}", Utils::EnumUtils::GetEnumName<GlobalNamespace::MultiplayerLobbyState>(state));
-        if (_difficultyCanvasGroup) {
-            _difficultyCanvasGroup->alpha = (state == GlobalNamespace::MultiplayerLobbyState::LobbySetup || 
-                                             state == GlobalNamespace::MultiplayerLobbyState::LobbyCountdown) ? 1.0f : 0.25f;
+        if (!_lobbyViewController || !_difficultyCanvasGroup || !difficultyControl || !ppdt || !ppmt) {
+            ERROR("UI was not properly initialized, returning...");
+            return;
         }
 
+        _difficultyCanvasGroup->alpha = (state == GlobalNamespace::MultiplayerLobbyState::LobbySetup || 
+                                        state == GlobalNamespace::MultiplayerLobbyState::LobbyCountdown) ? 1.0f : 0.25f;
+
         auto cells = ListW<::UnityW<::HMUI::TableCell>>(difficultyControl->cells);
         for (auto& cell : cells) {
             if (!cell) continue;
             cell->set_interactable(state == GlobalNamespace::MultiplayerLobbyState::LobbySetup || 
                                    state == GlobalNamespace::MultiplayerLobbyState::LobbyCountdown);
         }
 
-        if (!_lobbyViewController)
-            return;
-
         if (_lobbyViewController->_isPartyOwner)
         {
-            if (ppdt && ppmt) {
-                ppdt->set_interactable(state == GlobalNamespace::MultiplayerLobbyState::LobbySetup || 
-                                      state == GlobalNamespace::MultiplayerLobbyState::LobbyCountdown);
-                ppmt->set_interactable(state == GlobalNamespace::MultiplayerLobbyState::LobbySetup ||
-                                      state == GlobalNamespace::MultiplayerLobbyState::LobbyCountdown);
-            }
+            ppdt->set_interactable(state == GlobalNamespace::MultiplayerLobbyState::LobbySetup || 
+                                    state == GlobalNamespace::MultiplayerLobbyState::LobbyCountdown);
+            ppmt->set_interactable(state == GlobalNamespace::MultiplayerLobbyState::LobbySetup ||
+                                    state == GlobalNamespace::MultiplayerLobbyState::LobbyCountdown);
+
+            ppdt->text->alpha = (state == GlobalNamespace::MultiplayerLobbyState::LobbySetup || 
+                                state == GlobalNamespace::MultiplayerLobbyState::LobbyCountdown) ? 1.0f : 0.25f;
+            ppmt->text->alpha = (state == GlobalNamespace::MultiplayerLobbyState::LobbySetup ||
+                                state == GlobalNamespace::MultiplayerLobbyState::LobbyCountdown) ? 1.0f : 0.25f;
         }
     }
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -10,6 +10,8 @@
 #include "lapiz/shared/zenject/Zenjector.hpp"
 #include "bsml/shared/BSML.hpp"
 
+#define BEATSAVER_PLUSPLUS_AUTO_INIT
+
 modloader::ModInfo modInfo{MOD_ID, VERSION, VERSION_LONG};
 
 MPCORE_EXPORT_FUNC void setup(CModInfo* info) {