Fascinated/McGamerZone
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Recolored some messages, to the original mcgamerzone style.

Browse Source
This commit is contained in:
Joel 2021-05-24 22:13:52 +02:00
parent ce4a6f759f
commit 5911394e76
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/zone/themcgamer/core/account/AccountManager.java
View File

@ -111,7 +111,7 @@ public class AccountManager extends Module {
Rank finalRank = rank;
fromCache(player.getUniqueId()).ifPresent(account -> account.setPrimaryRank(finalRank));
nametagManager.setNametag(player, rank.getNametag(), null, rank.ordinal() + 1);
player.sendMessage(Style.main("Rank", "Your rank was updated to §f" + accountRankSetCommand.getRankDisplayName()));
player.sendMessage(Style.main("Rank", "Your rank was updated to §b" + accountRankSetCommand.getRankDisplayName()));
}
} else if (jedisCommand instanceof AccountRankClearCommand) {
AccountRankClearCommand accountRankClearCommand = (AccountRankClearCommand) jedisCommand;
@ -142,7 +142,7 @@ public class AccountManager extends Module {
if (account.isEmpty() || (!account.get().hasRank(Rank.HELPER)))
continue;
String format = staffChatCommand.getPrefix() +
" &7" + staffChatCommand.getUsername() + " &8» &f" + staffChatCommand.getMessage();
" &7" + staffChatCommand.getUsername() + " &8» &b" + staffChatCommand.getMessage();
player.sendMessage(Style.main(staffChatCommand.getServer(), format));
}
} else if (jedisCommand instanceof PlayerDirectMessageEvent) {

4
core/src/main/java/zone/themcgamer/core/chat/ChatManager.java
View File

@ -115,8 +115,8 @@ public class ChatManager extends Module {
Cooldown cooldown = CooldownHandler.getCooldown(player, "Chat");
if (cooldown == null)
return;
player.sendMessage(Style.main("Chat", "You have to wait &6" + TimeUtils.convertString(cooldown.getRemaining()) + " &7to chat!"));
player.sendMessage(Style.main("Chat", "This can be bypassed by " + Rank.GAMER.getPrefix() + " &7or &bhigher&7!"));
player.sendMessage(Style.main("Chat", "You have to wait &b" + TimeUtils.convertString(cooldown.getRemaining()) + " &7to chat!"));
player.sendMessage(Style.main("Chat", "This can be bypassed by " + Rank.GAMER.getPrefix() + " &7or &chigher&7!"));
player.playSound(player.getLocation(), XSound.ENTITY_VILLAGER_NO.parseSound(),0.5f, 1f);
return;
}

4
core/src/main/java/zone/themcgamer/core/cooldown/CooldownHandler.java
View File

@ -35,7 +35,7 @@ public class CooldownHandler extends Module {
if (cooldown.getRemaining() > 0)
return false;
if (cooldown.isInform())
player.sendMessage(Style.main("Cooldown", "Your cooldown for §f" + cooldown.getName() + " §7has expired"));
player.sendMessage(Style.main("Cooldown", "Your cooldown for §b" + cooldown.getName() + " §7has expired"));
return true;
});
}
@ -53,7 +53,7 @@ public class CooldownHandler extends Module {
.findFirst();
if (optionalCooldown.isPresent()) {
if (inform) {
player.sendMessage(Style.error("Cooldown", "§f" + name + " §cis still on cooldown for another §f" +
player.sendMessage(Style.error("Cooldown", "§b" + name + " §cis still on cooldown for another §f" +
TimeUtils.convertString(optionalCooldown.get().getRemaining())));
}
return false;

2
core/src/main/java/zone/themcgamer/core/server/ServerManager.java
View File

@ -42,7 +42,7 @@ public class ServerManager extends Module {
if (!((ServerRestartCommand) jedisCommand).getServerId().equals(minecraftServer.getId()))
return;
try {
traveler.sendAll("Hub", "&6" + minecraftServer.getName() + " &7is restarting");
traveler.sendAll("Hub", "&b" + minecraftServer.getName() + " &7is restarting");
} catch (IllegalArgumentException ignored) {}
Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), () ->
minecraftServer.setState(ServerState.RESTARTING), 10L);

4
core/src/main/java/zone/themcgamer/core/traveler/ServerTraveler.java
View File

@ -68,7 +68,7 @@ public class ServerTraveler extends Module {
public void sendAll(String server, String reason, boolean inform) {
if (reason != null) {
Bukkit.broadcastMessage("");
Bukkit.broadcastMessage(Style.color(" &c➢ &7" + reason));
Bukkit.broadcastMessage(Style.color(" &c➢ &b" + reason));
Bukkit.broadcastMessage("");
}
for (Player player : Bukkit.getOnlinePlayers()) {
@ -137,7 +137,7 @@ public class ServerTraveler extends Module {
if (MGZPlugin.getMinecraftServer().equals(server))
throw new IllegalArgumentException("Player is already connected");
if (inform) {
player.sendMessage(new ComponentBuilder(Style.main("Traveler", "Connecting to &6" + server.getName()))
player.sendMessage(new ComponentBuilder(Style.main("Traveler", "Connecting to &b" + server.getName()))
.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(MiscUtils.arrayToString(
Style.color("&7Server Id: &6" + server.getId()),
Style.color("&7Type: &6" + server.getGroup().getName())

2
core/src/main/java/zone/themcgamer/core/update/ServerUpdater.java
View File

@ -92,7 +92,7 @@ public class ServerUpdater extends Module {
private void update() {
MinecraftServer minecraftServer = MGZPlugin.getMinecraftServer();
try {
traveler.sendAll("Hub", "&6" + minecraftServer.getName() + " &7is being updated");
traveler.sendAll("Hub", "&b" + minecraftServer.getName() + " &7is being updated");
} catch (IllegalArgumentException ignored) {}
Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), () -> minecraftServer.setState(ServerState.UPDATING), 10L);
Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), Bukkit::shutdown, 40L);

1
core/src/main/java/zone/themcgamer/core/world/WorldCategory.java
View File

@ -15,6 +15,7 @@ public enum WorldCategory {
THE_BRIDGE("The Bridge", XMaterial.END_STONE),
DISASTERS("Disasters", XMaterial.LAVA_BUCKET),
CHAOSPVP("Chaospvp", XMaterial.IRON_SWORD),
TNT_WARS("TnT Wars", XMaterial.TNT),
SKYBLOCK("Skyblock", XMaterial.GRASS_BLOCK),
PRISON("Prison", XMaterial.IRON_BARS),