diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java index aa6a7a113..02937ed2f 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java @@ -9,32 +9,32 @@ import mineplex.core.common.util.UtilPlayer; public enum Rank { //Staff - LT("Leader", ChatColor.GOLD, "Leaders are in charge of special teams\nsuch as the whole staff team or the support!"), - OWNER("Owner", ChatColor.GOLD, "Owners are the Founders of Mineplex\nand they all manage different parts of it!"), - DEVELOPER("Dev", ChatColor.GOLD, "Developers make new games,\nand new features for you to enjoy"), - ADMIN("Admin", ChatColor.GOLD, "Administrators have their own\nSenior Moderator team that they lead!"), - JNR_DEV("Jr.Dev", ChatColor.GOLD, "Junior Developers make new games,\nand new features for you to enjoy"), - SUPPORT("Support", ChatColor.BLUE, "Support Agents take care of all the tickets\nthat get sent to mineplex.com/support"), - CMOD("C.Mod", ChatColor.GOLD, "Clan Moderators are Senior Moderators in\nthe Clans Management team.\nThey mainly moderate only the Clans servers.\nThey are around to help you with any problems on Clans servers."), - SNR_MODERATOR("Sr.Mod", ChatColor.GOLD, "Senior Moderators are in a special\nSenior Moderator team where they have to fulfill team tasks.\nThey are similar to Moderators who you can always ask for help!\nIf you have any questions, just message them using /a"), - MODERATOR("Mod", ChatColor.GOLD, "Moderators are here to moderate\nand help players with any concerns they have.\nIf you have any questions, just message them using /a"), - HELPER("Trainee", ChatColor.DARK_AQUA, "Trainees are staff in training,\nand are here to help players and moderate!\nIf you have any questions, just message them using /a"), - MAPLEAD("MapLead", ChatColor.BLUE, "Leader of the Official Build team"), - MAPDEV("Builder", ChatColor.BLUE, "Official Mineplex Map Builders"), - MEDIA("Media", ChatColor.BLUE, "Official Mineplex Artist and/or Designer"), + LT("Leader", ChatColor.GOLD, "Leaders manage the operation of their respective team or projects. They usually operate on affairs within the staff, development, or management team."), + OWNER("Owner", ChatColor.GOLD, "Owners are the founders of Mineplex. Each owner manages a different aspect of the server and ensures its efficient operation."), + DEVELOPER("Dev", ChatColor.GOLD, "Developers work behind the scenes to create new games and features, and fix bugs to give the best experience."), + ADMIN("Admin", ChatColor.GOLD, "An Administrator’s role is to manage their respective Senior Moderator team and all moderators within it."), + JNR_DEV("Jr.Dev", ChatColor.GOLD, "Junior Developers work behind the scenes to create new games and features, and fix bugs to give the best experience."), + SUPPORT("Support", ChatColor.BLUE, "Support agents handle tickets and provide customer service."), + CMOD("C.Mod", ChatColor.GOLD, "Clans Moderators are members of the Clans Management Senior Mod team. Their duties include moderation and support within the Clans servers. For assistance, contact them using /a ."), + SNR_MODERATOR("Sr.Mod", ChatColor.GOLD, "Senior Moderators are members of a special Senior Moderator team where they have to fulfill specific tasks. Just like Moderators, you can always ask them for help. For assistance, contact them using /a ."), + MODERATOR("Mod", ChatColor.GOLD, "Moderators enforce rules and provide help to anyone with questions or concerns. For assistance, contact them using /a ."), + HELPER("Trainee", ChatColor.DARK_AQUA, "Trainees are moderators-in-training. Their duties include enforcing the rules and providing help to anyone with questions or concerns. For assistance, contact them using /a ."), + MAPLEAD("MapLead", ChatColor.BLUE, "Map Leaders are leaders of the Mineplex Build Team. They oversee the creation of new maps and manage Builders."), + MAPDEV("Builder", ChatColor.BLUE, "Builders are members of the Mineplex Build Team. They create many of the maps used across Mineplex."), + MEDIA("Media", ChatColor.BLUE, "The Media rank is given to talented artists who are endorsed to create content for Mineplex."), - EVENT("Event", ChatColor.WHITE, "???"), + EVENT("Event", ChatColor.WHITE, "A member of the official Mineplex Events team!"), //Media - YOUTUBE("YouTube", ChatColor.RED, "Official Mineplex Youtuber"), - YOUTUBE_SMALL("YT", ChatColor.DARK_PURPLE, "Youtube Content Creators"), - TWITCH("Twitch", ChatColor.DARK_PURPLE, "Official Twitch Live Streamer"), + YOUTUBE("YouTube", ChatColor.RED, "A YouTuber who creates content for or related to Mineplex."), + YOUTUBE_SMALL("YT", ChatColor.DARK_PURPLE, "A YouTuber who creates content for or related to Mineplex. They have fewer subscribers than full YouTubers."), + TWITCH("Twitch", ChatColor.DARK_PURPLE, "A Twitch streamer who often features Mineplex in their streams."), //Player - TITAN("Titan", ChatColor.RED, true, "Mineplex's fourth premium rank\nBuy Titan at mineplex.com/shop"), - LEGEND("Legend", ChatColor.GREEN, true, "Mineplex's third premium rank\nBuy Legend at mineplex.com/shop"), - HERO("Hero", ChatColor.LIGHT_PURPLE, true, "Mineplex's second premium rank\nBuy Hero at mineplex.com/shop"), - ULTRA("Ultra", ChatColor.AQUA, true, "Mineplex's first premium rank\nBuy Ultra at mineplex.com/shop"), + TITAN("Titan", ChatColor.RED, true, "Ancient myths spoke of a gigantic being with immense power... Purchase Titan at www.mineplex.com/shop"), + LEGEND("Legend", ChatColor.GREEN, true, "Mineplex's third premium rank. Purchase Legend at www.mineplex.com/shop"), + HERO("Hero", ChatColor.LIGHT_PURPLE, true, "There are many stories of a valiant Hero who was brave enough to tame the most fearsome dragon in the land."), + ULTRA("Ultra", ChatColor.AQUA, true, "Mineplex's first premium rank. Purchase Ultra at www.mineplex.com/shop"), ALL("", ChatColor.WHITE, null); private ChatColor _color; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java index c9a93bff2..6525dd403 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java @@ -2,29 +2,21 @@ package nautilus.game.arcade.managers.chat; import java.text.DecimalFormat; import java.util.AbstractMap; -import java.util.Arrays; import java.util.Collection; -import java.util.HashMap; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.Map; import org.bukkit.ChatColor; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import org.bukkit.event.player.PlayerItemConsumeEvent; -import net.minecraft.server.v1_8_R3.IChatBaseComponent; import net.minecraft.server.v1_8_R3.PacketPlayOutChat; -import com.google.gson.stream.MalformedJsonException; import mineplex.core.account.CoreClient; import mineplex.core.common.Rank; -import mineplex.core.common.jsonchat.ChildJsonMessage; import mineplex.core.common.jsonchat.JsonMessage; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -34,9 +26,6 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.GameTeam; -import nautilus.game.arcade.managers.chat.ChatStatData; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; import org.jooq.tools.json.JSONObject; public class GameChatManager implements Listener