From 6a86c3f887a7dc73707580822712a9d78ed554d3 Mon Sep 17 00:00:00 2001 From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com> Date: Thu, 1 Oct 2026 11:19:33 +0000 Subject: [PATCH] fix: reword player messages in character Replace out-of-character wording in gameplay messages (permissions, containers, entities, chunks, plugin tags) with in-world phrasing. Staff commands, usage help and setup errors keep their plain wording. Co-Authored-By: Claude Opus 5.5 (1M context) --- .../tfmccore/manager/CoreManager.java | 2 +- .../tfmccore/whistle/WhistleConfig.java | 6 ++--- src/main/resources/animal-whistle-config.yml | 6 ++--- .../whistle/WhistleConfigLoaderTest.java | 24 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/net/tfminecraft/tfmccore/manager/CoreManager.java b/src/main/java/net/tfminecraft/tfmccore/manager/CoreManager.java index 275d6a8..98cf1bc 100644 --- a/src/main/java/net/tfminecraft/tfmccore/manager/CoreManager.java +++ b/src/main/java/net/tfminecraft/tfmccore/manager/CoreManager.java @@ -84,7 +84,7 @@ public void craftEvent(PrepareItemCraftEvent e) { public void blockConsume(PlayerItemConsumeEvent e) { if(Cache.blockedConsume.contains(e.getItem().getType())) { e.setCancelled(true); - e.getPlayer().sendMessage("§cCannot consume this item!"); + e.getPlayer().sendMessage("§cYou cannot eat or drink that!"); } } @EventHandler diff --git a/src/main/java/net/tfminecraft/tfmccore/whistle/WhistleConfig.java b/src/main/java/net/tfminecraft/tfmccore/whistle/WhistleConfig.java index a042b5c..a35c89d 100644 --- a/src/main/java/net/tfminecraft/tfmccore/whistle/WhistleConfig.java +++ b/src/main/java/net/tfminecraft/tfmccore/whistle/WhistleConfig.java @@ -14,9 +14,9 @@ public final class WhistleConfig { public static String soundName = "ITEM_GOAT_HORN_SOUND_6"; public static float soundVolume = 4.0f; public static float soundPitch = 2.0f; - public static String highlightedMessage = "&aHighlighted &6%count% &aanimals nearby."; - public static String noAnimalsMessage = "&7No animals found nearby."; - public static String cooldownMessage = "&7The whistle is on cooldown for another &6%seconds%s&7."; + public static String highlightedMessage = "&6%count% &aanimals nearby answer your whistle."; + public static String noAnimalsMessage = "&7No animals answer your whistle."; + public static String cooldownMessage = "&7You are still catching your breath. Try again in &6%seconds%s&7."; private WhistleConfig() {} } diff --git a/src/main/resources/animal-whistle-config.yml b/src/main/resources/animal-whistle-config.yml index 0bce0e5..e17fd2b 100644 --- a/src/main/resources/animal-whistle-config.yml +++ b/src/main/resources/animal-whistle-config.yml @@ -28,6 +28,6 @@ sound: # Player feedback messages (& color codes, empty = don't send) messages: - highlighted: "&aHighlighted &6%count% &aanimals nearby." - no-animals: "&7No animals found nearby." - cooldown: "&7The whistle is on cooldown for another &6%seconds%s&7." + highlighted: "&6%count% &aanimals nearby answer your whistle." + no-animals: "&7No animals answer your whistle." + cooldown: "&7You are still catching your breath. Try again in &6%seconds%s&7." diff --git a/src/test/java/net/tfminecraft/tfmccore/whistle/WhistleConfigLoaderTest.java b/src/test/java/net/tfminecraft/tfmccore/whistle/WhistleConfigLoaderTest.java index 83d75ec..a24b314 100644 --- a/src/test/java/net/tfminecraft/tfmccore/whistle/WhistleConfigLoaderTest.java +++ b/src/test/java/net/tfminecraft/tfmccore/whistle/WhistleConfigLoaderTest.java @@ -28,9 +28,9 @@ void resetConfig() throws IOException { WhistleConfig.soundName = "ITEM_GOAT_HORN_SOUND_6"; WhistleConfig.soundVolume = 4.0f; WhistleConfig.soundPitch = 2.0f; - WhistleConfig.highlightedMessage = "&aHighlighted &6%count% &aanimals nearby."; - WhistleConfig.noAnimalsMessage = "&7No animals found nearby."; - WhistleConfig.cooldownMessage = "&7The whistle is on cooldown for another &6%seconds%s&7."; + WhistleConfig.highlightedMessage = "&6%count% &aanimals nearby answer your whistle."; + WhistleConfig.noAnimalsMessage = "&7No animals answer your whistle."; + WhistleConfig.cooldownMessage = "&7You are still catching your breath. Try again in &6%seconds%s&7."; } @Test @@ -54,9 +54,9 @@ void loadsFullConfiguration() throws IOException { volume: 2.5 pitch: 1.5 messages: - highlighted: "&aHighlighted &6%count% &aanimals nearby." - no-animals: "&7No animals found nearby." - cooldown: "&7The whistle is on cooldown for another &6%seconds%s&7." + highlighted: "&6%count% &aanimals nearby answer your whistle." + no-animals: "&7No animals answer your whistle." + cooldown: "&7You are still catching your breath. Try again in &6%seconds%s&7." """); assertTrue(WhistleConfigLoader.load(configPath.toFile())); @@ -74,9 +74,9 @@ void loadsFullConfiguration() throws IOException { assertEquals("ITEM_GOAT_HORN_SOUND_6", WhistleConfig.soundName); assertEquals(2.5f, WhistleConfig.soundVolume); assertEquals(1.5f, WhistleConfig.soundPitch); - assertEquals("&aHighlighted &6%count% &aanimals nearby.", WhistleConfig.highlightedMessage); - assertEquals("&7No animals found nearby.", WhistleConfig.noAnimalsMessage); - assertEquals("&7The whistle is on cooldown for another &6%seconds%s&7.", WhistleConfig.cooldownMessage); + assertEquals("&6%count% &aanimals nearby answer your whistle.", WhistleConfig.highlightedMessage); + assertEquals("&7No animals answer your whistle.", WhistleConfig.noAnimalsMessage); + assertEquals("&7You are still catching your breath. Try again in &6%seconds%s&7.", WhistleConfig.cooldownMessage); } @Test @@ -128,9 +128,9 @@ void missingKeysKeepDefaults() throws IOException { assertEquals("ITEM_GOAT_HORN_SOUND_6", WhistleConfig.soundName); assertEquals(4.0f, WhistleConfig.soundVolume); assertEquals(2.0f, WhistleConfig.soundPitch); - assertEquals("&aHighlighted &6%count% &aanimals nearby.", WhistleConfig.highlightedMessage); - assertEquals("&7No animals found nearby.", WhistleConfig.noAnimalsMessage); - assertEquals("&7The whistle is on cooldown for another &6%seconds%s&7.", WhistleConfig.cooldownMessage); + assertEquals("&6%count% &aanimals nearby answer your whistle.", WhistleConfig.highlightedMessage); + assertEquals("&7No animals answer your whistle.", WhistleConfig.noAnimalsMessage); + assertEquals("&7You are still catching your breath. Try again in &6%seconds%s&7.", WhistleConfig.cooldownMessage); assertTrue(WhistleConfig.whitelistedAnimals.contains(EntityType.HORSE)); } }