6 files changed, 59 insertions(+), 19 deletions(-)

M src/Samples/External/ExternalBrowser/Program.cs
M src/Samples/HighLevel/SimplePiiBot/Commands/EntityCommands.cs
M src/Samples/HighLevel/SimplePiiBot/HostedService.cs
M src/Samples/LowLevel/InterceptNameChanger/NameChanger.cs
M src/Samples/LowLevel/SimpleChat/SimpleChat.cs
M src/Samples/LowLevel/WalkCommands/Startup.cs

@@ 55,17 55,17 @@ public class Program
                     Console.Error.WriteLine(initializationResult.ToFullString());
                 }
 
-                var length = externalBrowser.PetManagerList.Length;
+                var length = externalBrowser.PetManagerList.Get().Length;
                 Console.WriteLine(length);
 
-                if (!externalBrowser.IsInGame)
+                if (!externalBrowser.IsInGame.Get())
                 {
                     Console.Error.WriteLine("The player is not in game, cannot get the name of the player.");
                     continue;
                 }
 
                 Console.WriteLine
-                    ($"Player in process {process.Id} is named {externalBrowser.PlayerManager.Player.Name}");
+                    ($"Player in process {process.Id} is named {externalBrowser.PlayerManager.Get().Player.Name}");
             }
         }
     }

@@ 107,18 107,17 @@ public class EntityCommands : CommandGroup
     public async Task<Result> HandleFocusAsync(int entityId)
     {
         var entityResult = _sceneManager.FindEntity(entityId);
-        if (!entityResult.IsSuccess)
+        if (!entityResult.IsDefined(out var entity))
         {
             return Result.FromError(entityResult);
         }
 
         return await _synchronizer.SynchronizeAsync
         (
-            () =>
-            {
-                _hookManager.EntityFocus.WrapperFunction(entityResult.Entity);
-                return Result.FromSuccess();
-            },
+            () => _hookManager.EntityFocus.MapResult
+            (
+                focus => focus.WrapperFunction.MapResult(wrapper => wrapper(entity))
+            ),
             CancellationToken
         );
     }


@@ 139,11 138,10 @@ public class EntityCommands : CommandGroup
 
         return await _synchronizer.SynchronizeAsync
         (
-            () =>
-            {
-                _hookManager.EntityFollow.WrapperFunction(entity);
-                return Result.FromSuccess();
-            },
+            () => _hookManager.EntityFollow.MapResult
+            (
+                follow => follow.WrapperFunction.MapResult(wrapper => wrapper(entity))
+            ),
             CancellationToken
         );
     }


@@ 157,11 155,10 @@ public class EntityCommands : CommandGroup
     {
         return await _synchronizer.SynchronizeAsync
         (
-            () =>
-            {
-                _hookManager.EntityUnfollow.WrapperFunction();
-                return Result.FromSuccess();
-            },
+            () => _hookManager.EntityUnfollow.MapResult
+            (
+                unfollow => unfollow.WrapperFunction.MapResult(wrapper => wrapper())
+            ),
             CancellationToken
         );
     }

@@ 11,6 11,7 @@ using NosSmooth.Core.Client;
 using NosSmooth.Core.Extensions;
 using NosSmooth.Data.NOSFiles;
 using NosSmooth.LocalBinding;
+using NosSmooth.LocalBinding.Hooks;
 using NosSmooth.PacketSerializer.Extensions;
 using NosSmooth.PacketSerializer.Packets;
 using OneOf.Types;


@@ 78,6 79,15 @@ public class HostedService : BackgroundService
         if (!bindingResult.IsSuccess)
         {
             _logger.LogResultError(bindingResult);
+        }
+
+        if (!_bindingManager.IsModulePresent<IPeriodicHook>() || !_bindingManager.IsModulePresent<IPacketSendHook>()
+            || !_bindingManager.IsModulePresent<IPacketReceiveHook>())
+        {
+            _logger.LogError
+            (
+                "At least one of: periodic, packet receive, packet send has not been loaded correctly, the bot may not be used at all. Aborting"
+            );
             return;
         }
 

@@ 11,6 11,7 @@ using NosSmooth.Core.Client;
 using NosSmooth.Core.Extensions;
 using NosSmooth.Extensions.SharedBinding.Extensions;
 using NosSmooth.LocalBinding;
+using NosSmooth.LocalBinding.Hooks;
 using NosSmooth.LocalClient;
 using NosSmooth.LocalClient.Extensions;
 using NosSmooth.Packets.Enums;


@@ 63,6 64,16 @@ namespace InterceptNameChanger
                 logger.LogResultError(initializeResult);
             }
 
+            if (!bindingManager.IsModulePresent<IPeriodicHook>() || !bindingManager.IsModulePresent<IPacketSendHook>()
+                || !bindingManager.IsModulePresent<IPacketReceiveHook>())
+            {
+                logger.LogError
+                (
+                    "At least one of: periodic, packet receive, packet send has not been loaded correctly, the bot may not be used at all. Aborting"
+                );
+                return;
+            }
+            
             var packetTypesRepository = provider.GetRequiredService<IPacketTypesRepository>();
             var packetAddResult = packetTypesRepository.AddDefaultPackets();
             if (!packetAddResult.IsSuccess)

@@ 10,6 10,7 @@ using NosSmooth.Core.Client;
 using NosSmooth.Core.Extensions;
 using NosSmooth.Extensions.SharedBinding.Extensions;
 using NosSmooth.LocalBinding;
+using NosSmooth.LocalBinding.Hooks;
 using NosSmooth.LocalClient.Extensions;
 using NosSmooth.Packets.Enums;
 using NosSmooth.Packets.Enums.Chat;


@@ 57,6 58,16 @@ public class SimpleChat
             logger.LogError($"Could not initialize NosBindingManager.");
             logger.LogResultError(initializeResult);
         }
+        
+        if (!bindingManager.IsModulePresent<IPeriodicHook>() || !bindingManager.IsModulePresent<IPacketSendHook>()
+            || !bindingManager.IsModulePresent<IPacketReceiveHook>())
+        {
+            logger.LogError
+            (
+                "At least one of: periodic, packet receive, packet send has not been loaded correctly, the bot may not be used at all. Aborting"
+            );
+            return;
+        }
 
         var packetTypesRepository = provider.GetRequiredService<IPacketTypesRepository>();
         var packetAddResult = packetTypesRepository.AddDefaultPackets();

@@ 16,6 16,7 @@ using NosSmooth.Extensions.Pathfinding.Extensions;
 using NosSmooth.Extensions.SharedBinding.Extensions;
 using NosSmooth.LocalBinding;
 using NosSmooth.LocalBinding.Extensions;
+using NosSmooth.LocalBinding.Hooks;
 using NosSmooth.LocalClient;
 using NosSmooth.LocalClient.Extensions;
 using NosSmooth.PacketSerializer.Extensions;


@@ 82,6 83,16 @@ public class Startup
             logger.LogError($"Could not initialize NosBindingManager.");
             logger.LogResultError(initializeResult);
         }
+        
+        if (!bindingManager.IsModulePresent<IPeriodicHook>() || !bindingManager.IsModulePresent<IPacketSendHook>()
+            || !bindingManager.IsModulePresent<IPacketReceiveHook>())
+        {
+            logger.LogError
+            (
+                "At least one of: periodic, packet receive, packet send has not been loaded correctly, the bot may not be used at all. Aborting"
+            );
+            return;
+        }
 
         var packetTypesRepository = provider.GetRequiredService<IPacketTypesRepository>();
         var packetAddResult = packetTypesRepository.AddDefaultPackets();