feat(adventure): add quest compass tracking
Release / release (push) Successful in 11m24s

This commit is contained in:
dmg committed 2026-09-22 15:19:40 -04:00
1 parent a637e4090c
commit ff55fbace7
13 files changed
+304 -20

No files matched your search

@@ -323,5 +323,114 @@ class AdventureQuestNativeTest {
}
}
@Test void acceptedQuestPublishesBoundCompassGuidanceToggleAndExactBookRestoration() throws Exception {
java.nio.file.Files.writeString(data.resolve("config.yml"),"adventure-daily-site-count: 1\n");
try(var f=new FantasyStickLifecycleNativeTest.Fixture(data)){
f.plugin.setEnabled(true);
var actor=new FantasyStickLifecycleNativeTest.Actor(data);
var targetWorldActor=new FantasyStickLifecycleNativeTest.Actor(data);
f.players.put(actor.core.id,actor.player);
UUID targetWorld=UUID.randomUUID(),otherWorld=UUID.randomUUID();
when(actor.world.getUID()).thenReturn(targetWorld);
when(actor.world.getName()).thenReturn("Adventure Realm");
when(targetWorldActor.world.getUID()).thenReturn(targetWorld);
when(targetWorldActor.world.getName()).thenReturn("Adventure Realm");
actor.core.location.setX(0);actor.core.location.setY(64);actor.core.location.setZ(0);
f.activate(actor);var ordinaryCompass=new org.bukkit.inventory.ItemStack(Material.COMPASS);actor.core.inventory.setItem(10,ordinaryCompass);actor.core.cursor=new org.bukkit.inventory.ItemStack(Material.DIAMOND);
var directory=(games.dmg.fantasystick.adventure.AdventureQuestDirectory)
FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"adventureQuests");
var site=directory.placeSite(games.dmg.fantasystick.adventure.AdventureQuestState.SiteType.CAMP,
"Compass Camp",targetWorld,10.4,69.8,-10.2,games.dmg.fantasystick.adventure.AdventureQuestState.Arena.circle(4))
.get(5,java.util.concurrent.TimeUnit.SECONDS);
var catalog=directory.ensureToday().get(5,java.util.concurrent.TimeUnit.SECONDS);
var quest=directory.accept(catalog.revision(),site.id(),games.dmg.fantasystick.adventure.AdventureQuestState.UnitType.SOLO,
actor.core.record.id(),Set.of(actor.core.record.id())).get(5,java.util.concurrent.TimeUnit.SECONDS).quest().orElseThrow();
var controller=(games.dmg.fantasystick.adventure.AdventureQuestController)
FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"adventureQuestController");
for(Runnable pulse:List.copyOf(f.pulses))pulse.run();
var compass=actor.core.inventory.getItem(0);
assertEquals(Material.COMPASS,compass.getType());
assertEquals("Quest Compass",net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.plainText().serialize(compass.getItemMeta().displayName()));
var tracker=org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(compass)
.get(net.minecraft.core.component.DataComponents.LODESTONE_TRACKER);
assertNotNull(tracker);assertFalse(tracker.tracked());assertTrue(tracker.target().isPresent());
assertEquals(new net.minecraft.core.BlockPos(10,69,-11),tracker.target().orElseThrow().pos());
verify(actor.player,never()).setCompassTarget(any(Location.class));
String lore=compass.getItemMeta().lore().stream().map(net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.plainText()::serialize).reduce("",(a,b)->a+"\n"+b);
assertTrue(lore.contains("Compass Camp"));assertTrue(lore.contains("Monster camp"));
assertTrue(lore.contains("Adventure Realm (10, 69, -11)"));assertTrue(lore.contains("Distance: 15 blocks"));
assertTrue(lore.contains("Expires: "+quest.expiresAt()));
assertFalse(lore.contains(site.id().toString()));assertFalse(lore.contains(quest.id().toString()));
assertEquals(List.of("Compass Camp — 15 blocks NE · ↑ +6"),actor.actionBars);
var use=new org.bukkit.event.player.PlayerInteractEvent(actor.player,org.bukkit.event.block.Action.RIGHT_CLICK_AIR,
compass,null,org.bukkit.block.BlockFace.SELF,EquipmentSlot.HAND);
f.dispatcher.accept(use);assertEquals(org.bukkit.event.Event.Result.DENY,use.useItemInHand());
var characters=(games.dmg.fantasystick.persistence.CharacterStorage)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"characters");
characters.find(UUID.randomUUID()).get(5,java.util.concurrent.TimeUnit.SECONDS);for(int retry=0;retry<10&&actor.books.isEmpty();retry++)f.tick();assertEquals(1,actor.books.size());
doReturn(false).when(actor.player).hasPermission("fantasystick.admin");
assertEquals(List.of("tracking"),f.command.tabComplete(actor.player,"fantasystick",new String[]{"adventure","t"}));
assertEquals(List.of("off","on"),f.command.tabComplete(actor.player,"fantasystick",new String[]{"adventure","tracking",""}));
assertTrue(f.command.tabComplete(actor.player,"fantasystick",new String[]{"adventure","tracking","on","extra"}).isEmpty());
f.command.execute(actor.player,"fantasystick",new String[]{"adventure","tracking"});
assertTrue(actor.messages.getLast().contains("on"));
f.command.execute(actor.player,"fantasystick",new String[]{"adventure","tracking","off"});for(int retry=0;retry<10&&actor.core.inventory.getItem(0).getType()!=Material.BOOK;retry++)drainOne(f);
assertEquals(Material.BOOK,actor.core.inventory.getItem(0).getType());
assertFalse(directory.trackingEnabled(quest.id(),actor.core.record.id()));
f.command.execute(actor.player,"fantasystick",new String[]{"adventure","tracking","on"});for(int retry=0;retry<10&&actor.core.inventory.getItem(0).getType()!=Material.COMPASS;retry++)drainOne(f);
assertEquals(Material.COMPASS,actor.core.inventory.getItem(0).getType());
actor.core.location.setX(site.x());actor.core.location.setY(site.y());actor.core.location.setZ(site.z());
int guidance=actor.actionBars.size();for(Runnable pulse:List.copyOf(f.pulses))pulse.run();
assertEquals(guidance,actor.actionBars.size(),"inside the authoritative arena suppresses guidance");
assertEquals(Material.COMPASS,actor.core.inventory.getItem(0).getType(),"arrival keeps the bound return compass");
actor.core.location.setX(site.x()+8);for(Runnable pulse:List.copyOf(f.pulses))pulse.run();
assertEquals(guidance+1,actor.actionBars.size());
var other=mock(World.class);when(other.getUID()).thenReturn(otherWorld);actor.core.location.setWorld(other);
f.players.put(targetWorldActor.core.id,targetWorldActor.player);
for(Runnable pulse:List.copyOf(f.pulses))pulse.run();
assertEquals("Travel to Adventure Realm (10, 69, -11)",actor.actionBars.getLast());
f.players.remove(targetWorldActor.core.id);
for(Runnable pulse:List.copyOf(f.pulses))pulse.run();
assertEquals("Travel to unavailable world (10, 69, -11)",actor.actionBars.getLast());
assertTrue(directory.abandon(quest.id(),quest.unit()).get(5,java.util.concurrent.TimeUnit.SECONDS));
for(Runnable pulse:List.copyOf(f.pulses))pulse.run();
assertEquals(Material.BOOK,actor.core.inventory.getItem(0).getType());
assertEquals(ordinaryCompass,actor.core.inventory.getItem(10));assertEquals(Material.DIAMOND,actor.core.cursor.getType());
verify(actor.world,never()).getChunkAt(anyInt(),anyInt());
assertTrue(directory.snapshot().tracking().isEmpty());
assertFalse(controller.trackingAvailable(actor.player));
}
}
@Test void dungeonTrackingTargetsOnlyEntranceAndSuppressesGuidanceInsideAnyRegisteredRoom() throws Exception {
java.nio.file.Files.writeString(data.resolve("config.yml"),"adventure-daily-site-count: 1\n");
try(var f=new FantasyStickLifecycleNativeTest.Fixture(data)){
f.plugin.setEnabled(true);var actor=new FantasyStickLifecycleNativeTest.Actor(data);f.players.put(actor.core.id,actor.player);
UUID world=UUID.randomUUID();when(actor.world.getUID()).thenReturn(world);when(actor.world.getName()).thenReturn("Dungeon Realm");
actor.core.location.setX(0);actor.core.location.setY(60);actor.core.location.setZ(0);f.activate(actor);
var directory=(games.dmg.fantasystick.adventure.AdventureQuestDirectory)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"adventureQuests");
var entrance=new games.dmg.fantasystick.adventure.AdventureQuestState.Site(UUID.randomUUID(),games.dmg.fantasystick.adventure.AdventureQuestState.SiteType.DUNGEON,"Deep Keep",world,40,70,-20);
directory.registerDungeonSites(()->List.of(entrance));directory.registerDungeonAvailability(ignored->true);
var catalog=directory.ensureToday().get(5,java.util.concurrent.TimeUnit.SECONDS);
var quest=directory.accept(catalog.revision(),entrance.id(),games.dmg.fantasystick.adventure.AdventureQuestState.UnitType.SOLO,actor.core.record.id(),Set.of(actor.core.record.id())).get(5,java.util.concurrent.TimeUnit.SECONDS).quest().orElseThrow();
var controller=(games.dmg.fantasystick.adventure.AdventureQuestController)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"adventureQuestController");
var inside=new java.util.concurrent.atomic.AtomicBoolean(true);controller.registerDungeonRoomPresence((id,location)->id.equals(entrance.id())&&inside.get());
for(Runnable pulse:List.copyOf(f.pulses))pulse.run();
assertEquals(Material.COMPASS,actor.core.inventory.getItem(0).getType());assertTrue(actor.actionBars.isEmpty());
String visible=actor.core.inventory.getItem(0).getItemMeta().lore().stream().map(net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.plainText()::serialize).reduce("",String::concat);
assertTrue(visible.contains("Dungeon entrance"));assertTrue(visible.contains("Dungeon Realm (40, 70, -20)"));
for(UUID hidden:List.of(entrance.id(),quest.id(),quest.catalog(),quest.unit(),actor.core.record.id()))assertFalse(visible.contains(hidden.toString()));
inside.set(false);for(Runnable pulse:List.copyOf(f.pulses))pulse.run();
assertEquals(List.of("Deep Keep — 45 blocks NE · ↑ +10"),actor.actionBars);
assertTrue(directory.closeOffer(entrance.id()).get(5,java.util.concurrent.TimeUnit.SECONDS));
for(Runnable pulse:List.copyOf(f.pulses))pulse.run();
assertEquals(Material.BOOK,actor.core.inventory.getItem(0).getType());assertTrue(directory.snapshot().tracking().isEmpty());
}
}
private static void drainOne(FantasyStickLifecycleNativeTest.Fixture f)throws Exception{var task=f.tasks.poll(5,java.util.concurrent.TimeUnit.SECONDS);assertNotNull(task);task.run();}
}
@@ -1331,9 +1331,10 @@ class FantasyStickLifecycleNativeTest {
static final class Actor {
final EquipmentSessionsNativeTest.Actor core;
// Location holds a WeakReference: the fixture must model the server's world ownership.
final org.bukkit.World world = mock(org.bukkit.World.class);
final org.bukkit.craftbukkit.CraftWorld world = mock(org.bukkit.craftbukkit.CraftWorld.class);
final List<String> messages = new ArrayList<>();
final List<net.kyori.adventure.text.Component> messageComponents = new ArrayList<>();
final List<String> actionBars = new ArrayList<>();
final List<org.bukkit.inventory.ItemStack> books = new ArrayList<>();
final List<org.bukkit.inventory.Inventory> inventories = new ArrayList<>();
int inventoryCloses;
@@ -1413,7 +1414,7 @@ class FantasyStickLifecycleNativeTest {
if (!event.isCancelled()) { core.beforeMode.run(); core.gameMode = event.getNewGameMode(); }
yield null;
}
case "isSneaking", "isInvisible" -> false;
case "isSneaking", "isInvisible", "isDead" -> false;
case "isSprinting" -> sprinting;
case "setSprinting" -> { sprinting = (Boolean) args[0]; yield null; }
case "getScoreboard" -> craftBoard;
@@ -1425,6 +1426,11 @@ class FantasyStickLifecycleNativeTest {
} else messages.add((String) args[0]);
yield null;
}
case "sendActionBar" -> {
actionBars.add(net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer.plainText()
.serialize((net.kyori.adventure.text.Component) args[0]));
yield null;
}
case "openBook" -> { books.add(((org.bukkit.inventory.ItemStack) args[0]).clone()); yield null; }
case "openInventory" -> { inventories.add((org.bukkit.inventory.Inventory) args[0]); yield core.view; }
case "closeInventory" -> { inventoryCloses++; yield null; }
@@ -1454,6 +1460,8 @@ class FantasyStickLifecycleNativeTest {
when(nativePlayer.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.NAME_TAG_DISTANCE)).thenReturn(distance);
var level = mock(net.minecraft.server.level.ServerLevel.class);
when(nativePlayer.level()).thenReturn(level);
when(world.getHandle()).thenReturn(level);
when(level.dimension()).thenReturn(net.minecraft.world.level.Level.OVERWORLD);
var worldConfig = mock(io.papermc.paper.configuration.WorldConfiguration.class);
worldConfig.entities = allocate(io.papermc.paper.configuration.WorldConfiguration.Entities.class);
worldConfig.entities.spawning = allocate(io.papermc.paper.configuration.WorldConfiguration.Entities.Spawning.class);
@@ -62,6 +62,20 @@ class SessionControlsNativeTest {
}
}
@Test
void questCompassRetainsOnlyTheAuthenticBookControlIdentityAcrossNativeCodec() {
var compass=controls.create(character(Collections.nCopies(7,"")),owner,session)[0].clone();
compass.setType(Material.COMPASS);
var meta=compass.getItemMeta();meta.displayName(Component.text("Quest Compass"));compass.setItemMeta(meta);
var reloaded=roundTrip(compass);
assertEquals(Material.COMPASS,reloaded.getType());
assertEquals(new SessionControls.Identity(owner,session,0),controls.identify(reloaded).orElseThrow());
assertTrue(controls.owned(reloaded,owner,session));
assertTrue(controls.ability(reloaded).isEmpty());
var forged=reloaded.clone();var forgedMeta=forged.getItemMeta();forgedMeta.getPersistentDataContainer().set(key("control_slot"),PersistentDataType.INTEGER,1);forged.setItemMeta(forgedMeta);
assertTrue(controls.identify(forged).isEmpty(),"a compass cannot impersonate another control slot");
}
@Test
void everyApprovedSavedAbilityUsesItsOwnStableIdAndCataloguePresentation() {
var ids = List.of("fireball", "great_sword", "frost_shard", "longbow", "quickstep", "second_wind",