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
@@ -0,0 +1,29 @@
package net.tfminecraft.cooking.husbandry;

import java.util.UUID;

/** Decides when a right-click with a linked Co-Ownership Token accepts it. */
final class HusbandryCoOwnToken {

private HusbandryCoOwnToken() {}

/**
* A token linked to someone else's animal is accepted by any right-click: the air, a block, an
* animal or a player. Clients follow an entity click with a use-item packet, so every path must
* agree or the player sees an error and then a success. Owners keep linking and giving.
*/
static boolean accepts(UUID linkedAnimal, boolean linkedHasOwners, boolean clickerOwnsLinked) {
return linkedAnimal != null && linkedHasOwners && !clickerOwnsLinked;
}

static UUID parse(String linked) {
if (linked == null || linked.isBlank()) {
return null;
}
try {
return UUID.fromString(linked);
} catch (IllegalArgumentException ignored) {
return null;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ public void onInteractEntity(PlayerInteractEntityEvent event) {

if (HusbandryItems.matches(hand, HusbandryConfig.coOwnItem())) {
event.setCancelled(true);
if (clicked instanceof Player target) {
if (acceptsLinkedToken(player, hand)) {
handleCoOwnOnPlayer(player, player, hand);
} else if (clicked instanceof Player target) {
handleCoOwnOnPlayer(player, target, hand);
} else if (clicked instanceof LivingEntity living) {
handleCoOwnLink(player, living, hand);
Expand All @@ -66,28 +68,33 @@ public void onInteractEntity(PlayerInteractEntityEvent event) {
}

@EventHandler
public void onInteractAir(PlayerInteractEvent event) {
public void onInteractUse(PlayerInteractEvent event) {
if (event.getHand() != EquipmentSlot.HAND) {
return;
}
if (event.getAction() != org.bukkit.event.block.Action.RIGHT_CLICK_AIR
&& event.getAction() != org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK) {
return;
}
if (event.getClickedBlock() != null) {
return;
}
ItemStack hand = event.getItem();
if (!HusbandryItems.matches(hand, HusbandryConfig.coOwnItem())) {
return;
}
if (HusbandryItems.linkedAnimal(hand) == null) {
if (!acceptsLinkedToken(event.getPlayer(), hand)) {
return;
}
event.setCancelled(true);
handleCoOwnOnPlayer(event.getPlayer(), event.getPlayer(), hand);
}

private static boolean acceptsLinkedToken(Player player, ItemStack hand) {
UUID linked = HusbandryCoOwnToken.parse(HusbandryItems.linkedAnimal(hand));
return HusbandryCoOwnToken.accepts(
linked,
HusbandryOwnershipService.hasAnyOwner(linked),
HusbandryOwnershipService.isOwner(player, linked));
}

private static void handleTame(Player player, LivingEntity entity, ItemStack hand) {
String name = HusbandryItems.tameName(hand);
if (name == null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package net.tfminecraft.cooking.husbandry;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.UUID;

import org.junit.jupiter.api.Test;

class HusbandryCoOwnTokenTest {

private static final UUID ANIMAL = UUID.randomUUID();

@Test
void anotherPlayerAcceptsATokenLinkedToAnOwnedAnimal() {
assertTrue(HusbandryCoOwnToken.accepts(ANIMAL, true, false));
}

@Test
void ownersKeepLinkingAndGivingInsteadOfAccepting() {
assertFalse(HusbandryCoOwnToken.accepts(ANIMAL, true, true));
}

@Test
void tokensForAnimalsWithoutOwnersAreNotAccepted() {
assertFalse(HusbandryCoOwnToken.accepts(ANIMAL, false, false));
}

@Test
void unlinkedTokensAreNotAccepted() {
assertFalse(HusbandryCoOwnToken.accepts(null, true, false));
}

@Test
void parsesOnlyValidLinks() {
assertEquals(ANIMAL, HusbandryCoOwnToken.parse(ANIMAL.toString()));
assertNull(HusbandryCoOwnToken.parse(null));
assertNull(HusbandryCoOwnToken.parse(" "));
assertNull(HusbandryCoOwnToken.parse("not-a-uuid"));
}
}