From 1aa731e6629825c24dbaa1a971bba450f08f6bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Fri, 21 Jan 2022 18:59:13 +0100 Subject: [PATCH] feat(localbinding): rename Character to PlayerManager --- .../Extensions/ServiceCollectionExtensions.cs | 4 ++-- Local/NosSmooth.LocalBinding/NosBindingManager.cs | 6 +++--- .../{CharacterBinding.cs => PlayerManagerBinding.cs} | 10 +++++----- .../Options/CharacterBindingOptions.cs | 2 +- .../CommandHandlers/Walk/WalkCommandHandler.cs | 10 +++++----- .../CommandHandlers/Walk/WalkStatus.cs | 10 +++++----- Samples/WalkCommands/Commands/CombatCommands.cs | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) rename Local/NosSmooth.LocalBinding/Objects/{CharacterBinding.cs => PlayerManagerBinding.cs} (97%) diff --git a/Local/NosSmooth.LocalBinding/Extensions/ServiceCollectionExtensions.cs b/Local/NosSmooth.LocalBinding/Extensions/ServiceCollectionExtensions.cs index 9eafe6f..395efb3 100644 --- a/Local/NosSmooth.LocalBinding/Extensions/ServiceCollectionExtensions.cs +++ b/Local/NosSmooth.LocalBinding/Extensions/ServiceCollectionExtensions.cs @@ -18,7 +18,7 @@ public static class ServiceCollectionExtensions /// Adds bindings to Nostale objects along with to initialize those. /// /// - /// Adds and . + /// Adds and . /// You have to initialize these using /// prior to requesting them from the provider, otherwise an exception /// will be thrown. @@ -29,7 +29,7 @@ public static class ServiceCollectionExtensions { return serviceCollection .AddSingleton() - .AddSingleton(p => p.GetRequiredService().Character) + .AddSingleton(p => p.GetRequiredService().PlayerManager) .AddSingleton(p => p.GetRequiredService().SceneManager) .AddSingleton(p => p.GetRequiredService().Network); } diff --git a/Local/NosSmooth.LocalBinding/NosBindingManager.cs b/Local/NosSmooth.LocalBinding/NosBindingManager.cs index 252458e..cad9805 100644 --- a/Local/NosSmooth.LocalBinding/NosBindingManager.cs +++ b/Local/NosSmooth.LocalBinding/NosBindingManager.cs @@ -26,7 +26,7 @@ public class NosBindingManager : IDisposable private SceneManagerBindingOptions _sceneManagerBindingOptions; private NetworkBinding? _networkBinding; - private CharacterBinding? _characterBinding; + private PlayerManagerBinding? _characterBinding; private SceneManagerBinding? _sceneManagerBinding; /// @@ -87,7 +87,7 @@ public class NosBindingManager : IDisposable /// Gets the character binding. /// /// Thrown if the manager is not initialized yet. - public CharacterBinding Character + public PlayerManagerBinding PlayerManager { get { @@ -132,7 +132,7 @@ public class NosBindingManager : IDisposable } _networkBinding = network.Entity; - var character = CharacterBinding.Create(this, _characterBindingOptions); + var character = PlayerManagerBinding.Create(this, _characterBindingOptions); if (!character.IsSuccess) { return Result.FromError(character); diff --git a/Local/NosSmooth.LocalBinding/Objects/CharacterBinding.cs b/Local/NosSmooth.LocalBinding/Objects/PlayerManagerBinding.cs similarity index 97% rename from Local/NosSmooth.LocalBinding/Objects/CharacterBinding.cs rename to Local/NosSmooth.LocalBinding/Objects/PlayerManagerBinding.cs index 4ceea61..6141202 100644 --- a/Local/NosSmooth.LocalBinding/Objects/CharacterBinding.cs +++ b/Local/NosSmooth.LocalBinding/Objects/PlayerManagerBinding.cs @@ -1,5 +1,5 @@ // -// CharacterBinding.cs +// PlayerManagerBinding.cs // // Copyright (c) František Boháček. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. @@ -17,7 +17,7 @@ namespace NosSmooth.LocalBinding.Objects; /// /// The nostale binding of a character. /// -public class CharacterBinding +public class PlayerManagerBinding { [Function ( @@ -55,7 +55,7 @@ public class CharacterBinding /// The binding manager. /// The options for the binding. /// A network binding or an error. - public static Result Create(NosBindingManager bindingManager, CharacterBindingOptions options) + public static Result Create(NosBindingManager bindingManager, CharacterBindingOptions options) { var process = Process.GetCurrentProcess(); var characterObjectAddress = bindingManager.Scanner.CompiledFindPattern(options.CharacterObjectPattern); @@ -94,7 +94,7 @@ public class CharacterBinding (unfollowEntityAddress.Offset + (int)process.MainModule!.BaseAddress); var unfollowEntityWrapper = unfollowEntityFunction.GetWrapper(); - var binding = new CharacterBinding + var binding = new PlayerManagerBinding ( bindingManager, (IntPtr)(characterObjectAddress.Offset + (int)process.MainModule!.BaseAddress + 0x06), @@ -139,7 +139,7 @@ public class CharacterBinding private UnfollowEntityDelegate _originalUnfollowEntity; private WalkDelegate _originalWalk; - private CharacterBinding + private PlayerManagerBinding ( NosBindingManager bindingManager, IntPtr characterAddress, diff --git a/Local/NosSmooth.LocalBinding/Options/CharacterBindingOptions.cs b/Local/NosSmooth.LocalBinding/Options/CharacterBindingOptions.cs index d45c984..0224a94 100644 --- a/Local/NosSmooth.LocalBinding/Options/CharacterBindingOptions.cs +++ b/Local/NosSmooth.LocalBinding/Options/CharacterBindingOptions.cs @@ -9,7 +9,7 @@ using NosSmooth.LocalBinding.Objects; namespace NosSmooth.LocalBinding.Options; /// -/// Options for . +/// Options for . /// public class CharacterBindingOptions { diff --git a/Local/NosSmooth.LocalClient/CommandHandlers/Walk/WalkCommandHandler.cs b/Local/NosSmooth.LocalClient/CommandHandlers/Walk/WalkCommandHandler.cs index 0dfceac..58db073 100644 --- a/Local/NosSmooth.LocalClient/CommandHandlers/Walk/WalkCommandHandler.cs +++ b/Local/NosSmooth.LocalClient/CommandHandlers/Walk/WalkCommandHandler.cs @@ -17,20 +17,20 @@ namespace NosSmooth.LocalClient.CommandHandlers.Walk; /// public class WalkCommandHandler : ICommandHandler { - private readonly CharacterBinding _characterBinding; + private readonly PlayerManagerBinding _playerManagerBinding; private readonly WalkStatus _walkStatus; private readonly WalkCommandHandlerOptions _options; /// /// Initializes a new instance of the class. /// - /// The character object binding. + /// The character object binding. /// The walk status. /// The options. - public WalkCommandHandler(CharacterBinding characterBinding, WalkStatus walkStatus, IOptions options) + public WalkCommandHandler(PlayerManagerBinding playerManagerBinding, WalkStatus walkStatus, IOptions options) { _options = options.Value; - _characterBinding = characterBinding; + _playerManagerBinding = playerManagerBinding; _walkStatus = walkStatus; } @@ -46,7 +46,7 @@ public class WalkCommandHandler : ICommandHandler await _walkStatus.SetWalking(linked, command.TargetX, command.TargetY, command.CancelOnUserMove); while (!ct.IsCancellationRequested) { - var walkResult = _characterBinding.Walk(command.TargetX, command.TargetY); + var walkResult = _playerManagerBinding.Walk(command.TargetX, command.TargetY); if (!walkResult.IsSuccess) { try diff --git a/Local/NosSmooth.LocalClient/CommandHandlers/Walk/WalkStatus.cs b/Local/NosSmooth.LocalClient/CommandHandlers/Walk/WalkStatus.cs index 0d72ba0..ec4feda 100644 --- a/Local/NosSmooth.LocalClient/CommandHandlers/Walk/WalkStatus.cs +++ b/Local/NosSmooth.LocalClient/CommandHandlers/Walk/WalkStatus.cs @@ -13,7 +13,7 @@ namespace NosSmooth.LocalClient.CommandHandlers.Walk; /// public class WalkStatus { - private readonly CharacterBinding _characterBinding; + private readonly PlayerManagerBinding _playerManagerBinding; private readonly SemaphoreSlim _semaphore; private CancellationTokenSource? _walkingCancellation; private bool _userCanCancel; @@ -22,10 +22,10 @@ public class WalkStatus /// /// Initializes a new instance of the class. /// - /// The character binding. - public WalkStatus(CharacterBinding characterBinding) + /// The character binding. + public WalkStatus(PlayerManagerBinding playerManagerBinding) { - _characterBinding = characterBinding; + _playerManagerBinding = playerManagerBinding; _semaphore = new SemaphoreSlim(1, 1); } @@ -110,7 +110,7 @@ public class WalkStatus if (!_walkHooked) { - _characterBinding.WalkCall += OnCharacterWalked; + _playerManagerBinding.WalkCall += OnCharacterWalked; _walkHooked = true; } diff --git a/Samples/WalkCommands/Commands/CombatCommands.cs b/Samples/WalkCommands/Commands/CombatCommands.cs index 5107e88..89eeef7 100644 --- a/Samples/WalkCommands/Commands/CombatCommands.cs +++ b/Samples/WalkCommands/Commands/CombatCommands.cs @@ -19,19 +19,19 @@ namespace WalkCommands.Commands; public class CombatCommands : CommandGroup { private readonly SceneManagerBinding _sceneManagerBinding; - private readonly CharacterBinding _characterBinding; + private readonly PlayerManagerBinding _playerManagerBinding; private readonly FeedbackService _feedbackService; /// /// Initializes a new instance of the class. /// /// The scene manager binding. - /// The character binding. + /// The character binding. /// The feedback service. - public CombatCommands(SceneManagerBinding sceneManagerBinding, CharacterBinding characterBinding, FeedbackService feedbackService) + public CombatCommands(SceneManagerBinding sceneManagerBinding, PlayerManagerBinding playerManagerBinding, FeedbackService feedbackService) { _sceneManagerBinding = sceneManagerBinding; - _characterBinding = characterBinding; + _playerManagerBinding = playerManagerBinding; _feedbackService = feedbackService; } @@ -60,7 +60,7 @@ public class CombatCommands : CommandGroup return Task.FromResult(Result.FromError(entity)); } - return Task.FromResult(_characterBinding.FollowEntity(entity.Entity)); + return Task.FromResult(_playerManagerBinding.FollowEntity(entity.Entity)); } /// @@ -70,6 +70,6 @@ public class CombatCommands : CommandGroup [Command("unfollow")] public Task HandleUnfollowAsync() { - return Task.FromResult(_characterBinding.UnfollowEntity()); + return Task.FromResult(_playerManagerBinding.UnfollowEntity()); } } \ No newline at end of file -- 2.49.0