erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor(D.5.4): rename ItemRepository->ClientObjectTable, ItemInstance->ClientObject

Browse source 
Broaden naming to the data side of every server object (retail weenie_object_table
shape). Pure rename; no behavior change.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Erik 2026-06-18 15:33:03 +02:00
parent 2fc253d9ff
commit b506f53633
8 changed files with 142 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tests/AcDream.App.Tests/UI/Layout/ToolbarControllerTests.cs
View file

@ -47,8 +47,8 @@ public class ToolbarControllerTests
public void Populate_bindsShortcutToCorrectSlot()
{
var (layout, slots, _) = FakeToolbar();
var repo = new ItemRepository();
repo.AddOrUpdate(new ItemInstance { ObjectId = 0x5001u, WeenieClassId = 1u, IconId = 0x06001234u });
var repo = new ClientObjectTable();
repo.AddOrUpdate(new ClientObject { ObjectId = 0x5001u, WeenieClassId = 1u, IconId = 0x06001234u });
var shortcuts = new List<PlayerDescriptionParser.ShortcutEntry>
{ new(Index: 0, ObjectGuid: 0x5001u, SpellId: 0, Layer: 0) };
@ -64,7 +64,7 @@ public class ToolbarControllerTests
public void DeferredRebind_whenItemArrivesLate()
{
var (layout, slots, _) = FakeToolbar();
var repo = new ItemRepository(); // item NOT present yet
var repo = new ClientObjectTable(); // item NOT present yet
var shortcuts = new List<PlayerDescriptionParser.ShortcutEntry>
{ new(Index: 2, ObjectGuid: 0x5002u, SpellId: 0, Layer: 0) };
@ -72,7 +72,7 @@ public class ToolbarControllerTests
iconIds: (_,_,_,_,_) => 0x88u, useItem: _ => { });
Assert.Equal(0u, slots[Row1[2]].Cell.ItemId); // not bound yet
repo.AddOrUpdate(new ItemInstance { ObjectId = 0x5002u, WeenieClassId = 1u, IconId = 0x06005678u });
repo.AddOrUpdate(new ClientObject { ObjectId = 0x5002u, WeenieClassId = 1u, IconId = 0x06005678u });
Assert.Equal(0x5002u, slots[Row1[2]].Cell.ItemId); // rebound on ItemAdded
}
@ -81,8 +81,8 @@ public class ToolbarControllerTests
public void Click_emitsUseForBoundItem()
{
var (layout, slots, _) = FakeToolbar();
var repo = new ItemRepository();
repo.AddOrUpdate(new ItemInstance { ObjectId = 0x5001u, WeenieClassId = 1u, IconId = 0x06001234u });
var repo = new ClientObjectTable();
repo.AddOrUpdate(new ClientObject { ObjectId = 0x5001u, WeenieClassId = 1u, IconId = 0x06001234u });
var shortcuts = new List<PlayerDescriptionParser.ShortcutEntry>
{ new(Index: 0, ObjectGuid: 0x5001u, SpellId: 0, Layer: 0) };
uint used = 0;
@ -106,7 +106,7 @@ public class ToolbarControllerTests
public void CombatIndicator_defaultNonCombat_onlyPeaceVisible()
{
var (layout, _, indicators) = FakeToolbar();
var repo = new ItemRepository();
var repo = new ClientObjectTable();
ToolbarController.Bind(layout, repo,
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
@ -126,7 +126,7 @@ public class ToolbarControllerTests
public void CombatIndicator_setCombatModeMelee_onlyMeleeVisible()
{
var (layout, _, indicators) = FakeToolbar();
var repo = new ItemRepository();
var repo = new ClientObjectTable();
var ctrl = ToolbarController.Bind(layout, repo,
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
@ -147,7 +147,7 @@ public class ToolbarControllerTests
public void CombatIndicator_liveSignal_updatesWhenCombatStateChanges()
{
var (layout, _, indicators) = FakeToolbar();
var repo = new ItemRepository();
var repo = new ClientObjectTable();
var combat = new CombatState();
ToolbarController.Bind(layout, repo,
@ -187,7 +187,7 @@ public class ToolbarControllerTests
public void ShortcutNumbers_afterBind_topRowHasNumbers_bottomRowEmpty()
{
var (layout, slots, _) = FakeToolbar();
var repo = new ItemRepository();
var repo = new ClientObjectTable();
ToolbarController.Bind(layout, repo,
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
@ -213,7 +213,7 @@ public class ToolbarControllerTests
public void ShortcutNumbers_setCombatModeWar_topRowUsesWarDigits()
{
var (layout, slots, _) = FakeToolbar();
var repo = new ItemRepository();
var repo = new ClientObjectTable();
var ctrl = ToolbarController.Bind(layout, repo,
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { },
@ -240,7 +240,7 @@ public class ToolbarControllerTests
public void ShortcutNumbers_backToNonCombat_restoresPeaceDigits()
{
var (layout, slots, _) = FakeToolbar();
var repo = new ItemRepository();
var repo = new ClientObjectTable();
var ctrl = ToolbarController.Bind(layout, repo,
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { },
@ -261,7 +261,7 @@ public class ToolbarControllerTests
public void ShortcutNumbers_digitArraysInjected()
{
var (layout, slots, _) = FakeToolbar();
var repo = new ItemRepository();
var repo = new ClientObjectTable();
ToolbarController.Bind(layout, repo,
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
@ -283,7 +283,7 @@ public class ToolbarControllerTests
public void ShortcutNumbers_emptyDigitArrayInjected()
{
var (layout, slots, _) = FakeToolbar();
var repo = new ItemRepository();
var repo = new ClientObjectTable();
ToolbarController.Bind(layout, repo,
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
@ -304,7 +304,7 @@ public class ToolbarControllerTests
public void ShortcutNumbers_nullEmptyDigits_cellsHaveNullEmptyDigits()
{
var (layout, slots, _) = FakeToolbar();
var repo = new ItemRepository();
var repo = new ClientObjectTable();
ToolbarController.Bind(layout, repo,
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),

32
tests/AcDream.Core.Net.Tests/GameEventWiringTests.cs
View file

@ -37,10 +37,10 @@ public sealed class GameEventWiringTests
return body;
}
private static (GameEventDispatcher, ItemRepository, CombatState, Spellbook, ChatLog) MakeAll()
private static (GameEventDispatcher, ClientObjectTable, CombatState, Spellbook, ChatLog) MakeAll()
{
var dispatcher = new GameEventDispatcher();
var items = new ItemRepository();
var items = new ClientObjectTable();
var combat = new CombatState();
var spellbook = new Spellbook();
var chat = new ChatLog();
@ -101,10 +101,10 @@ public sealed class GameEventWiringTests
}
[Fact]
public void WireAll_WieldObject_RoutesToItemRepository()
public void WireAll_WieldObject_RoutesToClientObjectTable()
{
var (d, items, _, _, _) = MakeAll();
items.AddOrUpdate(new ItemInstance { ObjectId = 0x1000, WeenieClassId = 1 });
items.AddOrUpdate(new ClientObject { ObjectId = 0x1000, WeenieClassId = 1 });
byte[] payload = new byte[12];
BinaryPrimitives.WriteUInt32LittleEndian(payload, 0x1000);
@ -114,7 +114,7 @@ public sealed class GameEventWiringTests
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.WieldObject, payload));
d.Dispatch(env!.Value);
var item = items.GetItem(0x1000);
var item = items.Get(0x1000);
Assert.NotNull(item);
Assert.Equal(EquipMask.MeleeWeapon, item!.CurrentlyEquippedLocation);
Assert.Equal(0x2000u, item.ContainerId);
@ -141,7 +141,7 @@ public sealed class GameEventWiringTests
// through WireAll, lands in LocalPlayerState with the right
// ranks/start/current values.
var dispatcher = new GameEventDispatcher();
var items = new ItemRepository();
var items = new ClientObjectTable();
var combat = new CombatState();
var spellbook = new Spellbook();
var chat = new ChatLog();
@ -200,7 +200,7 @@ public sealed class GameEventWiringTests
public void WireAll_PlayerDescription_FeedsSpellbook()
{
var dispatcher = new GameEventDispatcher();
var items = new ItemRepository();
var items = new ClientObjectTable();
var combat = new CombatState();
var spellbook = new Spellbook();
var chat = new ChatLog();
@ -330,20 +330,20 @@ public sealed class GameEventWiringTests
}
[Fact]
public void PlayerDescription_RegistersInventoryEntries_InItemRepository()
public void PlayerDescription_RegistersInventoryEntries_InClientObjectTable()
{
// Issue #13 acceptance test: after a PlayerDescription with non-empty
// Inventory is dispatched through WireAll, ItemRepository.ItemCount > 0.
// Inventory is dispatched through WireAll, ClientObjectTable.ObjectCount > 0.
// Wire format: strict path (no GAMEPLAY_OPTIONS bit) so inventory +
// equipped follow directly after spellbook_filters.
var dispatcher = new GameEventDispatcher();
var items = new ItemRepository();
var items = new ClientObjectTable();
var combat = new CombatState();
var spellbook = new Spellbook();
var chat = new ChatLog();
GameEventWiring.WireAll(dispatcher, items, combat, spellbook, chat);
Assert.Equal(0, items.ItemCount); // pre-condition
Assert.Equal(0, items.ObjectCount); // pre-condition
var sb = new MemoryStream();
using var w = new BinaryWriter(sb);
@ -370,9 +370,9 @@ public sealed class GameEventWiringTests
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.PlayerDescription, sb.ToArray()));
dispatcher.Dispatch(env!.Value);
Assert.Equal(2, items.ItemCount);
Assert.NotNull(items.GetItem(0x50000A01u));
Assert.NotNull(items.GetItem(0x50000A02u));
Assert.Equal(2, items.ObjectCount);
Assert.NotNull(items.Get(0x50000A01u));
Assert.NotNull(items.Get(0x50000A02u));
}
[Fact]
@ -380,14 +380,14 @@ public sealed class GameEventWiringTests
{
// D.5.1 Task 4: WireAll must forward parsed.Shortcuts to the onShortcuts
// callback so the toolbar can read them without keeping a parser reference.
// Mirrors PlayerDescription_RegistersInventoryEntries_InItemRepository
// Mirrors PlayerDescription_RegistersInventoryEntries_InClientObjectTable
// for the harness pattern; adds the Shortcut flag (0x1) + one 12-byte
// entry, followed by the legacy-hotbar count (0) + spellbook_filters (0)
// then empty inventory and equipped.
IReadOnlyList<PlayerDescriptionParser.ShortcutEntry>? got = null;
var dispatcher = new GameEventDispatcher();
var items = new ItemRepository();
var items = new ClientObjectTable();
var combat = new CombatState();
var spellbook = new Spellbook();
var chat = new ChatLog();

94
tests/AcDream.Core.Tests/Items/ItemRepositoryTests.cs → tests/AcDream.Core.Tests/Items/ClientObjectTableTests.cs
View file

@ -3,10 +3,10 @@ using Xunit;
namespace AcDream.Core.Tests.Items;
public sealed class ItemRepositoryTests
public sealed class ClientObjectTableTests
{
private static ItemInstance MakeItem(uint id, string name = "Widget") =>
new ItemInstance
private static ClientObject MakeItem(uint id, string name = "Widget") =>
new ClientObject
{
ObjectId = id,
WeenieClassId = 1,
@ -20,27 +20,27 @@ public sealed class ItemRepositoryTests
[Fact]
public void AddOrUpdate_FiresAddedEvent()
{
var repo = new ItemRepository();
ItemInstance? added = null;
repo.ItemAdded += i => added = i;
var repo = new ClientObjectTable();
ClientObject? added = null;
repo.ObjectAdded += i => added = i;
var item = MakeItem(100);
repo.AddOrUpdate(item);
Assert.Same(item, added);
Assert.Equal(1, repo.ItemCount);
Assert.Same(item, repo.GetItem(100));
Assert.Equal(1, repo.ObjectCount);
Assert.Same(item, repo.Get(100));
}
[Fact]
public void AddOrUpdate_ExistingItem_FiresPropertiesUpdated()
{
var repo = new ItemRepository();
var repo = new ClientObjectTable();
var item = MakeItem(100);
repo.AddOrUpdate(item);
int propUpdateCount = 0;
repo.ItemPropertiesUpdated += _ => propUpdateCount++;
repo.ObjectUpdated += _ => propUpdateCount++;
repo.AddOrUpdate(item); // second call is an update
Assert.Equal(1, propUpdateCount);
@ -49,12 +49,12 @@ public sealed class ItemRepositoryTests
[Fact]
public void MoveItem_UpdatesContainerAndFiresEvent()
{
var repo = new ItemRepository();
var repo = new ClientObjectTable();
var item = MakeItem(100);
repo.AddOrUpdate(item);
uint seenOld = 999, seenNew = 999;
repo.ItemMoved += (it, oldC, newC) => { seenOld = oldC; seenNew = newC; };
repo.ObjectMoved += (it, oldC, newC) => { seenOld = oldC; seenNew = newC; };
repo.MoveItem(100, 42, newSlot: 3);
@ -67,29 +67,29 @@ public sealed class ItemRepositoryTests
[Fact]
public void MoveItem_Nonexistent_ReturnsFalse()
{
var repo = new ItemRepository();
var repo = new ClientObjectTable();
Assert.False(repo.MoveItem(999, 42));
}
[Fact]
public void Remove_FiresEventAndRemoves()
{
var repo = new ItemRepository();
var repo = new ClientObjectTable();
var item = MakeItem(100);
repo.AddOrUpdate(item);
ItemInstance? removed = null;
repo.ItemRemoved += i => removed = i;
ClientObject? removed = null;
repo.ObjectRemoved += i => removed = i;
Assert.True(repo.Remove(100));
Assert.Same(item, removed);
Assert.Null(repo.GetItem(100));
Assert.Null(repo.Get(100));
}
[Fact]
public void UpdateProperties_MergesIncomingBundle()
{
var repo = new ItemRepository();
var repo = new ClientObjectTable();
var item = MakeItem(100);
item.Properties.Ints[1] = 10;
repo.AddOrUpdate(item);
@ -108,67 +108,67 @@ public sealed class ItemRepositoryTests
[Fact]
public void Clear_RemovesAllItems()
{
var repo = new ItemRepository();
var repo = new ClientObjectTable();
repo.AddOrUpdate(MakeItem(1));
repo.AddOrUpdate(MakeItem(2));
repo.AddOrUpdate(MakeItem(3));
repo.Clear();
Assert.Equal(0, repo.ItemCount);
Assert.Equal(0, repo.ObjectCount);
}
[Fact]
public void EnrichItem_updatesIconOnExistingStub_andRaisesUpdated()
{
var repo = new ItemRepository();
repo.AddOrUpdate(new ItemInstance { ObjectId = 0x5001u, WeenieClassId = 42u }); // stub from PlayerDescription
ItemInstance? updated = null;
repo.ItemPropertiesUpdated += i => updated = i;
var repo = new ClientObjectTable();
repo.AddOrUpdate(new ClientObject { ObjectId = 0x5001u, WeenieClassId = 42u }); // stub from PlayerDescription
ClientObject? updated = null;
repo.ObjectUpdated += i => updated = i;
bool hit = repo.EnrichItem(0x5001u, iconId: 0x06001234u, name: "Mana Stone", type: ItemType.Misc);
Assert.True(hit);
Assert.Equal(0x06001234u, repo.GetItem(0x5001u)!.IconId);
Assert.Equal("Mana Stone", repo.GetItem(0x5001u)!.Name);
Assert.Equal(0x06001234u, repo.Get(0x5001u)!.IconId);
Assert.Equal("Mana Stone", repo.Get(0x5001u)!.Name);
Assert.NotNull(updated);
}
[Fact]
public void EnrichItem_returnsFalse_whenItemUnknown()
{
var repo = new ItemRepository();
var repo = new ClientObjectTable();
Assert.False(repo.EnrichItem(0x9999u, 0x06001234u, "x", ItemType.Misc));
}
[Fact]
public void EnrichItem_carriesEffects()
{
var repo = new ItemRepository();
repo.AddOrUpdate(new ItemInstance { ObjectId = 0x500000AAu });
var repo = new ClientObjectTable();
repo.AddOrUpdate(new ClientObject { ObjectId = 0x500000AAu });
bool ok = repo.EnrichItem(0x500000AAu, iconId: 0x06001234u, name: "Wand",
type: ItemType.Caster, iconOverlayId: 0, iconUnderlayId: 0, effects: 0x1u);
Assert.True(ok);
Assert.Equal(0x1u, repo.GetItem(0x500000AAu)!.Effects);
Assert.Equal(0x1u, repo.Get(0x500000AAu)!.Effects);
}
[Fact]
public void UpdateIntProperty_uiEffects_setsEffectsAndFires()
{
var repo = new ItemRepository();
repo.AddOrUpdate(new ItemInstance { ObjectId = 0x500000ABu });
ItemInstance? fired = null;
repo.ItemPropertiesUpdated += i => fired = i;
bool ok = repo.UpdateIntProperty(0x500000ABu, ItemRepository.UiEffectsPropertyId, value: 0x9);
var repo = new ClientObjectTable();
repo.AddOrUpdate(new ClientObject { ObjectId = 0x500000ABu });
ClientObject? fired = null;
repo.ObjectUpdated += i => fired = i;
bool ok = repo.UpdateIntProperty(0x500000ABu, ClientObjectTable.UiEffectsPropertyId, value: 0x9);
Assert.True(ok);
Assert.Equal(0x9u, repo.GetItem(0x500000ABu)!.Effects);
Assert.Equal(0x9, repo.GetItem(0x500000ABu)!.Properties.Ints[ItemRepository.UiEffectsPropertyId]);
Assert.Equal(0x9u, repo.Get(0x500000ABu)!.Effects);
Assert.Equal(0x9, repo.Get(0x500000ABu)!.Properties.Ints[ClientObjectTable.UiEffectsPropertyId]);
Assert.NotNull(fired);
}
[Fact]
public void UpdateIntProperty_unknownItem_returnsFalse()
{
var repo = new ItemRepository();
var repo = new ClientObjectTable();
Assert.False(repo.UpdateIntProperty(0xDEADBEEFu, 18u, 1));
}
@ -178,12 +178,12 @@ public sealed class ItemRepositoryTests
// The core "item with mana vs out of mana" promise: a draining item whose
// UiEffects clears to 0 must return to its base (un-tinted) icon. Guards
// against a future `if (value != 0)` regression on the unconditional assign.
var repo = new ItemRepository();
repo.AddOrUpdate(new ItemInstance { ObjectId = 0x500000ACu, Effects = 0x1u });
repo.UpdateIntProperty(0x500000ACu, ItemRepository.UiEffectsPropertyId, value: 0x1);
Assert.Equal(0x1u, repo.GetItem(0x500000ACu)!.Effects);
repo.UpdateIntProperty(0x500000ACu, ItemRepository.UiEffectsPropertyId, value: 0);
Assert.Equal(0u, repo.GetItem(0x500000ACu)!.Effects);
var repo = new ClientObjectTable();
repo.AddOrUpdate(new ClientObject { ObjectId = 0x500000ACu, Effects = 0x1u });
repo.UpdateIntProperty(0x500000ACu, ClientObjectTable.UiEffectsPropertyId, value: 0x1);
Assert.Equal(0x1u, repo.Get(0x500000ACu)!.Effects);
repo.UpdateIntProperty(0x500000ACu, ClientObjectTable.UiEffectsPropertyId, value: 0);
Assert.Equal(0u, repo.Get(0x500000ACu)!.Effects);
}
[Fact]
@ -191,11 +191,11 @@ public sealed class ItemRepositoryTests
{
// A re-spawn (CreateObject) of a now-inert item carries effects=0; it must
// clear a previously-set effect (unconditional assign, not gated on != 0).
var repo = new ItemRepository();
repo.AddOrUpdate(new ItemInstance { ObjectId = 0x500000ADu, Effects = 0x1u });
var repo = new ClientObjectTable();
repo.AddOrUpdate(new ClientObject { ObjectId = 0x500000ADu, Effects = 0x1u });
bool ok = repo.EnrichItem(0x500000ADu, iconId: 0x06001234u, name: "Wand",
type: ItemType.Caster, effects: 0u);
Assert.True(ok);
Assert.Equal(0u, repo.GetItem(0x500000ADu)!.Effects);
Assert.Equal(0u, repo.Get(0x500000ADu)!.Effects);
}
}