diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java index 48b83ccc..87efc110 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/competition/CompetitionGoal.java @@ -72,7 +72,7 @@ public final class CompetitionGoal { ); private static final CompetitionGoal[] values = new CompetitionGoal[] { - CATCH_AMOUNT, TOTAL_SCORE, MAX_SIZE, TOTAL_SIZE, RANDOM + CATCH_AMOUNT, TOTAL_SCORE, MAX_SIZE, MIN_SIZE, TOTAL_SIZE, RANDOM }; private static final Index index = Index.create(CompetitionGoal::key, values()); diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/competition/actionbar/ActionBarSender.java b/core/src/main/java/net/momirealms/customfishing/bukkit/competition/actionbar/ActionBarSender.java index 1dc3e3fa..d08c8a5f 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/competition/actionbar/ActionBarSender.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/competition/actionbar/ActionBarSender.java @@ -64,7 +64,9 @@ public class ActionBarSender { @SuppressWarnings("DuplicatedCode") private void updatePrivatePlaceholders() { - this.privateContext.arg(ContextKeys.SCORE_FORMATTED, String.format("%.2f", competition.getRanking().getPlayerScore(player.getName()))); + double score = competition.getRanking().getPlayerScore(player.getName()); + this.privateContext.arg(ContextKeys.SCORE_FORMATTED, String.format("%.2f", score)); + this.privateContext.arg(ContextKeys.SCORE, score); int rank = competition.getRanking().getPlayerRank(player.getName()); this.privateContext.arg(ContextKeys.RANK, rank != -1 ? String.valueOf(rank) : TranslationManager.miniMessageTranslation(MessageConstants.COMPETITION_NO_RANK.build().key())); this.privateContext.combine(competition.getPublicContext()); diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/competition/bossbar/BossBarSender.java b/core/src/main/java/net/momirealms/customfishing/bukkit/competition/bossbar/BossBarSender.java index c6489877..0fdd44a9 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/competition/bossbar/BossBarSender.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/competition/bossbar/BossBarSender.java @@ -74,7 +74,9 @@ public class BossBarSender { @SuppressWarnings("DuplicatedCode") private void updatePrivatePlaceholders() { - this.privateContext.arg(ContextKeys.SCORE_FORMATTED, String.format("%.2f", competition.getRanking().getPlayerScore(player.getName()))); + double score = competition.getRanking().getPlayerScore(player.getName()); + this.privateContext.arg(ContextKeys.SCORE_FORMATTED, String.format("%.2f", score)); + this.privateContext.arg(ContextKeys.SCORE, score); int rank = competition.getRanking().getPlayerRank(player.getName()); this.privateContext.arg(ContextKeys.RANK, rank != -1 ? String.valueOf(rank) : TranslationManager.miniMessageTranslation(MessageConstants.COMPETITION_NO_RANK.build().key())); this.privateContext.combine(competition.getPublicContext()); diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/migration/Migration.java b/core/src/main/java/net/momirealms/customfishing/bukkit/migration/Migration.java index 018e2a5d..780d530a 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/migration/Migration.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/migration/Migration.java @@ -107,6 +107,7 @@ public class Migration { try (BufferedWriter writer = new BufferedWriter( new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8))) { writer.write(sb.toString() + .replace("{score}", "{score_formatted}") .replace("{size}", "{size_formatted}") .replace("{SIZE}", "{size}") .replace("{price}", "{price_formatted}")