Skip to content

Commit 8d5c1a7

Browse files
committed
1.27 Release
1 parent 29d3c7b commit 8d5c1a7

7 files changed

+17
-52
lines changed

createqmod.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if ($help -eq $true) {
1717

1818
$mod = "./mod.json"
1919

20-
& $PSScriptRoot/validate-modjson.ps1
20+
# & $PSScriptRoot/validate-modjson.ps1
2121
if ($LASTEXITCODE -ne 0) {
2222
exit $LASTEXITCODE
2323
}

mod.template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"author": "KodenameKRAK, Henri",
77
"version": "0.1.0",
88
"packageId": "com.beatgames.beatsaber",
9-
"packageVersion": "1.25.1",
9+
"packageVersion": "1.27.0_3631150051",
1010
"coverImage": "cover.jpg",
1111
"description": "Menu saber colors reflect in game saber colors.",
1212
"dependencies": [],

qpm.json

+12-10
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,34 @@
66
"id": "qonsistentsabercolors",
77
"version": "0.1.0",
88
"url": null,
9-
"additionalData": {}
9+
"additionalData": {
10+
"overrideSoName": "libqonsistentsabercolors.so"
11+
}
1012
},
1113
"dependencies": [
1214
{
13-
"id": "codegen",
14-
"versionRange": "^0.28.0",
15+
"id": "beatsaber-hook",
16+
"versionRange": "^3.14.0",
1517
"additionalData": {}
1618
},
1719
{
18-
"id": "questui",
19-
"versionRange": "^0.17.5",
20+
"id": "config-utils",
21+
"versionRange": "^1.0.1",
2022
"additionalData": {}
2123
},
2224
{
23-
"id": "beatsaber-hook",
24-
"versionRange": "^3.14.0",
25+
"id": "questui",
26+
"versionRange": "^0.17.10",
2527
"additionalData": {}
2628
},
2729
{
28-
"id": "config-utils",
29-
"versionRange": "^1.0.1",
30+
"id": "codegen",
31+
"versionRange": "^0.32.0",
3032
"additionalData": {}
3133
},
3234
{
3335
"id": "custom-types",
34-
"versionRange": "^0.15.21",
36+
"versionRange": "^0.15.22",
3537
"additionalData": {}
3638
}
3739
],

src/ColorManager.cpp

+2-15
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace QonsistentSaberColors
3838
{
3939
void UpdateColors()
4040
{
41-
getLogger().info("Updating colors");
41+
getLogger().info("Updating colorScheme");
4242
if(colorSchemesSettings->overrideDefaultColors && getModConfig().Enabled.GetValue())
4343
{
4444
auto scheme = colorSchemesSettings->GetSelectedColorScheme();
@@ -54,7 +54,7 @@ namespace QonsistentSaberColors
5454

5555
void UpdatePointers()
5656
{
57-
getLogger().info("Updating neccessary pointers");
57+
getLogger().info("Updating pointers");
5858
auto controllers = UnityEngine::Resources::FindObjectsOfTypeAll<GlobalNamespace::VRController*>();
5959
leftController = controllers[1];
6060
rightController = controllers[0];
@@ -65,7 +65,6 @@ namespace QonsistentSaberColors
6565

6666
void SetControllerColors(UnityEngine::Color leftColor, UnityEngine::Color rightColor)
6767
{
68-
getLogger().info("SetControllerColors()");
6968
if(!leftController->m_CachedPtr.m_value || !leftController || !rightController->m_CachedPtr.m_value || !rightController)
7069
{
7170
getLogger().info("One of the controllers was null, updating pointers");
@@ -112,7 +111,6 @@ namespace QonsistentSaberColors
112111

113112
void SetLaserColor(VRUIControls::VRLaserPointer* pointer)
114113
{
115-
getLogger().info("SetLaserColor()");
116114
if(!laserPointer || !laserPointer->m_CachedPtr.m_value)
117115
{
118116
getLogger().info("laserPointer was null, not setting color");
@@ -138,28 +136,17 @@ namespace QonsistentSaberColors
138136

139137
void SetLaser(VRUIControls::VRLaserPointer* laser)
140138
{
141-
getLogger().info("SetLaser()");
142139
laserPointer = laser;
143140
}
144141

145142
void UpdateControllerColors()
146143
{
147-
getLogger().info("UpdateControllerColors()");
148144
UpdateColors();
149145
SetControllerColors(leftSaberColor, rightSaberColor);
150146
}
151147

152148
void UpdateLaserColor()
153149
{
154-
getLogger().info("UpdateLaserColor");
155-
if(laserPointer)
156-
getLogger().info("laserPointer is valid");
157-
else
158-
{
159-
getLogger().info("laserPointer is null");
160-
return;
161-
}
162-
163150
UpdateColors();
164151
SetLaserColor(laserPointer);
165152
}

src/SettingsViewController.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ void QonsistentSaberColors::SettingsViewController::DidActivate(bool firstActiva
1616

1717
QuestUI::BeatSaberUI::CreateToggle(transform, "Enabled", getModConfig().Enabled.GetValue(), [](bool value)
1818
{
19-
getLogger().info("Enabled toggle");
2019
getModConfig().Enabled.SetValue(value);
2120
QonsistentSaberColors::UpdateControllerColors();
2221
QonsistentSaberColors::UpdateLaserColor();
2322
});
2423

2524
QuestUI::BeatSaberUI::CreateToggle(transform, "Colored lasers", getModConfig().ColoredLasers.GetValue(), [](bool value)
2625
{
27-
getLogger().info("Lasers toggle");
2826
getModConfig().ColoredLasers.SetValue(value);
2927
QonsistentSaberColors::UpdateLaserColor();
3028
});

src/main.cpp

-22
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,20 @@
1313
#include "VRUIControls/VRPointer.hpp"
1414
#include "VRUIControls/VRLaserPointer.hpp"
1515

16-
17-
#include "UnityEngine/Resources.hpp"
18-
#include "UnityEngine/GameObject.hpp"
19-
#include "UnityEngine/Transform.hpp"
20-
#include "UnityEngine/Material.hpp"
21-
#include "UnityEngine/MeshRenderer.hpp"
22-
2316
static ModInfo modInfo;
2417

2518
using namespace QonsistentSaberColors;
2619

2720
MAKE_HOOK_MATCH(VRPointer_CreateLaserPointerAndLaserHit, &VRUIControls::VRPointer::CreateLaserPointerAndLaserHit, void, VRUIControls::VRPointer* self)
2821
{
29-
getLogger().info("VRPointer_CreateLaserPointerAndLaserHit");
3022
VRPointer_CreateLaserPointerAndLaserHit(self);
31-
32-
auto mr = self->laserPointer->GetComponentInChildren<UnityEngine::MeshRenderer*>();
33-
auto arr = mr->GetMaterialArray();
34-
for(int i = 0; i < arr.Length(); i++)
35-
{
36-
auto col = arr[i]->get_color();
37-
getLogger().info("Color for index %i is R:%f, G:%f, B:%f, A:%f", i, col.r, col.g, col.b, col.a);
38-
}
39-
4023
SetLaser(self->laserPointer);
4124
if(getModConfig().ColoredLasers.GetValue() && getModConfig().Enabled.GetValue())
4225
UpdateLaserColor();
4326
}
4427

4528
MAKE_HOOK_MATCH(MainMenuViewController_DidActivate, &GlobalNamespace::MainMenuViewController::DidActivate, void, GlobalNamespace::MainMenuViewController* self, bool a, bool b, bool c)
4629
{
47-
getLogger().info("MainMenuViewController_DidActivate");
4830
MainMenuViewController_DidActivate(self, a, b, c);
4931
if(getModConfig().Enabled.GetValue())
5032
{
@@ -56,7 +38,6 @@ MAKE_HOOK_MATCH(MainMenuViewController_DidActivate, &GlobalNamespace::MainMenuVi
5638

5739
MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleOverrideColorsToggleValueChanged, &GlobalNamespace::ColorsOverrideSettingsPanelController::HandleOverrideColorsToggleValueChanged, void, GlobalNamespace::ColorsOverrideSettingsPanelController* self, bool isOn)
5840
{
59-
getLogger().info("ColorsOverrideSettingsPanelController_HandleOverrideColorsToggleValueChanged");
6041
ColorsOverrideSettingsPanelController_HandleOverrideColorsToggleValueChanged(self, isOn);
6142
if(getModConfig().Enabled.GetValue())
6243
{
@@ -68,7 +49,6 @@ MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleOverrideColorsToggle
6849

6950
MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleEditColorSchemeControllerDidChangeColorScheme, &GlobalNamespace::ColorsOverrideSettingsPanelController::HandleEditColorSchemeControllerDidChangeColorScheme, void, GlobalNamespace::ColorsOverrideSettingsPanelController* self, GlobalNamespace::ColorScheme* colorScheme)
7051
{
71-
getLogger().info("ColorsOverrideSettingsPanelController_HandleEditColorSchemeControllerDidChangeColorScheme");
7252
ColorsOverrideSettingsPanelController_HandleEditColorSchemeControllerDidChangeColorScheme(self, colorScheme);
7353
if(getModConfig().Enabled.GetValue())
7454
{
@@ -80,7 +60,6 @@ MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleEditColorSchemeContr
8060

8161
MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleDropDownDidSelectCellWithIdx, &GlobalNamespace::ColorsOverrideSettingsPanelController::HandleDropDownDidSelectCellWithIdx, void, GlobalNamespace::ColorsOverrideSettingsPanelController* self, HMUI::DropdownWithTableView* dropDownWithTableView, int idx)
8262
{
83-
getLogger().info("ColorsOverrideSettingsPanelController_HandleDropDownDidSelectCellWithIdx");
8463
ColorsOverrideSettingsPanelController_HandleDropDownDidSelectCellWithIdx(self, dropDownWithTableView, idx);
8564
if(getModConfig().Enabled.GetValue())
8665
{
@@ -92,7 +71,6 @@ MAKE_HOOK_MATCH(ColorsOverrideSettingsPanelController_HandleDropDownDidSelectCel
9271

9372
MAKE_HOOK_MATCH(SceneManager_SetActiveScene, &UnityEngine::SceneManagement::SceneManager::SetActiveScene, bool, UnityEngine::SceneManagement::Scene scene)
9473
{
95-
getLogger().info("SceneManager_SetActiveScene");
9674
bool val = SceneManager_SetActiveScene(scene);
9775
UpdatePointers();
9876
if(getModConfig().Enabled.GetValue() && scene.get_name() == "HealthWarning")

validate-modjson.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $mod = "./mod.json"
22

33
if (-not (Test-Path -Path $mod)) {
44
if (Test-Path -Path ".\mod.template.json") {
5-
& qpm-rust qmod build
5+
& qpm qmod build
66
if ($LASTEXITCODE -ne 0) {
77
exit $LASTEXITCODE
88
}

0 commit comments

Comments
 (0)