Skip to content

Implémentation des translations dans les packages itemsadder, leaderboard, mailboxes, milestone, quests #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
iambibi wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Implémentation des translations dans les packages itemsadder, leaderboard, mailboxes, milestone, quests #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/fr/openmc/core/features/dream/milestone/quests/TransferableObjectQuest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import fr.openmc.core.features.quests.rewards.QuestTextReward;
import fr.openmc.core.utils.text.messages.MessageType;
import fr.openmc.core.utils.text.messages.Prefix;
import net.kyori.adventure.text.Component;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Expand All @@ -36,8 +37,7 @@ public TransferableObjectQuest() {
DreamSteps.TRANSFERABLE_OBJECT,
new QuestTier(
1,
new QuestTextReward("Il y a bien un lien entre cette dimension et le monde réel. " +
"Et ce n'est que le début d'une nouvelle aventure !", Prefix.DREAM, MessageType.SUCCESS)
new QuestTextReward(Component.text("Il y a bien un lien entre cette dimension et le monde réel. Et ce n'est que le début d'une nouvelle aventure !"), Prefix.DREAM, MessageType.SUCCESS)
)
);
}
Expand Down
25 changes: 14 additions & 11 deletions src/main/java/fr/openmc/core/features/itemsadder/SpawnerExtractorListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

import dev.lone.itemsadder.api.CustomStack;
import fr.openmc.core.OMCPlugin;
import fr.openmc.core.utils.EnumUtils;
import fr.openmc.core.utils.text.messages.TranslationManager;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.block.Block;
Expand Down Expand Up @@ -41,7 +40,7 @@ public void onBlockBreak(BlockBreakEvent event) {
return;

if (ThreadLocalRandom.current().nextDouble() < FAILURE_CHANCE) {
player.sendActionBar(Component.text("L'extraction a échoué ! Le spawner s'est brisé.", NamedTextColor.RED));
player.sendActionBar(TranslationManager.translation("feature.itemsadder.spawner_extractor.fail"));
return;
}

Expand All @@ -51,16 +50,19 @@ public void onBlockBreak(BlockBreakEvent event) {

ItemStack spawnerItem = ItemStack.of(Material.SPAWNER);
spawnerItem.editMeta(meta -> {
meta.displayName(Component.text("Spawner à ", NamedTextColor.YELLOW)
.append(Component.translatable(entityType.translationKey())));
meta.displayName(TranslationManager.translation(
"feature.itemsadder.spawner_extractor.display_name",
Component.translatable(entityType.translationKey())
));

meta.getPersistentDataContainer().set(KEY_SPAWNER_MOB, PersistentDataType.STRING, entityType.name());
});

block.getWorld().dropItemNaturally(block.getLocation(), spawnerItem);
player.sendActionBar(Component.text("Vous avez extrait un spawner à ", NamedTextColor.GREEN)
.append(Component.translatable(entityType.translationKey()))
.append(Component.text(" !")));
player.sendActionBar(TranslationManager.translation(
"feature.itemsadder.spawner_extractor.success_extract",
Component.translatable(entityType.translationKey())
));
}

@EventHandler
Expand All @@ -82,8 +84,9 @@ public void onBlockPlace(BlockPlaceEvent event) {
spawner.setSpawnedType(entityType);
spawner.update();

event.getPlayer().sendActionBar(Component.text("Spawner à ", NamedTextColor.GREEN)
.append(Component.translatable(entityType.translationKey()))
.append(Component.text(" placé !")));
event.getPlayer().sendActionBar(TranslationManager.translation(
"feature.itemsadder.spawner_extractor.success_place",
Component.translatable(entityType.translationKey())
));
}
}
153 changes: 96 additions & 57 deletions src/main/java/fr/openmc/core/features/leaderboards/LeaderboardManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import fr.openmc.core.features.leaderboards.commands.LeaderboardCommands;
import fr.openmc.core.utils.cache.PlayerNameCache;
import fr.openmc.core.utils.text.DateUtils;
import fr.openmc.core.utils.text.messages.TranslationManager;
import fr.openmc.core.utils.world.entities.TextDisplay;
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
import lombok.Getter;
Expand Down Expand Up @@ -107,9 +108,10 @@ public Set<Object> getCommands() {
public static Component createContributorsTextLeaderboard() {
var contributorsMap = new TreeMap<>(LeaderboardManager.getGithubContributorsMap());
if (contributorsMap.isEmpty()) {
return Component.text("Aucun contributeur trouvé pour le moment.").color(NamedTextColor.RED);
return TranslationManager.translation("feature.leaderboards.empty.contributors")
.color(NamedTextColor.RED);
}
Component text = Component.text("--- Leaderboard des Contributeurs GitHub ---")
Component text = TranslationManager.translation("feature.leaderboards.header.contributors")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD);
for (var entry : contributorsMap.entrySet()) {
Expand All @@ -121,19 +123,24 @@ public static Component createContributorsTextLeaderboard() {

int addLines = stats.added();
int removeLines = stats.removed();
Component line = Component.text("\n#")
.color(getRankColor(rank))
.append(Component.text(rank).color(getRankColor(rank)))
.append(Component.text(" ").append(Component.text(contributorName).color(NamedTextColor.LIGHT_PURPLE)))
.append(Component.text(" + ").color(NamedTextColor.GREEN))
.append(Component.text(addLines).color(NamedTextColor.WHITE)
.append(Component.text(" - ").color(NamedTextColor.RED))
.append(Component.text(removeLines).color(NamedTextColor.WHITE)));
TextColor rankColor = getRankColor(rank);
Component rankComponent = Component.text("#")
.color(rankColor)
.append(Component.text(rank).color(rankColor));
Component line = Component.text("\n")
.append(TranslationManager.translation(
"feature.leaderboards.line.contributors",
rankComponent,
Component.text(contributorName).color(NamedTextColor.LIGHT_PURPLE),
Component.text(addLines).color(NamedTextColor.WHITE),
Component.text(removeLines).color(NamedTextColor.WHITE)
));
text = text.append(line);
}
text = text.append(Component.text("\n-----------------------------------------")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD));
text = text.append(Component.text("\n")
.append(TranslationManager.translation("feature.leaderboards.footer")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD)));
return text;
}

Expand All @@ -145,9 +152,10 @@ public static Component createContributorsTextLeaderboard() {
public static Component createMoneyTextLeaderboard() {
var moneyMap = new TreeMap<>(LeaderboardManager.getPlayerMoneyMap());
if (moneyMap.isEmpty()) {
return Component.text("Aucun joueur trouvé pour le moment.").color(NamedTextColor.RED);
return TranslationManager.translation("feature.leaderboards.empty.players")
.color(NamedTextColor.RED);
}
Component text = Component.text("--- Leaderboard de l'argent des joueurs ---")
Component text = TranslationManager.translation("feature.leaderboards.header.money")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD);
for (var entry : moneyMap.entrySet()) {
Expand All @@ -157,17 +165,25 @@ public static Component createMoneyTextLeaderboard() {

if (playerName == null || money == null) continue;

Component line = Component.text("\n#")
.color(getRankColor(rank))
.append(Component.text(rank).color(getRankColor(rank)))
.append(Component.text(" ").append(Component.text(playerName).color(NamedTextColor.LIGHT_PURPLE)))
.append(Component.text(" - ").color(NamedTextColor.GRAY))
.append(Component.text(money + " " + EconomyManager.getEconomyIcon()).color(NamedTextColor.WHITE));
TextColor rankColor = getRankColor(rank);
Component rankComponent = Component.text("#")
.color(rankColor)
.append(Component.text(rank).color(rankColor));
Component valueComponent = Component.text(money + " " + EconomyManager.getEconomyIcon())
.color(NamedTextColor.WHITE);
Component line = Component.text("\n")
.append(TranslationManager.translation(
"feature.leaderboards.line.money",
rankComponent,
Component.text(playerName).color(NamedTextColor.LIGHT_PURPLE),
valueComponent
));
text = text.append(line);
}
text = text.append(Component.text("\n-----------------------------------------")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD));
text = text.append(Component.text("\n")
.append(TranslationManager.translation("feature.leaderboards.footer")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD)));
return text;
}

Expand All @@ -179,9 +195,10 @@ public static Component createMoneyTextLeaderboard() {
public static Component createCityMoneyTextLeaderboard() {
var moneyMap = LeaderboardManager.getVilleMoneyMap();
if (moneyMap.isEmpty()) {
return Component.text("Aucune ville trouvée pour le moment.").color(NamedTextColor.RED);
return TranslationManager.translation("feature.leaderboards.empty.cities")
.color(NamedTextColor.RED);
}
Component text = Component.text("--- Leaderboard de l'argent des villes ---")
Component text = TranslationManager.translation("feature.leaderboards.header.city_money")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD);
for (var entry : moneyMap.entrySet()) {
Expand All @@ -191,17 +208,25 @@ public static Component createCityMoneyTextLeaderboard() {

if (cityName == null || money == null) continue;

Component line = Component.text("\n#")
.color(getRankColor(rank))
.append(Component.text(rank).color(getRankColor(rank)))
.append(Component.text(" ").append(Component.text(cityName).color(NamedTextColor.LIGHT_PURPLE)))
.append(Component.text(" - ").color(NamedTextColor.GRAY))
.append(Component.text(money + " " + EconomyManager.getEconomyIcon()).color(NamedTextColor.WHITE));
TextColor rankColor = getRankColor(rank);
Component rankComponent = Component.text("#")
.color(rankColor)
.append(Component.text(rank).color(rankColor));
Component valueComponent = Component.text(money + " " + EconomyManager.getEconomyIcon())
.color(NamedTextColor.WHITE);
Component line = Component.text("\n")
.append(TranslationManager.translation(
"feature.leaderboards.line.city_money",
rankComponent,
Component.text(cityName).color(NamedTextColor.LIGHT_PURPLE),
valueComponent
));
text = text.append(line);
}
text = text.append(Component.text("\n-----------------------------------------")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD));
text = text.append(Component.text("\n")
.append(TranslationManager.translation("feature.leaderboards.footer")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD)));
return text;
}

Expand All @@ -213,9 +238,10 @@ public static Component createCityMoneyTextLeaderboard() {
public static Component createPlayTimeTextLeaderboard() {
var playtimeMap = new TreeMap<>(LeaderboardManager.getPlayTimeMap());
if (playtimeMap.isEmpty()) {
return Component.text("Aucun joueur trouvé pour le moment.").color(NamedTextColor.RED);
return TranslationManager.translation("feature.leaderboards.empty.players")
.color(NamedTextColor.RED);
}
Component text = Component.text("------- Leaderboard du temps de jeu -------")
Component text = TranslationManager.translation("feature.leaderboards.header.playtime")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD);
for (var entry : playtimeMap.entrySet()) {
Expand All @@ -225,26 +251,33 @@ public static Component createPlayTimeTextLeaderboard() {

if (playerName == null || time == null) continue;

Component line = Component.text("\n#")
.color(getRankColor(rank))
.append(Component.text(rank).color(getRankColor(rank)))
.append(Component.text(" ").append(Component.text(playerName).color(NamedTextColor.LIGHT_PURPLE)))
.append(Component.text(" - ").color(NamedTextColor.GRAY))
.append(Component.text(time).color(NamedTextColor.WHITE));
TextColor rankColor = getRankColor(rank);
Component rankComponent = Component.text("#")
.color(rankColor)
.append(Component.text(rank).color(rankColor));
Component line = Component.text("\n")
.append(TranslationManager.translation(
"feature.leaderboards.line.playtime",
rankComponent,
Component.text(playerName).color(NamedTextColor.LIGHT_PURPLE),
Component.text(time).color(NamedTextColor.WHITE)
));
text = text.append(line);
}
text = text.append(Component.text("\n-----------------------------------------")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD));
text = text.append(Component.text("\n")
.append(TranslationManager.translation("feature.leaderboards.footer")
.color(NamedTextColor.DARK_PURPLE)
.decorate(TextDecoration.BOLD)));
return text;
}

public static Component createPumpkinCountTextLeaderboard() {
var pumpkinCountMap = new TreeMap<>(LeaderboardManager.getPumpkinCountMap());
if (pumpkinCountMap.isEmpty()) {
return Component.text("Aucun joueur trouvé pour le moment.", NamedTextColor.RED);
return TranslationManager.translation("feature.leaderboards.empty.players")
.color(NamedTextColor.RED);
}
Component text = Component.text("--- Leaderboard des critrouilles ---")
Component text = TranslationManager.translation("feature.leaderboards.header.pumpkin")
.color(TextColor.color(156, 69, 26))
.decorate(TextDecoration.BOLD);
for (var entry : pumpkinCountMap.entrySet()) {
Expand All @@ -254,17 +287,23 @@ public static Component createPumpkinCountTextLeaderboard() {

if (playerName == null || pumpkinCount == null) continue;

Component line = Component.text("\n#")
.color(getRankColor(rank))
.append(Component.text(rank).color(getRankColor(rank)))
.append(Component.text(" ").append(Component.text(playerName).color(TextColor.color(255, 107, 37))))
.append(Component.text(" - ").color(NamedTextColor.GRAY))
.append(Component.text(pumpkinCount + " citrouilles").color(NamedTextColor.WHITE));
TextColor rankColor = getRankColor(rank);
Component rankComponent = Component.text("#")
.color(rankColor)
.append(Component.text(rank).color(rankColor));
Component line = Component.text("\n")
.append(TranslationManager.translation(
"feature.leaderboards.line.pumpkin",
rankComponent,
Component.text(playerName).color(TextColor.color(255, 107, 37)),
Component.text(pumpkinCount).color(NamedTextColor.WHITE)
));
text = text.append(line);
}
text = text.append(Component.text("\n-----------------------------------------")
.color(TextColor.color(156, 69, 26))
.decorate(TextDecoration.BOLD));
text = text.append(Component.text("\n")
.append(TranslationManager.translation("feature.leaderboards.footer")
.color(TextColor.color(156, 69, 26))
.decorate(TextDecoration.BOLD)));
return text;
}

Expand Down
Loading
Loading