From f0a7a2e6980bbc0c866206ab7867bd3a1a916a62 Mon Sep 17 00:00:00 2001 From: KAMKEEL <28842281+KAMKEEL@users.noreply.github.com> Date: Wed, 26 Aug 2026 04:15:16 -0400 Subject: [PATCH] Write the quest counters the shape the quest classes read PlayerFixtures wrote extraData.setInteger("Zombie", 14) and its note claimed that was where kill counts live. QuestKill.getKilled reads extraData.getTagList("Killed", 10) through NBTTags.getStringIntegerMap -- a list of Slot/Value compounds. extraData is an opaque compound the fixture filled by hand, so nothing on either side checked it, and two of Scribe's migration tests stood on the invented shape for two months. It writes the real one now, plus the location booleans and a party quest's group total beside one member's own Killed share. Also a deliberate unreadable case: a quest whose extraData an addon wrote, with keys no objective kind claims. That case existed by accident before, as this generator's own defect, and a reader has to report it rather than drop it. The counter map is built by hand rather than through NBTTags, so the fixture states the shape it is asserting -- borrowing the reader's own helper would agree with it by construction and prove nothing. --- .../npcs/fixtures/content/PlayerFixtures.java | 59 +++++++++++++++++-- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/src/fixtures/java/kamkeel/npcs/fixtures/content/PlayerFixtures.java b/src/fixtures/java/kamkeel/npcs/fixtures/content/PlayerFixtures.java index a836b28fa..e62adc923 100644 --- a/src/fixtures/java/kamkeel/npcs/fixtures/content/PlayerFixtures.java +++ b/src/fixtures/java/kamkeel/npcs/fixtures/content/PlayerFixtures.java @@ -73,15 +73,43 @@ public final class PlayerFixtures { PlayerData extras = player("069a79f4-44e9-4726-a5be-fca90e38aaf5", "Notch"); QuestData withExtras = questData(75, false); - withExtras.extraData.setInteger("Zombie", 14); - withExtras.extraData.setInteger("Skeleton", 3); - withExtras.extraData.setString("LastLocation", "Northern Watchtower"); + withExtras.extraData.setTag("Killed", killed("Zombie", 14, "Skeleton", 3)); + withExtras.extraData.setBoolean("LocationFound", true); + withExtras.extraData.setBoolean("Location2Found", true); extras.questData.activeQuests.put(75, withExtras); extras.dialogData.dialogsRead.add(58); out.add(new Case("", extras, - "an active quest whose ExtraData holds per-objective counters. This is where kill " - + "counts and reached locations actually live -- the quest itself stores only the " - + "targets, so a reader that ignores ExtraData can never show progress")); + "an active quest whose ExtraData holds per-objective progress, in the shapes the " + + "quest classes actually read. Kill counts are a Killed tag list of Slot/Value " + + "compounds -- NBTTags.getStringIntegerMap -- not loose integers keyed by mob " + + "name, and a reached location is a boolean under its own key. The quest stores " + + "only the targets, so a reader that ignores ExtraData can never show progress")); + + PlayerData party = player("11111111-2222-3333-4444-555555555555", "PartyMember"); + QuestData shared = questData(76, false); + // The per-player half of a party kill quest: QuestKill keys it by the player's own name + // rather than by slot, so two members of one party each carry their own tally. + shared.extraData.setTag("PartyMemberKilled", killed("Creeper", 2)); + shared.extraData.setTag("Killed", killed("Creeper", 5)); + party.questData.activeQuests.put(76, shared); + out.add(new Case("", party, + "a party kill quest, which stores the group total under Killed and each member's own " + + "share under Killed. The second key is composed from a name, so it " + + "cannot be enumerated from the quest -- only from the party that took it")); + + PlayerData foreign = player("22222222-3333-4444-5555-666666666666", "AddonUser"); + QuestData unclaimed = questData(77, false); + // ExtraData is an opaque compound: nothing validates its keys, so an addon that stores + // its own progress there produces a file no objective kind here can read. Deliberate, + // and the case a reader has to report rather than silently drop. + unclaimed.extraData.setInteger("dbcaddon:KiCharged", 900); + unclaimed.extraData.setString("dbcaddon:Form", "SuperSaiyan"); + foreign.questData.activeQuests.put(77, unclaimed); + out.add(new Case("", foreign, + "an active quest whose ExtraData holds only keys no objective kind claims, which is " + + "what an addon writing its own progress leaves behind. Nothing validates this " + + "compound, so a reader meets it on a real server and has to say so rather than " + + "drop it")); PlayerData nil = player("00000000-0000-0000-0000-000000000000", "NilUuid"); nil.dialogData.dialogsRead.add(1); @@ -122,6 +150,25 @@ public final class PlayerFixtures { * never touches it -- the quest id is the map key in the enclosing list, not part of the * entry. So a bare Quest carrying the right id is enough and nothing is invented. */ + /** + * A counter map in the shape {@code NBTTags.nbtStringIntegerMap} writes and + * {@code getStringIntegerMap} reads: a list of {@code {Slot, Value}} compounds. + * + *

Written out by hand rather than through {@code NBTTags} so the fixture states the shape + * it is asserting. A generator that borrows the reader's own helper agrees with it by + * construction and proves nothing about it. + */ + private static NBTTagList killed(Object... slotsAndCounts) { + NBTTagList list = new NBTTagList(); + for (int at = 0; at < slotsAndCounts.length; at += 2) { + NBTTagCompound entry = new NBTTagCompound(); + entry.setString("Slot", (String) slotsAndCounts[at]); + entry.setInteger("Value", ((Integer) slotsAndCounts[at + 1]).intValue()); + list.appendTag(entry); + } + return list; + } + private static QuestData questData(int questId, boolean completed) { Quest quest = new Quest(); quest.id = questId;