Merge pull request #16 from AbroGames/2.2.0

2.2.1

Author: KeyJ148

KludgeBox/DI/Requests/MpSyncInjection/MpSyncInjectionRequest.cs

@@ -1,8 +1,6 @@
 using Godot;
-using KludgeBox.DI.Requests.LoggerInjection;
 using KludgeBox.Godot.Nodes.MpSync;
 using KludgeBox.Reflection.Access;
-using Serilog;
 
 namespace KludgeBox.DI.Requests.MpSyncInjection;
 
@@ -11,8 +9,6 @@ public class MpSyncInjectionRequest : IProcessingRequest
     public static readonly string MpSyncNodeName = "MultiplayerSynchronizer";
 
     private readonly IMemberAccessor _memberAccessor;
-    
-    [Logger] private ILogger _log;
 
     public MpSyncInjectionRequest(IMemberAccessor memberAccessor)
     {
@@ -25,26 +21,12 @@ public void ProcessOnInstance(object instance)
     {
         if (instance is Node node)
         {
-            if (!_memberAccessor.HasAttribute(typeof(ExportAttribute)))
-            {
-                _log.Error("Member has Sync attribute, but doesn't have Export attribute: {type}.{member}.",
-                    _memberAccessor.Member.ReflectedType?.FullName,
-                    _memberAccessor.Member.Name);
-                return;
-            }
-
             var mpSync = node.GetNodeOrNull<AttributeMultiplayerSynchronizer>(MpSyncNodeName);
             if (mpSync == null)
             {
                 mpSync = new AttributeMultiplayerSynchronizer(node);
                 node.AddChildWithName(mpSync, MpSyncNodeName);
             }
         }
-        else
-        {
-            _log.Error("Sync attribute at not Node class: {type}.{member}.",
-                _memberAccessor.Member.ReflectedType?.FullName,
-                _memberAccessor.Member.Name);
-        }
     }
 }

KludgeBox/DI/Requests/MpSyncInjection/MpSyncInjectionRequestScanner.cs

@@ -1,17 +1,41 @@
-using KludgeBox.Godot.Nodes.MpSync;
+using Godot;
+using KludgeBox.Godot.Nodes.MpSync;
+using KludgeBox.Logging;
 using KludgeBox.Reflection.Access;
+using Serilog;
 
 namespace KludgeBox.DI.Requests.MpSyncInjection;
 
 public class MpSyncInjectionRequestScanner : IProcessingRequestScanner
 {
+
+    private readonly ILogger _log = LogFactory.GetForStatic<MpSyncInjectionRequestScanner>();
+    
     public bool TryGetRequest(IMemberAccessor accessor, out IProcessingRequest injectionRequest)
     {
         if (!accessor.TryGetAttribute<SyncAttribute>(out _))
         {
             injectionRequest = null;
             return false;
         }
+        
+        if (!accessor.HasAttribute(typeof(ExportAttribute)))
+        {
+            _log.Error("Member has Sync attribute, but doesn't have Export attribute: {type}.{member}.",
+                accessor.Member.ReflectedType?.FullName,
+                accessor.Member.Name);
+            injectionRequest = null;
+            return false;
+        }
+        
+        if (accessor.Member.DeclaringType == null || !accessor.Member.DeclaringType.IsAssignableTo(typeof(Node)))
+        {
+            _log.Error("Sync attribute at not Node class: {type}.{member}.",
+                accessor.Member.ReflectedType?.FullName,
+                accessor.Member.Name);
+            injectionRequest = null;
+            return false;
+        }
 
         injectionRequest = new MpSyncInjectionRequest(accessor);
         return true;

KludgeBox/Godot/Services/NodeTreeService.cs

@@ -10,7 +10,7 @@ namespace KludgeBox.Godot.Services;
 public class NodeTreeService
 {
 
-    [Logger] ILogger _log;
+    [Logger] private ILogger _log;
 
     public NodeTreeService()
     {

KludgeBox/KludgeBox.csproj

@@ -8,7 +8,7 @@
         Minor - добавление новх фич, запланированое плавное устаревание API
         Patch - небольшие фиксы и незначительный функционал
          -->
-        <GeneralVersion>2.2.0</GeneralVersion>
+        <GeneralVersion>2.2.1</GeneralVersion>
 
         <!--
         Пререлизный тег, на случай, когда надо зарелизить что-то, что не должно попасть в релиз