From 9abd790f211af6aada714300cba2cb95c2a186e1 Mon Sep 17 00:00:00 2001
From: Andrej730 <azhilenkov@gmail.com>
Date: Mon, 28 Oct 2024 12:14:46 +0500
Subject: [PATCH 1/2] Introduce blender_manifest.toml

---
 ActRec/blender_manifest.toml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 ActRec/blender_manifest.toml

diff --git a/ActRec/blender_manifest.toml b/ActRec/blender_manifest.toml
new file mode 100644
index 0000000..d250685
--- /dev/null
+++ b/ActRec/blender_manifest.toml
@@ -0,0 +1,10 @@
+schema_version = "1.0.0"
+id = "actionrecorder"
+name = "ActionRecorder"
+version = "4.1.2"
+tagline = "Record and replay Blender actions"
+maintainer = "RivinHD"
+type = "add-on"
+blender_version_min = "4.2.0"
+license = ["SPDX:GPL-3.0-or-later"]
+website = "https://github.com/InamuraJIN/ActionRecorder"

From 59872c8225de154a0f51161c39fe55bcb44ac6b5 Mon Sep 17 00:00:00 2001
From: Andrej730 <azhilenkov@gmail.com>
Date: Mon, 28 Oct 2024 12:32:32 +0500
Subject: [PATCH 2/2] Fix AddonPreferences bl_idname for Blender 4.2

See https://docs.blender.org/manual/en/latest/advanced/extensions/addons.html#user-preferences-and-package
---
 ActRec/actrec/functions/shared.py | 6 +++---
 ActRec/actrec/preferences.py      | 3 ++-
 ActRec/actrec/update.py           | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ActRec/actrec/functions/shared.py b/ActRec/actrec/functions/shared.py
index 3bc44a9..241ac7d 100644
--- a/ActRec/actrec/functions/shared.py
+++ b/ActRec/actrec/functions/shared.py
@@ -22,6 +22,7 @@
 # relative imports
 from ..log import logger
 from .. import shared_data
+from ... import __package__ as base_package
 if TYPE_CHECKING:
     from ..preferences import AR_preferences
     from ..properties.shared import AR_action
@@ -32,7 +33,6 @@
     Font_analysis = object
 # endregion
 
-__module__ = __package__.split(".")[0]
 
 # region functions
 
@@ -411,7 +411,7 @@ def run_queued_macros(context_copy: dict, action_type: str, action_id: str, star
     else:
         temp_override = context.temp_override(**context_copy)
     with temp_override:
-        ActRec_pref = context.preferences.addons[__module__].preferences
+        ActRec_pref = get_preferences(context)
         action = getattr(ActRec_pref, action_type)[action_id]
         play(context, action.macros, action, action_type, start)
 
@@ -904,6 +904,6 @@ def get_preferences(context: Context) -> AR_preferences:
     Returns:
         AR_preferences: preferences of this addon
     """
-    return context.preferences.addons[__module__].preferences
+    return context.preferences.addons[base_package].preferences
 
 # endregion
diff --git a/ActRec/actrec/preferences.py b/ActRec/actrec/preferences.py
index e7a6fbf..4c48fa3 100644
--- a/ActRec/actrec/preferences.py
+++ b/ActRec/actrec/preferences.py
@@ -13,6 +13,7 @@
 # relative imports
 from . import properties, functions, config, update, keymap, log, shared_data
 from .log import logger, log_sys
+from .. import __package__ as base_package
 
 if TYPE_CHECKING:
     def get_preferences(): return
@@ -24,7 +25,7 @@ def get_preferences(): return
 
 
 class AR_preferences(AddonPreferences):
-    bl_idname = __package__.split(".")[0]
+    bl_idname = base_package
 
     def update_is_loaded(self, context: Context) -> None:
         context.scene.name = context.scene.name
diff --git a/ActRec/actrec/update.py b/ActRec/actrec/update.py
index a9bd307..87f087a 100644
--- a/ActRec/actrec/update.py
+++ b/ActRec/actrec/update.py
@@ -22,6 +22,7 @@
 from . import config
 from .log import logger
 from .functions.shared import get_preferences
+from .. import __package__ as base_package
 if TYPE_CHECKING:
     from .preferences import AR_preferences
 else:
@@ -29,7 +30,6 @@
 # endregion
 
 
-__module__ = __package__.split(".")[0]
 
 
 class Update_manager:
@@ -57,7 +57,7 @@ def on_start(dummy: Scene = None) -> None:
     ActRec_pref = get_preferences(bpy.context)
     if not (ActRec_pref.auto_update and Update_manager.version_file_thread is None):
         return
-    t = threading.Thread(target=no_stream_download_version_file, args=[__module__], daemon=True)
+    t = threading.Thread(target=no_stream_download_version_file, args=[base_package], daemon=True)
     t.start()
     Update_manager.version_file_thread = t