Update to 1.17.1, fix position in MP lobby

Author: michael-r-elp

.github/workflows/Pre-Release.yml

@@ -4,11 +4,11 @@ on:
 name: Pre-Release Mod
 env:
      module_id: clockmod
-     version: 1.4.0-rc.2
-     BSVersion: 1.16.4
-     bs_hook: 2_2_5
-     codegen: 0_12_5
-     ndkname: android-ndk-r22
+     version: 1.5.1-rc.1
+     BSVersion: 1.17.1
+     bs_hook: 2_3_0
+     codegen: 0_14_0
+     ndkname: android-ndk-r23
 
 
 jobs:

.github/workflows/Release.yml

@@ -3,10 +3,10 @@ on:
 
     env:
      module_id: clockmod
-     version: 1.5.0
-     BSVersion: 1.17.0
+     version: 1.5.1
+     BSVersion: 1.17.1
      bs_hook: 2_3_0
-     codegen: 0_13_0
+     codegen: 0_14_0
      ndkname: android-ndk-r23
 
 name: Release Mod

.github/workflows/buildMod.yml

@@ -3,16 +3,16 @@ name: NDK build
 on:
   workflow_dispatch:
   push:
-    branches: [ main, dev, 1.16.4 ]
+    branches: [ main, dev ]
   pull_request:
-    branches: [ main, dev, 1.16.4 ]
+    branches: [ main, dev ]
 
 env:
      module_id: clockmod
-     version: 1.5.0-Dev.${{ github.run_number }}
-     BSVersion: 1.17.0
+     version: 1.5.1-Dev.${{ github.run_number }}
+     BSVersion: 1.17.1
      bs_hook: 2_3_0
-     codegen: 0_13_0
+     codegen: 0_14_0
 
 jobs:
   build:

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.8.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.3
 include $(CLEAR_VARS)
@@ -61,11 +61,11 @@ 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
-LOCAL_CFLAGS += -I'extern/libil2cpp/il2cpp/libil2cpp' -DID='"clockmod"' -DVERSION='"1.5.0-Dev"' -I'./shared' -I'./extern' -isystem'extern/codegen/include' -Ofast
+LOCAL_CFLAGS += -I'extern/libil2cpp/il2cpp/libil2cpp' -DID='"clockmod"' -DVERSION='"1.5.1-Dev"' -I'./shared' -I'./extern' -isystem'extern/codegen/include' -Ofast
 LOCAL_CPPFLAGS += -std=c++2a -Ofast
 LOCAL_C_INCLUDES += ./include ./src
 include $(BUILD_SHARED_LIBRARY)

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.8.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.3
 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

build.ps1

@@ -1,26 +1,22 @@
 $NDKPath = Get-Content $PSScriptRoot/ndkpath.txt
 if ($args.Count -eq 0  -or $args[0] -eq "--release") {
 $ModID = "clockmod"
-if ($args[0] -eq "--release") {
-    $VERSION = "1.5.0"
-} else {
-    $VERSION = "1.5.0-Dev"
+$VERSION = "1.5.1"
+if ($args[0] -ne "--release") {
+    $VERSION += "-Dev"
 }
 $BSHook = "2_3_0"
-$codegen_ver = "0_13_0"
 }
 
 if ($args[0] -eq "--actions") {
     $ModID = $env:module_id
     $BSHook = $env:bs_hook
     $VERSION = $env:version
-    $codegen_ver = $env:codegen
 }
 echo "Building mod with ModID: $ModID version: $VERSION, BS-Hook version: $BSHook"
 Copy-Item "./Android_Template.mk" "./Android.mk" -Force
 (Get-Content "./Android.mk").replace('{BS_Hook}',   "$BSHook")        | Set-Content "./Android.mk"
 (Get-Content "./Android.mk").replace('{VERSION}',   "$VERSION")       | Set-Content "./Android.mk"
-(Get-Content "./Android.mk").replace('{CG_VER}',    "$codegen_ver")   | Set-Content "./Android.mk"
 
 $buildScript = "$NDKPath/build/ndk-build"
 if (-not ($PSVersionTable.PSEdition -eq "Core")) {

buildQMOD.ps1

@@ -1,12 +1,12 @@
 # Builds a .qmod file for loading with QP
 if ($args.Count -eq 0 -or $args[0] -eq "--dev") {
 $ModID = "clockmod"
-$VERSION = "1.5.0"
+$VERSION = "1.5.1"
 if ($args[0] -eq "--dev") {
     $VERSION += "-Dev"
 }
 $BSHook = "2_3_0"
-$BS_Version = "1.17.0"
+$BS_Version = "1.17.1"
 echo "Compiling Mod"
 if ($args[0] -eq "--dev") {
     & $PSScriptRoot/build.ps1

mod.json

@@ -2,10 +2,10 @@
   "_QPVersion": "0.1.1",
   "id": "clockmod",
   "name": "Clock Mod",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "author": "BoopetyDoopety, EnderdracheLP",
   "packageId": "com.beatgames.beatsaber",
-  "packageVersion": "1.17.0",
+  "packageVersion": "1.17.1",
   "description": "Displays the time in game. Alternatively also the Battery Percentage",
   "coverImage": "Cover.jpg",
   "modFiles": [

qpm.json

@@ -20,7 +20,7 @@
     },
     {
       "id": "codegen",
-      "versionRange": "^0.13.0",
+      "versionRange": "^0.14.0",
       "additionalData": {}
     },
     {

src/main.cpp

@@ -101,7 +101,7 @@ UnityEngine::UI::VerticalLayoutGroup* layout;
 
 // Function that sets the ClockPosition for Multiplayer Lobbies.
 void MPLobbyClockPos(float MLobbyVCPosY) {
-    layout->get_transform()->set_position(UnityEngine::Vector3(0, MLobbyVCPosY-1, 1.62));
+    layout->get_transform()->set_position(UnityEngine::Vector3(0, MLobbyVCPosY-1, 1.75));
     layout->get_transform()->set_localScale(UnityEngine::Vector3(0.35, 0.35, 0.35));
     layout->get_gameObject()->get_transform()->GetParent()->set_eulerAngles(UnityEngine::Vector3(0, 0, 0));
 }