Use [Record] attribute for refresh/warp data objects and remove inter…

…faces
ethanmoffat · Apr 28, 2022 · 28edf4c · 28edf4c
1 parent c1249b6
commit 28edf4c
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 151 deletions.
diff --git a/EOLib/Domain/Map/RefreshReplyPacketData.cs b/EOLib/Domain/Map/RefreshReplyPacketData.cs
@@ -1,67 +1,23 @@
-using EOLib.Net.Translators;
+using Amadevus.RecordGenerator;
+using EOLib.Net.Translators;
 using System.Collections.Generic;
 
 namespace EOLib.Domain.Map
 {
-    public class RefreshReplyData : IRefreshReplyData
+    [Record]
+    public sealed partial class RefreshReplyData : ITranslatedData
     {
-        public IReadOnlyList<Character.Character> Characters { get; private set; }
+        public IReadOnlyList<Character.Character> Characters { get; }
 
-        public IReadOnlyList<NPC.NPC> NPCs { get; private set; }
+        public IReadOnlyList<NPC.NPC> NPCs { get; }
 
-        public IReadOnlyList<MapItem> Items { get; private set; }
+        public IReadOnlyList<MapItem> Items { get; }
 
         public RefreshReplyData()
         {
             Characters = new List<Character.Character>();
             NPCs = new List<NPC.NPC>();
             Items = new List<MapItem>();
         }
-
-        public IRefreshReplyData WithCharacters(IEnumerable<Character.Character> characters)
-        {
-            var newData = MakeCopy(this);
-            newData.Characters = new List<Character.Character>(characters);
-            return newData;
-        }
-
-        public IRefreshReplyData WithNPCs(IEnumerable<NPC.NPC> npcs)
-        {
-            var newData = MakeCopy(this);
-            newData.NPCs = new List<NPC.NPC>(npcs);
-            return newData;
-        }
-
-        public IRefreshReplyData WithItems(IEnumerable<MapItem> items)
-        {
-            var newData = MakeCopy(this);
-            newData.Items = new List<MapItem>(items);
-            return newData;
-        }
-
-        private static RefreshReplyData MakeCopy(IRefreshReplyData source)
-        {
-            return new RefreshReplyData
-            {
-                Characters = new List<Character.Character>(source.Characters),
-                NPCs = new List<NPC.NPC>(source.NPCs),
-                Items = new List<MapItem>(source.Items)
-            };
-        }
-    }
-
-    public interface IRefreshReplyData : ITranslatedData
-    {
-        IReadOnlyList<Character.Character> Characters { get; }
-
-        IReadOnlyList<NPC.NPC> NPCs { get; }
-
-        IReadOnlyList<MapItem> Items { get; }
-
-        IRefreshReplyData WithCharacters(IEnumerable<Character.Character> characters);
-
-        IRefreshReplyData WithNPCs(IEnumerable<NPC.NPC> npcs);
-
-        IRefreshReplyData WithItems(IEnumerable<MapItem> items);
     }
 }
diff --git a/EOLib/Domain/Map/WarpAgreePacketData.cs b/EOLib/Domain/Map/WarpAgreePacketData.cs
@@ -1,96 +1,27 @@
-using EOLib.Domain.Character;
+using Amadevus.RecordGenerator;
 using EOLib.Net.Translators;
 using System.Collections.Generic;
 
 namespace EOLib.Domain.Map
 {
-    public class WarpAgreePacketData : IWarpAgreePacketData
+    [Record]
+    public sealed partial class WarpAgreePacketData : ITranslatedData
     {
-        public short MapID { get; private set; }
+        public short MapID { get; }
 
-        public WarpAnimation WarpAnimation { get; private set; }
+        public WarpAnimation WarpAnimation { get; }
 
-        public IReadOnlyList<Character.Character> Characters { get; private set; }
+        public IReadOnlyList<Character.Character> Characters { get; }
 
-        public IReadOnlyList<NPC.NPC> NPCs { get; private set; }
+        public IReadOnlyList<NPC.NPC> NPCs { get; }
 
-        public IReadOnlyList<MapItem> Items { get; private set; }
+        public IReadOnlyList<MapItem> Items { get; }
 
         public WarpAgreePacketData()
         {
             Characters = new List<Character.Character>();
             NPCs = new List<NPC.NPC>();
             Items = new List<MapItem>();
         }
-
-        public IWarpAgreePacketData WithMapID(short mapID)
-        {
-            var newData = MakeCopy(this);
-            newData.MapID = mapID;
-            return newData;
-        }
-
-        public IWarpAgreePacketData WithWarpAnimation(WarpAnimation warpAnimation)
-        {
-            var newData = MakeCopy(this);
-            newData.WarpAnimation = warpAnimation;
-            return newData;
-        }
-
-        public IWarpAgreePacketData WithCharacters(IEnumerable<Character.Character> characters)
-        {
-            var newData = MakeCopy(this);
-            newData.Characters = new List<Character.Character>(characters);
-            return newData;
-        }
-
-        public IWarpAgreePacketData WithNPCs(IEnumerable<NPC.NPC> npcs)
-        {
-            var newData = MakeCopy(this);
-            newData.NPCs = new List<NPC.NPC>(npcs);
-            return newData;
-        }
-
-        public IWarpAgreePacketData WithItems(IEnumerable<MapItem> items)
-        {
-            var newData = MakeCopy(this);
-            newData.Items = new List<MapItem>(items);
-            return newData;
-        }
-
-        private static WarpAgreePacketData MakeCopy(IWarpAgreePacketData source)
-        {
-            return new WarpAgreePacketData
-            {
-                MapID = source.MapID,
-                WarpAnimation = source.WarpAnimation,
-                Characters = new List<Character.Character>(source.Characters),
-                NPCs = new List<NPC.NPC>(source.NPCs),
-                Items = new List<MapItem>(source.Items)
-            };
-        }
-    }
-
-    public interface IWarpAgreePacketData : ITranslatedData
-    {
-        short MapID { get; }
-
-        WarpAnimation WarpAnimation { get; }
-
-        IReadOnlyList<Character.Character> Characters { get; }
-
-        IReadOnlyList<NPC.NPC> NPCs { get; }
-
-        IReadOnlyList<MapItem> Items { get; }
-
-        IWarpAgreePacketData WithMapID(short mapID);
-
-        IWarpAgreePacketData WithWarpAnimation(WarpAnimation warpAnimation);
-
-        IWarpAgreePacketData WithCharacters(IEnumerable<Character.Character> characters);
-
-        IWarpAgreePacketData WithNPCs(IEnumerable<NPC.NPC> npcs);
-
-        IWarpAgreePacketData WithItems(IEnumerable<MapItem> items);
     }
 }
diff --git a/EOLib/Net/Translators/RefreshReplyPacketTranslator.cs b/EOLib/Net/Translators/RefreshReplyPacketTranslator.cs
@@ -1,25 +1,27 @@
 using AutomaticTypeMapper;
 using EOLib.Domain.Map;
+using System.Linq;
 
 namespace EOLib.Net.Translators
 {
     [AutoMappedType]
-    public class RefreshReplyPacketTranslator : MapStatePacketTranslator<IRefreshReplyData>
+    public class RefreshReplyPacketTranslator : MapStatePacketTranslator<RefreshReplyData>
     {
         public RefreshReplyPacketTranslator(ICharacterFromPacketFactory characterFromPacketFactory)
             : base(characterFromPacketFactory) { }
 
-        public override IRefreshReplyData TranslatePacket(IPacket packet)
+        public override RefreshReplyData TranslatePacket(IPacket packet)
         {
             var characters = GetCharacters(packet);
             var npcs = GetNPCs(packet);
             var items = GetMapItems(packet);
 
-            IRefreshReplyData data = new RefreshReplyData();
-
-            return data.WithCharacters(characters)
-                .WithNPCs(npcs)
-                .WithItems(items);
+            return new RefreshReplyData.Builder
+            {
+                Characters = characters.ToList(),
+                NPCs = npcs.ToList(),
+                Items = items.ToList(),
+            }.ToImmutable();
         }
     }
 }
diff --git a/EOLib/Net/Translators/WarpAgreePacketTranslator.cs b/EOLib/Net/Translators/WarpAgreePacketTranslator.cs
@@ -1,18 +1,17 @@
 using AutomaticTypeMapper;
 using EOLib.Domain.Map;
+using System.Linq;
 
 namespace EOLib.Net.Translators
 {
     [AutoMappedType]
-    public class WarpAgreePacketTranslator : MapStatePacketTranslator<IWarpAgreePacketData>
+    public class WarpAgreePacketTranslator : MapStatePacketTranslator<WarpAgreePacketData>
     {
         public WarpAgreePacketTranslator(ICharacterFromPacketFactory characterFromPacketFactory)
             : base(characterFromPacketFactory) { }
 
-        public override IWarpAgreePacketData TranslatePacket(IPacket packet)
+        public override WarpAgreePacketData TranslatePacket(IPacket packet)
         {
-            IWarpAgreePacketData retData = new WarpAgreePacketData();
-
             if (packet.ReadChar() != 2)
                 throw new MalformedPacketException("Missing initial marker value of 2", packet);
 
@@ -23,12 +22,14 @@ public override IWarpAgreePacketData TranslatePacket(IPacket packet)
             var npcs = GetNPCs(packet);
             var items = GetMapItems(packet);
 
-            return retData
-                .WithMapID(newMapID)
-                .WithWarpAnimation(warpAnim)
-                .WithCharacters(characters)
-                .WithNPCs(npcs)
-                .WithItems(items);
+            return new WarpAgreePacketData.Builder
+            { 
+                MapID = newMapID,
+                WarpAnimation = warpAnim,
+                Characters = characters.ToList(),
+                NPCs = npcs.ToList(),
+                Items = items.ToList(),
+            }.ToImmutable();
         }
     }
 }
diff --git a/EOLib/PacketHandlers/EndPlayerWarpHandler.cs b/EOLib/PacketHandlers/EndPlayerWarpHandler.cs
@@ -18,7 +18,7 @@ namespace EOLib.PacketHandlers
     [AutoMappedType]
     public class EndPlayerWarpHandler : InGameOnlyPacketHandler
     {
-        private readonly IPacketTranslator<IWarpAgreePacketData> _warpAgreePacketTranslator;
+        private readonly IPacketTranslator<WarpAgreePacketData> _warpAgreePacketTranslator;
         private readonly ICharacterRepository _characterRepository;
         private readonly ICurrentMapStateRepository _currentMapStateRepository;
         private readonly ICurrentMapProvider _currentMapProvider;
@@ -30,7 +30,7 @@ public class EndPlayerWarpHandler : InGameOnlyPacketHandler
         public override PacketAction Action => PacketAction.Agree;
 
         public EndPlayerWarpHandler(IPlayerInfoProvider playerInfoProvider,
-                                    IPacketTranslator<IWarpAgreePacketData> warpAgreePacketTranslator,
+                                    IPacketTranslator<WarpAgreePacketData> warpAgreePacketTranslator,
                                     ICharacterRepository characterRepository,
                                     ICurrentMapStateRepository currentMapStateRepository,
                                     ICurrentMapProvider currentMapProvider,
@@ -62,7 +62,7 @@ public override bool HandlePacket(IPacket packet)
                 .WithAppliedData(updatedMainCharacter, _eifFileProvider.EIFFile.IsRangedWeapon(updatedMainCharacter.RenderProperties.WeaponGraphic));
 
             var withoutMainCharacter = warpAgreePacketData.Characters.Where(x => !MainCharacterIDMatches(x));
-            warpAgreePacketData = warpAgreePacketData.WithCharacters(withoutMainCharacter);
+            warpAgreePacketData = warpAgreePacketData.WithCharacters(withoutMainCharacter.ToList());
 
             var differentMapID = _currentMapStateRepository.CurrentMapID != warpAgreePacketData.MapID;
 

diff --git a/EOLib/PacketHandlers/RefreshMapStateHandler.cs b/EOLib/PacketHandlers/RefreshMapStateHandler.cs
@@ -15,7 +15,7 @@ namespace EOLib.PacketHandlers
     [AutoMappedType]
     public class RefreshMapStateHandler : InGameOnlyPacketHandler
     {
-        private readonly IPacketTranslator<IRefreshReplyData> _refreshReplyTranslator;
+        private readonly IPacketTranslator<RefreshReplyData> _refreshReplyTranslator;
         private readonly ICharacterRepository _characterRepository;
         private readonly ICurrentMapStateRepository _currentMapStateRepository;
         private readonly IEnumerable<IMapChangedNotifier> _mapChangedNotifiers;
@@ -25,7 +25,7 @@ public class RefreshMapStateHandler : InGameOnlyPacketHandler
         public override PacketAction Action => PacketAction.Reply;
 
         public RefreshMapStateHandler(IPlayerInfoProvider playerInfoProvider,
-                                      IPacketTranslator<IRefreshReplyData> refreshReplyTranslator,
+                                      IPacketTranslator<RefreshReplyData> refreshReplyTranslator,
                                       ICharacterRepository characterRepository,
                                       ICurrentMapStateRepository currentMapStateRepository,
                                       IEnumerable<IMapChangedNotifier> mapChangedNotifiers)
@@ -48,7 +48,7 @@ public override bool HandlePacket(IPacket packet)
                 .WithMapY(updatedMainCharacter.RenderProperties.MapY);
 
             var withoutMainCharacter = data.Characters.Where(x => !IDMatches(x));
-            data = data.WithCharacters(withoutMainCharacter);
+            data = data.WithCharacters(withoutMainCharacter.ToList());
 
             _characterRepository.MainCharacter = _characterRepository.MainCharacter
                 .WithRenderProperties(updatedRenderProperties);