Fix build

Author: hardcpp

createqmod.ps1

@@ -1,26 +1,10 @@
 Param(
+    [String]$qmodname="",
     [Parameter(Mandatory=$false)]
-    [String] $qmodName="",
-
-    [Parameter(Mandatory=$false)]
-    [Switch] $help
+    [Switch]$clean
 )
 
-if ($help -eq $true) {
-    Write-Output "`"createqmod`" - Creates a .qmod file with your compiled libraries and mod.json."
-    Write-Output "`n-- Arguments --`n"
-
-    Write-Output "-QmodName `t The file name of your qmod"
-
-    exit
-}
-
 $mod = "./mod.json"
-
-& $PSScriptRoot/validate-modjson.ps1
-if ($LASTEXITCODE -ne 0) {
-    exit $LASTEXITCODE
-}
 $modJson = Get-Content $mod -Raw | ConvertFrom-Json
 
 if ($qmodName -eq "") {
@@ -30,8 +14,11 @@ if ($qmodName -eq "") {
 $filelist = @($mod)
 
 $cover = "./" + $modJson.coverImage
-if ((-not ($cover -eq "./")) -and (Test-Path $cover)) {
-    $filelist += ,$cover
+$fileList = @($mod)
+
+if ((-not ($cover -eq "./")) -and (Test-Path $cover))
+{
+    $fileList += ,$cover
 }
 
 foreach ($mod in $modJson.modFiles) {
@@ -61,5 +48,14 @@ foreach ($lib in $modJson.libraryFiles) {
 $zip = $qmodName + ".zip"
 $qmod = $qmodName + ".qmod"
 
+if ($clean.IsPresent) {
+    echo "Making Clean Qmod"
+}
+
+if ((-not ($clean.IsPresent)) -and (Test-Path $qmod))
+{
+    Move-Item $qmod $zip -Force
+}
+
 Compress-Archive -Path $filelist -DestinationPath $zip -Update
-Move-Item $zip $qmod -Force
+Move-Item $zip $qmod -Force

shared/NTConfig.hpp

@@ -6,7 +6,10 @@
 
 namespace QBeatSaberPlus_NoteTweaker {
 
-    using namespace UnityEngine;
+    namespace _u
+    {
+        using namespace UnityEngine;
+    }
 
     class NTConfig : public CP_SDK::Config::JsonConfig
     {
@@ -17,30 +20,30 @@ namespace QBeatSaberPlus_NoteTweaker {
             {
                 std::u16string Name             = u"New profile";
 
-                float NotesScale                = 0.9f;
-                bool  NotesShowPrecisonDots     = true;
-                float NotesPrecisonDotsScale    = 0.40f;
+                float       NotesScale                = 0.9f;
+                bool        NotesShowPrecisonDots     = true;
+                float       NotesPrecisonDotsScale    = 0.40f;
 
-                float ArrowsScale               = 1.0f;
-                float ArrowsIntensity           = 1.0f;
-                bool  ArrowsOverrideColors      = false;
-                Color ArrowsLColor              = Color(0.12f, 0.75f, 1.00f, 1.00f);
-                Color ArrowsRColor              = Color(0.12f, 0.75f, 1.00f, 1.00f);
+                float       ArrowsScale               = 1.0f;
+                float       ArrowsIntensity           = 1.0f;
+                bool        ArrowsOverrideColors      = false;
+                _u::Color   ArrowsLColor              = _u::Color(0.12f, 0.75f, 1.00f, 1.00f);
+                _u::Color   ArrowsRColor              = _u::Color(0.12f, 0.75f, 1.00f, 1.00f);
 
-                float DotsScale                 = 0.85f;
-                float DotsIntensity             = 1.0f;
-                bool  DotsOverrideColors        = false;
-                Color DotsLColor                = Color(0.12f, 0.75f, 1.00f, 1.00f);
-                Color DotsRColor                = Color(0.12f, 0.75f, 1.00f, 1.00f);
+                float       DotsScale                 = 0.85f;
+                float       DotsIntensity             = 1.0f;
+                bool        DotsOverrideColors        = false;
+                _u::Color   DotsLColor                = _u::Color(0.12f, 0.75f, 1.00f, 1.00f);
+                _u::Color   DotsRColor                = _u::Color(0.12f, 0.75f, 1.00f, 1.00f);
 
-                float BombsScale                = 1.0f;
-                bool  BombsOverrideColor        = false;
-                Color BombsColor                = Color(1.0000f, 0.0000f, 0.6469f, 1.0f);
+                float       BombsScale                = 1.0f;
+                bool        BombsOverrideColor        = false;
+                _u::Color   BombsColor                = _u::Color(1.0000f, 0.0000f, 0.6469f, 1.0f);
 
-                float ArcsIntensity             = 1.00f;
-                bool  ArcsHaptics               = true;
+                float       ArcsIntensity             = 1.00f;
+                bool        ArcsHaptics               = true;
 
-                float BurstNotesDotsScale       = 1.5f;
+                float       BurstNotesDotsScale       = 1.5f;
 
                 static std::shared_ptr<_Profile> AsDefault();
 

src/NTConfig.cpp

@@ -2,6 +2,8 @@
 
 #include <CP_SDK/ChatPlexSDK.hpp>
 
+using namespace UnityEngine;
+
 namespace QBeatSaberPlus_NoteTweaker {
 
     CP_SDK_CONFIG_JSONCONFIG_INSTANCE_IMPL(NTConfig);

src/Patches/PBombNoteController.cpp

@@ -136,7 +136,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {
 
         if (!PBombNoteController_WasInit)
         {
-            CP_SDK::ChatPlexSDK::OnGenericSceneChange += [](CP_SDK::ChatPlexSDK::EGenericScene x) { if (x == CP_SDK::ChatPlexSDK::EGenericScene::Menu) PBombNoteController_Cache.clear(); };
+            CP_SDK::ChatPlexSDK::OnGenericSceneChange += [](CP_SDK::EGenericScene x) { if (x == CP_SDK::EGenericScene::Menu) PBombNoteController_Cache.clear(); };
             PBombNoteController_WasInit = true;
         }
     }

src/Patches/PColorNoteVisuals.cpp

@@ -154,7 +154,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {
 
         if (!PColorNoteVisuals_WasInit)
         {
-            CP_SDK::ChatPlexSDK::OnGenericSceneChange += [](CP_SDK::ChatPlexSDK::EGenericScene x) { if (x == CP_SDK::ChatPlexSDK::EGenericScene::Menu) PColorNoteVisuals_Cache.clear(); };
+            CP_SDK::ChatPlexSDK::OnGenericSceneChange += [](CP_SDK::EGenericScene x) { if (x == CP_SDK::EGenericScene::Menu) PColorNoteVisuals_Cache.clear(); };
             PColorNoteVisuals_WasInit = true;
         }
     }