Fixes to multiplayer

scripts/build.ps1

@@ -0,0 +1,31 @@
+Param(
+    [Parameter(Mandatory=$false)]
+    [Switch] $clean,
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $help
+)
+
+if ($help -eq $true) {
+    Write-Output "`"Build`" - Copiles your mod into a `".so`" or a `".a`" library"
+    Write-Output "`n-- Arguments --`n"
+
+    Write-Output "-Clean `t`t Deletes the `"build`" folder, so that the entire library is rebuilt"
+
+    exit
+}
+
+# if user specified clean, remove all build files
+if ($clean.IsPresent) {
+    if (Test-Path -Path "build") {
+        remove-item build -R
+    }
+}
+
+
+if (($clean.IsPresent) -or (-not (Test-Path -Path "build"))) {
+    new-item -Path build -ItemType Directory
+} 
+
+& cmake -G "Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -B build
+& cmake --build ./build

scripts/copy.ps1

@@ -0,0 +1,79 @@
+Param(
+    [Parameter(Mandatory=$false)]
+    [Switch] $clean,
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $log,
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $useDebug,
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $self,
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $all,
+
+    [Parameter(Mandatory=$false)]
+    [String] $custom="",
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $file,
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $help
+)
+
+if ($help -eq $true) {
+    Write-Output "`"Copy`" - Builds and copies your mod to your quest, and also starts Beat Saber with optional logging"
+    Write-Output "`n-- Arguments --`n"
+
+    Write-Output "-Clean `t`t Performs a clean build (equvilant to running `"build -clean`")"
+    Write-Output "-UseDebug `t Copies the debug version of the mod to your quest"
+    Write-Output "-Log `t`t Logs Beat Saber using the `"Start-Logging`" command"
+
+    Write-Output "`n-- Logging Arguments --`n"
+
+    & $PSScriptRoot/start-logging.ps1 -help -excludeHeader
+
+    exit
+}
+
+& $PSScriptRoot/build.ps1 -clean:$clean
+
+if ($LASTEXITCODE -ne 0) {
+    Write-Output "Failed to build, exiting..."
+    exit $LASTEXITCODE
+}
+
+& $PSScriptRoot/validate-modjson.ps1
+if ($LASTEXITCODE -ne 0) {
+    exit $LASTEXITCODE
+}
+$modJson = Get-Content "./mod.json" -Raw | ConvertFrom-Json
+
+$modFiles = $modJson.modFiles
+$lateModFiles = $modJson.lateModFiles
+
+foreach ($fileName in $modFiles) {
+    if ($useDebug -eq $true) {
+        & adb push build/debug/$fileName /sdcard/ModData/com.beatgames.beatsaber/Modloader/early_mods/$fileName
+    } else {
+        & adb push build/$fileName /sdcard/ModData/com.beatgames.beatsaber/Modloader/early_mods/$fileName
+    }
+}
+
+foreach ($fileName in $lateModFiles) {
+    if ($useDebug -eq $true) {
+        & adb push build/debug/$fileName /sdcard/ModData/com.beatgames.beatsaber/Modloader/mods/$fileName
+    } else {
+        & adb push build/$fileName /sdcard/ModData/com.beatgames.beatsaber/Modloader/mods/$fileName
+    }
+}
+
+& $PSScriptRoot/restart-game.ps1
+
+if ($log -eq $true) {
+    & adb logcat -c
+    & $PSScriptRoot/start-logging.ps1 -self:$self -all:$all -custom:$custom -file:$file
+}

scripts/createqmod.ps1

@@ -0,0 +1,77 @@
+Param(
+    [Parameter(Mandatory=$false)]
+    [String] $qmodName="",
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $help
+)
+
+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 "") {
+    $qmodName = $modJson.name
+}
+
+$filelist = @($mod)
+
+$cover = "./" + $modJson.coverImage
+if ((-not ($cover -eq "./")) -and (Test-Path $cover)) {
+    $filelist += ,$cover
+}
+
+foreach ($mod in $modJson.modFiles) {
+    $path = "./build/" + $mod
+    if (-not (Test-Path $path)) {
+        $path = "./extern/libs/" + $mod
+    }
+    if (-not (Test-Path $path)) {
+        Write-Output "Error: could not find dependency: $path"
+        exit 1
+    }
+    $filelist += $path
+}
+
+foreach ($mod in $modJson.lateModFiles) {
+    $path = "./build/" + $mod
+    if (-not (Test-Path $path)) {
+        $path = "./extern/libs/" + $mod
+    }
+    if (-not (Test-Path $path)) {
+        Write-Output "Error: could not find dependency: $path"
+        exit 1
+    }
+    $filelist += $path
+}
+
+foreach ($lib in $modJson.libraryFiles) {
+    $path = "./build/" + $lib
+    if (-not (Test-Path $path)) {
+        $path = "./extern/libs/" + $lib
+    }
+    if (-not (Test-Path $path)) {
+        Write-Output "Error: could not find dependency: $path"
+        exit 1
+    }
+    $filelist += $path
+}
+
+$zip = $qmodName + ".zip"
+$qmod = $qmodName + ".qmod"
+
+Compress-Archive -Path $filelist -DestinationPath $zip -Update
+Move-Item $zip $qmod -Force

scripts/pull-tombstone.ps1

@@ -0,0 +1,52 @@
+Param(
+    [Parameter(Mandatory=$false)]
+    [String] $fileName = "RecentCrash.log",
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $analyze,
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $help
+)
+
+if ($help -eq $true) {
+    Write-Output "`"Pull-Tombstone`" - Finds and pulls the most recent tombstone from your quest, optionally analyzing it with ndk-stack"
+    Write-Output "`n-- Arguments --`n"
+
+    Write-Output "-FileName `t The name for the output file, defaulting to RecentCrash.log"
+    Write-Output "-Analyze `t Runs ndk-stack on the file after pulling"
+
+    exit
+}
+
+$global:currentDate = get-date
+$global:recentDate = $Null
+$global:recentTombstone = $Null
+
+for ($i = 0; $i -lt 3; $i++) {
+    $stats = & adb shell stat /sdcard/Android/data/com.beatgames.beatsaber/files/tombstone_0$i
+    $date = (Select-String -Input $stats -Pattern "(?<=Modify: )\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?=.\d{9})").Matches.Value
+    if([string]::IsNullOrEmpty($date)) {
+        Write-Output "Failed to pull tombstone, exiting..."
+        exit 1;
+    }
+    $dateObj = [datetime]::ParseExact($date, "yyyy-MM-dd HH:mm:ss", $Null)
+    $difference = [math]::Round(($currentDate - $dateObj).TotalMinutes)
+    if ($difference -eq 1) {
+        Write-Output "Found tombstone_0$i $difference minute ago"
+    } else {
+        Write-Output "Found tombstone_0$i $difference minutes ago"
+    }
+    if (-not $recentDate -or $recentDate -lt $dateObj) {
+        $recentDate = $dateObj
+        $recentTombstone = $i
+    }
+}
+
+Write-Output "Latest tombstone was tombstone_0$recentTombstone"
+
+& adb pull /sdcard/Android/data/com.beatgames.beatsaber/files/tombstone_0$recentTombstone $fileName
+
+if ($analyze) {
+    & $PSScriptRoot/ndk-stack.ps1 -logName:$fileName
+}

scripts/restart-game.ps1

@@ -0,0 +1,2 @@
+adb shell am force-stop com.beatgames.beatsaber
+adb shell am start com.beatgames.beatsaber/com.unity3d.player.UnityPlayerActivity

scripts/start-logging.ps1

@@ -0,0 +1,75 @@
+Param(
+    [Parameter(Mandatory=$false)]
+    [Switch] $self,
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $all,
+
+    [Parameter(Mandatory=$false)]
+    [String] $custom="",
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $file="",
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $help,
+
+    [Parameter(Mandatory=$false)]
+    [Switch] $excludeHeader
+)
+
+if ($help -eq $true) {
+    if ($excludeHeader -eq $false) {
+        Write-Output "`"Start-Logging`" - Logs Beat Saber using `"adb logcat`""
+        Write-Output "`n-- Arguments --`n"
+    }
+
+    Write-Output "-Self `t`t Only Logs your mod and Crashes"
+    Write-Output "-All `t`t Logs everything, including logs made by the Quest itself"
+    Write-Output "-Custom `t Specify a specific logging pattern, e.g `"custom-types|questui`""
+    Write-Output "`t`t NOTE: The paterent `"AndriodRuntime|CRASH`" is always appended to a custom pattern"
+    Write-Output "-File `t`t Saves the output of the log to the file name given"
+
+    exit
+}
+
+$bspid = adb shell pidof com.beatgames.beatsaber
+$command = "adb logcat "
+
+# if ($all -eq $false) {
+    $loops = 0
+    while ([string]::IsNullOrEmpty($bspid) -and $loops -lt 6) {
+        Start-Sleep -Milliseconds 100
+        $bspid = adb shell pidof com.beatgames.beatsaber
+        $loops += 1
+    }
+
+    if ([string]::IsNullOrEmpty($bspid)) {
+        Write-Output "Could not connect to adb, exiting..."
+        exit 1
+    }
+
+    $command += "--pid $bspid"
+# }
+
+if ($all -eq $false) {
+    $pattern = "("
+    if ($self -eq $true) {
+        $pattern += "MultiplayerCore|"
+    }
+    if (![string]::IsNullOrEmpty($custom)) {
+        $pattern += "$custom|"
+    }
+    if ($pattern -eq "(") {
+        $pattern = "(QuestHook|modloader|"
+    }
+    $pattern += "AndroidRuntime|CRASH)"
+    $command += " | Select-String -pattern `"$pattern`""
+}
+
+if ($file -eq $true) {
+    $command += " | Out-File -FilePath $PSScriptRoot\..\log.log"
+}
+
+Write-Output "Logging using Command `"$command`""
+Invoke-Expression $command

scripts/validate-modjson.ps1

@@ -0,0 +1,38 @@
+$mod = "./mod.json"
+
+if (-not (Test-Path -Path $mod)) {
+    if (Test-Path -Path ".\mod.template.json") {
+        & qpm qmod build
+        if ($LASTEXITCODE -ne 0) {
+            exit $LASTEXITCODE
+        }
+    }
+    else {
+        Write-Output "Error: mod.json and mod.template.json were not present"
+        exit 1
+    }
+}
+
+Write-Output "Creating qmod from mod.json"
+
+$psVersion = $PSVersionTable.PSVersion.Major
+if ($psVersion -ge 6) {
+    $schemaUrl = "https://raw.githubusercontent.com/Lauriethefish/QuestPatcher.QMod/main/QuestPatcher.QMod/Resources/qmod.schema.json"
+    Invoke-WebRequest $schemaUrl -OutFile ./mod.schema.json
+
+    $schema = "./mod.schema.json"
+    $modJsonRaw = Get-Content $mod -Raw
+    $modSchemaRaw = Get-Content $schema -Raw
+
+    Remove-Item $schema
+
+    Write-Output "Validating mod.json..."
+    if (-not ($modJsonRaw | Test-Json -Schema $modSchemaRaw)) {
+        Write-Output "Error: mod.json is not valid"
+        exit 1
+    }
+}
+else {
+    Write-Output "Could not validate mod.json with schema: powershell version was too low (< 6)"
+}
+exit

src/Beatmaps/Abstractions/DifficultyColors.cpp

@@ -23,12 +23,12 @@ namespace MultiplayerCore::Beatmaps::Abstractions {
 
     void DifficultyColors::Deserialize(LiteNetLib::Utils::NetDataReader* reader) {
         uint8_t colors = reader->GetByte();
-        if (((colors << 0) & 0x1) != 0) colorLeft = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
-        if (((colors << 1) & 0x1) != 0) colorRight = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
-        if (((colors << 2) & 0x1) != 0) envColorLeft = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
-        if (((colors << 3) & 0x1) != 0) envColorRight = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
-        if (((colors << 4) & 0x1) != 0) envColorLeftBoost = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
-        if (((colors << 5) & 0x1) != 0) envColorRightBoost = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
-        if (((colors << 6) & 0x1) != 0) obstacleColor = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
+        if (((colors >> 0) & 0x1) != 0) colorLeft = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
+        if (((colors >> 1) & 0x1) != 0) colorRight = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
+        if (((colors >> 2) & 0x1) != 0) envColorLeft = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
+        if (((colors >> 3) & 0x1) != 0) envColorRight = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
+        if (((colors >> 4) & 0x1) != 0) envColorLeftBoost = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
+        if (((colors >> 5) & 0x1) != 0) envColorRightBoost = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
+        if (((colors >> 6) & 0x1) != 0) obstacleColor = MultiplayerCore::Utils::ExtraSongData::MapColor(reader);
     }
 }