Add ACH placeholder to achievement reception messages (#1065)

PyvesB · Sep 20, 2021 · 3d4ae13 · 3d4ae13
1 parent 2c8eb31
commit 3d4ae13
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 49 deletions.
diff --git a/...s-plugin/src/main/java/com/hm/achievement/listener/PlayerAdvancedAchievementListener.java b/...s-plugin/src/main/java/com/hm/achievement/listener/PlayerAdvancedAchievementListener.java
@@ -263,43 +263,45 @@ private void displayReceiverMessages(Player player, String nameToShowUser, Strin
 				.flatMap(List::stream)
 				.map(m -> StringHelper.replacePlayerPlaceholders(m, player))
 				.collect(Collectors.toList());
+		String message = langAchievementNew.contains("ACH")
+				? StringUtils.replaceOnce(langAchievementNew, "ACH", nameToShowUser)
+				: langAchievementNew + nameToShowUser;
 		if (configHoverableReceiverChatText) {
 			StringBuilder hover = new StringBuilder(messageToShowUser + "\n");
 			chatMessages.forEach(t -> hover.append(ChatColor.translateAlternateColorCodes('&', t)).append("\n"));
 			try {
-				FancyMessageSender.sendHoverableMessage(player, langAchievementNew + nameToShowUser,
-						hover.substring(0, hover.length() - 1), "white");
+				FancyMessageSender.sendHoverableMessage(player, message, hover.substring(0, hover.length() - 1), "white");
 				return;
 			} catch (Exception e) {
 				logger.warning(
 						"Failed to display hoverable message for achievement reception. Displaying standard messages instead.");
 			}
 		}
-		player.sendMessage(langAchievementNew + nameToShowUser);
+		player.sendMessage(message);
 		player.sendMessage(pluginHeader.toString() + ChatColor.WHITE + messageToShowUser);
 		chatMessages.forEach(t -> player.sendMessage(pluginHeader + ChatColor.translateAlternateColorCodes('&', t)));
 	}
 
 	/**
 	 * Displays an action bar message or chat notification to another player.
 	 *
-	 * @param achievementReceiver
+	 * @param receiver
 	 * @param nameToShowUser
 	 * @param otherPlayer
 	 */
-	private void displayNotification(Player achievementReceiver, String nameToShowUser, Player otherPlayer) {
+	private void displayNotification(Player receiver, String nameToShowUser, Player otherPlayer) {
+		String message = langAchievementReceived.contains("ACH")
+				? StringUtils.replaceEach(langAchievementReceived, new String[] { "PLAYER", "ACH" },
+						new String[] { receiver.getName(), nameToShowUser })
+				: StringUtils.replaceOnce(langAchievementReceived, "PLAYER", receiver.getName()) + nameToShowUser;
 		if (configActionBarNotify) {
 			try {
-				FancyMessageSender.sendActionBarMessage(otherPlayer,
-						"&o" + StringUtils.replaceOnce(langAchievementReceived, "PLAYER", achievementReceiver.getName())
-								+ nameToShowUser);
+				FancyMessageSender.sendActionBarMessage(otherPlayer, "&o" + message);
 			} catch (Exception e) {
 				logger.warning("Failed to display action bar message for achievement reception notification.");
 			}
 		} else {
-			otherPlayer.sendMessage(
-					pluginHeader + StringUtils.replaceOnce(langAchievementReceived, "PLAYER", achievementReceiver.getName())
-							+ nameToShowUser);
+			otherPlayer.sendMessage(pluginHeader + message);
 		}
 	}
 

diff --git a/advanced-achievements-plugin/src/main/resources/lang-BP.yml b/advanced-achievements-plugin/src/main/resources/lang-BP.yml
@@ -52,8 +52,8 @@ error-value: "O valor VALUE deve ser um número inteiro!"
 statistic-increased: "Estatístisca ACH aumentou em AMOUNT para PLAYER!"
 
 # Related to achievement reception.
-achievement-received: "PLAYER recebeu a conquista:"
-achievement-new: "Nova conquista:"
+achievement-received: "PLAYER recebeu a conquista: ACH"
+achievement-new: "Nova conquista: ACH"
 
 # Related to /aach check.
 check-achievement-true: "PLAYER recebeu a conquista"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-CN.yml b/advanced-achievements-plugin/src/main/resources/lang-CN.yml
@@ -51,8 +51,8 @@ error-value: "给定值： VALUE 必须是一个整数!"
 statistic-increased: "玩家 PLAYER 的 ACH 成就统计增加了 AMOUNT!"
 
 # 与获得成就相关
-achievement-received: "玩家 PLAYER 获得成就"
-achievement-new: "新成就:"
+achievement-received: "玩家 PLAYER 获得成就 ACH"
+achievement-new: "新成就: ACH"
 
 # 与 /aach check 相关
 check-achievement-true: "PLAYER 已经拥有这项成就： ACH!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-CZ.yml b/advanced-achievements-plugin/src/main/resources/lang-CZ.yml
@@ -46,8 +46,8 @@ error-value: "Hodnota VALUE musi byt ciselna!"
 statistic-increased: "Statistika ACH se zvisila o AMOUNT pro hrace PLAYER!"
 
 # Related to achievement reception.
-achievement-received: "Hrac PLAYER ziskal uspech:"
-achievement-new: "Novy uspech:"
+achievement-received: "Hrac PLAYER ziskal uspech: ACH"
+achievement-new: "Novy uspech: ACH"
 
 # Related to /aach check.
 check-achievement-true: "Hrac PLAYER ziskal uspech ACH!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-DA.yml b/advanced-achievements-plugin/src/main/resources/lang-DA.yml
@@ -51,8 +51,8 @@ error-value: "Værdien VALUE skal være en integer!"
 statistic-increased: "Statistisk ACH øget med AMOUNT for PLAYER!"
 
 # Relateret til achievement reception.
-achievement-received: "PLAYER modtagede præsentationen:"
-achievement-new: "Ny præsentation:"
+achievement-received: "PLAYER modtagede præsentationen: ACH"
+achievement-new: "Ny præsentation: ACH"
 
 # Relateret til /aach check.
 check-achievement-true: "PLAYER har modtaget præsentationen ACH!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-DE.yml b/advanced-achievements-plugin/src/main/resources/lang-DE.yml
@@ -47,8 +47,8 @@ error-value: "Der Wert VALUE must muss eine ganze Zahl sein!"
 statistic-increased: "PLAYER's Statistik ACH ist um AMOUNT erhöht worden."
 
 # Related to achievement reception.
-achievement-received: "PLAYER erhielt den Erfolg:"
-achievement-new: "Neuer Erfolg:"
+achievement-received: "PLAYER erhielt den Erfolg: ACH"
+achievement-new: "Neuer Erfolg: ACH"
 
 # Related to /aach check.
 check-achievement-true: "PLAYER hat den Erfolg ACH erhalten!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-ES.yml b/advanced-achievements-plugin/src/main/resources/lang-ES.yml
@@ -52,8 +52,8 @@ error-value: "¡El valor VALUE debe ser un entero!"
 statistic-increased: "¡La estadística ACH aumentó en AMOUNT para el jugador PLAYER!"
 
 # Relacionado con la recepción de logros.
-achievement-received: "PLAYER recibió el logro:"
-achievement-new: "Nuevo logro:"
+achievement-received: "PLAYER recibió el logro: ACH"
+achievement-new: "Nuevo logro: ACH"
 
 # Usado en /aach check.
 check-achievement-true: "PLAYER ha recibido el logro ACH!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-FI.yml b/advanced-achievements-plugin/src/main/resources/lang-FI.yml
@@ -47,8 +47,8 @@ error-value: "Arvon VALUE täytyy olla kokonaisluku!"
 statistic-increased: "Tilastoa ACH kasvatettiin määrällä AMOUNT pelaajalle PLAYER!"
 
 # Related to achievement reception.
-achievement-received: "PLAYER avasi saavutuksen:"
-achievement-new: "Uusi saavutus:"
+achievement-received: "PLAYER avasi saavutuksen: ACH"
+achievement-new: "Uusi saavutus: ACH"
 
 # Related to /aach check.
 check-achievement-true: "PLAYER on avannut saavutuksen ACH!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-FR.yml b/advanced-achievements-plugin/src/main/resources/lang-FR.yml
@@ -52,8 +52,8 @@ error-value: "La valeur VALUE doit être un nombre entier !"
 statistic-increased: "La statistique ACH de PLAYER a été augmentée de AMOUNT !"
 
 # Used in achievement reception.
-achievement-received: "PLAYER a reçu le succès :"
-achievement-new: "Nouveau succès :"
+achievement-received: "PLAYER a reçu le succès : ACH"
+achievement-new: "Nouveau succès : ACH"
 
 # Used in /aach check.
 check-achievement-true: "PLAYER a reçu le succès ACH !"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-HU.yml b/advanced-achievements-plugin/src/main/resources/lang-HU.yml
@@ -48,8 +48,8 @@ error-value: "A VALUE értéknek egész számnak kell lennie!"
 statistic-increased: "A statisztikai ACH összege AMOUNT értékkel nőtt PLAYER számára!"
 
 # Related to achievement reception.
-achievement-received: "PLAYER megkapta a küldetést:"
-achievement-new: "Új küldetések:"
+achievement-received: "PLAYER megkapta a küldetést: ACH"
+achievement-new: "Új küldetések: ACH"
 
 # Related to /aach check.
 check-achievement-true: "PLAYER megkapta az ACH küldetést!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-IT.yml b/advanced-achievements-plugin/src/main/resources/lang-IT.yml
@@ -32,8 +32,8 @@ achievement-not-found: L'obiettivo specificato non è stato trovato.
 achievement-given: Obiettivo donato!
 
 # Related to achievement reception.
-achievement-received: 'PLAYER ha sbloccato l''obiettivo:'
-achievement-new: 'Nuovo obiettivo:'
+achievement-received: 'PLAYER ha sbloccato l''obiettivo: ACH'
+achievement-new: 'Nuovo obiettivo: ACH'
 
 # Related to /aach check.
 check-achievement-true: "PLAYER ha ottenuto l'obiettivo ACH!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-PL.yml b/advanced-achievements-plugin/src/main/resources/lang-PL.yml
@@ -44,8 +44,8 @@ achievement-not-found: Podane osiagniecie nie zostalo znalezione.
 achievement-given: Podarowano osiagniecie!
 
 # Related to achievement reception.
-achievement-received: 'Gracz PLAYER otrzymal osiagniecie:'
-achievement-new: 'Nowe osiagniecie:'
+achievement-received: 'Gracz PLAYER otrzymal osiagniecie: ACH'
+achievement-new: 'Nowe osiagniecie: ACH'
 
 # Related to /aach check.
 check-achievement-true: Gracz PLAYER otrzymal osiagniecie o nazwie ACH!

diff --git a/advanced-achievements-plugin/src/main/resources/lang-RO.yml b/advanced-achievements-plugin/src/main/resources/lang-RO.yml
@@ -32,8 +32,8 @@ achievement-not-found: "Aceasta realizare nu exista."
 achievement-given: "Realizare data!"
 
 # Related to achievement reception.
-achievement-received: "PLAYER a obtinut realizarea:"
-achievement-new: "New Achievement:"
+achievement-received: "PLAYER a obtinut realizarea: ACH"
+achievement-new: "New Achievement: ACH"
 
 # Related to /aach check.
 check-achievement-true: "PLAYER a primit realizarea ACH!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-RU.yml b/advanced-achievements-plugin/src/main/resources/lang-RU.yml
@@ -52,8 +52,8 @@ error-value: Значение VALUE должно быть целым число
 statistic-increased: Значение достижения [ACH] увеличено на AMOUNT ед. для игрока PLAYER!
 
 # Получение достижения.
-achievement-received: 'PLAYER заслужил(а) достижение:'
-achievement-new: 'Вы заслужили достижение:'
+achievement-received: 'PLAYER заслужил(а) достижение: ACH'
+achievement-new: 'Вы заслужили достижение: ACH'
 
 # Команда /aach check.
 check-achievement-true: PLAYER получал(а) достижение [ACH]!

diff --git a/advanced-achievements-plugin/src/main/resources/lang-SE.yml b/advanced-achievements-plugin/src/main/resources/lang-SE.yml
@@ -36,8 +36,8 @@ achievement-not-found: "Den specifierade prestationen hittades inte i kategorin
 achievement-given: "Prestation tilldelad!"
 
 # Related to achievement reception.
-achievement-received: "PLAYER mottog prestationen"
-achievement-new: "Ny prestation:"
+achievement-received: "PLAYER mottog prestationen ACH"
+achievement-new: "Ny prestation: ACH"
 
 # Related to /aach check.
 check-achievement-true: "PLAYER har mottagit prestationen ACH!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-SK.yml b/advanced-achievements-plugin/src/main/resources/lang-SK.yml
@@ -49,8 +49,8 @@ error-value: "Hodnota VALUE musí byť integer!"
 statistic-increased: "Štatistika ACH sa zvýšila o AMOUNT pre hrača PLAYER!"
 
 # Related to achievement reception.
-achievement-received: "Hrač PLAYER získal úspech:"
-achievement-new: "Nový Úspech:"
+achievement-received: "Hrač PLAYER získal úspech: ACH"
+achievement-new: "Nový Úspech: ACH"
 
 # Related to /aach check.
 check-achievement-true: "Hrač PLAYER už získal úspech ACH!"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-TR.yml b/advanced-achievements-plugin/src/main/resources/lang-TR.yml
@@ -50,8 +50,8 @@ error-value: "Girdiğiniz VALUE değeri tamsayı olmalı!"
 statistic-increased: "PLAYER oyuncusu için ACH istatistiği AMOUNT miktarda arttı!"
 
 # Related to achievement reception.
-achievement-received: 'PLAYER yeni başarımına ulaştı:'
-achievement-new: 'Yeni Başarım:'
+achievement-received: 'PLAYER yeni başarımına ulaştı: ACH'
+achievement-new: 'Yeni Başarım: ACH'
 
 # Related to /aach check.
 check-achievement-true: PLAYER adlı oyuncu ACH adlı başarıma ulaştı!

diff --git a/advanced-achievements-plugin/src/main/resources/lang-TW.yml b/advanced-achievements-plugin/src/main/resources/lang-TW.yml
@@ -47,8 +47,8 @@ error-value: "數值 VALUE 必須為整數！"
 statistic-increased: "PLAYER 的 ACH 統計資訊已增加 AMOUNT ！"
 
 # Related to achievement reception.
-achievement-received: "PLAYER 取得成就:"
-achievement-new: "新成就:"
+achievement-received: "PLAYER 取得成就: ACH"
+achievement-new: "新成就: ACH"
 
 # Related to /aach check.
 check-achievement-true: "PLAYER 已經取得成就 ACH！"

diff --git a/advanced-achievements-plugin/src/main/resources/lang-VN.yml b/advanced-achievements-plugin/src/main/resources/lang-VN.yml
@@ -46,8 +46,8 @@ error-value: Giá trị VALUE phải là số nguyên!
 statistic-increased: Thống kê ACH đã tăng lên AMOUNT cho PLAYER!
 
 # Related to achievement reception.
-achievement-received: 'PLAYER nhận được thành tựu:'
-achievement-new: 'Thành tựu mới:'
+achievement-received: 'PLAYER nhận được thành tựu: ACH'
+achievement-new: 'Thành tựu mới: ACH'
 
 # Related to /aach check.
 check-achievement-true: Người chơi PLAYER đã nhận được thành tựu ACH!

diff --git a/advanced-achievements-plugin/src/main/resources/lang.yml b/advanced-achievements-plugin/src/main/resources/lang.yml
@@ -51,8 +51,8 @@ error-value: "The value VALUE must to be an integer!"
 statistic-increased: "Statistic ACH increased by AMOUNT for PLAYER!"
 
 # Used in achievement reception.
-achievement-received: "PLAYER received the achievement:"
-achievement-new: "New Achievement:"
+achievement-received: "PLAYER received the achievement: ACH"
+achievement-new: "New Achievement: ACH"
 boss-bar-progress: "Achievement progress: AMOUNT"
 
 # Used in /aach check.