Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kodenamekrak/ParticleTuner
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.3.0
Choose a base ref
...
head repository: kodenamekrak/ParticleTuner
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 13 commits
  • 10 files changed
  • 3 contributors

Commits on Apr 8, 2024

  1. Copy the full SHA
    a821da2 View commit details
  2. update build script

    kodenamekrak committed Apr 8, 2024
    Copy the full SHA
    a5f85ae View commit details
  3. update validate script

    kodenamekrak committed Apr 8, 2024
    Copy the full SHA
    e423597 View commit details
  4. fix validate script

    kodenamekrak committed Apr 8, 2024
    Copy the full SHA
    51efe92 View commit details
  5. fix validate script

    kodenamekrak committed Apr 8, 2024
    Copy the full SHA
    87314b8 View commit details

Commits on Apr 11, 2024

  1. Register custom types

    kodenamekrak authored Apr 11, 2024
    Copy the full SHA
    2055f7c View commit details

Commits on Jun 29, 2024

  1. Update for 1.37

    kodenamekrak committed Jun 29, 2024
    Copy the full SHA
    21da1a7 View commit details
  2. reduce cover gif size

    kodenamekrak committed Jun 29, 2024
    Copy the full SHA
    cdd88bf View commit details
  3. Fix qpm build workflow

    kodenamekrak committed Jun 29, 2024
    Copy the full SHA
    6fd79fe View commit details
  4. Update qpm.json version

    kodenamekrak committed Jun 29, 2024
    Copy the full SHA
    6720e52 View commit details

Commits on Nov 10, 2024

  1. Updating bshook to 5.1.9

    lemmingllama committed Nov 10, 2024
    Copy the full SHA
    0519c34 View commit details
  2. Update artifact version

    lemmingllama authored Nov 10, 2024
    Copy the full SHA
    979004c View commit details
  3. Merge pull request #1 from lemmingllama/master

    Updating bshook to 5.1.9 and updating artifact build to v3
    kodenamekrak authored Nov 10, 2024
    Copy the full SHA
    5aedda4 View commit details
Showing with 318 additions and 249 deletions.
  1. +0 −101 .github/workflows/build-ndk-v1.yml
  2. +6 −10 .github/workflows/build-ndk.yml
  3. +0 −6 .gitignore
  4. BIN cover.gif
  5. +1 −1 mod.template.json
  6. +20 −14 qpm.json
  7. +287 −0 qpm.shared.json
  8. +0 −78 scripts/createqmod.ps1
  9. +0 −38 scripts/validate-modjson.ps1
  10. +4 −1 src/main.cpp
101 changes: 0 additions & 101 deletions .github/workflows/build-ndk-v1.yml

This file was deleted.

16 changes: 6 additions & 10 deletions .github/workflows/build-ndk.yml
Original file line number Diff line number Diff line change
@@ -19,8 +19,6 @@ on:
- "**.txt"
- "!CMakeLists.txt"
- "**.ps1"
- "!build.ps1"
- "!createqmod.ps1"
- "**.md"
- .gitignore
pull_request:
@@ -56,20 +54,18 @@ jobs:
- name: Setup qpm
if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
uses: Fernthedev/qpm-action@main # use v1 when fixed
uses: Fernthedev/qpm-action@v1
with:
workflow_token: ${{ secrets.GITHUB_TOKEN }}
# qpm_version: ref@main
restore: true
cache: true
publish: false

- name: Setup qpm for release
if: startsWith(github.ref, 'refs/tags/v')
uses: Fernthedev/qpm-action@main # use v1 when fixed
uses: Fernthedev/qpm-action@v1
with:
workflow_token: ${{ secrets.GITHUB_TOKEN }}
# qpm_version: ref@main
restore: true
cache: true
publish: false
@@ -81,7 +77,7 @@ jobs:
- name: Build & Create Qmod
run: |
cd ${GITHUB_WORKSPACE}
qpm s qmod
qpm qmod zip
- name: Get Library Name
id: libname
run: |
@@ -93,19 +89,19 @@ jobs:
run: mv "./build/debug/${{ steps.libname.outputs.NAME }}" "./build/debug_${{
steps.libname.outputs.NAME }}"
- name: Upload non-debug artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ steps.libname.outputs.NAME }}
path: ./build/${{ steps.libname.outputs.NAME }}
if-no-files-found: error
- name: Upload debug artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: debug_${{ steps.libname.outputs.NAME }}
path: ./build/debug_${{ steps.libname.outputs.NAME }}
if-no-files-found: error
- name: Upload qmod artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{env.qmod_name}}.qmod
path: ./${{ env.qmod_name }}.qmod
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -31,11 +31,6 @@
*.out
*.app

# VSCode config stuff
!.vscode/c_cpp_properties.json
!.vscode/tasks.json
!.vscode/settings.json

# Jetbrains IDEs
.idea/

@@ -56,7 +51,6 @@ Android.mk.backup
*.qmod
mod.json
qpm_defines.cmake
qpm.shared.json
![Cc][Mm]ake[Ll]ists.txt

# CMake stuff
Binary file modified cover.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion mod.template.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"id": "${mod_id}",
"author": "KodenameKRAK",
"version": "${version}",
"packageVersion": "1.35.0_8016709773",
"packageVersion": "1.37.0_9064817954",
"coverImage": "cover.gif",
"description": "Lets you tweak individual particle settings! And has rainbow particles!",
"dependencies": [],
34 changes: 20 additions & 14 deletions qpm.json
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"info": {
"name": "ParticleTuner",
"id": "particletuner",
"version": "0.2.0",
"version": "0.3.1",
"url": null,
"additionalData": {
"overrideSoName": "libparticletuner.so",
@@ -27,10 +27,6 @@
"adb logcat -c",
"pwsh ./scripts/start-logging.ps1"
],
"qmod": [
"pwsh ./scripts/build.ps1",
"pwsh ./scripts/createqmod.ps1"
],
"restart": [
"pwsh ./scripts/restart-game.ps1"
],
@@ -40,12 +36,20 @@
"tomb": [
"pwsh ./scripts/pull-tombstone.ps1"
]
}
},
"qmodIncludeDirs": [
"./build",
"./extern/libs"
],
"qmodIncludeFiles": [
"cover.gif"
],
"qmodOutput": "ParticleTuner"
},
"dependencies": [
{
"id": "beatsaber-hook",
"versionRange": "^5.1.0",
"versionRange": "^5.1.9",
"additionalData": {
"extraFiles": [
"src/inline-hook"
@@ -64,18 +68,15 @@
},
{
"id": "bs-cordl",
"versionRange": "^3500.0.0",
"additionalData": {}
},
{
"id": "bsml",
"versionRange": "^0.4.20",
"versionRange": "^3700.0.0",
"additionalData": {}
},
{
"id": "scotland2",
"versionRange": "^0.1.4",
"additionalData": {}
"additionalData": {
"includeQmod": false
}
},
{
"id": "custom-types",
@@ -86,6 +87,11 @@
"id": "paper",
"versionRange": "^3.6.3",
"additionalData": {}
},
{
"id": "bsml",
"versionRange": "^0.4.42",
"additionalData": {}
}
]
}
287 changes: 287 additions & 0 deletions qpm.shared.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,287 @@
{
"config": {
"version": "0.1.0",
"sharedDir": "shared",
"dependenciesDir": "extern",
"info": {
"name": "ParticleTuner",
"id": "particletuner",
"version": "0.3.1",
"url": null,
"additionalData": {
"overrideSoName": "libparticletuner.so",
"cmake": true
}
},
"workspace": {
"scripts": {
"build": [
"pwsh ./scripts/build.ps1"
],
"clean": [
"pwsh ./scripts/build.ps1 -clean"
],
"copy": [
"pwsh ./scripts/copy.ps1"
],
"logcat": [
"adb logcat -c",
"pwsh ./scripts/start-logging.ps1"
],
"restart": [
"pwsh ./scripts/restart-game.ps1"
],
"stack": [
"pwsh ./scripts/ndk-stack.ps1"
],
"tomb": [
"pwsh ./scripts/pull-tombstone.ps1"
]
},
"qmodIncludeDirs": [
"./build",
"./extern/libs"
],
"qmodIncludeFiles": [
"cover.gif"
],
"qmodOutput": "ParticleTuner"
},
"dependencies": [
{
"id": "beatsaber-hook",
"versionRange": "^5.1.9",
"additionalData": {
"extraFiles": [
"src/inline-hook"
]
}
},
{
"id": "sombrero",
"versionRange": "^0.1.37",
"additionalData": {}
},
{
"id": "config-utils",
"versionRange": "^1.4.2",
"additionalData": {}
},
{
"id": "bs-cordl",
"versionRange": "^3700.0.0",
"additionalData": {}
},
{
"id": "scotland2",
"versionRange": "^0.1.4",
"additionalData": {
"includeQmod": false
}
},
{
"id": "custom-types",
"versionRange": "^0.17.6",
"additionalData": {}
},
{
"id": "paper",
"versionRange": "^3.6.3",
"additionalData": {}
},
{
"id": "bsml",
"versionRange": "^0.4.42",
"additionalData": {}
}
]
},
"restoredDependencies": [
{
"dependency": {
"id": "bsml",
"versionRange": "=0.4.43",
"additionalData": {
"soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/libbsml.so",
"debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/debug_libbsml.so",
"overrideSoName": "libbsml.so",
"modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.43/BSML.qmod",
"branchName": "version/v0_4_43",
"cmake": true
}
},
"version": "0.4.43"
},
{
"dependency": {
"id": "paper",
"versionRange": "=3.7.0",
"additionalData": {
"soLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.7.0/libpaperlog.so",
"debugSoLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.7.0/debug_libpaperlog.so",
"overrideSoName": "libpaperlog.so",
"modLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.7.0/paperlog.qmod",
"branchName": "version/v3_7_0",
"compileOptions": {
"systemIncludes": [
"shared/utfcpp/source"
]
},
"cmake": false
}
},
"version": "3.7.0"
},
{
"dependency": {
"id": "rapidjson-macros",
"versionRange": "=1.2.1",
"additionalData": {
"headersOnly": true,
"branchName": "version/v1_2_1",
"cmake": true
}
},
"version": "1.2.1"
},
{
"dependency": {
"id": "config-utils",
"versionRange": "=1.4.2",
"additionalData": {
"headersOnly": true,
"soLink": "https://github.com/darknight1050/config-utils/releases/download/v1.4.2/libconfig-utils_test.so",
"overrideSoName": "libconfig-utils_test.so",
"branchName": "version/v1_4_2",
"cmake": true
}
},
"version": "1.4.2"
},
{
"dependency": {
"id": "sombrero",
"versionRange": "=0.1.42",
"additionalData": {
"headersOnly": true,
"branchName": "version/v0_1_42"
}
},
"version": "0.1.42"
},
{
"dependency": {
"id": "custom-types",
"versionRange": "=0.17.10",
"additionalData": {
"soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/libcustom-types.so",
"debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/debug_libcustom-types.so",
"overrideSoName": "libcustom-types.so",
"modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.10/CustomTypes.qmod",
"branchName": "version/v0_17_10",
"compileOptions": {
"cppFlags": [
"-Wno-invalid-offsetof"
]
},
"cmake": true
}
},
"version": "0.17.10"
},
{
"dependency": {
"id": "libil2cpp",
"versionRange": "=0.3.2",
"additionalData": {
"headersOnly": true,
"cmake": false
}
},
"version": "0.3.2"
},
{
"dependency": {
"id": "bs-cordl",
"versionRange": "=3700.0.0",
"additionalData": {
"headersOnly": true,
"branchName": "version/v3700_0_0",
"compileOptions": {
"includePaths": [
"include"
],
"cppFeatures": [],
"cppFlags": [
"-DNEED_UNSAFE_CSHARP",
"-fdeclspec",
"-DUNITY_2021",
"-DHAS_CODEGEN"
]
}
}
},
"version": "3700.0.0"
},
{
"dependency": {
"id": "beatsaber-hook",
"versionRange": "=5.1.9",
"additionalData": {
"soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.9/libbeatsaber-hook_5_1_9.so",
"debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.9/debug_libbeatsaber-hook_5_1_9.so",
"branchName": "version/v5_1_9",
"cmake": true
}
},
"version": "5.1.9"
},
{
"dependency": {
"id": "scotland2",
"versionRange": "=0.1.4",
"additionalData": {
"soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.4/libsl2.so",
"debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.4/debug_libsl2.so",
"overrideSoName": "libsl2.so",
"branchName": "version/v0_1_4"
}
},
"version": "0.1.4"
},
{
"dependency": {
"id": "tinyxml2",
"versionRange": "=10.0.0",
"additionalData": {
"soLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/libtinyxml2.so",
"debugSoLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/debug_libtinyxml2.so",
"overrideSoName": "libtinyxml2.so",
"modLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/tinyxml2.qmod",
"branchName": "version/v10_0_0",
"cmake": true
}
},
"version": "10.0.0"
},
{
"dependency": {
"id": "fmt",
"versionRange": "=11.0.2",
"additionalData": {
"headersOnly": true,
"branchName": "version/v11_0_2",
"compileOptions": {
"systemIncludes": [
"fmt/include/"
],
"cppFlags": [
"-DFMT_HEADER_ONLY"
]
}
}
},
"version": "11.0.2"
}
]
}
78 changes: 0 additions & 78 deletions scripts/createqmod.ps1

This file was deleted.

38 changes: 0 additions & 38 deletions scripts/validate-modjson.ps1

This file was deleted.

5 changes: 4 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
@@ -146,6 +146,9 @@ extern "C" void late_load() {
il2cpp_functions::Init();

getModConfig().Init(modInfo);

custom_types::Register::AutoRegister();

BSML::Init();
BSML::Register::RegisterMainMenu<ParticleTuner::SettingsViewController*>("ParticleTuner", "ParticleTuner", "ParticleTuner mod settings");

@@ -158,4 +161,4 @@ extern "C" void late_load() {
INSTALL_HOOK(Logger, SaberBurnMarkSparkles_Start);
INSTALL_HOOK(Logger, ObstacleSaberSparkleEffect_Awake);
INFO("Installed all hooks!");
}
}