MultiQuestensions Update to newest Beat Saber

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.github/workflows/ndk-build.yml

@@ -39,10 +39,9 @@ on:
       - '!.gitignore'
 
 env:
-     module_id: multiquestensions
-     version: 0.1.1-Dev-${{ github.run_number }}
-     bs_hook: 2_3_2
-     BS_Version: 1.17.1
+     module_id: MultiQuestensions
+     version: 0.2.0-Dev-${{ github.run_number }}
+     BS_Version: 1.21.0
      #ndkname: android-ndk-r23
 
 jobs:

.gitignore

@@ -347,3 +347,5 @@ ARM64/
 ndkbuild.props
 /MultiQuestensions/log_timestamp
 *.qmod
+*.cmake
+/build/

.vscode/launch.json

@@ -4,12 +4,76 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+
         {
-            "type": "pwa-chrome",
+            "name": "Launch Beat Saber",
+            "type": "fb-lldb",
             "request": "launch",
-            "name": "Launch Chrome against localhost",
-            "url": "http://localhost:8080",
-            "webRoot": "${workspaceFolder}"
+            "android": {
+                "application": {
+                    "package": "com.beatgames.beatsaber",
+                    "activity": "com.unity3d.player.UnityPlayerActivity"
+                },
+                "lldbConfig": {
+                    "sourceMaps": [
+                        "\\home\\runner\\work\\MultiplayerCore.Quest\\MultiplayerCore.Quest\\ ${workspaceFolder}/../",
+                        "/home/runner/work/MultiplayerCore.Quest/MultiplayerCore.Quest/ ${workspaceFolder}/../",
+                        "\\home\\runner\\work\\MultiQuestensions\\MultiQuestensions\\ ${workspaceFolder}/MultiQuestensions/",
+                        "/home/runner/work/MultiQuestensions/ ${workspaceFolder}/MultiQuestensions/",
+                        "/home/runner/work/SongDownloader/ ${workspaceFolder}/../",
+                        "/home/runner/work/SongDownloader/SongDownloader/shared ${workspaceFolder}/extern/includes/SongDownloader/shared",
+                        "/home/runner/work/SongLoader/ ${workspaceFolder}/../",
+                        "/home/runner/work/SongLoader/SongLoader/shared ${workspaceFolder}/extern/includes/SongLoader/shared",
+                        "/home/runner/work/questui/ ${workspaceFolder}/../",
+                        "/home/runner/work/questui/questui/shared ${workspaceFolder}/extern/includes/questui/shared",
+                        "/home/runner/work/beatsaber-hook/ ${workspaceFolder}/../",
+                        "/home/runner/work/beatsaber-hook/beatsaber-hook/ ${workspaceFolder}/extern/includes/beatsaber-hook/",
+                        "/home/runner/work/custom-types/ ${workspaceFolder}/../",
+                        "/home/runner/work/Il2CppQuestTypePatching/Il2CppQuestTypePatching/shared ${workspaceFolder}/extern/includes/custom-types/shared"
+                    ],
+                    "librarySearchPaths": [
+                        "${workspaceFolder}/build/debug/",
+                        "${workspaceFolder}/extern/libs/",
+                        "${workspaceFolder}/../Symbols/",
+                        "${workspaceFolder}/../MultiplayerCore.Quest/build/debug/",
+                    ]
+                }
+            }
+        },
+        {
+            "name": "Attach to running Beat Saber Instance",
+            "type": "fb-lldb",
+            "request": "attach",
+            "android": {
+                "application": {
+                    "package": "com.beatgames.beatsaber",
+                    "activity": "com.unity3d.player.UnityPlayerActivity"
+                },
+                "lldbConfig": {
+                    "sourceMaps": [
+                        "\\home\\runner\\work\\MultiplayerCore.Quest\\MultiplayerCore.Quest\\ ${workspaceFolder}/../",
+                        "/home/runner/work/MultiplayerCore.Quest/MultiplayerCore.Quest/ ${workspaceFolder}/../",
+                        "\\home\\runner\\work\\MultiQuestensions\\MultiQuestensions\\ ${workspaceFolder}/MultiQuestensions/",
+                        "/home/runner/work/MultiQuestensions/ ${workspaceFolder}/MultiQuestensions/",
+                        "/home/runner/work/SongDownloader/ ${workspaceFolder}/../",
+                        "/home/runner/work/SongDownloader/SongDownloader/shared ${workspaceFolder}/extern/includes/SongDownloader/shared",
+                        "/home/runner/work/SongLoader/ ${workspaceFolder}/../",
+                        "/home/runner/work/SongLoader/SongLoader/shared ${workspaceFolder}/extern/includes/SongLoader/shared",
+                        "/home/runner/work/questui/ ${workspaceFolder}/../",
+                        "/home/runner/work/questui/questui/shared ${workspaceFolder}/extern/includes/questui/shared",
+                        "/home/runner/work/beatsaber-hook/ ${workspaceFolder}/../",
+                        "/home/runner/work/beatsaber-hook/beatsaber-hook/ ${workspaceFolder}/extern/includes/beatsaber-hook/",
+                        "/home/runner/work/custom-types/ ${workspaceFolder}/../",
+                        "/home/runner/work/Il2CppQuestTypePatching/Il2CppQuestTypePatching/shared ${workspaceFolder}/extern/includes/custom-types/shared"
+                    ],
+                    "librarySearchPaths": [
+                        "${workspaceFolder}/build/debug/",
+                        "${workspaceFolder}/extern/libs/",
+                        "${workspaceFolder}/../Symbols/",
+                        "${workspaceFolder}/../MultiplayerCore.Quest/build/debug/",
+                    ]
+                }
+            }
         }
     ]
 }

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "cmake.sourceDirectory": "${workspaceFolder}/MultiQuestensions",
+    "cmake.configureOnOpen": false
+}

MultiQuestensions.code-workspace

@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {}
+}

MultiQuestensions/.gitignore

@@ -48,6 +48,7 @@ out/
 [Ll]ibs/
 [Oo]bj/
 [Oo]bjs/
+[Bb]uild/
 *.zip
 *.txt
 extern/

MultiQuestensions/Android.mk

@@ -18,14 +18,13 @@ TARGET_ARCH_ABI := $(APP_ABI)
 
 rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
 
-# Creating prebuilt for dependency: beatsaber-hook - version: 2.3.2
+# Creating prebuilt for dependency: beatsaber-hook - version: 3.6.1
 include $(CLEAR_VARS)
-LOCAL_MODULE := beatsaber-hook_2_3_2
+LOCAL_MODULE := beatsaber-hook_3_6_1
 LOCAL_EXPORT_C_INCLUDES := extern/beatsaber-hook
-LOCAL_SRC_FILES := extern/libbeatsaber-hook_2_3_2.so
-LOCAL_CPP_FEATURES += exceptions
+LOCAL_SRC_FILES := extern/libbeatsaber-hook_3_6_1.so
 include $(PREBUILT_SHARED_LIBRARY)
-# Creating prebuilt for dependency: custom-types - version: 0.12.7
+# Creating prebuilt for dependency: custom-types - version: 0.15.2
 include $(CLEAR_VARS)
 LOCAL_MODULE := custom-types
 LOCAL_EXPORT_C_INCLUDES := extern/custom-types
@@ -37,13 +36,13 @@ LOCAL_MODULE := modloader
 LOCAL_EXPORT_C_INCLUDES := extern/modloader
 LOCAL_SRC_FILES := extern/libmodloader.so
 include $(PREBUILT_SHARED_LIBRARY)
-# Creating prebuilt for dependency: songloader - version: 0.7.2
+# Creating prebuilt for dependency: songloader - version: 0.8.0
 include $(CLEAR_VARS)
 LOCAL_MODULE := songloader
 LOCAL_EXPORT_C_INCLUDES := extern/songloader
 LOCAL_SRC_FILES := extern/libsongloader.so
 include $(PREBUILT_SHARED_LIBRARY)
-# Creating prebuilt for dependency: questui - version: 0.11.1
+# Creating prebuilt for dependency: questui - version: 0.12.3
 include $(CLEAR_VARS)
 LOCAL_MODULE := questui
 LOCAL_EXPORT_C_INCLUDES := extern/questui
@@ -55,7 +54,7 @@ LOCAL_MODULE := songdownloader
 LOCAL_EXPORT_C_INCLUDES := extern/songdownloader
 LOCAL_SRC_FILES := extern/libsongdownloader.so
 include $(PREBUILT_SHARED_LIBRARY)
-# Creating prebuilt for dependency: codegen - version: 0.14.0
+# Creating prebuilt for dependency: codegen - version: 0.19.0
 include $(CLEAR_VARS)
 LOCAL_MODULE := codegen
 LOCAL_EXPORT_C_INCLUDES := extern/codegen
@@ -68,7 +67,7 @@ LOCAL_SRC_FILES += $(call rwildcard,src/,*.cpp)
 LOCAL_SRC_FILES += $(call rwildcard,extern/beatsaber-hook/src/inline-hook,*.cpp)
 LOCAL_SRC_FILES += $(call rwildcard,extern/beatsaber-hook/src/inline-hook,*.c)
 LOCAL_SHARED_LIBRARIES += modloader
-LOCAL_SHARED_LIBRARIES += beatsaber-hook_2_3_2
+LOCAL_SHARED_LIBRARIES += beatsaber-hook_3_6_1
 LOCAL_SHARED_LIBRARIES += custom-types
 LOCAL_SHARED_LIBRARIES += songloader
 LOCAL_SHARED_LIBRARIES += questui
@@ -78,4 +77,5 @@ LOCAL_LDLIBS += -llog
 LOCAL_CFLAGS += -I'extern/libil2cpp/il2cpp/libil2cpp' -DID='"multiquestensions"' -DVERSION='"$(VERSION)"' -DMPEX_PROTOCOL='"$(MPEX_PROTOCOL)"' -I'./shared' -I'./extern' -isystem'extern/codegen/include' -Ofast
 LOCAL_CPPFLAGS += -std=c++2a
 LOCAL_C_INCLUDES += ./include ./src
+LOCAL_CPP_FEATURES += rtti exceptions
 include $(BUILD_SHARED_LIBRARY)

MultiQuestensions/MultiQuestensions.vcxproj

@@ -81,6 +81,7 @@
     <ClInclude Include="include\UI\CenterScreenLoading.hpp" />
     <ClInclude Include="include\UI\LobbySetupPanel.hpp" />
     <ClInclude Include="shared\CodegenExtensions\ColorUtility.hpp" />
+    <ClInclude Include="shared\CodegenExtensions\TempBloomFilterUtil.hpp" />
     <ClInclude Include="shared\Utils\CustomData.hpp" />
     <ClInclude Include="shared\Utils\SemVerChecker.hpp" />
     <ClInclude Include="src\Hooks\NetworkPlayerEntitlementCheckerHooks.cpp" />
@@ -114,12 +115,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <NMakeIncludeSearchPath>src;include;extern;extern\libil2cpp\il2cpp\libil2cpp;extern\codegen\include;extern\custom-types\shared</NMakeIncludeSearchPath>
+    <NMakeIncludeSearchPath>src;include;extern\includes;extern\includes\libil2cpp\il2cpp\libil2cpp;extern\includes\codegen\include;extern\includes\custom-types\shared</NMakeIncludeSearchPath>
     <NMakePreprocessorDefinitions>ID='"Mod ID"';VERSION='"Mod Version"';MPEX_PROTOCOL='"0.6.1"'</NMakePreprocessorDefinitions>
     <NMakeBuildCommandLine>"$(NdkPath)\build\ndk-build.cmd" NDK_PROJECT_PATH=$(ProjectDir) APP_BUILD_SCRIPT=$(ProjectDir)Android.mk NDK_APPLICATION_MK=$(ProjectDir)Application.mk</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>"$(NdkPath)\build\ndk-build.cmd" -B</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>"$(NdkPath)\build\ndk-build.cmd" clean</NMakeCleanCommandLine>
-    <NMakeForcedIncludes>src;include;extern;extern\libil2cpp\il2cpp\libil2cpp;extern\codegen\include;extern\custom-types\shared;..\android-ndk-r23\toolchains\llvm\prebuilt\windows-x86_64\sysroot\usr\include\**;..\android-ndk-r23\sources\cxx-stl\system\include;..\android-ndk-r23\sources\cxx-stl\llvm-libc++\include;..\android-ndk-r23\sources\cxx-stl\llvm-libc++abi\include</NMakeForcedIncludes>
+    <NMakeForcedIncludes>src;include;extern\includes;extern\includes\libil2cpp\il2cpp\libil2cpp;extern\includes\codegen\include;extern\includes\custom-types\shared;..\android-ndk-r23\toolchains\llvm\prebuilt\windows-x86_64\sysroot\usr\include\**;..\android-ndk-r23\sources\cxx-stl\system\include;..\android-ndk-r23\sources\cxx-stl\llvm-libc++\include;..\android-ndk-r23\sources\cxx-stl\llvm-libc++abi\include</NMakeForcedIncludes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <NMakeIncludeSearchPath>src;include;extern;extern\libil2cpp\il2cpp\libil2cpp;extern\codegen\include;extern\custom-types\shared</NMakeIncludeSearchPath>

MultiQuestensions/MultiQuestensions.vcxproj.filters

@@ -229,5 +229,6 @@
     <ClInclude Include="shared\Utils\CustomData.hpp" />
     <ClInclude Include="include\CS_DataStore.hpp" />
     <ClInclude Include="shared\Utils\SemVerChecker.hpp" />
+    <ClInclude Include="shared\CodegenExtensions\TempBloomFilterUtil.hpp" />
   </ItemGroup>
 </Project>

MultiQuestensions/build.ps1

@@ -1,41 +1,56 @@
 Param (
+[Parameter(Mandatory=$false)][Switch]$clean,
 [Parameter(HelpMessage="The version the mod should be compiled with")][string]$Version,
 [Parameter(HelpMessage="The MpEx protocol version the mod should be compiled with")][Alias("MpEx-Protocol")][string]$MpEx_Protocol
 )
 Write-Host $Version
-$NDKPath = Get-Content $PSScriptRoot/ndkpath.txt -First 1
 if ($env:VERSION) {
 $Version = $env:VERSION
 }
 if (!($Version)) {
-$Version = "0.1.1"
+$Version = "1.0.0"
 }
 if ($env:MPEX_PROTOCOL) {
 $MpEx_Protocol = $env:MPEX_PROTOCOL
 }
 if (!($MpEx_Protocol)) {
-$MpEx_Protocol = "0.7.1"
+$MpEx_Protocol = "1.0.0"
 }
-if ((Test-Path "./extern/beatsaber-hook/src/inline-hook/And64InlineHook.cpp", "./extern/beatsaber-hook/src/inline-hook/inlineHook.c", "./extern/beatsaber-hook/src/inline-hook/relocate.c") -contains $false) {
+if ((Test-Path "./extern/includes/beatsaber-hook/src/inline-hook/And64InlineHook.cpp", "./extern/includes/beatsaber-hook/src/inline-hook/inlineHook.c", "./extern/includes/beatsaber-hook/src/inline-hook/relocate.c") -contains $false) {
     Write-Host "Critical: Missing inline-hook"
-    if (!(Test-Path "./extern/beatsaber-hook/src/inline-hook/And64InlineHook.cpp")) {
-        Write-Host "./extern/beatsaber-hook/src/inline-hook/And64InlineHook.cpp"
+    if (!(Test-Path "./extern/includes/beatsaber-hook/src/inline-hook/And64InlineHook.cpp")) {
+        Write-Host "./extern/includes/beatsaber-hook/src/inline-hook/And64InlineHook.cpp"
     }
-    if (!(Test-Path "./extern/beatsaber-hook/src/inline-hook/inlineHook.c")) {
-        Write-Host "./extern/beatsaber-hook/src/inline-hook/inlineHook.c"
+    if (!(Test-Path "./extern/includes/beatsaber-hook/src/inline-hook/inlineHook.c")) {
+        Write-Host "./extern/includes/beatsaber-hook/src/inline-hook/inlineHook.c"
     }
-        if (!(Test-Path "./extern/beatsaber-hook/inline-hook/src/relocate.c")) {
-        Write-Host "./extern/beatsaber-hook/src/inline-hook/relocate.c"
+        if (!(Test-Path "./extern/includes/beatsaber-hook/inline-hook/src/relocate.c")) {
+        Write-Host "./extern/includes/beatsaber-hook/src/inline-hook/relocate.c"
     }
     Write-Host "Task Failed"
     exit 1;
 }
 
-echo "Building MultiQuestensions Version: $Version with MpEx Protocol Version: $MpEx_Protocol"
+Write-Output "Building MultiQuestensions Version: $Version with MpEx Protocol Version: $MpEx_Protocol"
 
-$buildScript = "$NDKPath/build/ndk-build"
-if (-not ($PSVersionTable.PSEdition -eq "Core")) {
-    $buildScript += ".cmd"
+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) | Out-Null
 }
 
-& $buildScript NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_APPLICATION_MK=./Application.mk VERSION=$Version MPEX_PROTOCOL=$MpEx_Protocol
+& qpm-rust package edit --version $Version
+
+Set-Location build
+& cmake -G "Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DMPEX_PROTOCOL="$MpEx_Protocol" ../
+& cmake --build . -j 6
+$ExitCode = $LastExitCode
+Set-Location ..
+exit $ExitCode