Update dependencies

.clang-format

@@ -1,9 +1,9 @@
----
+---
 AccessModifierOffset: -4
 AlignAfterOpenBracket: DontAlign
 AlignConsecutiveAssignments: 'false'
 AlignConsecutiveBitFields: 'false'
-AlignConsecutiveDeclarations: 'false'
+AlignConsecutiveDeclarations: 'true'
 AlignConsecutiveMacros: 'false'
 AlignEscapedNewlines: Left
 AlignOperands: Align

.github/workflows/main.yml

@@ -16,10 +16,14 @@ jobs:
     with:
       CMAKE_VR_CONFIG_PRESET: ''
       CMAKE_VR_BUILD_PRESET: ''
-      AE_353_BRANCH: master-1.6.353
       FOMOD_INCLUDE_PDB: true
       FOMOD_MOD_NAME: "Frozen Electrocuted Combustion"
       FOMOD_MOD_AUTHOR: "powerofthree"
       FOMOD_MOD_NEXUS_ID: "3532"
       FOMOD_REQUIRED_INSTALLATION_DIR: "Skyrim/Data"
+      FOMOD_AE_NAME: 'SSE v1.640+ ("Anniversary Edition")'
+      FOMOD_AE_DESCR: 'Select this if you are using Skyrim Anniversary Edition v1.6.640 or higher.'
+      FOMOD_AE_MIN_GAME_VERSION: '1.6'
       PUBLISH_ARCHIVE_TYPE: '7z'
+      VCPKG_COMMIT_ID: '198d68dbcc6c907cb3d0b9b1d93c3df6ecf93c62'
+

.github/workflows/maintenance.yml

@@ -7,18 +7,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v2
-        with:
-          python-version: "3.9"
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
 
-      - name: Run clang-format
-        run: find -type f \( -name *.h -o -name *.cpp \) | xargs clang-format-14 -style=file -i
+    - name: Run clang-format
+      run: find -type f \( -name *.h -o -name *.cpp \) | xargs clang-format-14 -style=file -i
 
-      - name: Glob files
-        run: python ${{ github.workspace }}/ProjectGen.py
+    - name: Glob files
+      run: python ${{ github.workspace }}/ProjectGen.py
 
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: maintenance
+    - uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: maintenance

CMakeLists.txt

@@ -134,6 +134,7 @@ find_path(SRELL_INCLUDE_DIRS "srell.hpp")
 find_path(CLIB_UTIL_INCLUDE_DIRS "ClibUtil/utils.hpp")
 
 find_package(frozen CONFIG REQUIRED)
+find_package(unordered_dense CONFIG REQUIRED)
 
 # ---- Add source files ----
 include(cmake/headerlist.cmake)
@@ -186,6 +187,7 @@ target_link_libraries(
 	PRIVATE
 	${CommonLibName}::${CommonLibName}
 	frozen::frozen
+	unordered_dense::unordered_dense
 )
 
 target_precompile_headers(

CMakePresets.json

@@ -1,121 +1,115 @@
 {
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 21,
+    "patch": 0
+  },
   "configurePresets": [
     {
-      "binaryDir": "${sourceDir}/build",
+      "name": "cmake-dev",
+      "hidden": true,
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": {
-          "type": "STRING",
-          "value": "Release"
-        }
+        "CMAKE_CONFIGURATION_TYPES": "Debug;Release",
+        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /external:anglebrackets /external:W0 $penv{CXXFLAGS}"
       },
       "errors": {
         "deprecated": true
       },
-      "hidden": true,
-      "name": "cmake-dev",
       "warnings": {
         "deprecated": true,
         "dev": true
       }
     },
     {
-      "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": {
-          "type": "STRING",
-          "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
-        },
-        "VCPKG_OVERLAY_PORTS": {
-          "type": "STRING",
-          "value": "${sourceDir}/cmake/ports/"
-        }
-      },
+      "name": "vcpkg",
       "hidden": true,
-      "name": "vcpkg"
+      "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+      "cacheVariables": {
+        "VCPKG_OVERLAY_PORTS": "${sourceDir}/cmake/ports/"
+      }
     },
     {
+      "name": "windows",
+      "hidden": true,
       "cacheVariables": {
-        "CMAKE_MSVC_RUNTIME_LIBRARY": {
-          "type": "STRING",
-          "value": "MultiThreaded$<$<CONFIG:Debug>:Debug>"
-        },
-        "VCPKG_TARGET_TRIPLET": {
-          "type": "STRING",
-          "value": "x64-windows-static"
-        }
-      },
+        "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>",
+        "VCPKG_TARGET_TRIPLET": "x64-windows-static"
+      }
+    },
+    {
+      "name": "vs2022",
+      "hidden": true,
+      "generator": "Visual Studio 17 2022",
+      "toolset": "v143"
+    },
+    {
+      "name": "se",
       "hidden": true,
-      "name": "windows"
+      "binaryDir": "${sourceDir}/build"
     },
     {
+      "name": "ae",
+      "hidden": true,
       "binaryDir": "${sourceDir}/buildae",
       "cacheVariables": {
         "BUILD_SKYRIMAE": true
-      },
-      "hidden": true,
-      "name": "ae"
+      }
     },
     {
+      "name": "vr",
+      "hidden": true,
       "binaryDir": "${sourceDir}/buildvr",
       "cacheVariables": {
         "BUILD_SKYRIMVR": true
-      },
-      "hidden": true,
-      "name": "vr"
+      }
     },
     {
-      "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /external:anglebrackets /external:W0 $penv{CXXFLAGS}"
-      },
-      "generator": "Visual Studio 16 2019",
+      "name": "vs2022-windows-vcpkg-se",
       "inherits": [
-        "vr",
         "cmake-dev",
         "vcpkg",
-        "windows"
-      ],
-      "name": "vs2019-windows-vcpkg-vr"
+        "windows",
+        "vs2022",
+        "se"
+      ]
     },
     {
-      "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /external:anglebrackets /external:W0 $penv{CXXFLAGS}"
-      },
-      "generator": "Visual Studio 17 2022",
+      "name": "vs2022-windows-vcpkg-ae",
       "inherits": [
         "cmake-dev",
         "vcpkg",
-        "windows"
-      ],
-      "name": "vs2022-windows-vcpkg-se",
-      "toolset": "v143"
+        "windows",
+        "vs2022",
+        "ae"
+      ]
     },
     {
-      "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /external:anglebrackets /external:W0 $penv{CXXFLAGS}"
-      },
-      "generator": "Visual Studio 17 2022",
-      "inherits": [
-        "vr",
-        "cmake-dev",
-        "vcpkg",
-        "windows"
-      ],
       "name": "vs2022-windows-vcpkg-vr",
-      "toolset": "v143"
-    },
-    {
-      "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4 /external:anglebrackets /external:W0 $penv{CXXFLAGS}"
-      },
-      "generator": "Visual Studio 17 2022",
       "inherits": [
-        "ae",
         "cmake-dev",
         "vcpkg",
-        "windows"
-      ],
-      "name": "vs2022-windows-vcpkg-ae",
-      "toolset": "v143"
+        "windows",
+        "vs2022",
+        "vr"
+      ]
     }
   ],
-  "version": 3
+  "buildPresets": [
+    {
+      "name": "vs2022-windows-vcpkg-ae",
+      "configurePreset": "vs2022-windows-vcpkg-ae",
+      "configuration": "Release"
+    },
+    {
+      "name": "vs2022-windows-vcpkg-se",
+      "configurePreset": "vs2022-windows-vcpkg-se",
+      "configuration": "Release"
+    },
+    {
+      "name": "vs2022-windows-vcpkg-vr",
+      "configurePreset": "vs2022-windows-vcpkg-vr",
+      "configuration": "Release"
+    }
+  ]
 }

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 powerofthree
+Copyright (c) 2021-2024 powerofthree
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

cmake/ports/clib-util/portfile.cmake

@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO powerof3/CLibUtil
-    REF 8dff3f8f064ba662d987b94e1b007ff299cf4ef1
-    SHA512 fdc0a82aa8e6863eefc968e45df2aaf782e1ccad083fa4fd308f6dc53a402641ad1efc26ca9eae2a2526be30def6c3d865719c4a9d82d575b218aac7ef581ba4
+    REF 88d78d94464a04e582669beac56346edbbc4a662
+    SHA512 960cf62e5317356f7c0d994e49f56effb89c415377e9c865e801c5ec28b57e9ec0fd2a9fd54136cd2382addedb6745cd5cc062c46cab5cccb1f634999491c9e1
     HEAD_REF master
 )
 

cmake/ports/clib-util/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "clib-util",
-  "version-string": "1.1.2",
+  "version-string": "1.4.2",
   "port-version": 1,
   "description": "",
   "homepage": "https://github.com/powerof3/CLibUtil"

include/Dependencies.h

@@ -31,13 +31,13 @@ namespace Dependencies
 
 	using _PEGETVERSION = const char* (*)();
 
+	std::string CheckErrors();
+
 	inline constexpr auto PapyrusExtender{ "po3_PapyrusExtender"sv };
 	inline constexpr auto PapyrusUtil{ "PapyrusUtil"sv };
 	inline constexpr auto po3Tweaks{ "po3_Tweaks"sv };
 
 	inline Version requiredPE{ 5, 4, 0 };
-
-	std::string CheckErrors();
 }
 
 template <>

include/Globals.h

@@ -13,7 +13,7 @@ namespace FEC
 	using StackID = RE::VMStackID;
 	using Severity = RE::BSScript::ErrorLogger::Severity;
 
-	inline RE::TESFile* mod;
+	inline RE::TESFile*   mod;
 	inline RE::SpellItem* deathEffectsPCAbility;
 	inline RE::SpellItem* deathEffectsAbility;
 
@@ -128,7 +128,7 @@ namespace FEC
 		inline constexpr RE::FormID DLC1_SunCloakSpellHandFX{ 0x0200A3BD };
 
 		inline constexpr std::array<RE::FormID, 3> FEC_fireFXS = { 0x8E2, 0x877, 0x896 };
-		inline constexpr RE::FormID FEC_sunFXS{ 0x807 };
+		inline constexpr RE::FormID                FEC_sunFXS{ 0x807 };
 
 		inline constexpr std::array<RE::FormID, 3> sunHitFXS = { 0x02019C9D, 0x0200A3BB, 0x0200A3BC };
 		inline constexpr std::array<RE::FormID, 2> sunHitArt = { 0x0200A3B7, 0x0200A3B8 };

include/Graphics.h

@@ -17,7 +17,7 @@ namespace FEC::GRAPHICS
 
 	namespace TEXTURE
 	{
-		void sanitize_path(std::string& a_path);
+		void                    sanitize_path(std::string& a_path);
 		RE::BSShaderTextureSet* create_textureset(char** a_value);
 	}
 
@@ -47,7 +47,7 @@ namespace FEC::GRAPHICS
 
 		using ShaderData = std::tuple<RE::BSShaderTextureSet*, Feature, std::uint64_t, RE::NiColor, float>;
 
-		void stop_all_skin_shaders(RE::TESObjectREFR* a_ref);
+		void                       stop_all_skin_shaders(RE::TESObjectREFR* a_ref);
 		std::pair<bool, ResetData> get_data(RE::NiAVObject* a_object);
 
 		void Toggle(RE::NiAVObject* a_root, RE::NiStringsExtraData* a_data);

include/PCH.h

@@ -12,9 +12,10 @@
 #include "SKSE/SKSE.h"
 
 #include <ClibUtil/numeric.hpp>
+#include <ClibUtil/singleton.hpp>
 #include <ClibUtil/string.hpp>
+#include <ankerl/unordered_dense.h>
 #include <frozen/map.h>
-#include <robin_hood.h>
 #include <spdlog/sinks/basic_file_sink.h>
 #include <srell.hpp>
 #include <xbyak/xbyak.h>
@@ -24,9 +25,9 @@
 namespace logger = SKSE::log;
 namespace numeric = clib_util::numeric;
 namespace string = clib_util::string;
-namespace WinAPI = SKSE::WinAPI;
 
 using namespace std::literals;
+using namespace clib_util::singleton;
 
 namespace stl
 {
@@ -36,6 +37,8 @@ namespace stl
 	void write_thunk_call(std::uintptr_t a_src)
 	{
 		auto& trampoline = SKSE::GetTrampoline();
+		SKSE::AllocTrampoline(14);
+
 		T::func = trampoline.write_call<5>(a_src, T::thunk);
 	}
 

include/Papyrus.h

@@ -57,7 +57,7 @@ namespace FEC
 	namespace Papyrus
 	{
 		std::vector<std::int32_t> GetCauseOfDeath(VM* a_vm, StackID a_stackID, RE::StaticFunctionTag*, RE::Actor* a_actor, std::uint32_t a_type);
-		void RemoveEffectsNotOfType(VM* a_vm, StackID a_stackID, RE::StaticFunctionTag*, RE::Actor* a_actor, std::int32_t a_type);
+		void                      RemoveEffectsNotOfType(VM* a_vm, StackID a_stackID, RE::StaticFunctionTag*, RE::Actor* a_actor, std::int32_t a_type);
 
 		bool GetPermanentDeathEffect(VM* a_vm, StackID a_stackID, RE::StaticFunctionTag*, RE::Actor* a_actor, std::int32_t a_type);
 		bool GetTemporaryDeathEffect(VM* a_vm, StackID a_stackID, RE::StaticFunctionTag*, RE::Actor* a_actor, std::int32_t a_type);