From ea0fcbd713fe4581c3083261c0d50a4cb82d72e9 Mon Sep 17 00:00:00 2001
From: Haselnussbomber <mail@haselnussbomber.de>
Date: Mon, 8 Sep 2025 00:07:17 +0200
Subject: [PATCH] Rename DataId to BaseId

---
 Dalamud/Game/ClientState/Buddy/BuddyMember.cs        |  9 +++++++++
 Dalamud/Game/ClientState/Objects/Types/GameObject.cs |  9 +++++++++
 Dalamud/Game/ClientState/Party/PartyMember.cs        | 11 ++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Dalamud/Game/ClientState/Buddy/BuddyMember.cs b/Dalamud/Game/ClientState/Buddy/BuddyMember.cs
index 025de611d..393598d32 100644
--- a/Dalamud/Game/ClientState/Buddy/BuddyMember.cs
+++ b/Dalamud/Game/ClientState/Buddy/BuddyMember.cs
@@ -19,8 +19,14 @@ public interface IBuddyMember
     /// <summary>
     /// Gets the object ID of this buddy.
     /// </summary>
+    [Obsolete("Renamed to EntityId")]
     uint ObjectId { get; }
 
+    /// <summary>
+    /// Gets the entity ID of this buddy.
+    /// </summary>
+    uint EntityId { get; }
+
     /// <summary>
     /// Gets the actor associated with this buddy.
     /// </summary>
@@ -83,6 +89,9 @@ internal unsafe class BuddyMember : IBuddyMember
     /// <inheritdoc />
     public uint ObjectId => this.Struct->EntityId;
 
+    /// <inheritdoc />
+    public uint EntityId => this.Struct->EntityId;
+
     /// <inheritdoc />
     public IGameObject? GameObject => this.objectTable.SearchById(this.ObjectId);
 
diff --git a/Dalamud/Game/ClientState/Objects/Types/GameObject.cs b/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
index 4209100f0..829949c12 100644
--- a/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
@@ -35,8 +35,14 @@ public interface IGameObject : IEquatable<IGameObject>
     /// <summary>
     /// Gets the data ID for linking to other respective game data.
     /// </summary>
+    [Obsolete("Renamed to BaseId")]
     public uint DataId { get; }
 
+    /// <summary>
+    /// Gets the base ID for linking to other respective game data.
+    /// </summary>
+    public uint BaseId { get; }
+
     /// <summary>
     /// Gets the ID of this GameObject's owner.
     /// </summary>
@@ -208,6 +214,9 @@ internal unsafe partial class GameObject : IGameObject
     /// <inheritdoc/>
     public uint DataId => this.Struct->BaseId;
 
+    /// <inheritdoc/>
+    public uint BaseId => this.Struct->BaseId;
+
     /// <inheritdoc/>
     public uint OwnerId => this.Struct->OwnerId;
 
diff --git a/Dalamud/Game/ClientState/Party/PartyMember.cs b/Dalamud/Game/ClientState/Party/PartyMember.cs
index 65b752808..2a0b18836 100644
--- a/Dalamud/Game/ClientState/Party/PartyMember.cs
+++ b/Dalamud/Game/ClientState/Party/PartyMember.cs
@@ -40,8 +40,14 @@ public interface IPartyMember
     /// <summary>
     /// Gets the actor ID of this party member.
     /// </summary>
+    [Obsolete("Renamed to EntityId")]
     uint ObjectId { get; }
 
+    /// <summary>
+    /// Gets the entity ID of this party member.
+    /// </summary>
+    uint EntityId { get; }
+
     /// <summary>
     /// Gets the actor associated with this buddy.
     /// </summary>
@@ -140,13 +146,16 @@ internal unsafe class PartyMember : IPartyMember
     /// </summary>
     public uint ObjectId => this.Struct->EntityId;
 
+    /// <inheritdoc/>
+    public uint EntityId => this.Struct->EntityId;
+
     /// <summary>
     /// Gets the actor associated with this buddy.
     /// </summary>
     /// <remarks>
     /// This iterates the actor table, it should be used with care.
     /// </remarks>
-    public IGameObject? GameObject => Service<ObjectTable>.Get().SearchById(this.ObjectId);
+    public IGameObject? GameObject => Service<ObjectTable>.Get().SearchById(this.EntityId);
 
     /// <summary>
     /// Gets the current HP of this party member.