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 @@ -88,8 +88,8 @@ static List<String> lines(
String label = species == null || species.isBlank() ? "animal" : species.toLowerCase(Locale.ROOT);
String warning = staysWild
? "§eThis " + label + " is not claimed. Anyone can ride it or claim it until someone does."
: "§eThis " + label + " is not claimed. Unclaimed animals disappear the next time"
+ " their area loads.";
: "§eThis " + label + " is not claimed. Unclaimed animals wander off before"
+ " anyone next comes by.";
if (!claimable) {
return List.of(warning, "§7This kind of animal cannot be claimed, so it will not stay.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ private static void handleCoOwnOnPlayer(Player actor, Player target, ItemStack h
try {
animalUuid = UUID.fromString(linked);
} catch (IllegalArgumentException ignored) {
actor.sendMessage("§cThis token is invalid.");
actor.sendMessage("§cThis token does not name any animal.");
return;
}
HusbandryRepository repository = HusbandryEntities.repository();
Expand All @@ -194,7 +194,7 @@ private static void handleCoOwnOnPlayer(Player actor, Player target, ItemStack h
}
Optional<HusbandryAnimal> stored = HusbandryEntities.lookup(animalUuid);
if (stored.isEmpty()) {
actor.sendMessage("§cThat animal no longer exists.");
actor.sendMessage("§cThat animal can no longer be found.");
return;
}
HusbandryAnimal animal = stored.get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ private void handleDispense(Furniture furniture, Player player) {

boolean lastCup = hand.getAmount() <= 1;
if (!lastCup && !hasStorageSlot(player)) {
player.sendMessage("Need a free inventory slot.");
player.sendMessage("You have no room to carry another cup.");
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ private void handleIngredientAdd(Furniture furniture, Player player, FurnitureIn

if (ingredient == null) {

player.sendMessage("§cUse converted cooking ingredients.");
player.sendMessage("§cYou have to prepare the ingredients before cooking with them.");

event.setCancelled(true);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public static boolean canAcceptAddon(Map<String, FoodItem> slots, FoodItem incom
}
if (hasDuplicateOrigin(slots, incoming)) {
if (player != null) {
player.sendMessage("§cThat ingredient is already in the station.");
player.sendMessage("§cThat ingredient is already in there.");
}
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void hintAtCapSaysItCannotBeClaimed() {
void unclaimableAnimalsAreNotSentToTheToken() {
List<String> lines = HusbandryClaimHint.lines("Wolf", false, false, false, 0, 15, false);
assertEquals(2, lines.size());
assertTrue(lines.get(0).contains("the next time their area loads"));
assertTrue(lines.get(0).contains("wander off before anyone next comes by"));
assertTrue(lines.get(1).contains("cannot be claimed"));
assertFalse(String.join(" ", lines).contains("Ownership Token"));
}
Expand Down