Add full synchronisation

.editorconfig

@@ -62,11 +62,11 @@ resharper_web_config_module_not_resolved_highlighting = warning
 resharper_web_config_type_not_resolved_highlighting = warning
 resharper_web_config_wrong_module_highlighting = warning
 
-[{*.har,*.inputactions,*.jsb2,*.jsb3,*.json,*.yml,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
+[{*.har,*.inputactions,*.jsb2,*.jsb3,*.yml,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
 indent_style = space
 indent_size = 2
 
-[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,cc,cginc,compute,cp,cpp,cs,cshtml,cu,cuh,cxx,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,master,ml,mli,mpp,mq4,mq5,mqh,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,vb,xaml,xamlx,xoml,xsd}]
+[*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,cc,cginc,compute,cp,cpp,cs,cshtml,cu,cuh,cxx,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,json,master,ml,mli,mpp,mq4,mq5,mqh,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,vb,xaml,xamlx,xoml,xsd}]
 indent_style = space
 indent_size = 4
 tab_width = 4

.github/workflows/dotnet.yml

@@ -26,7 +26,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Download dependencies
-        run: wget https://files.catbox.moe/r5p6rr.gpg -O deps.zip.gpg
+        run: wget https://files.catbox.moe/t156ho.gpg -O deps.zip.gpg
 
       - name: Decrypt dependencies
         run: gpg --quiet --batch --yes --decrypt --passphrase="${{ secrets.DEPENDENCIES_ZIP_PASSPHRASE }}" --output deps.zip deps.zip.gpg
@@ -44,7 +44,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: Restore dependencies
         run: dotnet restore ${{ github.workspace }}
@@ -60,6 +60,7 @@ jobs:
             ${{ github.workspace }}/HKMP/bin/Release/net472/HKMP.dll
             ${{ github.workspace }}/HKMP/bin/Release/net472/HKMP.xml
             ${{ github.workspace }}/HKMP/bin/Release/net472/HKMP.pdb
+            ${{ github.workspace }}/HKMP/bin/Release/net472/BouncyCastle.Cryptography.dll
 
       - name: Upload HKMPServer artifact
         uses: actions/upload-artifact@v4
@@ -68,3 +69,7 @@ jobs:
           path: |
             ${{ github.workspace }}/HKMPServer/bin/Release/net472/HKMPServer.exe
             ${{ github.workspace }}/HKMPServer/bin/Release/net472/HKMPServer.pdb
+            ${{ github.workspace }}/HKMPServer/bin/Release/net472/HKMP.dll
+            ${{ github.workspace }}/HKMPServer/bin/Release/net472/HKMP.pdb
+            ${{ github.workspace }}/HKMPServer/bin/Release/net472/Newtonsoft.Json.dll
+            ${{ github.workspace }}/HKMPServer/bin/Release/net472/BouncyCastle.Cryptography.dll

HKMP/Animation/AnimationEffect.cs

@@ -26,21 +26,19 @@ public void SetServerSettings(ServerSettings serverSettings) {
     }
 
     /// <summary>
-    /// Locate the damages_enemy FSM and change the attack type to generic. This will avoid the local
-    /// player taking knock back from remote players hitting shields etc.
+    /// Locate the damages_enemy FSM and change the attack direction to the given direciton. This will ensure that
+    /// enemies are getting knocked back in the correct direction from remote player's attacks.
     /// </summary>
     /// <param name="targetObject">The target GameObject to change.</param>
-    protected static void ChangeAttackTypeOfFsm(GameObject targetObject) {
+    /// <param name="direction">The direction in float that the damage is coming from.</param>
+    protected static void ChangeAttackDirection(GameObject targetObject, float direction) {
         var damageFsm = targetObject.LocateMyFSM("damages_enemy");
         if (damageFsm == null) {
             return;
         }
-
-        var takeDamage = damageFsm.GetFirstAction<TakeDamage>("Send Event");
-        takeDamage.AttackType.Value = (int) AttackTypes.Generic;
-        takeDamage = damageFsm.GetFirstAction<TakeDamage>("Parent");
-        takeDamage.AttackType.Value = (int) AttackTypes.Generic;
-        takeDamage = damageFsm.GetFirstAction<TakeDamage>("Grandparent");
-        takeDamage.AttackType.Value = (int) AttackTypes.Generic;
+
+        // Find the variable that controls the slash direction for damaging enemies
+        var directionVar = damageFsm.FsmVariables.GetFsmFloat("direction");
+        directionVar.Value = direction;
     }
 }

HKMP/Animation/AnimationManager.cs

@@ -10,14 +10,15 @@
 using Hkmp.Game.Client;
 using Hkmp.Game.Settings;
 using Hkmp.Networking.Client;
-using Hkmp.Networking.Packet;
 using Hkmp.Networking.Packet.Data;
 using Hkmp.Util;
 using HutongGames.PlayMaker.Actions;
 using Modding;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using Logger = Hkmp.Logging.Logger;
+using Object = UnityEngine.Object;
+using Random = UnityEngine.Random;
 
 namespace Hkmp.Animation;
 
@@ -33,14 +34,14 @@ internal class AnimationManager {
     /// <summary>
     /// Animations that are allowed to loop, because they need to transmit the effect.
     /// </summary>
-    private static readonly string[] AllowedLoopAnimations = { "Focus Get", "Run" };
+    private static readonly string[] AllowedLoopAnimations = ["Focus Get", "Run"];
 
     /// <summary>
     /// Clip names of animations that are handled by the animation controller.
     /// </summary>
-    private static readonly string[] AnimationControllerClipNames = {
+    private static readonly string[] AnimationControllerClipNames = [
         "Airborne"
-    };
+    ];
 
     /// <summary>
     /// The animation effect for cancelling the Crystal Dash Charge. Stored since it needs to be called
@@ -406,20 +407,29 @@ internal class AnimationManager {
 
     public AnimationManager(
         NetClient netClient,
-        PlayerManager playerManager,
-        PacketManager packetManager,
-        ServerSettings serverSettings
+        PlayerManager playerManager
     ) {
         _netClient = netClient;
         _playerManager = playerManager;
 
         _chargedEffectStopwatch = new Stopwatch();
         _chargedEndEffectStopwatch = new Stopwatch();
+    }
 
-        // Register packet handler
-        packetManager.RegisterClientPacketHandler<GenericClientData>(ClientPacketId.PlayerDeath,
-            OnPlayerDeath);
+    /// <summary>
+    /// Initialize the animation manager by registering packet handlers and initializing animation effects.
+    /// </summary>
+    public void Initialize(ServerSettings serverSettings) {
+        // Set the server settings for all animation effects
+        foreach (var effect in AnimationEffects.Values) {
+            effect.SetServerSettings(serverSettings);
+        }
+    }
 
+    /// <summary>
+    /// Register the game hooks for the animation manager.
+    /// </summary>
+    public void RegisterHooks() {
         // Register scene change, which is where we update the animation event handler
         UnityEngine.SceneManagement.SceneManager.activeSceneChanged += OnSceneChange;
 
@@ -443,18 +453,39 @@ ServerSettings serverSettings
         On.GameManager.HazardRespawn += GameManagerOnHazardRespawn;
 
         // Register when the HeroController starts, so we can register dung trail events
-        On.HeroController.Start += HeroControllerOnStart;
+        CustomHooks.HeroControllerStartAction += HeroControllerOnStart;
 
         // Relinquish Control cancels a lot of effects, so we need to broadcast the end of these effects
         On.HeroController.RelinquishControl += HeroControllerOnRelinquishControl;
 
         // Register when the player dies to send the animation
         ModHooks.BeforePlayerDeadHook += OnDeath;
+    }
 
-        // Set the server settings for all animation effects
-        foreach (var effect in AnimationEffects.Values) {
-            effect.SetServerSettings(serverSettings);
-        }
+    /// <summary>
+    /// Deregister the game hooks for the animation manager.
+    /// </summary>
+    public void DeregisterHooks() {
+        UnityEngine.SceneManagement.SceneManager.activeSceneChanged -= OnSceneChange;
+
+        On.HeroAnimationController.Play -= HeroAnimationControllerOnPlay;
+        On.HeroAnimationController.PlayFromFrame -= HeroAnimationControllerOnPlayFromFrame;
+
+        On.tk2dSpriteAnimator.WarpClipToLocalTime -= Tk2dSpriteAnimatorOnWarpClipToLocalTime;
+        On.tk2dSpriteAnimator.ProcessEvents -= Tk2dSpriteAnimatorOnProcessEvents;
+
+        On.HeroController.CancelDash -= HeroControllerOnCancelDash;
+
+        ModHooks.HeroUpdateHook -= OnHeroUpdateHook;
+
+        On.HeroController.DieFromHazard -= HeroControllerOnDieFromHazard;
+        On.GameManager.HazardRespawn -= GameManagerOnHazardRespawn;
+
+        CustomHooks.HeroControllerStartAction -= HeroControllerOnStart;
+
+        On.HeroController.RelinquishControl -= HeroControllerOnRelinquishControl;
+
+        ModHooks.BeforePlayerDeadHook -= OnDeath;
     }
 
     /// <summary>
@@ -470,15 +501,13 @@ public void OnPlayerAnimationUpdate(ushort id, int clipId, int frame, bool[] eff
 
         var animationClip = (AnimationClip) clipId;
 
-        if (AnimationEffects.ContainsKey(animationClip)) {
+        if (AnimationEffects.TryGetValue(animationClip, out var animationEffect)) {
             var playerObject = _playerManager.GetPlayerObject(id);
-            if (playerObject == null) {
+            if (!playerObject) {
                 // Logger.Get().Warn(this, $"Tried to play animation effect {clipName} with ID: {id}, but player object doesn't exist");
                 return;
             }
 
-            var animationEffect = AnimationEffects[animationClip];
-
             // Check if the animation effect is a DamageAnimationEffect and if so,
             // set whether it should deal damage based on player teams
             if (animationEffect is DamageAnimationEffect damageAnimationEffect) {
@@ -507,7 +536,7 @@ public void OnPlayerAnimationUpdate(ushort id, int clipId, int frame, bool[] eff
     /// <param name="frame">The frame that the animation should play from.</param>
     public void UpdatePlayerAnimation(ushort id, int clipId, int frame) {
         var playerObject = _playerManager.GetPlayerObject(id);
-        if (playerObject == null) {
+        if (!playerObject) {
             // Logger.Get().Warn(this, $"Tried to update animation, but there was not matching player object for ID {id}");
             return;
         }
@@ -615,8 +644,8 @@ private void OnAnimationEvent(tk2dSpriteAnimationClip clip) {
         var animationClip = ClipEnumNames[clip.name];
 
         // Check whether there is an effect that adds info to this packet
-        if (AnimationEffects.ContainsKey(animationClip)) {
-            var effectInfo = AnimationEffects[animationClip].GetEffectInfo();
+        if (AnimationEffects.TryGetValue(animationClip, out var effect)) {
+            var effectInfo = effect.GetEffectInfo();
 
             _netClient.UpdateManager.UpdatePlayerAnimation(animationClip, 0, effectInfo);
         } else {
@@ -783,7 +812,7 @@ float time
         orig(self, clip, time);
 
         var localPlayer = HeroController.instance;
-        if (localPlayer == null) {
+        if (!localPlayer) {
             return;
         }
 
@@ -820,7 +849,7 @@ int direction
         orig(self, start, last, direction);
 
         var localPlayer = HeroController.instance;
-        if (localPlayer == null) {
+        if (!localPlayer) {
             return;
         }
 
@@ -862,10 +891,10 @@ private IEnumerator HeroControllerOnDieFromHazard(On.HeroController.orig_DieFrom
             return orig(self, hazardType, angle);
         }
 
-        _netClient.UpdateManager.UpdatePlayerAnimation(AnimationClip.HazardDeath, 0, new[] {
+        _netClient.UpdateManager.UpdatePlayerAnimation(AnimationClip.HazardDeath, 0, [
             hazardType.Equals(HazardType.SPIKES),
             hazardType.Equals(HazardType.ACID)
-        });
+        ]);
 
         // Execute the original method and return its value
         return orig(self, hazardType, angle);
@@ -891,7 +920,7 @@ private void GameManagerOnHazardRespawn(On.GameManager.orig_HazardRespawn orig,
     /// Callback method for when a player death is received.
     /// </summary>
     /// <param name="data">The generic client data for this event.</param>
-    private void OnPlayerDeath(GenericClientData data) {
+    public void OnPlayerDeath(GenericClientData data) {
         // And play the death animation for the ID in the packet
         MonoBehaviourUtil.Instance.StartCoroutine(PlayDeathAnimation(data.Id));
     }
@@ -1004,12 +1033,7 @@ private IEnumerator PlayDeathAnimation(ushort id) {
     /// <summary>
     /// Callback method on the HeroController#Start method.
     /// </summary>
-    /// <param name="orig">The original method.</param>
-    /// <param name="self">The HeroController instance.</param>
-    private void HeroControllerOnStart(On.HeroController.orig_Start orig, HeroController self) {
-        // Execute original method
-        orig(self);
-
+    private void HeroControllerOnStart() {
         SetDescendingDarkLandEffectDelay();
         RegisterDefenderCrestEffects();
     }
@@ -1061,12 +1085,12 @@ private void SetDescendingDarkLandEffectDelay() {
     /// </summary>
     private void RegisterDefenderCrestEffects() {
         var charmEffects = HeroController.instance.gameObject.FindGameObjectInChildren("Charm Effects");
-        if (charmEffects == null) {
+        if (!charmEffects) {
             return;
         }
 
         var dungObject = charmEffects.FindGameObjectInChildren("Dung");
-        if (dungObject == null) {
+        if (!dungObject) {
             return;
         }
 

HKMP/Animation/Effects/CycloneSlash.cs

@@ -47,13 +47,13 @@ public override void Play(GameObject playerObject, bool[] effectInfo) {
             cycloneObj,
             playerAttacks.transform
         );
-        cycloneSlash.layer = 22;
+        cycloneSlash.layer = 17;
 
         var hitLComponent = cycloneSlash.FindGameObjectInChildren("Hit L");
-        ChangeAttackTypeOfFsm(hitLComponent);
+        ChangeAttackDirection(hitLComponent, 0f);
 
         var hitRComponent = cycloneSlash.FindGameObjectInChildren("Hit R");
-        ChangeAttackTypeOfFsm(hitRComponent);
+        ChangeAttackDirection(hitRComponent, 180f);
 
         cycloneSlash.SetActive(true);
 

HKMP/Animation/Effects/DashBase.cs

@@ -124,20 +124,38 @@ protected void Play(GameObject playerObject, bool[] effectInfo, bool shadowDash,
                 // Lastly, disable the player collider, since we are in a shadow dash
                 // We only do this, if we don't have sharp shadow
                 playerObject.GetComponent<BoxCollider2D>().enabled = false;
-            } else if (
-                !ServerSettings.IsBodyDamageEnabled && 
-                ServerSettings.IsPvpEnabled && 
-                ShouldDoDamage && 
-                damage != 0
-            ) {
-                // If body damage is disabled, but PvP is enabled and we are performing a sharp shadow dash
-                // we need to enable the DamageHero component and move the player object to the correct layer
-                // to allow the local player to collide with it
-                playerObject.layer = 11;
-
-                var damageHero = playerObject.GetComponent<DamageHero>();
-                damageHero.enabled = true;
-                damageHero.damageDealt = damage;
+            } else {
+                var localPlayerAttacks = HeroController.instance.gameObject.FindGameObjectInChildren("Attacks");
+                var playerAttacks = playerObject.FindGameObjectInChildren("Attacks");
+
+                var sharpShadowPrefab = localPlayerAttacks.FindGameObjectInChildren("Sharp Shadow");
+
+                var sharpShadowObject = Object.Instantiate(
+                    sharpShadowPrefab,
+                    playerAttacks.transform
+                );
+                sharpShadowObject.name = "Sharp Shadow";
+                sharpShadowObject.SetActive(true);
+                sharpShadowObject.layer = 17;
+
+                if (
+                    !ServerSettings.IsBodyDamageEnabled && 
+                    ServerSettings.IsPvpEnabled &&
+                    ShouldDoDamage &&
+                    damage != 0
+                ) {
+                    // If body damage is disabled, but PvP is enabled and we are performing a sharp shadow dash
+                    // we need to enable the DamageHero component and move the player object to the correct layer
+                    // to allow the local player to collide with it
+                    playerObject.layer = 11;
+
+                    var damageHero = playerObject.GetComponent<DamageHero>();
+                    damageHero.enabled = true;
+                    damageHero.damageDealt = damage;
+                }
+
+                // As a failsafe, we remove the sharp shadow object again on a timer
+                Object.Destroy(sharpShadowObject, 1f);
             }
         } else {
             // Instantiate the dash burst relative to the player effects