From f56393bbc61224da75465542183e478910640a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?=
 <fandabohacek@gmail.com>
Date: Sun, 15 Jan 2023 10:20:11 +0100
Subject: [PATCH] feat: add new movers

---
 .../Extensions/ServiceCollectionExtensions.cs | 10 +++++++++
 src/Anonymizer/Movers/Basic/AtPacketMover.cs  | 20 ++++++++++++++++++
 src/Anonymizer/Movers/Basic/EqPacketMover.cs  | 20 ++++++++++++++++++
 .../Movers/Basic/NcifPacketMover.cs           | 20 ++++++++++++++++++
 .../Movers/Basic/RevivePacketMover.cs         | 20 ++++++++++++++++++
 .../Movers/Basic/TitinfoPacketMover.cs        | 20 ++++++++++++++++++
 src/Anonymizer/Movers/Basic/UPPacketMover.cs  | 21 +++++++++++++++++++
 .../Movers/Basic/UPetPacketMover.cs           | 21 +++++++++++++++++++
 src/Anonymizer/Movers/Basic/USPacketMover.cs  | 20 ++++++++++++++++++
 9 files changed, 172 insertions(+)
 create mode 100644 src/Anonymizer/Movers/Basic/AtPacketMover.cs
 create mode 100644 src/Anonymizer/Movers/Basic/EqPacketMover.cs
 create mode 100644 src/Anonymizer/Movers/Basic/NcifPacketMover.cs
 create mode 100644 src/Anonymizer/Movers/Basic/RevivePacketMover.cs
 create mode 100644 src/Anonymizer/Movers/Basic/TitinfoPacketMover.cs
 create mode 100644 src/Anonymizer/Movers/Basic/UPPacketMover.cs
 create mode 100644 src/Anonymizer/Movers/Basic/UPetPacketMover.cs
 create mode 100644 src/Anonymizer/Movers/Basic/USPacketMover.cs

diff --git a/src/Anonymizer/Extensions/ServiceCollectionExtensions.cs b/src/Anonymizer/Extensions/ServiceCollectionExtensions.cs
index b23f98b..76e5f48 100644
--- a/src/Anonymizer/Extensions/ServiceCollectionExtensions.cs
+++ b/src/Anonymizer/Extensions/ServiceCollectionExtensions.cs
@@ -10,6 +10,7 @@ using Anonymizer.Movers.Basic;
 using Microsoft.Extensions.DependencyInjection;
 using NosSmooth.Packets;
 using NosSmooth.Packets.Client;
+using NosSmooth.Packets.Client.Battle;
 using NosSmooth.Packets.Client.Inventory;
 using NosSmooth.Packets.Server.Battle;
 using NosSmooth.Packets.Server.Character;
@@ -41,6 +42,7 @@ public static class ServiceCollectionExtensions
             .AddSingleton<PacketProcessor>()
             .AddSingleton<IAnonymizer, DefaultAnonymizer>()
             .AddTransient<IFilter, HeaderFilter>()
+            .AddTransient<IFilter, MessageFilter>()
             .AddBasicMovers();
 
     /// <summary>
@@ -71,6 +73,14 @@ public static class ServiceCollectionExtensions
             .AddMover<StPacketMover, StPacket>()
             .AddMover<SuPacketMover, SuPacket>()
             .AddMover<TwkPacketMover, TwkPacket>()
+            .AddMover<AtPacketMover, AtPacket>()
+            .AddMover<EqPacketMover, EqPacket>()
+            .AddMover<NcifPacketMover, NcifPacket>()
+            .AddMover<RevivePacketMover, RevivePacket>()
+            .AddMover<TitinfoPacketMover, TitinfoPacket>()
+            .AddMover<UPetPacketMover, UsePetSkillPacket>()
+            .AddMover<UPPacketMover, UsePartnerSkillPacket>()
+            .AddMover<USPacketMover, UseSkillPacket>()
             .AddMover<CListPacketMover, CListPacket>();
 
     /// <summary>
diff --git a/src/Anonymizer/Movers/Basic/AtPacketMover.cs b/src/Anonymizer/Movers/Basic/AtPacketMover.cs
new file mode 100644
index 0000000..7cbbf8f
--- /dev/null
+++ b/src/Anonymizer/Movers/Basic/AtPacketMover.cs
@@ -0,0 +1,20 @@
+//
+//  AtPacketMover.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.
+
+using NosSmooth.Packets.Server.Maps;
+
+namespace Anonymizer.Movers.Basic;
+
+/// <inheritdoc />
+public class AtPacketMover : AbstractMover<AtPacket>
+{
+    /// <inheritdoc />
+    public override AtPacket Move(IAnonymizer anonymizer, AtPacket packet)
+        => packet with
+        {
+            CharacterId = anonymizer.AnonymizeId(packet.CharacterId)
+        };
+}
\ No newline at end of file
diff --git a/src/Anonymizer/Movers/Basic/EqPacketMover.cs b/src/Anonymizer/Movers/Basic/EqPacketMover.cs
new file mode 100644
index 0000000..5df52e2
--- /dev/null
+++ b/src/Anonymizer/Movers/Basic/EqPacketMover.cs
@@ -0,0 +1,20 @@
+//
+//  EqPacketMover.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.
+
+using NosSmooth.Packets.Server.Inventory;
+
+namespace Anonymizer.Movers.Basic;
+
+/// <inheritdoc />
+public class EqPacketMover : AbstractMover<EqPacket>
+{
+    /// <inheritdoc />
+    public override EqPacket Move(IAnonymizer anonymizer, EqPacket packet)
+        => packet with
+        {
+            CharacterId = anonymizer.AnonymizeId(packet.CharacterId)
+        };
+}
\ No newline at end of file
diff --git a/src/Anonymizer/Movers/Basic/NcifPacketMover.cs b/src/Anonymizer/Movers/Basic/NcifPacketMover.cs
new file mode 100644
index 0000000..aab531b
--- /dev/null
+++ b/src/Anonymizer/Movers/Basic/NcifPacketMover.cs
@@ -0,0 +1,20 @@
+//
+//  NcifPacketMover.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.
+
+using NosSmooth.Packets.Client.Battle;
+
+namespace Anonymizer.Movers.Basic;
+
+/// <inheritdoc />
+public class NcifPacketMover : AbstractMover<NcifPacket>
+{
+    /// <inheritdoc />
+    public override NcifPacket Move(IAnonymizer anonymizer, NcifPacket packet)
+        => packet with
+        {
+            TargetId = anonymizer.AnonymizeId(packet.TargetId)
+        };
+}
\ No newline at end of file
diff --git a/src/Anonymizer/Movers/Basic/RevivePacketMover.cs b/src/Anonymizer/Movers/Basic/RevivePacketMover.cs
new file mode 100644
index 0000000..19a9e2f
--- /dev/null
+++ b/src/Anonymizer/Movers/Basic/RevivePacketMover.cs
@@ -0,0 +1,20 @@
+//
+//  RevivePacketMover.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.
+
+using NosSmooth.Packets.Server.Entities;
+
+namespace Anonymizer.Movers.Basic;
+
+/// <inheritdoc />
+public class RevivePacketMover : AbstractMover<RevivePacket>
+{
+    /// <inheritdoc />
+    public override RevivePacket Move(IAnonymizer anonymizer, RevivePacket packet)
+        => packet with
+        {
+            EntityId = anonymizer.AnonymizeId(packet.EntityId)
+        };
+}
\ No newline at end of file
diff --git a/src/Anonymizer/Movers/Basic/TitinfoPacketMover.cs b/src/Anonymizer/Movers/Basic/TitinfoPacketMover.cs
new file mode 100644
index 0000000..507b1ad
--- /dev/null
+++ b/src/Anonymizer/Movers/Basic/TitinfoPacketMover.cs
@@ -0,0 +1,20 @@
+//
+//  TitinfoPacketMover.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.
+
+using NosSmooth.Packets.Server.Character;
+
+namespace Anonymizer.Movers.Basic;
+
+/// <inheritdoc />
+public class TitinfoPacketMover : AbstractMover<TitinfoPacket>
+{
+    /// <inheritdoc />
+    public override TitinfoPacket Move(IAnonymizer anonymizer, TitinfoPacket packet)
+        => packet with
+        {
+            CharacterId = anonymizer.AnonymizeId(packet.CharacterId)
+        };
+}
\ No newline at end of file
diff --git a/src/Anonymizer/Movers/Basic/UPPacketMover.cs b/src/Anonymizer/Movers/Basic/UPPacketMover.cs
new file mode 100644
index 0000000..461b739
--- /dev/null
+++ b/src/Anonymizer/Movers/Basic/UPPacketMover.cs
@@ -0,0 +1,21 @@
+//
+//  UPPacketMover.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.
+
+using NosSmooth.Packets.Client.Battle;
+
+namespace Anonymizer.Movers.Basic;
+
+/// <inheritdoc />
+public class UPPacketMover : AbstractMover<UsePartnerSkillPacket>
+{
+    /// <inheritdoc />
+    public override UsePartnerSkillPacket Move(IAnonymizer anonymizer, UsePartnerSkillPacket packet)
+        => packet with
+        {
+            MateTransportId = anonymizer.AnonymizeId(packet.MateTransportId),
+            TargetId = anonymizer.AnonymizeId(packet.TargetId)
+        };
+}
\ No newline at end of file
diff --git a/src/Anonymizer/Movers/Basic/UPetPacketMover.cs b/src/Anonymizer/Movers/Basic/UPetPacketMover.cs
new file mode 100644
index 0000000..a78b75f
--- /dev/null
+++ b/src/Anonymizer/Movers/Basic/UPetPacketMover.cs
@@ -0,0 +1,21 @@
+//
+//  UPetPacketMover.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.
+
+using NosSmooth.Packets.Client.Battle;
+
+namespace Anonymizer.Movers.Basic;
+
+/// <inheritdoc />
+public class UPetPacketMover : AbstractMover<UsePetSkillPacket>
+{
+    /// <inheritdoc />
+    public override UsePetSkillPacket Move(IAnonymizer anonymizer, UsePetSkillPacket packet)
+        => packet with
+        {
+            MateTransportId = anonymizer.AnonymizeId(packet.MateTransportId),
+            TargetId = anonymizer.AnonymizeId(packet.TargetId)
+        };
+}
\ No newline at end of file
diff --git a/src/Anonymizer/Movers/Basic/USPacketMover.cs b/src/Anonymizer/Movers/Basic/USPacketMover.cs
new file mode 100644
index 0000000..86013e5
--- /dev/null
+++ b/src/Anonymizer/Movers/Basic/USPacketMover.cs
@@ -0,0 +1,20 @@
+//
+//  USPacketMover.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.
+
+using NosSmooth.Packets.Client.Battle;
+
+namespace Anonymizer.Movers.Basic;
+
+/// <inheritdoc />
+public class USPacketMover : AbstractMover<UseSkillPacket>
+{
+    /// <inheritdoc />
+    public override UseSkillPacket Move(IAnonymizer anonymizer, UseSkillPacket packet)
+        => packet with
+        {
+            TargetId = anonymizer.AnonymizeId(packet.TargetId)
+        };
+}
\ No newline at end of file
-- 
2.48.1