From 4d01ccb06506d69f311f1a3d6dae435d050dc6c5 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Mon, 26 Sep 2022 23:52:24 +0200 Subject: [PATCH] Update Config.java --- api/src/main/java/com/alttd/chat/config/Config.java | 12 ++++++++++++ .../com/alttd/chat/listeners/PlayerListener.java | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java index 112fe17..d6a8f63 100755 --- a/api/src/main/java/com/alttd/chat/config/Config.java +++ b/api/src/main/java/com/alttd/chat/config/Config.java @@ -169,6 +169,7 @@ public final class Config { public static String MINIMIUMSTAFFRANK = "trainee"; public static String CONSOLENAME = "Console"; public static UUID CONSOLEUUID = UUID.randomUUID(); + public static int EMOTELIMIT = 3; private static void settings() { PREFIXGROUPS = getList("settings.prefix-groups", Lists.newArrayList("discord", "socialmedia", "eventteam", "eventleader", "youtube", "twitch", "developer")); @@ -179,6 +180,7 @@ public final class Config { CONSOLENAME = getString("settings.console-name", CONSOLENAME); CONSOLEUUID = UUID.fromString(getString("settings.console-uuid", CONSOLEUUID.toString())); MINIMIUMSTAFFRANK = getString("settings.minimum-staff-rank", MINIMIUMSTAFFRANK); + EMOTELIMIT = getInt("settings.emote-limit", EMOTELIMIT); } public static List MESSAGECOMMANDALIASES = new ArrayList<>(); @@ -466,4 +468,14 @@ public final class Config { private static void loadMessages() { HELP_REPORT = getString("settings.mail.mail-sent", HELP_REPORT); } + + public static String EMOTELIST_HEADER = "Available Chat Emotes"; + public static String EMOTELIST_ITEM = "\"> : "; + public static String EMOTELIST_FOOTER = "----<< Prev / Next >>----"; + private static void emoteListCommand() { + EMOTELIST_HEADER = getString("commands.emotelist.header", EMOTELIST_HEADER); + EMOTELIST_ITEM = getString("commands.emotelist.item", EMOTELIST_ITEM); + EMOTELIST_FOOTER = getString("commands.emotelist.footer", EMOTELIST_FOOTER); + } + } diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java index 02a1f97..456d676 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java @@ -23,7 +23,9 @@ public class PlayerListener implements Listener { @EventHandler private void onPlayerLogin(PlayerJoinEvent event) { - UUID uuid = event.getPlayer().getUniqueId(); + Player player = event.getPlayer(); + GalaxyUtility.addAdditionalChatCompletions(player); + UUID uuid = player.getUniqueId(); Toggleable.disableToggles(uuid); ChatUser user = ChatUserManager.getChatUser(uuid); if(user != null) return;