Skip to content

Commit

Permalink
Better MessageType use
Browse files Browse the repository at this point in the history
Better MockSign
Make Flags - even as unused as they are - better distinguishable from ctf flags
  • Loading branch information
FireInstall committed Feb 27, 2024
1 parent abc53f7 commit a623492
Show file tree
Hide file tree
Showing 68 changed files with 193 additions and 310 deletions.
31 changes: 14 additions & 17 deletions Minigames/src/main/java/au/com/mineauz/minigames/Events.java
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public void playerInteract(@NotNull PlayerInteractEvent event) {

if (mgm != null && (!mgm.getUsePermissions() || event.getPlayer().hasPermission("minigame.join." + mgm.getName().toLowerCase()))) {
if (!mgm.isEnabled()) {
MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.INFO, MinigameLangKey.MINIGAME_ERROR_NOTENABLED);
MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.ERROR, MinigameLangKey.MINIGAME_ERROR_NOTENABLED);
} else {
MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.NONE, MinigameLangKey.MINIGAME_INFO_HEADER);

Expand Down Expand Up @@ -372,14 +372,20 @@ public void playerInteract(@NotNull PlayerInteractEvent event) {
event.setCancelled(true);
}
} else {
checkTool(tool, mgPlayer);
if (tool.getMode() != null && tool.getMinigame() != null) {
Minigame mg = tool.getMinigame();
if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
tool.getMode().onRightClick(mgPlayer, mg, TeamsModule.getMinigameModule(mg).getTeam(tool.getTeamColor()), event);
} else if (event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK) {
tool.getMode().onLeftClick(mgPlayer, mg, TeamsModule.getMinigameModule(mg).getTeam(tool.getTeamColor()), event);
if (tool.getMinigame() != null) {
if (tool.getMode() != null) {
Minigame mg = tool.getMinigame();

if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
tool.getMode().onRightClick(mgPlayer, mg, TeamsModule.getMinigameModule(mg).getTeam(tool.getTeamColor()), event);
} else if (event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK) {
tool.getMode().onLeftClick(mgPlayer, mg, TeamsModule.getMinigameModule(mg).getTeam(tool.getTeamColor()), event);
}
} else {
MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.ERROR, MinigameLangKey.TOOL_ERROR_NOMODE);
}
} else {
MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.ERROR, MinigameLangKey.TOOL_ERROR_NOMINIGAME);
}
}
}
Expand Down Expand Up @@ -532,15 +538,6 @@ private void playerRightClickEntity(@NotNull PlayerInteractEntityEvent event) {
}
}

private void checkTool(@NotNull MinigameTool tool, @NotNull MinigamePlayer mgPlayer) {
if (tool.getMinigame() == null) {
MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.INFO, MinigameLangKey.TOOL_ERROR_NOMINIGAME);
}
if (tool.getMode() == null) {
MinigameMessageManager.sendMgMessage(mgPlayer, MinigameMessageType.INFO, MinigameLangKey.TOOL_ERROR_NOMODE);
}
}

@EventHandler(ignoreCancelled = true)
private void playerShoot(@NotNull ProjectileLaunchEvent event) {
if (event.getEntityType() == EntityType.SNOWBALL) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private void doTimer() {
} else if (currentLobbyWaitTime == 0 && startWaitTime == 0) {
//game should start...
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_GO),
MinigameMessageType.INFO);
MinigameMessageType.SUCCESS);
reclearInventories(minigame);
if (!LobbySettingsModule.getMinigameModule(minigame).isTeleportOnPlayerWait()) {
playerManager.balanceGame(minigame);
Expand Down Expand Up @@ -198,7 +198,8 @@ public void removeTimer() {

public void resumeTimer() {
paused = false;
MinigameMessageManager.sendMinigameMessage(minigame, MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_RESUMED), MinigameMessageType.INFO);
MinigameMessageManager.sendMinigameMessage(minigame,
MinigameMessageManager.getMgMessage(MinigameLangKey.TIME_STARTUP_RESUMED), MinigameMessageType.INFO);
}

public boolean isPaused() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
public class StoredPlayerCheckpoints {
private final String uuid;
private final Map<String, Location> checkpoints;
private final Map<String, List<String>> flags;
private final Map<String, List<String>> singlePlayerFlags;
private final Map<String, Long> storedTime;
private final Map<String, Integer> storedDeaths;
private final Map<String, Integer> storedReverts;
Expand All @@ -19,7 +19,7 @@ public class StoredPlayerCheckpoints {
public StoredPlayerCheckpoints(String uuid) {
this.uuid = uuid;
checkpoints = new HashMap<>();
flags = new HashMap<>();
singlePlayerFlags = new HashMap<>();
storedTime = new HashMap<>();
storedDeaths = new HashMap<>();
storedReverts = new HashMap<>();
Expand Down Expand Up @@ -57,20 +57,20 @@ public boolean hasNoCheckpoints() {
return checkpoints.isEmpty();
}

public boolean hasFlags(String minigame) {
return flags.containsKey(minigame);
public boolean hasSinglePlayerFlags(String minigame) {
return singlePlayerFlags.containsKey(minigame);
}

public void addFlags(String minigame, List<String> flagList) {
flags.put(minigame, new ArrayList<>(flagList));
public void addSinglePlayerFlags(String minigame, List<String> flagList) {
singlePlayerFlags.put(minigame, new ArrayList<>(flagList));
}

public List<String> getFlags(String minigame) {
return flags.get(minigame);
public List<String> getSinglePlayerFlags(String minigame) {
return singlePlayerFlags.get(minigame);
}

public void removeFlags(String minigame) {
flags.remove(minigame);
public void removeSinglePlayerFlags(String minigame) {
singlePlayerFlags.remove(minigame);
}

public void addTime(String minigame, long time) {
Expand Down Expand Up @@ -138,8 +138,8 @@ public void saveCheckpoints() {
save.getConfig().set(mgm + ".pitch", checkpoints.get(mgm).getPitch());
save.getConfig().set(mgm + ".world", checkpoints.get(mgm).getWorld().getName());

if (flags.containsKey(mgm))
save.getConfig().set(mgm + ".flags", getFlags(mgm));
if (singlePlayerFlags.containsKey(mgm))
save.getConfig().set(mgm + ".flags", getSinglePlayerFlags(mgm));

if (storedTime.containsKey(mgm))
save.getConfig().set(mgm + ".time", getTime(mgm));
Expand All @@ -157,7 +157,7 @@ public void saveCheckpoints() {
// Remove the checkpoint from memory, so it doesn't cause an error again
save.getConfig().set(mgm, null);
checkpoints.remove(mgm);
flags.remove(mgm);
singlePlayerFlags.remove(mgm);
storedTime.remove(mgm);
storedDeaths.remove(mgm);
storedReverts.remove(mgm);
Expand Down Expand Up @@ -209,7 +209,7 @@ public void loadCheckpoints() {
Minigames.getCmpnntLogger().error("", e);
}
if (save.getConfig().contains(mgm + ".flags")) {
flags.put(mgm, save.getConfig().getStringList(mgm + ".flags"));
singlePlayerFlags.put(mgm, save.getConfig().getStringList(mgm + ".flags"));
}

if (save.getConfig().contains(mgm + ".time")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull String @NotNull
type = MinigameType.SINGLEPLAYER;
}
Minigame mgm = new Minigame(mgmName, type, player.getLocation());
MinigameMessageManager.sendMgMessage(player, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_CREATE_SUCCESS,
MinigameMessageManager.sendMgMessage(player, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_CREATE_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), args[0]));
List<String> mgs;
if (PLUGIN.getConfig().contains("minigames")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public boolean onCommand(@NotNull CommandSender sender,
for (Minigame mg : minigames) {
mg.setEnabled(true);
}
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_ENABLEALL_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_ENABLEALL_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.NUMBER.getKey(), String.valueOf(minigames.size())));
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull String @NotNull
}
}

MinigameMessageManager.sendMessage(sender, MinigameMessageType.INFO, outputBuilder.build());
MinigameMessageManager.sendMessage(sender, MinigameMessageType.NONE, outputBuilder.build());
return true;
} else {
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAND_INFO_OUTPUT_NOMINIGAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull String @NotNull
if (bool != null) {
PLUGIN.getPlayerManager().setPartyMode(bool);

MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_PARTYMODE_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_PARTYMODE_SUCCESS,
Placeholder.component(MinigamePlaceHolderKey.STATE.getKey(), MinigameMessageManager.getMgMessage(
bool ? MgCommandLangKey.COMMAND_STATE_ENABLED : MgCommandLangKey.COMMAND_STATE_DISABLED)));
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public boolean onCommand(@NotNull CommandSender sender,
MgCommandLangKey.COMMAND_PLAYER_PLAYERINFO_PLAYTIME,
Placeholder.component(MinigamePlaceHolderKey.TIME.getKey(), MinigameUtils.convertTime(playTime))));

MinigameMessageManager.sendMessage(sender, MinigameMessageType.INFO, message.build());
MinigameMessageManager.sendMessage(sender, MinigameMessageType.NONE, message.build());
} else {
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAND_ERROR_NOTINMINIGAME_PLAYER,
Placeholder.component(MinigamePlaceHolderKey.PLAYER.getKey(), mgPlayer.displayName()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,16 @@ public boolean onCommand(final @NotNull CommandSender sender, @NotNull String @N
PLUGIN.getServer().getScheduler().runTaskLaterAsynchronously(PLUGIN, () -> {
if (newPack.isValid()) {
PLUGIN.getResourceManager().addResourcePack(newPack);
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_RESSOUCEPACK_ADDRESOURCE_SUCCESS);
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_RESSOUCEPACK_ADDRESOURCE_SUCCESS);
sendList(sender);
} else {
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_RESSOUCEPACK_ADDRESOURCE_ERROR_INVALID);
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAND_RESSOUCEPACK_ADDRESOURCE_ERROR_INVALID);
}
}, 100);
return true;

} catch (MalformedURLException e) {
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_RESSOUCEPACK_ADDRESOURCE_ERROR_BADURL);
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.ERROR, MgCommandLangKey.COMMAND_RESSOUCEPACK_ADDRESOURCE_ERROR_BADURL);
return false;
}
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ public boolean onCommand(@NotNull CommandSender sender,
if (minigame.getMpTimer().isPaused()) {
minigame.getMpTimer().resumeTimer();

MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_TOGGLETIMER_RESUME_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_TOGGLETIMER_RESUME_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()));
} else {
// message to players of Minigame
minigame.getMpTimer().pauseTimer(MinigameMessageManager.getMgMessage(MgCommandLangKey.COMMAND_TOGGLETIMER_PAUSE_MSG,
Placeholder.unparsed(MinigamePlaceHolderKey.PLAYER.getKey(), sender.getName())));
// message to sender
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_TOGGLETIMER_PAUSE_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_TOGGLETIMER_PAUSE_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()),
Placeholder.unparsed(MinigamePlaceHolderKey.TIME.getKey(), String.valueOf(minigame.getMpTimer().getPlayerWaitTimeLeft())));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
if (bool != null) {
minigame.setAllowEnderPearls(bool);

MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_SET_ALLOWENDERPERLS_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_SET_ALLOWENDERPERLS_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()),
Placeholder.component(MinigamePlaceHolderKey.STATE.getKey(), MinigameMessageManager.getMgMessage(
bool ? MgCommandLangKey.COMMAND_STATE_ENABLED : MgCommandLangKey.COMMAND_STATE_DISABLED)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
if (bool != null) {
minigame.setCanBlockBreak(bool);

MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_SET_BLOCKBREAK_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_SET_BLOCKBREAK_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()),
Placeholder.component(MinigamePlaceHolderKey.STATE.getKey(), MinigameMessageManager.getMgMessage(
bool ? MgCommandLangKey.COMMAND_STATE_ENABLED : MgCommandLangKey.COMMAND_STATE_DISABLED)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
if (bool != null) {
minigame.setCanBlockPlace(bool);

MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_SET_BLOCKPLACE_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_SET_BLOCKPLACE_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()),
Placeholder.component(MinigamePlaceHolderKey.STATE.getKey(), MinigameMessageManager.getMgMessage(
bool ? MgCommandLangKey.COMMAND_STATE_ENABLED : MgCommandLangKey.COMMAND_STATE_DISABLED)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
if (bool != null) {
minigame.setBlocksDrop(bool);

MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_SET_BLOCKSDROP_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_SET_BLOCKSDROP_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()),
Placeholder.component(MinigamePlaceHolderKey.STATE.getKey(), MinigameMessageManager.getMgMessage(
bool ? MgCommandLangKey.COMMAND_STATE_ENABLED : MgCommandLangKey.COMMAND_STATE_DISABLED)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga

if (teamColor != null) {
teamsModule.setDefaultWinner(teamColor);
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_SET_DEFAULTWINNER_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_SET_DEFAULTWINNER_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()),
Placeholder.component(MinigamePlaceHolderKey.TEAM.getKey(), teamColor.getCompName()));
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
Placeholder.component(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getDisplayName()));
} else {
minigame.setDisplayName(MiniMessage.miniMessage().deserialize(name));
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO, MgCommandLangKey.COMMAND_SET_DISPLAYNAME_SUCCESS,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS, MgCommandLangKey.COMMAND_SET_DISPLAYNAME_SUCCESS,
Placeholder.component(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getDisplayName()),
Placeholder.unparsed(MinigamePlaceHolderKey.TEXT.getKey(), name));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Minigame miniga
minigame.setDisplayScoreboard(bool);

if (bool) {
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.INFO,
MinigameMessageManager.sendMgMessage(sender, MinigameMessageType.SUCCESS,
MgCommandLangKey.COMMAND_SET_DISPLAYSCOREBOARD_SUCCESS,
Placeholder.unparsed(MinigamePlaceHolderKey.MINIGAME.getKey(), minigame.getName()));
} else {
Expand Down
Loading

0 comments on commit a623492

Please sign in to comment.