Use [Record] attribute for PaperdollData and remove IPaperdollData in…

…terface
ethanmoffat · Apr 28, 2022 · 6cabf65 · 6cabf65
1 parent 3b791f2
commit 6cabf65
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 170 deletions.
diff --git a/EOLib/Domain/Character/PaperdollData.cs b/EOLib/Domain/Character/PaperdollData.cs
@@ -1,186 +1,38 @@
-using EOLib.Domain.Online;
+using Amadevus.RecordGenerator;
+using EOLib.Domain.Online;
 using EOLib.IO;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace EOLib.Domain.Character
 {
-    public class PaperdollData : IPaperdollData
+    [Record]
+    public sealed partial class PaperdollData
     {
-        public string Name { get; private set; }
+        public string Name { get; }
 
-        public string Home { get; private set; }
+        public string Home { get; }
 
-        public string Partner { get; private set; }
+        public string Partner { get; }
 
-        public string Title { get; private set; }
+        public string Title { get; }
 
-        public string Guild { get; private set; }
+        public string Guild { get; }
 
-        public string Rank { get; private set; }
+        public string Rank { get; }
 
-        public short PlayerID { get; private set; }
+        public short PlayerID { get; }
 
-        public byte Class { get; private set; }
+        public byte Class { get; }
 
-        public byte Gender { get; private set; }
+        public byte Gender { get; }
 
-        public IReadOnlyDictionary<EquipLocation, short> Paperdoll { get; private set; }
+        public IReadOnlyDictionary<EquipLocation, short> Paperdoll { get; }
 
-        public OnlineIcon Icon { get; private set; }
+        public OnlineIcon Icon { get; }
 
         public PaperdollData()
         {
             Paperdoll = new Dictionary<EquipLocation, short>();
         }
-
-        private PaperdollData(string name,
-            string home,
-            string partner,
-            string title,
-            string guild,
-            string rank,
-            short playerID,
-            byte @class,
-            byte gender,
-            IReadOnlyDictionary<EquipLocation, short> paperdoll,
-            OnlineIcon icon)
-        {
-            Name = name;
-            Home = home;
-            Partner = partner;
-            Title = title;
-            Guild = guild;
-            Rank = rank;
-            PlayerID = playerID;
-            Class = @class;
-            Gender = gender;
-            Paperdoll = paperdoll;
-            Icon = icon;
-        }
-
-        public IPaperdollData WithName(string name)
-        {
-            return new PaperdollData(name, Home, Partner, Title, Guild, Rank, PlayerID, Class, Gender, Paperdoll, Icon);
-        }
-
-        public IPaperdollData WithHome(string home)
-        {
-            return new PaperdollData(Name, home, Partner, Title, Guild, Rank, PlayerID, Class, Gender, Paperdoll, Icon);
-        }
-
-        public IPaperdollData WithPartner(string partner)
-        {
-            return new PaperdollData(Name, Home, partner, Title, Guild, Rank, PlayerID, Class, Gender, Paperdoll, Icon);
-        }
-
-        public IPaperdollData WithTitle(string title)
-        {
-            return new PaperdollData(Name, Home, Partner, title, Guild, Rank, PlayerID, Class, Gender, Paperdoll, Icon);
-        }
-
-        public IPaperdollData WithGuild(string guild)
-        {
-            return new PaperdollData(Name, Home, Partner, Title, guild, Rank, PlayerID, Class, Gender, Paperdoll, Icon);
-        }
-
-        public IPaperdollData WithRank(string rank)
-        {
-            return new PaperdollData(Name, Home, Partner, Title, Guild, rank, PlayerID, Class, Gender, Paperdoll, Icon);
-        }
-
-        public IPaperdollData WithPlayerID(short playerID)
-        {
-            return new PaperdollData(Name, Home, Partner, Title, Guild, Rank, playerID, Class, Gender, Paperdoll, Icon);
-        }
-
-        public IPaperdollData WithClass(byte @class)
-        {
-            return new PaperdollData(Name, Home, Partner, Title, Guild, Rank, PlayerID, @class, Gender, Paperdoll, Icon);
-        }
-
-        public IPaperdollData WithGender(byte gender)
-        {
-            return new PaperdollData(Name, Home, Partner, Title, Guild, Rank, PlayerID, Class, gender, Paperdoll, Icon);
-        }
-
-        public IPaperdollData WithPaperdoll(IReadOnlyDictionary<EquipLocation, short> paperdoll)
-        {
-            return new PaperdollData(Name, Home, Partner, Title, Guild, Rank, PlayerID, Class, Gender, paperdoll, Icon);
-        }
-
-        public IPaperdollData WithIcon(OnlineIcon icon)
-        {
-            return new PaperdollData(Name, Home, Partner, Title, Guild, Rank, PlayerID, Class, Gender, Paperdoll, icon);
-        }
-
-        public override bool Equals(object obj)
-        {
-            var other = obj as PaperdollData;
-            if (other == null)
-                return false;
-
-            return Name == other.Name && Home == other.Home && Partner == other.Partner && Title == other.Title &&
-                Guild == other.Guild && Rank == other.Rank && PlayerID == other.PlayerID &&
-                Class == other.Class && Gender == other.Gender && Icon == other.Icon && Paperdoll.SequenceEqual(other.Paperdoll);
-        }
-
-        public override int GetHashCode()
-        {
-            int hashCode = 170256730;
-            hashCode = hashCode * -1521134295 + Name.GetHashCode();
-            hashCode = hashCode * -1521134295 + Home.GetHashCode();
-            hashCode = hashCode * -1521134295 + Partner.GetHashCode();
-            hashCode = hashCode * -1521134295 + Title.GetHashCode();
-            hashCode = hashCode * -1521134295 + Guild.GetHashCode();
-            hashCode = hashCode * -1521134295 + Rank.GetHashCode();
-            hashCode = hashCode * -1521134295 + PlayerID.GetHashCode();
-            hashCode = hashCode * -1521134295 + Class.GetHashCode();
-            hashCode = hashCode * -1521134295 + Gender.GetHashCode();
-            hashCode = hashCode * -1521134295 + Paperdoll.Select(x => (int)x.Value)
-                .Aggregate(hashCode * -1521134295, (a, b) => a * -1521134295 + b.GetHashCode());
-            hashCode = hashCode * -1521134295 + Icon.GetHashCode();
-            return hashCode;
-        }
-    }
-
-    public interface IPaperdollData
-    {
-        string Name { get; }
-        string Home { get; }
-        string Partner { get; }
-        string Title { get; }
-        string Guild { get; }
-        string Rank { get; }
-
-        short PlayerID { get; }
-        byte Class { get; }
-        byte Gender { get; }
-
-        IReadOnlyDictionary<EquipLocation, short> Paperdoll { get; }
-
-        OnlineIcon Icon { get; }
-
-        IPaperdollData WithName(string name);
-
-        IPaperdollData WithHome(string home);
-
-        IPaperdollData WithPartner(string partner);
-
-        IPaperdollData WithTitle(string title);
-
-        IPaperdollData WithGuild(string guild);
-
-        IPaperdollData WithRank(string rank);
-
-        IPaperdollData WithPlayerID(short playerID);
-
-        IPaperdollData WithClass(byte @class);
-
-        IPaperdollData WithGender(byte gender);
-
-        IPaperdollData WithPaperdoll(IReadOnlyDictionary<EquipLocation, short> paperdoll);
-
-        IPaperdollData WithIcon(OnlineIcon icon);
     }
 }
diff --git a/EOLib/Domain/Character/PaperdollRepository.cs b/EOLib/Domain/Character/PaperdollRepository.cs
@@ -5,19 +5,19 @@ namespace EOLib.Domain.Character
 {
     public interface IPaperdollRepository
     {
-        Dictionary<int, IPaperdollData> VisibleCharacterPaperdolls { get; set; }
+        Dictionary<int, PaperdollData> VisibleCharacterPaperdolls { get; set; }
     }
 
     public interface IPaperdollProvider
     {
-        IReadOnlyDictionary<int, IPaperdollData> VisibleCharacterPaperdolls { get; }
+        IReadOnlyDictionary<int, PaperdollData> VisibleCharacterPaperdolls { get; }
     }
 
     [AutoMappedType(IsSingleton = true)]
     public class PaperdollRepository : IPaperdollRepository, IPaperdollProvider
     {
-        public Dictionary<int, IPaperdollData> VisibleCharacterPaperdolls { get; set; } = new Dictionary<int, IPaperdollData>();
+        public Dictionary<int, PaperdollData> VisibleCharacterPaperdolls { get; set; } = new Dictionary<int, PaperdollData>();
 
-        IReadOnlyDictionary<int, IPaperdollData> IPaperdollProvider.VisibleCharacterPaperdolls => VisibleCharacterPaperdolls;
+        IReadOnlyDictionary<int, PaperdollData> IPaperdollProvider.VisibleCharacterPaperdolls => VisibleCharacterPaperdolls;
     }
 }
diff --git a/EndlessClient/Dialogs/PaperdollDialog.cs b/EndlessClient/Dialogs/PaperdollDialog.cs
@@ -43,7 +43,7 @@ public class PaperdollDialog : BaseEODialog
         private Option<Rectangle> _characterIconSourceRect;
         private readonly InventoryPanel _inventoryPanel;
 
-        private Option<IPaperdollData> _paperdollData;
+        private Option<PaperdollData> _paperdollData;
 
         private readonly List<PaperdollDialogItem> _childItems;
 
@@ -128,7 +128,7 @@ public PaperdollDialog(IGameStateProvider gameStateProvider,
             CenterInGameView();
             DrawPosition = new Vector2(DrawPosition.X, 15);
 
-            _paperdollData = Option.None<IPaperdollData>();
+            _paperdollData = Option.None<PaperdollData>();
         }
 
         public bool NoItemsDragging() => !_childItems.Any(x => x.IsBeingDragged);
@@ -173,7 +173,7 @@ protected override void OnDrawControl(GameTime gameTime)
             _spriteBatch.End();
         }
 
-        private void UpdateDisplayedData(IPaperdollData paperdollData)
+        private void UpdateDisplayedData(PaperdollData paperdollData)
         {
             _name.Text = Capitalize(paperdollData.Name);
             _home.Text = Capitalize(paperdollData.Home);