Skip to content

Commit

Permalink
Force correct use of MinigameLangKey vs identifier
Browse files Browse the repository at this point in the history
  • Loading branch information
FireInstall committed Feb 27, 2024
1 parent 3424cb6 commit 3483a60
Show file tree
Hide file tree
Showing 250 changed files with 1,143 additions and 1,125 deletions.
64 changes: 32 additions & 32 deletions Minigames/src/main/java/au/com/mineauz/minigames/Events.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import au.com.mineauz.minigames.events.MinigameTimerTickEvent;
import au.com.mineauz.minigames.events.TimerExpireEvent;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MinigameLangKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgMiscLangKey;
import au.com.mineauz.minigames.minigame.Minigame;
import au.com.mineauz.minigames.objects.MinigamePlayer;
import au.com.mineauz.minigames.sounds.MGSounds;
Expand Down Expand Up @@ -97,7 +97,7 @@ private void runTimer() {

if (msgTimes.contains(timeLeft) && broadcastTime) {
PlayMGSound.playSound(minigame, MGSounds.TIMER_TICK.getSound());
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_TIMELEFT,
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_TIMELEFT,
Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(Duration.ofSeconds(timeLeft)))));
}

Expand Down
26 changes: 13 additions & 13 deletions Minigames/src/main/java/au/com/mineauz/minigames/MinigameUtils.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package au.com.mineauz.minigames;

import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MinigameLangKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgMiscLangKey;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.JoinConfiguration;
import net.kyori.adventure.text.minimessage.MiniMessage;
Expand Down Expand Up @@ -89,54 +89,54 @@ public static Component convertTime(Duration duration, boolean small) { //todo m

if (small) {
if (weeks != 0) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_WEEKS_SHORT,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_WEEKS_SHORT,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(weeks))));
}
if (days != 0) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_DAYS_SHORT,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_DAYS_SHORT,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(days))));
}
if (hours != 0) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_HOURS_SHORT,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_HOURS_SHORT,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(hours))));
}
if (minutes != 0) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_MINUTES_SHORT,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_MINUTES_SHORT,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(minutes))));
}

if (seconds != 0 || timeComponents.isEmpty()) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_SECONDS_SHORT,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_SECONDS_SHORT,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(seconds))));
}

return Component.join(JoinConfiguration.separator(Component.text(":")), timeComponents);
} else {
if (weeks != 0) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_WEEKS_LONG,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_WEEKS_LONG,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(weeks))));
}
if (days != 0) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_DAYS_LONG,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_DAYS_LONG,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(days))));
}
if (hours != 0) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_HOURS_LONG,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_HOURS_LONG,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(hours))));
}
if (minutes != 0) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_MINUTES_LONG,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_MINUTES_LONG,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(minutes))));
}
if (seconds != 0 || timeComponents.isEmpty()) {
timeComponents.add(MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_SECONDS_LONG,
timeComponents.add(MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_SECONDS_LONG,
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(seconds))));
}

Component lastTimeComponent = timeComponents.pop();
if (!timeComponents.isEmpty()) {
return Component.join(JoinConfiguration.commas(true), timeComponents).
appendSpace().append(MinigameMessageManager.getMgMessage(MinigameLangKey.AND)).appendSpace().
appendSpace().append(MinigameMessageManager.getMgMessage(MgMiscLangKey.AND)).appendSpace().
append(lastTimeComponent);
} else {
return lastTimeComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
import au.com.mineauz.minigames.gametypes.MinigameType;
import au.com.mineauz.minigames.gametypes.MultiplayerType;
import au.com.mineauz.minigames.gametypes.SingleplayerType;
import au.com.mineauz.minigames.managers.*;
import au.com.mineauz.minigames.managers.MinigameManager;
import au.com.mineauz.minigames.managers.MinigamePlayerManager;
import au.com.mineauz.minigames.managers.PlaceHolderManager;
import au.com.mineauz.minigames.managers.ResourcePackManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.mechanics.TreasureHuntMechanic;
import au.com.mineauz.minigames.minigame.Minigame;
import au.com.mineauz.minigames.minigame.modules.ModuleFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package au.com.mineauz.minigames;

import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.MinigamePlayerManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageType;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MinigameLangKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgMiscLangKey;
import au.com.mineauz.minigames.minigame.Minigame;
import au.com.mineauz.minigames.minigame.MinigameState;
import au.com.mineauz.minigames.minigame.modules.LobbySettingsModule;
Expand Down Expand Up @@ -66,7 +66,7 @@ private void doTimer() {
if (currentLobbyWaitTime != 0 && !paused) {
if (currentLobbyWaitTime == oLobbyWaitTime) {

MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_WAITINGFORPLAYERS,
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_STARTUP_WAITINGFORPLAYERS,
Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(Duration.ofSeconds(currentLobbyWaitTime)))),
MinigameMessageType.INFO);
allowInteraction(LobbySettingsModule.getMinigameModule(minigame).canInteractPlayerWait());
Expand All @@ -81,7 +81,7 @@ private void doTimer() {
//wait time done game will start.
if (startWaitTime == oStartWaitTime) {
minigame.setState(MinigameState.STARTING);
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_MINIGAMESTARTS),
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_STARTUP_MINIGAMESTARTS),
MinigameMessageType.INFO);

freezePlayers(!LobbySettingsModule.getMinigameModule(minigame).canMoveStartWait());
Expand All @@ -103,7 +103,7 @@ private void doTimer() {
}
} else if (currentLobbyWaitTime == 0 && startWaitTime == 0) {
//game should start...
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_GO),
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_STARTUP_GO),
MinigameMessageType.SUCCESS);
reclearInventories(minigame);
if (!LobbySettingsModule.getMinigameModule(minigame).isTeleportOnPlayerWait()) {
Expand Down Expand Up @@ -133,7 +133,7 @@ private void doTimer() {
if (minigame.getTimer() > 0) {
minigame.setMinigameTimer(new MinigameTimer(minigame, minigame.getTimer()));
MinigameMessageManager.sendMinigameMessage(minigame,
MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_TIMELEFT,
MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_TIMELEFT,
Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(Duration.ofSeconds(minigame.getTimer())))));
}

Expand Down Expand Up @@ -197,7 +197,7 @@ public void pauseTimer() {

public void pauseTimer(Component reason) {
paused = true;
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_PAUSED,
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_STARTUP_PAUSED,
Placeholder.component(MinigamePlaceHolderKey.TEXT.getKey(), reason)), MinigameMessageType.INFO);
}

Expand All @@ -210,7 +210,7 @@ public void removeTimer() {
public void resumeTimer() {
paused = false;
MinigameMessageManager.sendMinigameMessage(minigame,
MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_RESUMED), MinigameMessageType.INFO);
MinigameMessageManager.getMgMessage(MgMiscLangKey.TIME_STARTUP_RESUMED), MinigameMessageType.INFO);
}

public boolean isPaused() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package au.com.mineauz.minigames;

import au.com.mineauz.minigames.config.MinigameSave;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import org.bukkit.Location;
import org.bukkit.World;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import au.com.mineauz.minigames.backend.*;
import au.com.mineauz.minigames.backend.both.SQLExport;
import au.com.mineauz.minigames.backend.both.SQLImport;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.minigame.Minigame;
import au.com.mineauz.minigames.minigame.ScoreboardOrder;
import au.com.mineauz.minigames.objects.MinigamePlayer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import au.com.mineauz.minigames.backend.ConnectionHandler;
import au.com.mineauz.minigames.backend.StatementKey;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.minigame.Minigame;
import au.com.mineauz.minigames.minigame.ScoreboardOrder;
import au.com.mineauz.minigames.stats.MinigameStat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import au.com.mineauz.minigames.backend.ConnectionHandler;
import au.com.mineauz.minigames.backend.StatementKey;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.stats.MinigameStat;
import au.com.mineauz.minigames.stats.StatFormat;
import au.com.mineauz.minigames.stats.StatisticValueField;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import au.com.mineauz.minigames.backend.*;
import au.com.mineauz.minigames.backend.both.SQLExport;
import au.com.mineauz.minigames.backend.both.SQLImport;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.minigame.Minigame;
import au.com.mineauz.minigames.minigame.ScoreboardOrder;
import au.com.mineauz.minigames.objects.MinigamePlayer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import au.com.mineauz.minigames.backend.ConnectionHandler;
import au.com.mineauz.minigames.backend.StatementKey;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.minigame.Minigame;
import au.com.mineauz.minigames.minigame.ScoreboardOrder;
import au.com.mineauz.minigames.stats.MinigameStat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import au.com.mineauz.minigames.backend.ConnectionHandler;
import au.com.mineauz.minigames.backend.StatementKey;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.stats.MinigameStat;
import au.com.mineauz.minigames.stats.StatFormat;
import au.com.mineauz.minigames.stats.StatisticValueField;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import au.com.mineauz.minigames.Minigames;
import au.com.mineauz.minigames.backend.BackendManager;
import au.com.mineauz.minigames.backend.Notifier;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageType;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgCommandLangKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package au.com.mineauz.minigames.commands;

import au.com.mineauz.minigames.Minigames;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageType;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgCommandLangKey;
import au.com.mineauz.minigames.managers.language.langkeys.MinigameLangKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgMiscLangKey;
import au.com.mineauz.minigames.minigame.Minigame;
import au.com.mineauz.minigames.minigame.MinigameState;
import au.com.mineauz.minigames.recorder.RecorderData;
Expand Down Expand Up @@ -93,7 +93,7 @@ public boolean onCommand(@NotNull CommandSender sender,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()));
}
} else {
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MinigameLangKey.MINIGAME_ERROR_NOMINIGAME,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgMiscLangKey.MINIGAME_ERROR_NOMINIGAME,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), args[0]));
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import au.com.mineauz.minigames.Minigames;
import au.com.mineauz.minigames.commands.set.SetCommand;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageType;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgCommandLangKey;
import au.com.mineauz.minigames.managers.language.langkeys.MinigameLangKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgMiscLangKey;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import org.bukkit.command.Command;
Expand Down Expand Up @@ -136,7 +136,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
}
}
} else {
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MinigameLangKey.MINIGAME_ERROR_NOPERMISSION);
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgMiscLangKey.MINIGAME_ERROR_NOPERMISSION);
}
} else {
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAND_ERROR_SENDERNOTAPLAYER);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import au.com.mineauz.minigames.MinigameUtils;
import au.com.mineauz.minigames.gametypes.MinigameType;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageType;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgCommandLangKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package au.com.mineauz.minigames.commands;

import au.com.mineauz.minigames.Minigames;
import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageType;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgCommandLangKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package au.com.mineauz.minigames.commands;

import au.com.mineauz.minigames.managers.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageManager;
import au.com.mineauz.minigames.managers.language.MinigameMessageType;
import au.com.mineauz.minigames.managers.language.MinigamePlaceHolderKey;
import au.com.mineauz.minigames.managers.language.langkeys.MgCommandLangKey;
Expand Down
Loading

0 comments on commit 3483a60

Please sign in to comment.