Update v1.6.0

.github/workflows/build.yml

@@ -0,0 +1,53 @@
+name: Build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+env:
+  BUILD_TYPE: Release
+  VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/vcpkg-cache
+  VCPKG_ROOT: C:\vcpkg
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v6
+      with:
+        submodules: recursive
+
+    - name: Setup vcpkg
+      run: |
+        mkdir -p ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+        cd $env:VCPKG_INSTALLATION_ROOT
+        ./bootstrap-vcpkg.bat
+        ./vcpkg --version > ${{ github.workspace }}/vcpkg-version.txt
+
+    - name: Cache vcpkg
+      uses: actions/cache@v5
+      id: vcpkg-cache
+      env:
+        cache-name: vcpkg-cache
+      with:
+        path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}/*
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('main/**/vcpkg.json', 'vcpkg-version.txt') }}
+
+    - name: Configure CMake
+      run: cmake --preset vs2022-windows -Wno-deprecated
+
+    - name: Build
+      run: cmake --build ${{ github.workspace }}/build --config ${{ env.BUILD_TYPE }} --parallel
+
+    - name: Install
+      run: cmake --install ${{ github.workspace }}/build --config ${{ env.BUILD_TYPE }} --prefix ${{ github.workspace }}/install
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v6
+      with:
+        name: ${{ github.event.repository.name }}
+        path: ${{ github.workspace }}/install

.gitignore

@@ -1,4 +1,2 @@
-build/
-buildVR/
-package/
+package*/
 *.7z

CMakeLists.txt

@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.24)
 
 project(
 	MCMHelper
-	VERSION 1.5.0
+	VERSION 1.6.0
 	LANGUAGES CXX
 )
 
 # MCM Helper public release number
-set(PLUGIN_VERSION 14)
+set(PLUGIN_VERSION 15)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -58,21 +58,6 @@ target_include_directories(
 		${SIMPLEINI_INCLUDE_DIRS}
 )
 
-Papyrus_Add(
-	"Papyrus"
-	GAME ${SkyrimSE_PATH}
-	IMPORTS
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/private"
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public"
-		"$ENV{SKSE64Path}/Scripts/Source"
-	SOURCES
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/MCM.psc"
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/SKI_ConfigMenu.psc"
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/private/MCM_ConfigBase.psc"
-	OPTIMIZE
-	ANONYMIZE
-)
-
 set(TRANSLATION_FILES
 	"${CMAKE_CURRENT_SOURCE_DIR}/data/Interface/Translations/MCMHelper_CZECH.txt"
 	"${CMAKE_CURRENT_SOURCE_DIR}/data/Interface/Translations/MCMHelper_ENGLISH.txt"
@@ -85,17 +70,39 @@ set(TRANSLATION_FILES
 	"${CMAKE_CURRENT_SOURCE_DIR}/data/Interface/Translations/MCMHelper_SPANISH.txt"
 )
 
-BSArchive_Add(
-	"BSA"
-	OUTPUT "MCMHelper.bsa"
-	FORMAT SSE
-	FILES
-		${Papyrus_OUTPUT}
-		${TRANSLATION_FILES}
-	PREFIX
-		"${CMAKE_CURRENT_SOURCE_DIR}/data"
-)
-
-add_dependencies("BSA" "Papyrus")
+if(SkyrimSE_PATH)
+	Papyrus_Add(
+		"Papyrus"
+		GAME ${SkyrimSE_PATH}
+		IMPORTS
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/private"
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public"
+			"$ENV{SKSE64Path}/Scripts/Source"
+		SOURCES
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/MCM.psc"
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/SKI_ConfigMenu.psc"
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/private/MCM_ConfigBase.psc"
+		OPTIMIZE
+		ANONYMIZE
+	)
+
+	BSArchive_Add(
+		"BSA"
+		OUTPUT "MCMHelper.bsa"
+		FORMAT SSE
+		FILES
+			${Papyrus_OUTPUT}
+			${TRANSLATION_FILES}
+		PREFIX
+			"${CMAKE_CURRENT_SOURCE_DIR}/data"
+	)
+
+	add_dependencies("BSA" "Papyrus")
+endif()
 
 include(install_files.cmake)
+
+if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+  file(WRITE "${CMAKE_BINARY_DIR}/.gitignore" "*")
+  file(WRITE "${CMAKE_BINARY_DIR}/.hgignore" "syntax: glob\n**/*")
+endif()

CMakePresets.json

@@ -32,11 +32,11 @@
       "cacheVariables": {
         "CMAKE_MSVC_RUNTIME_LIBRARY": {
           "type": "STRING",
-          "value": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL"
+          "value": "MultiThreaded$<$<CONFIG:Debug>:Debug>"
         },
         "VCPKG_TARGET_TRIPLET": {
           "type": "STRING",
-          "value": "x64-windows-static-md"
+          "value": "x64-windows-static"
         }
       },
       "hidden": true,

data/MCM/Config/SkyUI_SE/config.json

@@ -609,85 +609,6 @@
             "step": 1,
             "sourceType": "ModSettingInt"
           }
-        },
-        {
-          "type": "empty"
-        },
-        {
-          "text": "$SWF Version Checking",
-          "type": "header"
-        },
-        {
-          "id": "bMapMenu:SWFVersionCheck",
-          "text": "$Map Menu",
-          "help": "$SKI_INFO3{$On}",
-          "type": "toggle",
-          "valueOptions": {
-            "sourceType": "ModSettingBool"
-          }
-        },
-        {
-          "id": "bFavoritesMenu:SWFVersionCheck",
-          "text": "$Favorites Menu",
-          "help": "$SKI_INFO3{$On}",
-          "type": "toggle",
-          "valueOptions": {
-            "sourceType": "ModSettingBool"
-          }
-        },
-        {
-          "id": "bInventoryMenu:SWFVersionCheck",
-          "text": "$Inventory Menu",
-          "help": "$SKI_INFO3{$On}",
-          "type": "toggle",
-          "valueOptions": {
-            "sourceType": "ModSettingBool"
-          }
-        },
-        {
-          "id": "bMagicMenu:SWFVersionCheck",
-          "text": "$Magic Menu",
-          "help": "$SKI_INFO3{$On}",
-          "type": "toggle",
-          "valueOptions": {
-            "sourceType": "ModSettingBool"
-          }
-        },
-        {
-          "id": "bBarterMenu:SWFVersionCheck",
-          "text": "$Barter Menu",
-          "help": "$SKI_INFO3{$On}",
-          "type": "toggle",
-          "valueOptions": {
-            "sourceType": "ModSettingBool"
-          }
-        },
-        {
-          "id": "bContainerMenu:SWFVersionCheck",
-          "text": "$Container Menu",
-          "help": "$SKI_INFO3{$On}",
-          "type": "toggle",
-          "valueOptions": {
-            "sourceType": "ModSettingBool"
-          }
-        },
-        {
-          "id": "bCraftingMenu:SWFVersionCheck",
-          "text": "$Crafting Menu",
-          "help": "$SKI_INFO3{$On}",
-          "type": "toggle",
-          "valueOptions": {
-            "sourceType": "ModSettingBool"
-          }
-        },
-        {
-          "id": "bGiftMenu:SWFVersionCheck",
-          "text": "$Gift Menu",
-          "help": "$SKI_INFO3{$On}",
-          "type": "toggle",
-          "valueOptions": {
-            "sourceType": "ModSettingBool"
-          }
         }
       ]
     }

data/fomod/ModuleConfig.xml

@@ -60,7 +60,7 @@
 				<group name="Plugin" type="SelectExactlyOne"> 
 					<plugins order="Explicit"> 
 						<plugin name="ESP"> 
-							<description>Install a standard ESP, which uses one of the 255 normal plugin slots.</description> 
+							<description>Install a standard ESP, which uses one of the 254 normal plugin slots.</description> 
 							<files> 
 								<file source="ESP\MCMHelper.esp" destination="MCMHelper.esp" priority="0" /> 
 							</files> 

install_files.cmake

@@ -13,12 +13,14 @@ install(
 	COMPONENT ESL
 )
 
-install(
-	FILES
-		"${CMAKE_CURRENT_BINARY_DIR}/MCMHelper.bsa"
-	DESTINATION "."
-	COMPONENT BSA
-)
+if(TARGET BSA)
+	install(
+		FILES
+			"${CMAKE_CURRENT_BINARY_DIR}/MCMHelper.bsa"
+		DESTINATION "."
+		COMPONENT BSA
+	)
+endif()
 
 install(
 	FILES ${TRANSLATION_FILES}
@@ -27,12 +29,14 @@ install(
 	EXCLUDE_FROM_ALL
 )
 
-install(
-	FILES ${Papyrus_OUTPUT}
-	DESTINATION "Scripts"
-	COMPONENT Loose
-	EXCLUDE_FROM_ALL
-)
+if(TARGET Papyrus)
+	install(
+		FILES ${Papyrus_OUTPUT}
+		DESTINATION "Scripts"
+		COMPONENT Loose
+		EXCLUDE_FROM_ALL
+	)
+endif()
 
 install(
 	FILES
@@ -51,37 +55,39 @@ install(
 	COMPONENT Data
 )
 
-install(
-	FILES
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/SKI_ConfigMenu.psc"
-	DESTINATION
-		"Source/Scripts"
-	COMPONENT Data
-)
+if(TARGET Papyrus)
+	install(
+		FILES
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/SKI_ConfigMenu.psc"
+		DESTINATION
+			"Source/Scripts"
+		COMPONENT Data
+	)
 
-install(
-	FILES
-		"${CMAKE_CURRENT_BINARY_DIR}/Scripts/MCM.pex"
-		"${CMAKE_CURRENT_BINARY_DIR}/Scripts/MCM_ConfigBase.pex"
-		"${CMAKE_CURRENT_SOURCE_DIR}/data/SDK/Scripts/SKI_ConfigBase.pex"
-		"${CMAKE_CURRENT_SOURCE_DIR}/data/SDK/Scripts/SKI_ConfigManager.pex"
-		"${CMAKE_CURRENT_SOURCE_DIR}/data/SDK/Scripts/SKI_PlayerLoadGameAlias.pex"
-		"${CMAKE_CURRENT_SOURCE_DIR}/data/SDK/Scripts/SKI_QuestBase.pex"
-	DESTINATION "Scripts"
-	COMPONENT SDK
-	EXCLUDE_FROM_ALL
-)
+	install(
+		FILES
+			"${CMAKE_CURRENT_BINARY_DIR}/Scripts/MCM.pex"
+			"${CMAKE_CURRENT_BINARY_DIR}/Scripts/MCM_ConfigBase.pex"
+			"${CMAKE_CURRENT_SOURCE_DIR}/data/SDK/Scripts/SKI_ConfigBase.pex"
+			"${CMAKE_CURRENT_SOURCE_DIR}/data/SDK/Scripts/SKI_ConfigManager.pex"
+			"${CMAKE_CURRENT_SOURCE_DIR}/data/SDK/Scripts/SKI_PlayerLoadGameAlias.pex"
+			"${CMAKE_CURRENT_SOURCE_DIR}/data/SDK/Scripts/SKI_QuestBase.pex"
+		DESTINATION "Scripts"
+		COMPONENT SDK
+		EXCLUDE_FROM_ALL
+	)
 
-install(
-	FILES
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/MCM.psc"
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/MCM_ConfigBase.psc"
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/SKI_ConfigBase.psc"
-		"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/SKI_QuestBase.psc"
-	DESTINATION "Source/Scripts"
-	COMPONENT SDK
-	EXCLUDE_FROM_ALL
-)
+	install(
+		FILES
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/MCM.psc"
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/MCM_ConfigBase.psc"
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/SKI_ConfigBase.psc"
+			"${CMAKE_CURRENT_SOURCE_DIR}/scripts/public/SKI_QuestBase.psc"
+		DESTINATION "Source/Scripts"
+		COMPONENT SDK
+		EXCLUDE_FROM_ALL
+	)
+endif()
 
 install(
 	FILES