diff --git a/include/BNM/EventBase.hpp b/include/BNM/EventBase.hpp index e0632f8..d24e26b 100644 --- a/include/BNM/EventBase.hpp +++ b/include/BNM/EventBase.hpp @@ -88,7 +88,11 @@ namespace BNM { if (!_data) return BNM_OBFUSCATE(DBG_BNM_MSG_EventBase_str_nullptr); auto isStatic = _hasAdd ? _add._isStatic : _hasRemove ? _remove._isStatic : _raise._isStatic; return Class(_data->parent).str() + BNM_OBFUSCATE(".(") + + #if UNITY_VER >= 233 + _data->name + + #else ((Structures::Mono::String *)_data->name)->str() + + #endif BNM_OBFUSCATE("){" DBG_BNM_MSG_EventBase_str_add ": ") + (_hasAdd ? BNM_OBFUSCATE(DBG_BNM_MSG_EventBase_str_exists) : BNM_OBFUSCATE(DBG_BNM_MSG_EventBase_str_not_exists)) + BNM_OBFUSCATE(", " DBG_BNM_MSG_EventBase_str_remove ": ") + (_hasRemove ? BNM_OBFUSCATE(DBG_BNM_MSG_EventBase_str_exists) : BNM_OBFUSCATE(DBG_BNM_MSG_EventBase_str_not_exists)) + BNM_OBFUSCATE(", " DBG_BNM_MSG_EventBase_str_raise ": ") + (_hasRaise ? BNM_OBFUSCATE(DBG_BNM_MSG_EventBase_str_exists) : BNM_OBFUSCATE(DBG_BNM_MSG_EventBase_str_not_exists)) + diff --git a/include/BNM/UserSettings/GlobalSettings.hpp b/include/BNM/UserSettings/GlobalSettings.hpp index 97d154b..3377bcd 100644 --- a/include/BNM/UserSettings/GlobalSettings.hpp +++ b/include/BNM/UserSettings/GlobalSettings.hpp @@ -23,6 +23,7 @@ static_assert(false, "ByNameModding requires C++20 and above!"); #define UNITY_VER 222 // 2022.2.x - 2022.3.x //#define UNITY_VER 231 // 2023.1.x //#define UNITY_VER 232 // 2023.2.x+ +//#define UNITY_VER 233 // 6000.x+ // 6000.0.59f2 #define UNITY_PATCH_VER 32 // Для особых случаев (For special cases) diff --git a/src/EventBase.cpp b/src/EventBase.cpp index 26c1893..91ea11d 100644 --- a/src/EventBase.cpp +++ b/src/EventBase.cpp @@ -5,6 +5,8 @@ using namespace BNM; EventBase::EventBase(const IL2CPP::EventInfo *info) { if (!info) return; + + _data = (decltype(_data))info; _hasAdd = _hasRemove = _hasRaise = false; if (info->add && info->add->methodPointer) { _hasAdd = true; diff --git a/src/Image.cpp b/src/Image.cpp index 9afa4f7..7b07aca 100644 --- a/src/Image.cpp +++ b/src/Image.cpp @@ -59,7 +59,8 @@ std::vector BNM::Image::GetClasses(bool includeInner) const { std::vector BNM::Image::GetImages() { auto &assemblies = *Internal::il2cppMethods.Assembly$$GetAllAssemblies(); - std::vector ret{assemblies.size()}; + std::vector ret; + ret.reserve(assemblies.size()); for (auto assembly : assemblies) ret.emplace_back(Internal::il2cppMethods.il2cpp_assembly_get_image(assembly));