Skip to content

Commit

Permalink
update to 1.19.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ComputerElite committed Mar 9, 2022
1 parent 7c2ff4f commit fde54ea
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 21 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# include some defines automatically made by qpm
include(qpm_defines.cmake)

# override mod id
set(MOD_ID "Streamer-Tools")

# Enable link time optimization
# In my experience, this can be highly unstable but it nets a huge size optimization and likely performance
# However, the instability was seen using Android.mk/ndk-build builds. With Ninja + CMake, this problem seems to have been solved.
# As always, test thoroughly
# - Fern
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
# set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)

cmake_minimum_required(VERSION 3.21)
project(${COMPILE_ID})
Expand All @@ -21,7 +24,7 @@ set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)

# compile options used
add_compile_options(-frtti -fexceptions)
add_compile_options(-Ofast)
add_compile_options(-O3)
# compile definitions used
add_compile_definitions(VERSION=\"${MOD_VERSION}\")
add_compile_definitions(ID=\"${MOD_ID}\")
Expand All @@ -41,8 +44,6 @@ add_library(

target_include_directories(${COMPILE_ID} PRIVATE .)

target_include_directories(${COMPILE_ID} PRIVATE extern/includes/questui_components)

# add src dir as include dir
target_include_directories(${COMPILE_ID} PRIVATE ${SOURCE_DIR})
# add include dir as include dir
Expand Down
18 changes: 9 additions & 9 deletions mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@
"name": "Streamer Tools",
"id": "Streamer-Tools",
"author": "EnderdracheLP, ComputerElite, Lauriethefish, Phaze",
"version": "0.3.0-Dev",
"version": "0.3.0",
"packageId": "com.beatgames.beatsaber",
"packageVersion": "1.19.0",
"packageVersion": "1.19.1",
"description": "Allows applications to get information from the game like, currently played song.",
"coverImage": "cover.png",
"dependencies": [
{
"version": "^0.15.6",
"version": "^0.15.7",
"id": "custom-types",
"downloadIfMissing": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.6/CustomTypes.qmod"
"downloadIfMissing": "https://github.com/sc2ad/Il2CppQuestTypePatching/releases/download/v0.15.8/CustomTypes.qmod"
},
{
"version": "^0.19.3",
"version": "^0.20.0",
"id": "codegen",
"downloadIfMissing": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.19.3/Codegen.qmod"
"downloadIfMissing": "https://github.com/sc2ad/BeatSaber-Quest-Codegen/releases/download/v0.20.0/Codegen.qmod"
},
{
"version": "^0.13.1",
"version": "^0.13.2",
"id": "questui",
"downloadIfMissing": "https://github.com/darknight1050/questui/releases/download/v0.13.1/QuestUI.qmod"
"downloadIfMissing": "https://github.com/darknight1050/questui/releases/download/v0.13.2/QuestUI.qmod"
}
],
"modFiles": [
"libStreamer-Tools.so"
],
"libraryFiles": [
"libbeatsaber-hook_3_6_7.so"
"libbeatsaber-hook_3_6_8.so"
],
"fileCopies": [],
"copyExtensions": []
Expand Down
2 changes: 1 addition & 1 deletion mod.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "EnderdracheLP, ComputerElite, Lauriethefish, Phaze",
"version": "${version}",
"packageId": "com.beatgames.beatsaber",
"packageVersion": "1.19.0",
"packageVersion": "1.19.1",
"description": "Allows applications to get information from the game like, currently played song.",
"coverImage": "cover.png",
"dependencies": [],
Expand Down
10 changes: 5 additions & 5 deletions qpm.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"info": {
"name": "Streamer Tools",
"id": "Streamer-Tools",
"version": "0.3.0-Dev",
"version": "0.3.0",
"url": null,
"additionalData": {
"overrideSoName": "libStreamer-Tools.so"
Expand All @@ -13,7 +13,7 @@
"dependencies": [
{
"id": "beatsaber-hook",
"versionRange": "^3.6.7",
"versionRange": "^3.6.8",
"additionalData": {
"extraFiles": [
"src/inline-hook"
Expand All @@ -22,17 +22,17 @@
},
{
"id": "codegen",
"versionRange": "^0.19.3",
"versionRange": "^0.20.0",
"additionalData": {}
},
{
"id": "questui",
"versionRange": "^0.13.1",
"versionRange": "^0.13.2",
"additionalData": {}
},
{
"id": "custom-types",
"versionRange": "^0.15.6",
"versionRange": "^0.15.7",
"additionalData": {}
},
{
Expand Down
5 changes: 3 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
#include "GlobalNamespace/PauseController.hpp"
#include "GlobalNamespace/AudioTimeSyncController.hpp"
#include "GlobalNamespace/MultiplayerSpectatorController.hpp"
#include "GlobalNamespace/MultiplayerSessionManager_SessionType.hpp"
using namespace GlobalNamespace;

#if !defined(MAKE_HOOK_MATCH)
Expand Down Expand Up @@ -365,8 +366,8 @@ void onLobbyDisconnect() {
stManager->statusLock.unlock();
}

MAKE_HOOK_FIND_VERBOSE(MultiplayerJoinLobby, il2cpp_utils::FindMethodUnsafe("", "MultiplayerSessionManager", "StartSession", 1), void, MultiplayerSessionManager* self, ConnectedPlayerManager* connectedPlayerManager) {
MultiplayerJoinLobby(self, connectedPlayerManager);
MAKE_HOOK_MATCH(MultiplayerJoinLobby, &MultiplayerSessionManager::StartSession, void, MultiplayerSessionManager* self, GlobalNamespace::MultiplayerSessionManager_SessionType sessionType, ConnectedPlayerManager* connectedPlayerManager) {
MultiplayerJoinLobby(self, sessionType, connectedPlayerManager);

int maxPlayers = self->get_maxPlayerCount();
int numActivePlayers = self->get_connectedPlayerCount();
Expand Down

0 comments on commit fde54ea

Please sign in to comment.