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

- Added sounds to ChatManager and ServerTraveler - Also cooldown message is different now.

Browse Source
This commit is contained in:
Joel 2021-02-21 17:43:21 +01:00
parent f6fd0427a5
commit 09a4a6140f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package zone.themcgamer.core.chat; package zone.themcgamer.core.chat;
import com.cryptomorin.xseries.XSound;
import lombok.Getter; import lombok.Getter;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
@ -24,6 +25,7 @@ import zone.themcgamer.core.chat.command.message.MessageCommand;
import zone.themcgamer.core.chat.command.message.ReplyCommand; import zone.themcgamer.core.chat.command.message.ReplyCommand;
import zone.themcgamer.core.chat.component.IChatComponent; import zone.themcgamer.core.chat.component.IChatComponent;
import zone.themcgamer.core.common.Style; import zone.themcgamer.core.common.Style;
import zone.themcgamer.core.cooldown.Cooldown;
import zone.themcgamer.core.cooldown.CooldownHandler; import zone.themcgamer.core.cooldown.CooldownHandler;
import zone.themcgamer.core.module.Module; import zone.themcgamer.core.module.Module;
import zone.themcgamer.core.module.ModuleInfo; import zone.themcgamer.core.module.ModuleInfo;
@ -90,6 +92,7 @@ public class ChatManager extends Module {
Optional<Punishment> optionalMute = optionalBadSportClient.get().getMute(); Optional<Punishment> optionalMute = optionalBadSportClient.get().getMute();
if (optionalMute.isPresent()) { if (optionalMute.isPresent()) {
player.sendMessage(Style.error("Bad Sport", PunishmentCategory.format(optionalMute.get()))); player.sendMessage(Style.error("Bad Sport", PunishmentCategory.format(optionalMute.get())));
player.playSound(player.getLocation(), XSound.ENTITY_VILLAGER_NO.parseSound(),0.5f, 1f);
return; return;
} }
try { try {
@ -107,8 +110,10 @@ public class ChatManager extends Module {
} }
if (!CooldownHandler.canUse(player, "Chat", TimeUnit.SECONDS.toMillis(3L), false) if (!CooldownHandler.canUse(player, "Chat", TimeUnit.SECONDS.toMillis(3L), false)
&& !optionalAccount.get().hasRank(Rank.GAMER) && !optionalAccount.get().hasRank(Rank.HELPER)) { && !optionalAccount.get().hasRank(Rank.GAMER) && !optionalAccount.get().hasRank(Rank.HELPER)) {
player.sendMessage(Style.error("Chat", "You are chatting too quickly! To bypass this cooldown," + //TODO the actual cooldown in numbers.
" please consider purchasing a donator rank over at §bstore.mcgamerzone.net§7.")); player.sendMessage(Style.main("Chat", "You have to wait &63 &7more seconds in-order to chat!"));
player.sendMessage(Style.error("Chat", "This can be bypassed by " + Rank.GAMER.getPrefix() + " &7or &bhigher&7!"));
player.playSound(player.getLocation(), XSound.ENTITY_VILLAGER_NO.parseSound(),0.5f, 1f);
return; return;
} }
for (Map.Entry<String, String> emote : emotes.entrySet()) for (Map.Entry<String, String> emote : emotes.entrySet())

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

@ -136,6 +136,9 @@ public class ServerTraveler extends Module {
Style.color("&7Type: &6" + server.getGroup().getName()) Style.color("&7Type: &6" + server.getGroup().getName())
)).create())).create()); )).create())).create());
} }
try {
player.playSound(player.getEyeLocation(), XSound.ENTITY_ENDERMAN_TELEPORT.parseSound(), 0.9f, 1f);
} catch (NoClassDefFoundError ignored) {}
JedisCommandHandler.getInstance().send(new ServerSendCommand(player.getName(), server.getId())); JedisCommandHandler.getInstance().send(new ServerSendCommand(player.getName(), server.getId()));
} }
} }