diff --git a/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryClaimHint.java b/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryClaimHint.java index 0552add..3acf018 100644 --- a/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryClaimHint.java +++ b/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryClaimHint.java @@ -88,8 +88,8 @@ static List 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."); } diff --git a/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryTamingListener.java b/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryTamingListener.java index 4d395a7..3183a1d 100644 --- a/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryTamingListener.java +++ b/src/main/java/net/tfminecraft/cooking/husbandry/HusbandryTamingListener.java @@ -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(); @@ -194,7 +194,7 @@ private static void handleCoOwnOnPlayer(Player actor, Player target, ItemStack h } Optional 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(); diff --git a/src/main/java/net/tfminecraft/cooking/liquid/LiquidContainerHandler.java b/src/main/java/net/tfminecraft/cooking/liquid/LiquidContainerHandler.java index 0f49547..7bfd739 100644 --- a/src/main/java/net/tfminecraft/cooking/liquid/LiquidContainerHandler.java +++ b/src/main/java/net/tfminecraft/cooking/liquid/LiquidContainerHandler.java @@ -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; } diff --git a/src/main/java/net/tfminecraft/cooking/mixing/MixingBowlHandler.java b/src/main/java/net/tfminecraft/cooking/mixing/MixingBowlHandler.java index 9c94927..bb21255 100644 --- a/src/main/java/net/tfminecraft/cooking/mixing/MixingBowlHandler.java +++ b/src/main/java/net/tfminecraft/cooking/mixing/MixingBowlHandler.java @@ -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); diff --git a/src/main/java/net/tfminecraft/cooking/utils/StationAddonRules.java b/src/main/java/net/tfminecraft/cooking/utils/StationAddonRules.java index 5cedc1c..06b22b0 100644 --- a/src/main/java/net/tfminecraft/cooking/utils/StationAddonRules.java +++ b/src/main/java/net/tfminecraft/cooking/utils/StationAddonRules.java @@ -99,7 +99,7 @@ public static boolean canAcceptAddon(Map 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; } diff --git a/src/test/java/net/tfminecraft/cooking/husbandry/HusbandryOwnedMountTest.java b/src/test/java/net/tfminecraft/cooking/husbandry/HusbandryOwnedMountTest.java index b184233..08b7adf 100644 --- a/src/test/java/net/tfminecraft/cooking/husbandry/HusbandryOwnedMountTest.java +++ b/src/test/java/net/tfminecraft/cooking/husbandry/HusbandryOwnedMountTest.java @@ -73,7 +73,7 @@ void hintAtCapSaysItCannotBeClaimed() { void unclaimableAnimalsAreNotSentToTheToken() { List 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")); }