Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,22 @@ private static void applyCare(ItemStack stack, Inventory inventory) {
ArtifactCareStore.Persist.ALWAYS);
}

@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onFurnitureSlotAddCare(FurnitureSlotItemAddEvent event) {
if (!ArtifactDisplayIndex.isDisplayFurniture(event.getFurniture())) {
return;
}
ItemStack item = event.getItem();
if (ArtifactIds.hasKey(item)) {
ArtifactCareStore.apply(
item,
false,
System.currentTimeMillis(),
ArtifactCareStore.Persist.ALWAYS);
event.setItem(item);
}
}

@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onFurnitureSlotAdd(FurnitureSlotItemAddEvent event) {
Furniture furniture = event.getFurniture();
Expand Down Expand Up @@ -104,7 +120,15 @@ public void onFurnitureSlotTake(FurnitureSlotItemTakeEvent event) {
ShrineChargeService.stop(event.getFurniture().getEntityId(), event.getSlot().getId());
SacrificeRiteService.stop(event.getFurniture().getEntityId(), event.getSlot().getId());
}
event.setItem(VesselLore.updateItem(event.getItem()));
ItemStack item = event.getItem();
if (ArtifactDisplayIndex.isDisplayFurniture(event.getFurniture()) && ArtifactIds.hasKey(item)) {
ArtifactCareStore.apply(
item,
true,
System.currentTimeMillis(),
ArtifactCareStore.Persist.ALWAYS);
}
event.setItem(VesselLore.updateItem(item));
}

@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
Expand Down
54 changes: 54 additions & 0 deletions src/test/java/net/tfminecraft/magic/ArtifactListenerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
listener.onPickup(new EntityPickupItemEvent(mock(Zombie.class), mock(Item.class), 0));
listener.onPickup(new EntityPickupItemEvent(player, mock(Item.class), 0));
server.getScheduler().performOneTick();
listener.onJoin(new PlayerJoinEvent(player, "joined"));

Check warning on line 119 in src/test/java/net/tfminecraft/magic/ArtifactListenerTest.java

View workflow job for this annotation

GitHub Actions / build

PlayerJoinEvent(org.bukkit.entity.Player,java.lang.String) in org.bukkit.event.player.PlayerJoinEvent has been deprecated and marked for removal
lore.verify(() -> VesselLore.updateInventory(player), times(2));
}
}
Expand Down Expand Up @@ -168,6 +168,60 @@
}
}

@Test
void furnitureSlotTransitionsTickArtifactCareAcrossDisplayCases() {
var listener = new ArtifactListener();
var furniture = mock(Furniture.class);
when(furniture.getEntityId()).thenReturn(UUID.randomUUID());
var add = mock(FurnitureSlotItemAddEvent.class);
var take = mock(FurnitureSlotItemTakeEvent.class);
var plain = new ItemStack(Material.STONE);
var artifact = new ItemStack(Material.STONE);
ArtifactIds.writeNew(artifact);
when(add.getFurniture()).thenReturn(furniture);
when(add.getItem()).thenReturn(plain);
when(take.getFurniture()).thenReturn(furniture);
when(take.getItem()).thenReturn(artifact);
try (var display = mockStatic(ArtifactDisplayIndex.class);
var care = mockStatic(ArtifactCareStore.class);
var meditation = mockStatic(MeditationService.class);
var shrine = mockStatic(ShrineChargeService.class);
var sacrifice = mockStatic(SacrificeRiteService.class);
var lore = mockStatic(VesselLore.class)) {
listener.onFurnitureSlotAddCare(add);
display.when(() -> ArtifactDisplayIndex.isDisplayFurniture(furniture)).thenReturn(true);
listener.onFurnitureSlotAddCare(add);
verify(add, never()).setItem(plain);

when(add.getItem()).thenReturn(artifact);
listener.onFurnitureSlotAddCare(add);
verify(add).setItem(artifact);
care.verify(
() ->
ArtifactCareStore.apply(
eq(artifact),
eq(false),
anyLong(),
eq(ArtifactCareStore.Persist.ALWAYS)));

lore.when(() -> VesselLore.updateItem(artifact)).thenReturn(artifact);
listener.onFurnitureSlotTake(take);
care.verify(
() ->
ArtifactCareStore.apply(
eq(artifact),
eq(true),
anyLong(),
eq(ArtifactCareStore.Persist.ALWAYS)));
verify(take).setItem(artifact);

display.when(() -> ArtifactDisplayIndex.isDisplayFurniture(furniture)).thenReturn(false);
listener.onFurnitureSlotAddCare(add);
listener.onFurnitureSlotTake(take);
care.verifyNoMoreInteractions();
}
}

@Test
void sacrificeChatOnlyStartsMatchingRpWordsAndHonorsVisibility() {
var listener = new SacrificeListener();
Expand Down Expand Up @@ -242,7 +296,7 @@
verify(event).setCancelled(true);
assertEquals("fillchest.done", player.nextMessage());
service.verify(() -> ArtifactFillChestService.consume(player.getUniqueId()));
listener.onQuit(new PlayerQuitEvent(player, "quit"));

Check warning on line 299 in src/test/java/net/tfminecraft/magic/ArtifactListenerTest.java

View workflow job for this annotation

GitHub Actions / build

PlayerQuitEvent(org.bukkit.entity.Player,java.lang.String) in org.bukkit.event.player.PlayerQuitEvent has been deprecated and marked for removal
service.verify(() -> ArtifactFillChestService.clear(player.getUniqueId()), times(2));
}
}
Expand Down
Loading