From 16890e56e4b92f4431ee97805c2dbc988bd03899 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 22:39:56 +0000 Subject: [PATCH] ci: maintenance `2023-11-06` --- CommonLibSF/include/RE/B/BGSBlockBashData.h | 2 +- CommonLibSF/include/RE/B/BSTOptional.h | 96 ++++++++++++--------- CommonLibSF/include/RE/IDs.h | 2 +- CommonLibSF/include/RE/Starfield.h | 5 ++ CommonLibSF/vcpkg.json | 2 +- README.md | 2 +- 6 files changed, 62 insertions(+), 47 deletions(-) diff --git a/CommonLibSF/include/RE/B/BGSBlockBashData.h b/CommonLibSF/include/RE/B/BGSBlockBashData.h index 91cfe176..221a030e 100644 --- a/CommonLibSF/include/RE/B/BGSBlockBashData.h +++ b/CommonLibSF/include/RE/B/BGSBlockBashData.h @@ -6,7 +6,7 @@ namespace RE { class BGSImpactDataSet; class BGSMaterialType; - + class BGSBlockBashData : public BaseFormComponent { public: diff --git a/CommonLibSF/include/RE/B/BSTOptional.h b/CommonLibSF/include/RE/B/BSTOptional.h index 2639434d..c71994df 100644 --- a/CommonLibSF/include/RE/B/BSTOptional.h +++ b/CommonLibSF/include/RE/B/BSTOptional.h @@ -27,10 +27,14 @@ namespace RE } // 2) trivial - constexpr BSTOptional(const BSTOptional&) requires(std::is_trivially_copy_constructible_v) = default; + constexpr BSTOptional(const BSTOptional&) + requires(std::is_trivially_copy_constructible_v) + = default; // 2) trivial - constexpr BSTOptional(BSTOptional&&) requires(std::is_trivially_move_constructible_v) = default; + constexpr BSTOptional(BSTOptional&&) + requires(std::is_trivially_move_constructible_v) + = default; // 3) non-trivial constexpr BSTOptional(BSTOptional&& a_rhs) // @@ -52,12 +56,12 @@ namespace RE requires(std::is_constructible_v && !std::is_constructible_v&> && !std::is_constructible_v&> && - !std::is_constructible_v&&> && - !std::is_constructible_v&&> && + !std::is_constructible_v &&> && + !std::is_constructible_v &&> && !std::is_convertible_v&, value_type> && !std::is_convertible_v&, value_type> && - !std::is_convertible_v&&, value_type> && - !std::is_convertible_v&&, value_type>) + !std::is_convertible_v &&, value_type> && + !std::is_convertible_v &&, value_type>) { if (a_rhs.has_value()) { std::construct_at(std::addressof(_value), a_rhs.value()); @@ -70,15 +74,15 @@ namespace RE explicit(!std::is_convertible_v) // BSTOptional(BSTOptional&& a_rhs) // noexcept(std::is_nothrow_constructible_v) // - requires(std::is_constructible_v && + requires(std::is_constructible_v && !std::is_constructible_v&> && !std::is_constructible_v&> && - !std::is_constructible_v&&> && - !std::is_constructible_v&&> && + !std::is_constructible_v &&> && + !std::is_constructible_v &&> && !std::is_convertible_v&, value_type> && !std::is_convertible_v&, value_type> && - !std::is_convertible_v&&, value_type> && - !std::is_convertible_v&&, value_type>) + !std::is_convertible_v &&, value_type> && + !std::is_convertible_v &&, value_type>) { if (a_rhs.has_value()) { std::construct_at(std::addressof(_value), std::move(a_rhs).value()); @@ -90,7 +94,7 @@ namespace RE template constexpr explicit BSTOptional(std::in_place_t, Args&&... a_args) // noexcept(std::is_nothrow_constructible_v) // - requires(std::is_constructible_v) + requires(std::is_constructible_v) { std::construct_at(std::addressof(_value), std::forward(a_args)...); _active = true; @@ -100,7 +104,7 @@ namespace RE template constexpr explicit BSTOptional(std::in_place_t, std::initializer_list a_ilist, Args&&... a_args) // noexcept(std::is_nothrow_constructible_v&, Args&&...>) // - requires(std::is_constructible_v&, Args&&...>) + requires(std::is_constructible_v&, Args && ...>) { std::construct_at(std::addressof(_value), a_ilist, std::forward(a_args)...); _active = true; @@ -111,7 +115,7 @@ namespace RE constexpr explicit(!std::is_convertible_v) // BSTOptional(U&& a_value) // noexcept(std::is_nothrow_constructible_v) // - requires(std::is_constructible_v && + requires(std::is_constructible_v && !std::same_as, std::in_place_t> && !std::same_as, BSTOptional>) { @@ -128,7 +132,9 @@ namespace RE } // trivial - ~BSTOptional() requires(std::is_trivially_destructible_v) = default; + ~BSTOptional() + requires(std::is_trivially_destructible_v) + = default; // 1) BSTOptional& operator=(std::nullopt_t) // @@ -164,7 +170,8 @@ namespace RE // 2) deleted BSTOptional& operator=(const BSTOptional&) // requires(!std::is_copy_constructible_v || - !std::is_copy_assignable_v) = delete; + !std::is_copy_assignable_v) + = delete; // 3) defined constexpr BSTOptional& operator=(BSTOptional&& a_rhs) // @@ -192,7 +199,8 @@ namespace RE // 3) deleted BSTOptional& operator=(BSTOptional&&) // requires(!std::is_move_constructible_v || - !std::is_move_assignable_v) = delete; + !std::is_move_assignable_v) + = delete; // 4) template @@ -201,8 +209,8 @@ namespace RE std::is_nothrow_constructible_v && std::is_nothrow_assignable_v)) // requires(!std::same_as, BSTOptional> && - std::is_constructible_v && - std::is_assignable_v && + std::is_constructible_v && + std::is_assignable_v && (!std::is_scalar_v || !std::same_as, T>)) { if (has_value()) { @@ -222,16 +230,16 @@ namespace RE std::is_nothrow_assignable_v)) // requires(!std::is_constructible_v&> && !std::is_constructible_v&> && - !std::is_constructible_v&&> && - !std::is_constructible_v&&> && + !std::is_constructible_v &&> && + !std::is_constructible_v &&> && !std::is_convertible_v&, value_type> && !std::is_convertible_v&, value_type> && - !std::is_convertible_v&&, value_type> && - !std::is_convertible_v&&, value_type> && + !std::is_convertible_v &&, value_type> && + !std::is_convertible_v &&, value_type> && !std::is_assignable_v&> && !std::is_assignable_v&> && - !std::is_assignable_v&&> && - !std::is_assignable_v&&> && + !std::is_assignable_v &&> && + !std::is_assignable_v &&> && std::is_constructible_v && std::is_assignable_v) { @@ -256,16 +264,16 @@ namespace RE std::is_nothrow_assignable_v)) // requires(!std::is_constructible_v&> && !std::is_constructible_v&> && - !std::is_constructible_v&&> && - !std::is_constructible_v&&> && + !std::is_constructible_v &&> && + !std::is_constructible_v &&> && !std::is_convertible_v&, value_type> && !std::is_convertible_v&, value_type> && - !std::is_convertible_v&&, value_type> && - !std::is_convertible_v&&, value_type> && + !std::is_convertible_v &&, value_type> && + !std::is_convertible_v &&, value_type> && !std::is_assignable_v&> && !std::is_assignable_v&> && - !std::is_assignable_v&&> && - !std::is_assignable_v&&> && + !std::is_assignable_v &&> && + !std::is_assignable_v &&> && std::is_constructible_v && std::is_assignable_v) { @@ -282,12 +290,12 @@ namespace RE return *this; } - [[nodiscard]] constexpr const value_type* operator->() const noexcept { return std::addressof(value()); } - [[nodiscard]] constexpr value_type* operator->() noexcept { return std::addressof(value()); } - [[nodiscard]] constexpr const value_type& operator*() const& noexcept { return value(); } - [[nodiscard]] constexpr value_type& operator*() & noexcept { return value(); } + [[nodiscard]] constexpr const value_type* operator->() const noexcept { return std::addressof(value()); } + [[nodiscard]] constexpr value_type* operator->() noexcept { return std::addressof(value()); } + [[nodiscard]] constexpr const value_type& operator*() const& noexcept { return value(); } + [[nodiscard]] constexpr value_type& operator*() & noexcept { return value(); } [[nodiscard]] constexpr const value_type&& operator*() const&& noexcept { return std::move(*this).value(); } - [[nodiscard]] constexpr value_type&& operator*() && noexcept { return std::move(*this).value(); } + [[nodiscard]] constexpr value_type&& operator*() && noexcept { return std::move(*this).value(); } [[nodiscard]] constexpr explicit operator bool() const noexcept { return has_value(); } [[nodiscard]] constexpr bool has_value() const noexcept { return _active; } @@ -329,18 +337,20 @@ namespace RE template [[nodiscard]] constexpr value_type value_or(U&& a_default) && // requires((std::is_move_constructible_v && - std::convertible_to)) + std::convertible_to)) { + return has_value() ? std::move(*this).value() : static_cast(std::forward(a_default)); + } + + void reset() noexcept(noexcept(do_reset())) { - return has_value() ? std::move(*this).value() : static_cast(std::forward(a_default)); + do_reset(); } - void reset() noexcept(noexcept(do_reset())) { do_reset(); } - // 1) template value_type& emplace(Args&&... a_args) // noexcept(std::is_nothrow_constructible_v) // - requires(std::is_constructible_v) + requires(std::is_constructible_v) { reset(); std::construct_at(std::addressof(_value), std::forward(a_args)...); @@ -352,7 +362,7 @@ namespace RE template value_type& emplace(std::initializer_list a_ilist, Args&&... a_args) // noexcept(std::is_nothrow_constructible_v&, Args&&...>) // - requires(std::is_constructible_v&, Args&&...>) + requires(std::is_constructible_v&, Args && ...>) { reset(); std::construct_at(std::addressof(_value), a_ilist, std::forward(a_args)...); @@ -375,7 +385,7 @@ namespace RE union { std::remove_const_t _value; - std::byte _buffer[sizeof(value_type)]{}; + std::byte _buffer[sizeof(value_type)]{}; }; // 00 bool _active{ false }; // ?? }; diff --git a/CommonLibSF/include/RE/IDs.h b/CommonLibSF/include/RE/IDs.h index e6789e65..c2cfe30a 100644 --- a/CommonLibSF/include/RE/IDs.h +++ b/CommonLibSF/include/RE/IDs.h @@ -333,7 +333,7 @@ namespace RE::ID namespace TESObjectREFR { inline constexpr REL::ID ActivateRef{ 106374 }; - inline constexpr REL::ID AddLockChange{ 106386 }; + inline constexpr REL::ID AddLockChange{ 106386 }; inline constexpr REL::ID GetCalcLevel{ 107531 }; inline constexpr REL::ID GetCurrentLocation{ 106554 }; inline constexpr REL::ID GetLinkedRef{ 107578 }; diff --git a/CommonLibSF/include/RE/Starfield.h b/CommonLibSF/include/RE/Starfield.h index 83b3cb93..64ab5bb7 100644 --- a/CommonLibSF/include/RE/Starfield.h +++ b/CommonLibSF/include/RE/Starfield.h @@ -16,6 +16,7 @@ #include "RE/B/BGSAttachParentArray.h" #include "RE/B/BGSAttackDataForm.h" #include "RE/B/BGSBipedObjectForm.h" +#include "RE/B/BGSBlockBashData.h" #include "RE/B/BGSBodyPartInfo.h" #include "RE/B/BGSCraftingResourceOwner.h" #include "RE/B/BGSCraftingUseSound.h" @@ -27,6 +28,7 @@ #include "RE/B/BGSFeaturedItemMessage.h" #include "RE/B/BGSForcedLocRefType.h" #include "RE/B/BGSFormFolderKeywordList.h" +#include "RE/B/BGSInstanceNamingRulesForm.h" #include "RE/B/BGSInventoryInterface.h" #include "RE/B/BGSInventoryItem.h" #include "RE/B/BGSInventoryList.h" @@ -76,6 +78,7 @@ #include "RE/B/BSTArray.h" #include "RE/B/BSTEvent.h" #include "RE/B/BSTList.h" +#include "RE/B/BSTOptional.h" #include "RE/B/BSTSingleton.h" #include "RE/B/BSTSmartPointer.h" #include "RE/B/BSTTuple.h" @@ -176,6 +179,7 @@ #include "RE/T/TESAIForm.h" #include "RE/T/TESActorBase.h" #include "RE/T/TESActorBaseData.h" +#include "RE/T/TESBipedModelForm.h" #include "RE/T/TESBoundAnimObject.h" #include "RE/T/TESBoundObject.h" #include "RE/T/TESCamera.h" @@ -186,6 +190,7 @@ #include "RE/T/TESDataHandler.h" #include "RE/T/TESDeathEvent.h" #include "RE/T/TESDescription.h" +#include "RE/T/TESEnchantableForm.h" #include "RE/T/TESFile.h" #include "RE/T/TESForm.h" #include "RE/T/TESFormRefCount.h" diff --git a/CommonLibSF/vcpkg.json b/CommonLibSF/vcpkg.json index 4be1b1bf..f64dfbac 100644 --- a/CommonLibSF/vcpkg.json +++ b/CommonLibSF/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "commonlibsf", - "version-date": "2023-11-05", + "version-date": "2023-11-06", "port-version": 0, "description": "A collaborative reverse-engineered library for Starfield.", "homepage": "https://github.com/Starfield-Reverse-Engineering/CommonLibSF", diff --git a/README.md b/README.md index 20be1ab3..f07c881c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![C++23](https://img.shields.io/static/v1?label=standard&message=c%2B%2B23&color=blue&logo=c%2B%2B&&logoColor=red&style=flat)](https://en.cppreference.com/w/cpp/compiler_support) ![Platform](https://img.shields.io/static/v1?label=platform&message=windows&color=dimgray&style=flat&logo=windows) [![Game version](https://img.shields.io/badge/game%20version-1.7.36-orange)](#Developing-with-CommonLibSF) -[![VCPKG_VER](https://img.shields.io/static/v1?label=vcpkg%20registry&message=2023-11-05&color=green&style=flat)](https://github.com/Starfield-Reverse-Engineering/Starfield-RE-vcpkg) +[![VCPKG_VER](https://img.shields.io/static/v1?label=vcpkg%20registry&message=2023-11-06&color=green&style=flat)](https://github.com/Starfield-Reverse-Engineering/Starfield-RE-vcpkg) [![Main CI](https://img.shields.io/github/actions/workflow/status/Starfield-Reverse-Engineering/CommonLibSF/main_ci.yml)](https://github.com/Starfield-Reverse-Engineering/CommonLibSF/actions/workflows/main_ci.yml) ## Build Dependencies