1.27 Release

kodenamekrak · Jan 11, 2023 · 8d5c1a7 · 8d5c1a7
1 parent 29d3c7b
commit 8d5c1a7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 52 deletions.
diff --git a/createqmod.ps1 b/createqmod.ps1
@@ -17,7 +17,7 @@ if ($help -eq $true) {
 
 $mod = "./mod.json"
 
-& $PSScriptRoot/validate-modjson.ps1
+# & $PSScriptRoot/validate-modjson.ps1
 if ($LASTEXITCODE -ne 0) {
     exit $LASTEXITCODE
 }

diff --git a/mod.template.json b/mod.template.json
@@ -6,7 +6,7 @@
   "author": "KodenameKRAK, Henri",
   "version": "0.1.0",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.25.1",
+  "packageVersion": "1.27.0_3631150051",
   "coverImage": "cover.jpg",
   "description": "Menu saber colors reflect in game saber colors.",
   "dependencies": [],

diff --git a/qpm.json b/qpm.json
@@ -6,32 +6,34 @@
     "id": "qonsistentsabercolors",
     "version": "0.1.0",
     "url": null,
-    "additionalData": {}
+    "additionalData": {
+      "overrideSoName": "libqonsistentsabercolors.so"
+    }
   },
   "dependencies": [
     {
-      "id": "codegen",
-      "versionRange": "^0.28.0",
+      "id": "beatsaber-hook",
+      "versionRange": "^3.14.0",
       "additionalData": {}
     },
     {
-      "id": "questui",
-      "versionRange": "^0.17.5",
+      "id": "config-utils",
+      "versionRange": "^1.0.1",
       "additionalData": {}
     },
     {
-      "id": "beatsaber-hook",
-      "versionRange": "^3.14.0",
+      "id": "questui",
+      "versionRange": "^0.17.10",
       "additionalData": {}
     },
     {
-      "id": "config-utils",
-      "versionRange": "^1.0.1",
+      "id": "codegen",
+      "versionRange": "^0.32.0",
       "additionalData": {}
     },
     {
       "id": "custom-types",
-      "versionRange": "^0.15.21",
+      "versionRange": "^0.15.22",
       "additionalData": {}
     }
   ],

diff --git a/src/ColorManager.cpp b/src/ColorManager.cpp
@@ -38,7 +38,7 @@ namespace QonsistentSaberColors
 {
     void UpdateColors()
     {
-        getLogger().info("Updating colors");
+        getLogger().info("Updating colorScheme");
         if(colorSchemesSettings->overrideDefaultColors && getModConfig().Enabled.GetValue())
         {
             auto scheme = colorSchemesSettings->GetSelectedColorScheme();
@@ -54,7 +54,7 @@ namespace QonsistentSaberColors
 
     void UpdatePointers()
     {
-        getLogger().info("Updating neccessary pointers");
+        getLogger().info("Updating pointers");
         auto controllers = UnityEngine::Resources::FindObjectsOfTypeAll<GlobalNamespace::VRController*>();
         leftController = controllers[1];
         rightController = controllers[0];
@@ -65,7 +65,6 @@ namespace QonsistentSaberColors
 
     void SetControllerColors(UnityEngine::Color leftColor, UnityEngine::Color rightColor)
     {
-        getLogger().info("SetControllerColors()");
         if(!leftController->m_CachedPtr.m_value || !leftController || !rightController->m_CachedPtr.m_value || !rightController)
         {
             getLogger().info("One of the controllers was null, updating pointers");
@@ -112,7 +111,6 @@ namespace QonsistentSaberColors
 
     void SetLaserColor(VRUIControls::VRLaserPointer* pointer)
     {
-        getLogger().info("SetLaserColor()");
         if(!laserPointer || !laserPointer->m_CachedPtr.m_value)
         {
             getLogger().info("laserPointer was null, not setting color");
@@ -138,28 +136,17 @@ namespace QonsistentSaberColors
 
     void SetLaser(VRUIControls::VRLaserPointer* laser)
     {
-        getLogger().info("SetLaser()");
         laserPointer = laser;
     }
 
     void UpdateControllerColors()
     {
-        getLogger().info("UpdateControllerColors()");
         UpdateColors();
         SetControllerColors(leftSaberColor, rightSaberColor);
     }
 
     void UpdateLaserColor()
     {
-        getLogger().info("UpdateLaserColor");
-        if(laserPointer)
-            getLogger().info("laserPointer is valid");
-        else
-        {
-            getLogger().info("laserPointer is null");
-            return;
-        }
-
         UpdateColors();
         SetLaserColor(laserPointer);
     }

diff --git a/src/SettingsViewController.cpp b/src/SettingsViewController.cpp
@@ -16,15 +16,13 @@ void QonsistentSaberColors::SettingsViewController::DidActivate(bool firstActiva
 
     QuestUI::BeatSaberUI::CreateToggle(transform, "Enabled", getModConfig().Enabled.GetValue(), [](bool value)
     {
-        getLogger().info("Enabled toggle");
         getModConfig().Enabled.SetValue(value);
         QonsistentSaberColors::UpdateControllerColors();
         QonsistentSaberColors::UpdateLaserColor();
     });
 
     QuestUI::BeatSaberUI::CreateToggle(transform, "Colored lasers", getModConfig().ColoredLasers.GetValue(), [](bool value)
     {
-        getLogger().info("Lasers toggle");
         getModConfig().ColoredLasers.SetValue(value);
         QonsistentSaberColors::UpdateLaserColor();
     });

diff --git a/src/main.cpp b/src/main.cpp
@@ -13,38 +13,20 @@
 #include "VRUIControls/VRPointer.hpp"
 #include "VRUIControls/VRLaserPointer.hpp"
 
-
-#include "UnityEngine/Resources.hpp"
-#include "UnityEngine/GameObject.hpp"
-#include "UnityEngine/Transform.hpp"
-#include "UnityEngine/Material.hpp"
-#include "UnityEngine/MeshRenderer.hpp"
-
 static ModInfo modInfo;
 
 using namespace QonsistentSaberColors;
 
 MAKE_HOOK_MATCH(VRPointer_CreateLaserPointerAndLaserHit, &VRUIControls::VRPointer::CreateLaserPointerAndLaserHit, void, VRUIControls::VRPointer* self)
 {
-    getLogger().info("VRPointer_CreateLaserPointerAndLaserHit");
     VRPointer_CreateLaserPointerAndLaserHit(self);
-
-    auto mr = self->laserPointer->GetComponentInChildren<UnityEngine::MeshRenderer*>();
-    auto arr = mr->GetMaterialArray();
-    for(int i = 0; i < arr.Length(); i++)
-    {
-        auto col = arr[i]->get_color();
-        getLogger().info("Color for index %i is R:%f, G:%f, B:%f, A:%f", i, col.r, col.g, col.b, col.a);
-    }
-
     SetLaser(self->laserPointer);
     if(getModConfig().ColoredLasers.GetValue() && getModConfig().Enabled.GetValue())
         UpdateLaserColor();
 }
 
 MAKE_HOOK_MATCH(MainMenuViewController_DidActivate, &GlobalNamespace::MainMenuViewController::DidActivate, void, GlobalNamespace::MainMenuViewController* self, bool a, bool b, bool c)
 {
-    getLogger().info("MainMenuViewController_DidActivate");
     MainMenuViewController_DidActivate(self, a, b, c);
     if(getModConfig().Enabled.GetValue())
     {
@@ -56,7 +38,6 @@ MAKE_HOOK_MATCH(MainMenuViewController_DidActivate, &GlobalNamespace::MainMenuVi
 
 MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleOverrideColorsToggleValueChanged, &GlobalNamespace::ColorsOverrideSettingsPanelController::HandleOverrideColorsToggleValueChanged, void, GlobalNamespace::ColorsOverrideSettingsPanelController* self, bool isOn)
 {
-    getLogger().info("ColorsOverrideSettingsPanelController_HandleOverrideColorsToggleValueChanged");
     ColorsOverrideSettingsPanelController_HandleOverrideColorsToggleValueChanged(self, isOn);
     if(getModConfig().Enabled.GetValue())
     {
@@ -68,7 +49,6 @@ MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleOverrideColorsToggle
 
 MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleEditColorSchemeControllerDidChangeColorScheme, &GlobalNamespace::ColorsOverrideSettingsPanelController::HandleEditColorSchemeControllerDidChangeColorScheme, void, GlobalNamespace::ColorsOverrideSettingsPanelController* self, GlobalNamespace::ColorScheme* colorScheme)
 {
-    getLogger().info("ColorsOverrideSettingsPanelController_HandleEditColorSchemeControllerDidChangeColorScheme");
     ColorsOverrideSettingsPanelController_HandleEditColorSchemeControllerDidChangeColorScheme(self, colorScheme);
     if(getModConfig().Enabled.GetValue())
     {
@@ -80,7 +60,6 @@ MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleEditColorSchemeContr
 
 MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleDropDownDidSelectCellWithIdx, &GlobalNamespace::ColorsOverrideSettingsPanelController::HandleDropDownDidSelectCellWithIdx, void, GlobalNamespace::ColorsOverrideSettingsPanelController* self, HMUI::DropdownWithTableView* dropDownWithTableView, int idx)
 {
-    getLogger().info("ColorsOverrideSettingsPanelController_HandleDropDownDidSelectCellWithIdx");
     ColorsOverrideSettingsPanelController_HandleDropDownDidSelectCellWithIdx(self, dropDownWithTableView, idx);
     if(getModConfig().Enabled.GetValue())
     {
@@ -92,7 +71,6 @@ MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleDropDownDidSelectCel
 
 MAKE_HOOK_MATCH(SceneManager_SetActiveScene, &UnityEngine::SceneManagement::SceneManager::SetActiveScene, bool, UnityEngine::SceneManagement::Scene scene)
 {
-    getLogger().info("SceneManager_SetActiveScene");
     bool val = SceneManager_SetActiveScene(scene);
     UpdatePointers();
     if(getModConfig().Enabled.GetValue() && scene.get_name() == "HealthWarning")

diff --git a/validate-modjson.ps1 b/validate-modjson.ps1
@@ -2,7 +2,7 @@ $mod = "./mod.json"
 
 if (-not (Test-Path -Path $mod)) {
     if (Test-Path -Path ".\mod.template.json") {
-        & qpm-rust qmod build
+        & qpm qmod build
         if ($LASTEXITCODE -ne 0) {
             exit $LASTEXITCODE
         }