Update to 1.17.1

EnderdracheLP · Sep 12, 2021 · d5b738e · d5b738e
1 parent c0bc22c
commit d5b738e
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 41 deletions.
diff --git a/.github/workflows/BuildQSounds.yml b/.github/workflows/BuildQSounds.yml
@@ -21,10 +21,10 @@ on:
 
 env:
      module_id: QuestSounds
-     version: 1.0.2-Dev.${{ github.run_number }}
-     BSVersion: 1.17.0
+     version: 1.0.3-Dev.${{ github.run_number }}
+     BSVersion: 1.17.1
      bs_hook: 2_3_0
-     codegen: 0_13_0
+     codegen: 0_14_0
 #     ndkname: android-ndk-r22
 
 jobs:

diff --git a/.github/workflows/Pre-Release.yml b/.github/workflows/Pre-Release.yml
@@ -5,10 +5,10 @@ on:
 
 env:
      module_id: QuestSounds
-     version: 1.0.2-rc.1
-     BSVersion: 1.17.0
+     version: 1.0.3-rc.1
+     BSVersion: 1.17.1
      bs_hook: 2_3_0
-     codegen: 0_13_0
+     codegen: 0_14_0
      ndkname: android-ndk-r22
 
 

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -9,9 +9,9 @@ on:
 
 env:
      module_id: QuestSounds
-     BSVersion: 1.17.0
+     BSVersion: 1.17.1
      bs_hook: 2_3_0
-     codegen: 0_13_0
+     codegen: 0_14_0
      ndkname: android-ndk-r23
 
 jobs:
@@ -114,24 +114,36 @@ jobs:
       run: |
         cd ${GITHUB_WORKSPACE}
         pwsh -Command ./buildQMOD.ps1 --package
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: ${{ env.module_id }} ${{ github.ref }} for Beat Saber ${{ env.BSVersion }}
-        body_path: ./rl-notes.md
-        draft: true
-        prerelease: false
-    - name: Upload QMOD Release Asset
-      id: upload-release-QMOD 
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Release
+      uses: softprops/action-gh-release@v1
       with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./${{ env.module_id }}.qmod
-        asset_name: ${{ env.module_id }}.qmod
-        asset_content_type: application/qmod
+          name: ${{ env.module_id }} ${{ github.ref }} for Beat Saber ${{ env.BSVersion }}
+          files: |
+            Examples/FNF-SoundPack/FNF-SoundPack.qmod
+            Examples/Bandoot-SoundPack.qmod
+            Examples/Osu-SoundPack.qmod
+            ./${{ env.module_id }}.qmod
+          body_path: ./rl-notes.md
+          draft: true
+
+    #- name: Create Release
+    #  id: create_release
+    #  uses: actions/create-release@v1
+    #  env:
+    #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #  with:
+    #    tag_name: ${{ github.ref }}
+    #    release_name: ${{ env.module_id }} ${{ github.ref }} for Beat Saber ${{ env.BSVersion }}
+    #    body_path: ./rl-notes.md
+    #    draft: true
+    #    prerelease: false
+    #- name: Upload QMOD Release Asset
+    #  id: upload-release-QMOD 
+    #  uses: actions/upload-release-asset@v1
+    #  env:
+    #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #  with:
+    #    upload_url: ${{ steps.create_release.outputs.upload_url }}
+    #    asset_path: ./${{ env.module_id }}.qmod
+    #    asset_name: ${{ env.module_id }}.qmod
+    #    asset_content_type: application/qmod
diff --git a/Android.mk b/Android.mk
@@ -29,11 +29,11 @@ LOCAL_EXPORT_C_INCLUDES := extern/beatsaber-hook
 LOCAL_SRC_FILES := extern/libbeatsaber-hook_2_3_0.so
 LOCAL_CPP_FEATURES := exceptions
 include $(PREBUILT_SHARED_LIBRARY)
-# Creating prebuilt for dependency: codegen - version: 0.7.1
+# Creating prebuilt for dependency: codegen - version: 0.14.0
 include $(CLEAR_VARS)
-LOCAL_MODULE := codegen_0_13_0
+LOCAL_MODULE := codegen
 LOCAL_EXPORT_C_INCLUDES := extern/codegen
-LOCAL_SRC_FILES := extern/libcodegen_0_13_0.so
+LOCAL_SRC_FILES := extern/libcodegen.so
 include $(PREBUILT_SHARED_LIBRARY)
 # Creating prebuilt for dependency: custom-types - version: 0.8.2
 include $(CLEAR_VARS)
@@ -61,7 +61,7 @@ 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_0
-LOCAL_SHARED_LIBRARIES += codegen_0_13_0
+LOCAL_SHARED_LIBRARIES += codegen
 LOCAL_SHARED_LIBRARIES += custom-types
 LOCAL_SHARED_LIBRARIES += questui
 LOCAL_LDLIBS += -llog

diff --git a/Android_Template.mk b/Android_Template.mk
@@ -29,11 +29,11 @@ LOCAL_EXPORT_C_INCLUDES := extern/beatsaber-hook
 LOCAL_SRC_FILES := extern/libbeatsaber-hook_{BS_Hook}.so
 LOCAL_CPP_FEATURES := exceptions
 include $(PREBUILT_SHARED_LIBRARY)
-# Creating prebuilt for dependency: codegen - version: 0.7.1
+# Creating prebuilt for dependency: codegen - version: 0.14.0
 include $(CLEAR_VARS)
-LOCAL_MODULE := codegen_{CG_VER}
+LOCAL_MODULE := codegen
 LOCAL_EXPORT_C_INCLUDES := extern/codegen
-LOCAL_SRC_FILES := extern/libcodegen_{CG_VER}.so
+LOCAL_SRC_FILES := extern/libcodegen.so
 include $(PREBUILT_SHARED_LIBRARY)
 # Creating prebuilt for dependency: custom-types - version: 0.8.2
 include $(CLEAR_VARS)
@@ -61,7 +61,7 @@ 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_{BS_Hook}
-LOCAL_SHARED_LIBRARIES += codegen_{CG_VER}
+LOCAL_SHARED_LIBRARIES += codegen
 LOCAL_SHARED_LIBRARIES += custom-types
 LOCAL_SHARED_LIBRARIES += questui
 LOCAL_LDLIBS += -llog

diff --git a/Examples/Bandoot-SoundPack.qmod b/Examples/Bandoot-SoundPack.qmod
diff --git a/Examples/FNF-SoundPack/FNF-SoundPack.qmod b/Examples/FNF-SoundPack/FNF-SoundPack.qmod
diff --git a/Examples/Osu-SoundPack.qmod b/Examples/Osu-SoundPack.qmod
diff --git a/build.ps1 b/build.ps1
@@ -13,7 +13,7 @@ echo "Arg $($i) is $($args[$i])"
 if ($args.Count -eq 0 -or $actions -ne $true) {
 $ModID = "QuestSounds"
 $BSHook = "2_3_0"
-$VERSION = "1.0.1"
+$VERSION = "1.0.3"
 if ($release -ne $true) {
     $VERSION += "-Dev"
 }

diff --git a/qpm.json b/qpm.json
@@ -27,7 +27,7 @@
     },
     {
       "id": "codegen",
-      "versionRange": "^0.13.0",
+      "versionRange": "^0.14.0",
       "additionalData": {}
     },
     {

diff --git a/rl-notes.md b/rl-notes.md
@@ -1,13 +1,12 @@
-__**QuestSounds 1.0.2 for Beat Saber 1.17.0**__
+__**QuestSounds 1.0.3 for Beat Saber 1.17.1**__
 
 **READ ENTIRE POST BEFORE OPENING AN ISSUE**
 Description:
 QuestSounds or short QSounds allows you to add Custom Hit Sounds and other sounds without asset mods, 
 just drop them into the Folder and select them in-game!
 
 __**Changelog:**__ 
-- Fixed crash on level restart.
-- Changed threshold for long levelFailed sounds to 7 seconds, will be considered long if over that.
+- Updated for 1.17.1
 
 Features:
   In-Game Menu for selecting sound files and enabling/disabling custom sounds.