Update macros

hardcpp · hardcpp · commit 3ff84c59d827 · 2023-10-24T01:26:51.000+02:00
diff --git a/shared/Patches/PBombNoteController.hpp b/shared/Patches/PBombNoteController.hpp
@@ -9,7 +9,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {
     /// @brief BombNoteController patch
     class PBombNoteController
     {
-        DISABLE_CONSTRUCTORS(PBombNoteController);
+        CP_SDK_NO_DEF_CTORS(PBombNoteController);
 
         public:
             /// @brief Set from configuration
diff --git a/shared/Patches/PBurstSliderGameNoteController.hpp b/shared/Patches/PBurstSliderGameNoteController.hpp
@@ -7,7 +7,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {
     /// @brief GameNoteController Patch
     class PBurstSliderGameNoteController
     {
-        DISABLE_CONSTRUCTORS(PBurstSliderGameNoteController);
+        CP_SDK_NO_DEF_CTORS(PBurstSliderGameNoteController);
 
         public:
             /// @brief Set from configuration
diff --git a/shared/Patches/PColorNoteVisuals.hpp b/shared/Patches/PColorNoteVisuals.hpp
@@ -16,7 +16,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {
     /// @brief ColorNoteVisuals patch
     class PColorNoteVisuals
     {
-        DISABLE_CONSTRUCTORS(PColorNoteVisuals);
+        CP_SDK_NO_DEF_CTORS(PColorNoteVisuals);
 
         public:
             /// @brief Set from configuration
diff --git a/shared/Patches/PGameNoteController.hpp b/shared/Patches/PGameNoteController.hpp
@@ -7,7 +7,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {
     /// @brief GameNoteController Patch
     class PGameNoteController
     {
-        DISABLE_CONSTRUCTORS(PGameNoteController);
+        CP_SDK_NO_DEF_CTORS(PGameNoteController);
 
         public:
             /// @brief Set from configuration
diff --git a/shared/Patches/PSliderController.hpp b/shared/Patches/PSliderController.hpp
@@ -7,7 +7,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {
     /// @brief SliderController patch
     class PSliderController
     {
-        DISABLE_CONSTRUCTORS(PSliderController);
+        CP_SDK_NO_DEF_CTORS(PSliderController);
 
         public:
             /// @brief Set from configuration
diff --git a/shared/Patches/PSliderHapticFeedbackInteractionEffect.hpp b/shared/Patches/PSliderHapticFeedbackInteractionEffect.hpp
@@ -7,7 +7,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {
     /// @brief SliderHapticFeedbackInteractionEffect patch
     class PSliderHapticFeedbackInteractionEffect
     {
-        DISABLE_CONSTRUCTORS(PSliderHapticFeedbackInteractionEffect);
+        CP_SDK_NO_DEF_CTORS(PSliderHapticFeedbackInteractionEffect);
 
         public:
             /// @brief Set from configuration
diff --git a/shared/UI/Modals/ProfileImportModal.hpp b/shared/UI/Modals/ProfileImportModal.hpp
@@ -14,9 +14,9 @@ namespace QBeatSaberPlus_NoteTweaker::UI::Modals {
     /// @brief Profile import modal
     class ProfileImportModal : public CP_SDK::UI::IModal
     {
-        CP_SDK_IL2CPP_INHERIT_CUSTOM("QBeatSaberPlus_NoteTweaker.Modals", ProfileImportModal, CP_SDK::UI::IModal);
-        CP_SDK_IL2CPP_DECLARE_CTOR_CHAIN(ProfileImportModal, CP_SDK::UI::IModal);
-        CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHAIN(ProfileImportModal, CP_SDK::UI::IModal);
+        CP_SDK_IL2CPP_INHERIT("QBeatSaberPlus_NoteTweaker.Modals", ProfileImportModal, CP_SDK::UI::IModal);
+        CP_SDK_IL2CPP_DECLARE_CTOR_CHILD(ProfileImportModal);
+        CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHILD(ProfileImportModal);
 
         private:
             _u::XUIDropdown::Ptr m_Dropdown;
diff --git a/shared/UI/SettingsLeftView.hpp b/shared/UI/SettingsLeftView.hpp
@@ -8,9 +8,9 @@ namespace QBeatSaberPlus_NoteTweaker::UI {
     /// @brief Settings left view controller
     class SettingsLeftView : public CP_SDK::UI::ViewController
     {
-        CP_SDK_IL2CPP_INHERIT_CUSTOM("QBeatSaberPlus_NoteTweaker.UI", SettingsLeftView, CP_SDK::UI::ViewController);
-        CP_SDK_IL2CPP_DECLARE_CTOR_CHAIN(SettingsLeftView, CP_SDK::UI::ViewController);
-        CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHAIN(SettingsLeftView, CP_SDK::UI::ViewController);
+        CP_SDK_IL2CPP_INHERIT("QBeatSaberPlus_NoteTweaker.UI", SettingsLeftView, CP_SDK::UI::ViewController);
+        CP_SDK_IL2CPP_DECLARE_CTOR_CHILD(SettingsLeftView);
+        CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHILD(SettingsLeftView);
         CP_SDK_UI_VIEW_CONTROLLER_INSTANCE();
 
         private:
diff --git a/shared/UI/SettingsMainView.hpp b/shared/UI/SettingsMainView.hpp
@@ -17,9 +17,9 @@ namespace QBeatSaberPlus_NoteTweaker::UI {
     /// @brief Settings main view controller
     class SettingsMainView : public CP_SDK::UI::ViewController
     {
-        CP_SDK_IL2CPP_INHERIT_CUSTOM("QBeatSaberPlus_NoteTweaker.UI", SettingsMainView, CP_SDK::UI::ViewController);
-        CP_SDK_IL2CPP_DECLARE_CTOR_CHAIN(SettingsMainView, CP_SDK::UI::ViewController);
-        CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHAIN(SettingsMainView, CP_SDK::UI::ViewController);
+        CP_SDK_IL2CPP_INHERIT("QBeatSaberPlus_NoteTweaker.UI", SettingsMainView, CP_SDK::UI::ViewController);
+        CP_SDK_IL2CPP_DECLARE_CTOR_CHILD(SettingsMainView);
+        CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHILD(SettingsMainView);
         CP_SDK_UI_VIEW_CONTROLLER_INSTANCE();
 
         private:
diff --git a/shared/UI/SettingsRightView.hpp b/shared/UI/SettingsRightView.hpp
@@ -16,9 +16,9 @@ namespace QBeatSaberPlus_NoteTweaker::UI {
     /// @brief Settings right view controller
     class SettingsRightView : public CP_SDK::UI::ViewController
     {
-        CP_SDK_IL2CPP_INHERIT_CUSTOM("QBeatSaberPlus_NoteTweaker.UI", SettingsRightView, CP_SDK::UI::ViewController);
-        CP_SDK_IL2CPP_DECLARE_CTOR_CHAIN(SettingsRightView, CP_SDK::UI::ViewController);
-        CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHAIN(SettingsRightView, CP_SDK::UI::ViewController);
+        CP_SDK_IL2CPP_INHERIT("QBeatSaberPlus_NoteTweaker.UI", SettingsRightView, CP_SDK::UI::ViewController);
+        CP_SDK_IL2CPP_DECLARE_CTOR_CHILD(SettingsRightView);
+        CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHILD(SettingsRightView);
         CP_SDK_UI_VIEW_CONTROLLER_INSTANCE();
 
         private:
diff --git a/src/UI/Modals/ProfileImportModal.cpp b/src/UI/Modals/ProfileImportModal.cpp
@@ -15,13 +15,13 @@ namespace QBeatSaberPlus_NoteTweaker::UI::Modals {
     ////////////////////////////////////////////////////////////////////////////
 
     /// @brief Constructor
-    CP_SDK_IL2CPP_DECLARE_CTOR_CHAIN_IMPL(ProfileImportModal, CP_SDK::UI::IModal)
+    CP_SDK_IL2CPP_DECLARE_CTOR_IMPL(ProfileImportModal)
     {
         OnShow  = {this, &ProfileImportModal::Impl_OnShow};
         OnClose = {this, &ProfileImportModal::Impl_OnClose};
     }
     /// @brief Destructor
-    CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHAIN_IMPL(ProfileImportModal, CP_SDK::UI::IModal)
+    CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_IMPL(ProfileImportModal)
     {
 
     }
diff --git a/src/UI/SettingsLeftView.cpp b/src/UI/SettingsLeftView.cpp
@@ -21,12 +21,12 @@ namespace QBeatSaberPlus_NoteTweaker::UI {
     ////////////////////////////////////////////////////////////////////////////
 
     /// @brief Constructor
-    CP_SDK_IL2CPP_DECLARE_CTOR_CHAIN_IMPL(SettingsLeftView, CP_SDK::UI::ViewController)
+    CP_SDK_IL2CPP_DECLARE_CTOR_IMPL(SettingsLeftView)
     {
         OnViewCreation = {this, &SettingsLeftView::OnViewCreation_Impl};
     }
     /// @brief Destructor
-    CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHAIN_IMPL(SettingsLeftView, CP_SDK::UI::ViewController)
+    CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_IMPL(SettingsLeftView)
     {
 
     }
diff --git a/src/UI/SettingsMainView.cpp b/src/UI/SettingsMainView.cpp
@@ -30,15 +30,15 @@ namespace QBeatSaberPlus_NoteTweaker::UI {
     ////////////////////////////////////////////////////////////////////////////
 
     /// @brief Constructor
-    CP_SDK_IL2CPP_DECLARE_CTOR_CHAIN_IMPL(SettingsMainView, CP_SDK::UI::ViewController)
+    CP_SDK_IL2CPP_DECLARE_CTOR_IMPL(SettingsMainView)
     {
         m_PreventChanges = false;
 
         OnViewCreation      = {this, &SettingsMainView::OnViewCreation_Impl};
         OnViewDeactivation  = {this, &SettingsMainView::OnViewDeactivation_Impl};
     }
     /// @brief Destructor
-    CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHAIN_IMPL(SettingsMainView, CP_SDK::UI::ViewController)
+    CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_IMPL(SettingsMainView)
     {
 
     }
diff --git a/src/UI/SettingsRightView.cpp b/src/UI/SettingsRightView.cpp
@@ -40,15 +40,15 @@ namespace QBeatSaberPlus_NoteTweaker::UI {
     ////////////////////////////////////////////////////////////////////////////
 
     /// @brief Constructor
-    CP_SDK_IL2CPP_DECLARE_CTOR_CHAIN_IMPL(SettingsRightView, CP_SDK::UI::ViewController)
+    CP_SDK_IL2CPP_DECLARE_CTOR_IMPL(SettingsRightView)
     {
         OnViewCreation      = {this, &SettingsRightView::OnViewCreation_Impl};
         OnViewActivation    = {this, &SettingsRightView::OnViewActivation_Impl};
         OnViewDeactivation  = {this, &SettingsRightView::OnViewDeactivation_Impl};
         OnViewDestruction   = {this, &SettingsRightView::OnViewDestruction_Impl};
     }
     /// @brief Destructor
-    CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_CHAIN_IMPL(SettingsRightView, CP_SDK::UI::ViewController)
+    CP_SDK_IL2CPP_DECLARE_DTOR_MONOBEHAVIOUR_IMPL(SettingsRightView)
     {
 
     }
diff --git a/src/main.cpp b/src/main.cpp
@@ -17,7 +17,7 @@ extern "C" void setup(ModInfo & p_ModInfo)
 
     s_ModInfo = p_ModInfo;
 
-    auto l_Logger = new CP_SDK::Logging::BMBFLogger(new Logger(p_ModInfo));
+    auto l_Logger = new CP_SDK::Logging::BMBFLogger(new Logger(p_ModInfo, LoggerOptions(false, true)));
 
     l_Logger->Error(u"QBeatSaberPlus-NoteTweaker Setuping!");
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {`
`9`	`9`	`/// @brief BombNoteController patch`
`10`	`10`	`class PBombNoteController`
`11`	`11`	`{`
`12`		`- DISABLE_CONSTRUCTORS(PBombNoteController);`
	`12`	`+ CP_SDK_NO_DEF_CTORS(PBombNoteController);`
`13`	`13`
`14`	`14`	`public:`
`15`	`15`	`/// @brief Set from configuration`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {`
`7`	`7`	`/// @brief GameNoteController Patch`
`8`	`8`	`class PBurstSliderGameNoteController`
`9`	`9`	`{`
`10`		`- DISABLE_CONSTRUCTORS(PBurstSliderGameNoteController);`
	`10`	`+ CP_SDK_NO_DEF_CTORS(PBurstSliderGameNoteController);`
`11`	`11`
`12`	`12`	`public:`
`13`	`13`	`/// @brief Set from configuration`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {`
`16`	`16`	`/// @brief ColorNoteVisuals patch`
`17`	`17`	`class PColorNoteVisuals`
`18`	`18`	`{`
`19`		`- DISABLE_CONSTRUCTORS(PColorNoteVisuals);`
	`19`	`+ CP_SDK_NO_DEF_CTORS(PColorNoteVisuals);`
`20`	`20`
`21`	`21`	`public:`
`22`	`22`	`/// @brief Set from configuration`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {`
`7`	`7`	`/// @brief GameNoteController Patch`
`8`	`8`	`class PGameNoteController`
`9`	`9`	`{`
`10`		`- DISABLE_CONSTRUCTORS(PGameNoteController);`
	`10`	`+ CP_SDK_NO_DEF_CTORS(PGameNoteController);`
`11`	`11`
`12`	`12`	`public:`
`13`	`13`	`/// @brief Set from configuration`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {`
`7`	`7`	`/// @brief SliderController patch`
`8`	`8`	`class PSliderController`
`9`	`9`	`{`
`10`		`- DISABLE_CONSTRUCTORS(PSliderController);`
	`10`	`+ CP_SDK_NO_DEF_CTORS(PSliderController);`
`11`	`11`
`12`	`12`	`public:`
`13`	`13`	`/// @brief Set from configuration`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace QBeatSaberPlus_NoteTweaker::Patches {`
`7`	`7`	`/// @brief SliderHapticFeedbackInteractionEffect patch`
`8`	`8`	`class PSliderHapticFeedbackInteractionEffect`
`9`	`9`	`{`
`10`		`- DISABLE_CONSTRUCTORS(PSliderHapticFeedbackInteractionEffect);`
	`10`	`+ CP_SDK_NO_DEF_CTORS(PSliderHapticFeedbackInteractionEffect);`
`11`	`11`
`12`	`12`	`public:`
`13`	`13`	`/// @brief Set from configuration`