Compare commits
2 Commits
5a508fdf28
...
8546bda28a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8546bda28a | ||
|
|
28894ef245 |
|
|
@ -38,9 +38,9 @@ public final class Config {
|
||||||
CONFIGPATH = new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "ChatPlugin");
|
CONFIGPATH = new File(File.separator + "mnt" + File.separator + "configs" + File.separator + "ChatPlugin");
|
||||||
CONFIG_FILE = new File(CONFIGPATH, "config.yml");
|
CONFIG_FILE = new File(CONFIGPATH, "config.yml");
|
||||||
configLoader = YamlConfigurationLoader.builder()
|
configLoader = YamlConfigurationLoader.builder()
|
||||||
.file(CONFIG_FILE)
|
.file(CONFIG_FILE)
|
||||||
.nodeStyle(NodeStyle.BLOCK)
|
.nodeStyle(NodeStyle.BLOCK)
|
||||||
.build();
|
.build();
|
||||||
if (!CONFIG_FILE.getParentFile().exists()) {
|
if (!CONFIG_FILE.getParentFile().exists()) {
|
||||||
if (!CONFIG_FILE.getParentFile().mkdirs()) {
|
if (!CONFIG_FILE.getParentFile().mkdirs()) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -183,11 +183,15 @@ public final class Config {
|
||||||
private static void settings() {
|
private static void settings() {
|
||||||
PREFIXGROUPS = getList("settings.prefix-groups",
|
PREFIXGROUPS = getList("settings.prefix-groups",
|
||||||
Lists.newArrayList("discord", "socialmedia", "eventteam", "eventleader", "youtube", "twitch",
|
Lists.newArrayList("discord", "socialmedia", "eventteam", "eventleader", "youtube", "twitch",
|
||||||
"developer"));
|
"developer"
|
||||||
|
)
|
||||||
|
);
|
||||||
CONFLICTINGPREFIXGROUPS = getList("settings.prefix-conflicts-groups",
|
CONFLICTINGPREFIXGROUPS = getList("settings.prefix-conflicts-groups",
|
||||||
Lists.newArrayList("eventteam", "eventleader"));
|
Lists.newArrayList("eventteam", "eventleader")
|
||||||
|
);
|
||||||
STAFFGROUPS = getList("settings.staff-groups",
|
STAFFGROUPS = getList("settings.staff-groups",
|
||||||
Lists.newArrayList("trainee", "moderator", "headmod", "admin", "manager", "owner"));
|
Lists.newArrayList("trainee", "moderator", "headmod", "admin", "manager", "owner")
|
||||||
|
);
|
||||||
CONSOLENAME = getString("settings.console-name", CONSOLENAME);
|
CONSOLENAME = getString("settings.console-name", CONSOLENAME);
|
||||||
CONSOLEUUID = UUID.fromString(getString("settings.console-uuid", CONSOLEUUID.toString()));
|
CONSOLEUUID = UUID.fromString(getString("settings.console-uuid", CONSOLEUUID.toString()));
|
||||||
MINIMIUMSTAFFRANK = getString("settings.minimum-staff-rank", MINIMIUMSTAFFRANK);
|
MINIMIUMSTAFFRANK = getString("settings.minimum-staff-rank", MINIMIUMSTAFFRANK);
|
||||||
|
|
@ -282,7 +286,7 @@ public final class Config {
|
||||||
public static String NO_PERMISSION = "<red>You don't have permission to use this command.</red>";
|
public static String NO_PERMISSION = "<red>You don't have permission to use this command.</red>";
|
||||||
public static String NO_CONSOLE = "<red>This command can not be used by console</red>";
|
public static String NO_CONSOLE = "<red>This command can not be used by console</red>";
|
||||||
public static String CREATED_PARTY = "<green>You created a chat party called: " +
|
public static String CREATED_PARTY = "<green>You created a chat party called: " +
|
||||||
"'<gold><party_name></gold>' with the password: '<gold><party_password></gold>'</green>";
|
"'<gold><party_name></gold>' with the password: '<gold><party_password></gold>'</green>";
|
||||||
public static String NOT_IN_A_PARTY = "<red>You're not in a chat party.</red>";
|
public static String NOT_IN_A_PARTY = "<red>You're not in a chat party.</red>";
|
||||||
public static String NOT_YOUR_PARTY = "<red>You don't own this chat party.</red>";
|
public static String NOT_YOUR_PARTY = "<red>You don't own this chat party.</red>";
|
||||||
public static String NOT_A_PARTY = "<red>This chat party does not exist.</red>";
|
public static String NOT_A_PARTY = "<red>This chat party does not exist.</red>";
|
||||||
|
|
@ -307,14 +311,14 @@ public final class Config {
|
||||||
public static String ALREADY_IN_THIS_PARTY = "<red>You're already in <party>!</red>";
|
public static String ALREADY_IN_THIS_PARTY = "<red>You're already in <party>!</red>";
|
||||||
public static String SENT_PARTY_INV = "<green>You send a chat party invite to <player>!</green>";
|
public static String SENT_PARTY_INV = "<green>You send a chat party invite to <player>!</green>";
|
||||||
public static String JOIN_PARTY_CLICK_MESSAGE = "<click:run_command:'/party join <party> <party_password>'>" +
|
public static String JOIN_PARTY_CLICK_MESSAGE = "<click:run_command:'/party join <party> <party_password>'>" +
|
||||||
"<dark_aqua>You received an invite to join <party>, click this message to accept.</dark_aqua></click>";
|
"<dark_aqua>You received an invite to join <party>, click this message to accept.</dark_aqua></click>";
|
||||||
public static String PARTY_MEMBER_LOGGED_ON = "<dark_aqua>[ChatParty] <player> joined Altitude...</dark_aqua>";
|
public static String PARTY_MEMBER_LOGGED_ON = "<dark_aqua>[ChatParty] <player> joined Altitude...</dark_aqua>";
|
||||||
public static String PARTY_MEMBER_LOGGED_OFF = "<dark_aqua>[ChatParty] <player> left Altitude...</dark_aqua>";
|
public static String PARTY_MEMBER_LOGGED_OFF = "<dark_aqua>[ChatParty] <player> left Altitude...</dark_aqua>";
|
||||||
public static String RENAMED_PARTY =
|
public static String RENAMED_PARTY =
|
||||||
"<dark_aqua>[ChatParty] <owner> changed the party name from <old_name> to <new_name>!</dark_aqua>";
|
"<dark_aqua>[ChatParty] <owner> changed the party name from <old_name> to <new_name>!</dark_aqua>";
|
||||||
public static String CHANGED_PASSWORD = "<green>Password was set to <password></green>";
|
public static String CHANGED_PASSWORD = "<green>Password was set to <password></green>";
|
||||||
public static String DISBAND_PARTY_CONFIRM = "<green><bold>Are you sure you want to disband your party?</bold> " +
|
public static String DISBAND_PARTY_CONFIRM = "<green><bold>Are you sure you want to disband your party?</bold> " +
|
||||||
"Type <gold>/party disband confirm <party></gold> to confirm.";
|
"Type <gold>/party disband confirm <party></gold> to confirm.";
|
||||||
public static String DISBANDED_PARTY =
|
public static String DISBANDED_PARTY =
|
||||||
"<dark_aqua>[ChatParty] <owner> has disbanded <party>, everyone has been removed.</dark_aqua>";
|
"<dark_aqua>[ChatParty] <owner> has disbanded <party>, everyone has been removed.</dark_aqua>";
|
||||||
public static String PARTY_INFO = """
|
public static String PARTY_INFO = """
|
||||||
|
|
@ -413,7 +417,8 @@ public final class Config {
|
||||||
ConfigurationNode node = getNode("chat-channels");
|
ConfigurationNode node = getNode("chat-channels");
|
||||||
if (node.empty()) {
|
if (node.empty()) {
|
||||||
getString("chat-channels.ac.format",
|
getString("chat-channels.ac.format",
|
||||||
"<white><gray><sender></gray> <hover:show_text:on <server>><yellow>to <channel></yellow></hover><gray>: <message>");
|
"<white><gray><sender></gray> <hover:show_text:on <server>><yellow>to <channel></yellow></hover><gray>: <message>"
|
||||||
|
);
|
||||||
getList("chat-channels.ac.servers", List.of("lobby"));
|
getList("chat-channels.ac.servers", List.of("lobby"));
|
||||||
getBoolean("chat-channels.ac.proxy", false);
|
getBoolean("chat-channels.ac.proxy", false);
|
||||||
node = getNode("chat-channels");
|
node = getNode("chat-channels");
|
||||||
|
|
@ -617,11 +622,15 @@ public final class Config {
|
||||||
NICK_WAIT_TIME = getLong("nicknames.wait-time", NICK_WAIT_TIME);
|
NICK_WAIT_TIME = getLong("nicknames.wait-time", NICK_WAIT_TIME);
|
||||||
NICK_ITEM_LORE = getList("nicknames.item-lore",
|
NICK_ITEM_LORE = getList("nicknames.item-lore",
|
||||||
List.of("<aqua>New nick: <newnick>", "<aqua>Old nick: <oldnick>", "<aqua>Last changed: <lastchanged>",
|
List.of("<aqua>New nick: <newnick>", "<aqua>Old nick: <oldnick>", "<aqua>Last changed: <lastchanged>",
|
||||||
"<green>Left click to Accept <light_purple>| <red>Right click to Deny"));
|
"<green>Left click to Accept <light_purple>| <red>Right click to Deny"
|
||||||
|
)
|
||||||
|
);
|
||||||
NICK_BLOCKED_COLOR_CODESLIST = getList("nicknames.blocked-color-codes", List.of("&k", "&l", "&n", "&m", "&o"));
|
NICK_BLOCKED_COLOR_CODESLIST = getList("nicknames.blocked-color-codes", List.of("&k", "&l", "&n", "&m", "&o"));
|
||||||
NICK_ALLOWED_COLOR_CODESLIST = getList("nicknames.allowed-color-codes",
|
NICK_ALLOWED_COLOR_CODESLIST = getList("nicknames.allowed-color-codes",
|
||||||
List.of("&0", "&1", "&2", "&3", "&4", "&5", "&6", "&7", "&8", "&9", "&a", "&b", "&c", "&d", "&e", "&f",
|
List.of("&0", "&1", "&2", "&3", "&4", "&5", "&6", "&7", "&8", "&9", "&a", "&b", "&c", "&d", "&e", "&f",
|
||||||
"&r"));
|
"&r"
|
||||||
|
)
|
||||||
|
);
|
||||||
NICK_CURRENT = getString("nicknames.messages.nick-current", NICK_CURRENT);
|
NICK_CURRENT = getString("nicknames.messages.nick-current", NICK_CURRENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -641,4 +650,10 @@ public final class Config {
|
||||||
CHAT_LOG_DELETE_OLDER_THAN_DAYS = getLong("chat-log.delete-older-than-days", CHAT_LOG_DELETE_OLDER_THAN_DAYS);
|
CHAT_LOG_DELETE_OLDER_THAN_DAYS = getLong("chat-log.delete-older-than-days", CHAT_LOG_DELETE_OLDER_THAN_DAYS);
|
||||||
CHAT_LOG_SAVE_DELAY_MINUTES = getLong("chat-log.save-delay-minutes", CHAT_LOG_SAVE_DELAY_MINUTES);
|
CHAT_LOG_SAVE_DELAY_MINUTES = getLong("chat-log.save-delay-minutes", CHAT_LOG_SAVE_DELAY_MINUTES);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String CHAT_WEB_SERVER_BASE_URL = "http://10.0.0.121:8080";
|
||||||
|
|
||||||
|
private static void webServerSettings() {
|
||||||
|
CHAT_WEB_SERVER_BASE_URL = getString("web-server.base-url", CHAT_WEB_SERVER_BASE_URL);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import com.alttd.altitudeweb.api.ChatApi;
|
||||||
import com.alttd.altitudeweb.invoker.ApiClient;
|
import com.alttd.altitudeweb.invoker.ApiClient;
|
||||||
import com.alttd.altitudeweb.invoker.ApiException;
|
import com.alttd.altitudeweb.invoker.ApiException;
|
||||||
import com.alttd.altitudeweb.model.ChatMessageDto;
|
import com.alttd.altitudeweb.model.ChatMessageDto;
|
||||||
|
import com.alttd.chat.config.Config;
|
||||||
import com.alttd.chat.util.ALogger;
|
import com.alttd.chat.util.ALogger;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
@ -27,7 +28,7 @@ public class ChatLogWebHandler {
|
||||||
|
|
||||||
public ChatLogWebHandler() {
|
public ChatLogWebHandler() {
|
||||||
ApiClient apiClient = new ApiClient();
|
ApiClient apiClient = new ApiClient();
|
||||||
apiClient.setBasePath("http://10.0.0.109");
|
apiClient.setBasePath(Config.CHAT_WEB_SERVER_BASE_URL);
|
||||||
|
|
||||||
chatApi = new ChatApi(apiClient);
|
chatApi = new ChatApi(apiClient);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user