Merge pull request #14 from kodenamekrak/main

1.28.0
ComputerElite · Mar 4, 2023 · 555e8ae · 555e8ae
2 parents 1e3de40 + 04635f3
commit 555e8ae
Show file tree

Hide file tree

Showing 16 changed files with 82 additions and 422 deletions.
diff --git a/.gitignore b/.gitignore
@@ -55,6 +55,7 @@ Android.mk.backup
 [Ee]xtern/
 *.qmod
 mod.json
+qpm_defines.cmake
 qpm.shared.json
 ![Cc][Mm]ake[Ll]ists.txt
 
@@ -64,5 +65,4 @@ cmake-build-*/
 extern.cmake
 
 # QMOD Schema
-mod.json.schema
-ndkpath.txt
+mod.json.schema
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -3,7 +3,7 @@
     {
       "defines": [
         "MOD_ID=\"#{id}\"",
-        "VERSION=\"0.1.0\"",
+        "VERSION=\"#{version}\"",
         "__GNUC__",
         "__aarch64__"
       ],

diff --git a/Android.mk b/Android.mk
diff --git a/Application.mk b/Application.mk
diff --git a/bmbfmod.json b/bmbfmod.json
diff --git a/build.ps1 b/build.ps1
@@ -7,30 +7,25 @@ Param(
 )
 
 if ($help -eq $true) {
-    echo "`"Build`" - Copiles your mod into a `".so`" or a `".a`" library"
-    echo "`n-- Arguments --`n"
+    Write-Output "`"Build`" - Copiles your mod into a `".so`" or a `".a`" library"
+    Write-Output "`n-- Arguments --`n"
 
-    echo "-Clean `t`t Deletes the `"build`" folder, so that the entire library is rebuilt"
+    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")
-    {
+if ($clean.IsPresent) {
+    if (Test-Path -Path "build") {
         remove-item build -R
     }
 }
 
 
-if (($clean.IsPresent) -or (-not (Test-Path -Path "build")))
-{
-    $out = new-item -Path build -ItemType Directory
+if (($clean.IsPresent) -or (-not (Test-Path -Path "build"))) {
+    new-item -Path build -ItemType Directory
 } 
 
-cd build
-& cmake -G "Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" ../
-& cmake --build .
-cd ..
+& cmake -G "Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -B build
+& cmake --build ./build
diff --git a/copy.ps1 b/copy.ps1
@@ -18,21 +18,21 @@ Param(
     [String] $custom="",
 
     [Parameter(Mandatory=$false)]
-    [Switch] $file,
+    [String] $file="",
 
     [Parameter(Mandatory=$false)]
     [Switch] $help
 )
 
 if ($help -eq $true) {
-    echo "`"Copy`" - Builds and copies your mod to your quest, and also starts Beat Saber with optional logging"
-    echo "`n-- Arguments --`n"
+    Write-Output "`"Copy`" - Builds and copies your mod to your quest, and also starts Beat Saber with optional logging"
+    Write-Output "`n-- Arguments --`n"
 
-    echo "-Clean `t`t Performs a clean build (equvilant to running `"Build -clean`")"
-    echo "-UseDebug `t Copied the debug version of the mod to your quest"
-    echo "-Log `t`t Logs Beat Saber using the `"Start-Logging`" command"
+    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"
 
-    echo "`n-- Logging Arguments --`n"
+    Write-Output "`n-- Logging Arguments --`n"
 
     & $PSScriptRoot/start-logging.ps1 -help -excludeHeader
 
@@ -42,18 +42,29 @@ if ($help -eq $true) {
 & $PSScriptRoot/build.ps1 -clean:$clean
 
 if ($LASTEXITCODE -ne 0) {
-    echo "Failed to build, exiting..."
+    Write-Output "Failed to build, exiting..."
     exit $LASTEXITCODE
 }
 
-if ($useDebug -eq $true) {
-    $fileName = Get-ChildItem lib*.so -Path "build/debug" -Name
-} else {
-    $fileName = Get-ChildItem lib*.so -Path "build/" -Name
-}
+# & $PSScriptRoot/validate-modjson.ps1
+# if ($LASTEXITCODE -ne 0) {
+#     exit $LASTEXITCODE
+# }
+$modJson = Get-Content "./mod.json" -Raw | ConvertFrom-Json
+
+$modFiles = $modJson.modFiles
 
-& adb push build/$fileName /sdcard/Android/data/com.beatgames.beatsaber/files/mods/$fileName
+foreach ($fileName in $modFiles) {
+    if ($useDebug -eq $true) {
+        & adb push build/debug/$fileName /sdcard/Android/data/com.beatgames.beatsaber/files/mods/$fileName
+    } else {
+        & adb push build/$fileName /sdcard/Android/data/com.beatgames.beatsaber/files/mods/$fileName
+    }
+}
 
 & $PSScriptRoot/restart-game.ps1
 
-if ($log -eq $true) { & $PSScriptRoot/start-logging.ps1 -self:$self -all:$all -custom:$custom -file:$file }
+if ($log -eq $true) {
+    & adb logcat -c
+    & $PSScriptRoot/start-logging.ps1 -self:$self -all:$all -custom:$custom -file:$file
+}
diff --git a/createqmod.ps1 b/createqmod.ps1
@@ -17,19 +17,6 @@ if ($help -eq $true) {
 
 $mod = "./mod.json"
 
-& $PSScriptRoot/build.ps1 -clean:$clean
-
-if ($LASTEXITCODE -ne 0) {
-    echo "Failed to build, exiting..."
-    exit $LASTEXITCODE
-}
-
-& qpm-rust qmod build
-
-& $PSScriptRoot/validate-modjson.ps1
-if ($LASTEXITCODE -ne 0) {
-    exit $LASTEXITCODE
-}
 $modJson = Get-Content $mod -Raw | ConvertFrom-Json
 
 if ($qmodName -eq "") {
@@ -67,8 +54,8 @@ foreach ($lib in $modJson.libraryFiles) {
     $filelist += $path
 }
 
-$zip = "Play3rdPer.zip"
-$qmod = "Play3rdPer.qmod"
+$zip = $qmodName + ".zip"
+$qmod = $qmodName + ".qmod"
 
 Compress-Archive -Path $filelist -DestinationPath $zip -Update
 Move-Item $zip $qmod -Force
diff --git a/mod.json b/mod.json
diff --git a/mod.template.json b/mod.template.json
@@ -1,12 +1,12 @@
 {
   "_QPVersion": "0.1.1",
-  "id": "Play3rdPer",
-  "name": "Third Person mod",
-  "version": "0.11.0",
+  "name": "${mod_name}",
+  "id": "${mod_id}",
+  "version": "${version}",
   "coverImage": "cover.png",
   "author": "ComputerElite",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.27.0_3631150051",
+  "packageVersion": "1.28.0_4124311467",
   "modFiles": [
   ],
   "libraryFiles": [

diff --git a/ndkpath.txt b/ndkpath.txt
diff --git a/qpm.json b/qpm.json
@@ -4,7 +4,7 @@
   "info": {
     "name": "Third Person Mod",
     "id": "Play3rdPer",
-    "version": "0.11.0",
+    "version": "0.12.0",
     "url": null,
     "additionalData": {
       "overrideSoName": "libPlay3rdPer.so"
@@ -23,7 +23,7 @@
     },
     {
       "id": "custom-types",
-      "versionRange": "^0.15.22",
+      "versionRange": "^0.15.23",
       "additionalData": {}
     },
     {
@@ -33,12 +33,12 @@
     },
     {
       "id": "codegen",
-      "versionRange": "^0.32.0",
+      "versionRange": "^0.33.0",
       "additionalData": {}
     },
     {
       "id": "questui",
-      "versionRange": "^0.17.10",
+      "versionRange": "^0.17.11",
       "additionalData": {}
     }
   ]