Bannerlord-Coop-Team · Ciel1996 · Jan 18, 2023 · Jan 19, 2023 · Jan 20, 2023 · Jan 20, 2023
diff --git a/source/ClientDebug/ClientDebug.csproj.user b/source/ClientDebug/ClientDebug.csproj.user
@@ -11,4 +11,4 @@
     <StartProgram>..\mb2\bin\Win64_Shipping_Client\Bannerlord.exe</StartProgram>
     <StartWorkingDirectory>..\..\..\..\mb2\bin\Win64_Shipping_Client\</StartWorkingDirectory>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/source/MissionTestMod/app.config b/source/MissionTestMod/app.config
@@ -14,14 +14,14 @@
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/source/MissionTests/AgentMovementDeltaSerializationTest.cs b/source/MissionTests/AgentMovementDeltaSerializationTest.cs
@@ -0,0 +1,39 @@
+using Common.Serialization;
+using Missions.Services.Agents.Messages;
+using Missions.Services.Agents.Packets;
+using Missions.Services.Network.Surrogates;
+using ProtoBuf.Meta;
+using System;
+using TaleWorlds.Library;
+using Xunit;
+
+namespace IntroductionServerTests
+{
+    public class AgentMovementDeltaSerializationTest
+    {
+        [Fact]
+        public void Serialize_Test()
+        {
+            try
+            {
+                RuntimeTypeModel.Default.SetSurrogate<Vec3, Vec3Surrogate>();
+                RuntimeTypeModel.Default.SetSurrogate<Vec2, Vec2Surrogate>();
+            }
+            catch
+            {
+                // nop
+            }
+
+            var delta = new AgentMovement(Guid.NewGuid());
+
+            var bytes = ProtoBufSerializer.Serialize(delta);
+
+            Assert.NotNull(bytes);
+            Assert.NotEmpty(bytes);
+
+            var desDelta = (AgentMovement)ProtoBufSerializer.Deserialize(bytes);
+
+            Assert.Equal(delta, desDelta);
+        }
+    }
+}
diff --git a/source/MissionTests/MissionTests.csproj b/source/MissionTests/MissionTests.csproj
@@ -122,6 +122,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AgentMovementDeltaSerializationTest.cs" />
     <Compile Include="AutoFacTests.cs" />
     <Compile Include="NetworkAgentRegistryTests.cs" />
     <Compile Include="ClientInfoTests.cs" />

diff --git a/source/MissionTests/NetworkAgentRegistryTests.cs b/source/MissionTests/NetworkAgentRegistryTests.cs
@@ -1,11 +1,8 @@
-using Common.Messaging;
-using Missions.Services.Network;
+using Missions.Services.Network;
 using System;
 using LiteNetLib;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
-using System.Text;
-using TaleWorlds.CampaignSystem;
 using TaleWorlds.MountAndBlade;
 using Xunit;
 

diff --git a/source/MissionTests/NetworkMessageSerializationTest.cs b/source/MissionTests/NetworkMessageSerializationTest.cs
@@ -35,10 +35,17 @@ public NetworkMessageSerializationTest()
         [Fact]
         public void Serialize_Test()
         {
-            RuntimeTypeModel.Default.SetSurrogate<Vec3, Vec3Surrogate>();
-            RuntimeTypeModel.Default.SetSurrogate<Vec2, Vec2Surrogate>();
-            RuntimeTypeModel.Default.SetSurrogate<CharacterObject, CharacterObjectSurrogate>();
-            RuntimeTypeModel.Default.SetSurrogate<Equipment, EquipmentSurrogate>();
+            try
+            {
+                RuntimeTypeModel.Default.SetSurrogate<Vec3, Vec3Surrogate>();
+                RuntimeTypeModel.Default.SetSurrogate<Vec2, Vec2Surrogate>(); 
+                RuntimeTypeModel.Default.SetSurrogate<CharacterObject, CharacterObjectSurrogate>();
+                RuntimeTypeModel.Default.SetSurrogate<Equipment, EquipmentSurrogate>();
+            }
+            catch
+            {
+                // nop
+            }
 
             var character = (CharacterObject)FormatterServices.GetUninitializedObject(typeof(CharacterObject));
 
@@ -64,11 +71,17 @@ public void Serialize_Test()
         [Fact]
         public void Serialize2_Test()
         {
-            RuntimeTypeModel.Default.SetSurrogate<Vec3, Vec3Surrogate>();
-            RuntimeTypeModel.Default.SetSurrogate<Vec2, Vec2Surrogate>();
-            RuntimeTypeModel.Default.SetSurrogate<CharacterObject, CharacterObjectSurrogate>();
-            RuntimeTypeModel.Default.SetSurrogate<AttackCollisionData, AttackCollisionDataSurrogate>();
-            RuntimeTypeModel.Default.SetSurrogate<Blow, BlowSurrogate>();
+            try
+            {
+                RuntimeTypeModel.Default.SetSurrogate<Vec3, Vec3Surrogate>();
+                RuntimeTypeModel.Default.SetSurrogate<Vec2, Vec2Surrogate>();
+                RuntimeTypeModel.Default.SetSurrogate<CharacterObject, CharacterObjectSurrogate>();
+                RuntimeTypeModel.Default.SetSurrogate<Equipment, EquipmentSurrogate>();
+            }
+            catch
+            {
+                // nop
+            }
 
             var attackerGuid = Guid.NewGuid();
 

diff --git a/source/MissionTests/app.config b/source/MissionTests/app.config
@@ -15,16 +15,16 @@
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.5.0" newVersion="1.2.5.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/source/Missions/MissionModule.cs b/source/Missions/MissionModule.cs
@@ -5,6 +5,8 @@
 using GameInterface;
 using IntroServer.Config;
 using Missions.Services;
+using Missions.Services.Agents;
+using Missions.Services.Agents.Packets;
 using Missions.Services.Agents.Handlers;
 using Missions.Services.Arena;
 using Missions.Services.BoardGames;
@@ -13,11 +15,13 @@
 using Missions.Services.Missiles.Handlers;
 using Missions.Services.Network;
 using Missions.Services.Taverns;
+using System;
 
 namespace Missions
 {
     public class MissionModule : Module
     {
+
         protected override void Load(ContainerBuilder builder)
         {
             // TODO find how to make this not disgusting
@@ -52,11 +56,14 @@ protected override void Load(ContainerBuilder builder)
                 .SingleInstance()
                 .PropertiesAutowired(PropertyWiringOptions.AllowCircularDependencies);
 
-
             builder.RegisterInstance(NetworkAgentRegistry.Instance)
                 .As<INetworkAgentRegistry>()
                 .SingleInstance();
 
+            builder.RegisterInstance(new AgentPublisherConfig())
+                .As<IAgentPublisherConfig>()
+                .SingleInstance();
+
             // Interface classes
             builder.RegisterType<LiteNetP2PClient>().As<INetwork>().AsSelf().InstancePerLifetimeScope();
 
@@ -73,6 +80,10 @@ protected override void Load(ContainerBuilder builder)
             builder.RegisterType<AgentDamageHandler>().As<IAgentDamageHandler>().InstancePerLifetimeScope();
             builder.RegisterType<AgentDeathHandler>().As<IAgentDeathHandler>().InstancePerLifetimeScope();
 
+            builder.RegisterType<EventPacketHandler>().AsSelf().InstancePerLifetimeScope();
+            builder.RegisterType<MovementHandler>().AsSelf().InstancePerLifetimeScope();
+            builder.RegisterType<AgentPublisher>().AsSelf().InstancePerLifetimeScope();
+
             base.Load(builder);
         }
     }

diff --git a/source/Missions/Missions.csproj b/source/Missions/Missions.csproj
@@ -45,11 +45,23 @@
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.7.0.0\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
+    </Reference>
     <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <HintPath>..\packages\protobuf-net.3.2.16\lib\net462\protobuf-net.dll</HintPath>
+      <HintPath>..\packages\protobuf-net.3.1.26\lib\net462\protobuf-net.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
-      <HintPath>..\packages\protobuf-net.Core.3.2.16\lib\net462\protobuf-net.Core.dll</HintPath>
+      <HintPath>..\packages\protobuf-net.Core.3.1.26\lib\net462\protobuf-net.Core.dll</HintPath>
     </Reference>
     <Reference Include="SandBox">
       <HintPath>..\..\mb2\Modules\SandBox\bin\Win64_Shipping_Client\SandBox.dll</HintPath>
@@ -70,9 +82,10 @@
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Collections.Immutable, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.7.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -92,6 +105,9 @@
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -162,8 +178,16 @@
     <Compile Include="Services\Agents\Messages\WeaponPickedup.cs" />
     <Compile Include="Services\Agents\Messages\WeaponDropped.cs" />
     <Compile Include="ContainerProvider.cs" />
+    <Compile Include="Services\Agents\AgentPublisherConfig.cs" />
+    <Compile Include="Services\Agents\Messages\ActionDataChanged.cs" />
+    <Compile Include="Services\Agents\AgentPublisher.cs" />
+    <Compile Include="Services\Agents\Messages\LookDirectionChanged.cs" />
+    <Compile Include="Services\Agents\Messages\MountDataChanged.cs" />
+    <Compile Include="Services\Agents\Messages\IMovementEvent.cs" />
+    <Compile Include="Services\Agents\Messages\MovementInputVectorChanged.cs" />
+    <Compile Include="Services\Agents\Packets\AgentMovement.cs" />
     <Compile Include="MissionModule.cs" />
-    <Compile Include="Services\Agents\Packets\MovementPacket.cs" />
+    <Compile Include="Services\Agents\Packets\MovementHandler.cs" />
     <Compile Include="Services\Agents\Patches\AgentDropPatch.cs" />
     <Compile Include="Services\Agents\Patches\AgentPickupPatch.cs" />
     <Compile Include="Services\Agents\Patches\AgentShieldDamagePatch.cs" />
@@ -223,7 +247,6 @@
     <Compile Include="Services\Network\LiteNetP2PClient.cs" />
     <Compile Include="Services\Network\NetworkAgentRegistry.cs" />
     <Compile Include="Services\Agents\Packets\AgentActionData.cs" />
-    <Compile Include="Services\Agents\Packets\AgentData.cs" />
     <Compile Include="Services\Agents\Packets\AgentEquipmentData.cs" />
     <Compile Include="Services\Agents\Packets\AgentGroupController.cs" />
     <Compile Include="Services\Agents\Packets\AgentMountData.cs" />