From 1fd5b38499f0e793c3a96e6f2e94c72faa2cab4b Mon Sep 17 00:00:00 2001 From: Jaime Martinez Rincon Date: Fri, 21 Apr 2017 15:58:54 +0200 Subject: [PATCH] Some things I have missed --- .../me/jaimemartz/lobbybalancer/LobbyBalancer.java | 10 ++++++---- .../lobbybalancer/configuration/ConfigEntries.java | 6 +++--- .../lobbybalancer/section/ServerSection.java | 3 ++- src/main/resources/config.yml | 6 +++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/me/jaimemartz/lobbybalancer/LobbyBalancer.java b/src/main/java/me/jaimemartz/lobbybalancer/LobbyBalancer.java index 3ba2193..4a7c9af 100644 --- a/src/main/java/me/jaimemartz/lobbybalancer/LobbyBalancer.java +++ b/src/main/java/me/jaimemartz/lobbybalancer/LobbyBalancer.java @@ -19,14 +19,13 @@ import org.bstats.Metrics; import org.inventivetalent.update.bungee.BungeeUpdater; import java.io.IOException; -import java.util.concurrent.Callable; import java.util.logging.Level; public class LobbyBalancer extends Plugin { public static final String USER_ID = "%%__USER__%%"; public static final String RESOURCE_ID = "%%__RESOURCE__%%"; public static final String NONCE_ID = "%%__NONCE__%%"; - private static final int LAST_VER_CONFIG_UPDATE = 20600; + private static final int LAST_VER_CONFIG_UPDATE = 20950; private boolean failed = false; @@ -50,7 +49,7 @@ public class LobbyBalancer extends Plugin { //Metrics (https://bstats.org/) Metrics metrics = new Metrics(this); - metrics.addCustomChart(new Metrics.SingleLineChart("configred_sections", () -> sectionManager.getSections().size())); + metrics.addCustomChart(new Metrics.SingleLineChart("configured_sections", () -> sectionManager.getSections().size())); } private void enable() { @@ -122,7 +121,10 @@ public class LobbyBalancer extends Plugin { e.printStackTrace(); } } else { - getLogger().warning("The plugin is disabled, so nothing will work except the main command"); + getLogger().warning("-----------------------------------------------------"); + getLogger().warning("WARNING: This plugin is disabled, do not forget to set enabled on the config to true"); + getLogger().warning("Nothing is going to work until you do that, you can reload me by using the /balancer command"); + getLogger().warning("-----------------------------------------------------"); } } diff --git a/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java b/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java index ba71fcf..d8ad991 100644 --- a/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java +++ b/src/main/java/me/jaimemartz/lobbybalancer/configuration/ConfigEntries.java @@ -41,12 +41,12 @@ public class ConfigEntries implements ConfigEntryHolder { public static final ConfigEntry FALLBACK_PRINCIPAL_ENABLED = new ConfigEntry<>(0, "settings.fallback-principal", true); public static final ConfigEntry SERVERS_UPDATE = new ConfigEntry<>(0, "settings.servers-update", true); - public static final ConfigEntry CONNECTING_MESSAGE = new ConfigEntry<>(0, "settings.messages.connecting", null); - public static final ConfigEntry FAILURE_MESSAGE = new ConfigEntry<>(0, "settings.messages.failure", null); + public static final ConfigEntry CONNECTING_MESSAGE = new ConfigEntry<>(0, "settings.messages.connecting-server", null); + public static final ConfigEntry FAILURE_MESSAGE = new ConfigEntry<>(0, "settings.messages.misc-failure", null); public static final ConfigEntry UNKNOWN_SECTION_MESSAGE = new ConfigEntry<>(0, "settings.messages.unknown-section", null); public static final ConfigEntry INVALID_INPUT_MESSAGE = new ConfigEntry<>(0, "settings.messages.invalid-input", null); public static final ConfigEntry UNAVAILABLE_MESSAGE = new ConfigEntry<>(0, "settings.messages.unavailable-server", null); - public static final ConfigEntry KICK_MESSAGE = new ConfigEntry<>(0, "settings.messages.kick", null); + public static final ConfigEntry KICK_MESSAGE = new ConfigEntry<>(0, "settings.messages.player-kicked", null); public static final ConfigEntry CONFIG_VERSION = new ConfigEntry<>(0, "version", null); } diff --git a/src/main/java/me/jaimemartz/lobbybalancer/section/ServerSection.java b/src/main/java/me/jaimemartz/lobbybalancer/section/ServerSection.java index f59597d..44888e9 100644 --- a/src/main/java/me/jaimemartz/lobbybalancer/section/ServerSection.java +++ b/src/main/java/me/jaimemartz/lobbybalancer/section/ServerSection.java @@ -9,7 +9,8 @@ import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.config.Configuration; import java.net.InetSocketAddress; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 15cf570..8fec23d 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -110,12 +110,12 @@ settings: # Comment a message to disable it messages: - connecting: '&aConnecting to {server}' - failure: '&cCould not find a server to get connected' + connecting-server: '&aConnecting to {server}' + misc-failure: '&cCould not find a server to get connected' unknown-section: '&cCould not find a section with that name' invalid-input: '&cThis is an invalid input type for this command' unavailable-server: '&cThis command cannot be executed on this server' - kick: '&cYou have been kicked from &a{from} &cand you are being moved to &a{to}&c, reason: &a{reason}' + player-kicked: '&cYou have been kicked from &a{from} &cand you are being moved to &a{to}&c, reason: &a{reason}' # Here you have an example of what you can do with the sections # The plugin will print out info telling you if your config is right or not