2.4 Release

Move kickmessage back to config

Maintenance-API/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>maintenance-base</artifactId>
         <groupId>eu.kennytv</groupId>
-        <version>2.3.1</version>
+        <version>2.4</version>
     </parent>
 
     <artifactId>maintenance-api</artifactId>

Maintenance-API/src/main/java/eu/kennytv/maintenance/api/ISettings.java

@@ -17,7 +17,7 @@ public interface ISettings {
     boolean isMaintenance();
 
     /**
-     * @return true if "join-notification" is set to true in the config
+     * @return true if "send-join-notification" is set to true in the config
      */
     boolean isJoinNotifications();
 

Maintenance-Bungee/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>maintenance-base</artifactId>
         <groupId>eu.kennytv</groupId>
-        <version>2.3.1</version>
+        <version>2.4</version>
     </parent>
 
     <artifactId>maintenance-bungee</artifactId>

Maintenance-Bungee/src/main/java/eu/kennytv/maintenance/bungee/MaintenanceBungeePlugin.java

@@ -31,7 +31,7 @@ public final class MaintenanceBungeePlugin extends MaintenanceModePlugin {
         this.plugin = plugin;
         plugin.getLogger().info("Plugin by KennyTV");
 
-        settings = new SettingsBungee(plugin);
+        settings = new SettingsBungee(this, plugin);
 
         final PluginManager pm = getProxy().getPluginManager();
         pm.registerListener(plugin, new PostLoginListener(this, settings));
@@ -60,24 +60,28 @@ public final class MaintenanceBungeePlugin extends MaintenanceModePlugin {
             settings.reloadConfigs();
         }
 
-        if (serverListPlusHook != null)
-            serverListPlusHook.setEnabled(!maintenance);
+        serverActions(maintenance);
 
         if (isTaskRunning())
             cancelTask();
+    }
+
+    void serverActions(final boolean maintenance) {
+        if (serverListPlusHook != null)
+            serverListPlusHook.setEnabled(!maintenance);
 
         if (maintenance) {
             getProxy().getPlayers().stream()
                     .filter(p -> !p.hasPermission("maintenance.bypass") && !settings.getWhitelistedPlayers().containsKey(p.getUniqueId()))
                     .forEach(p -> p.disconnect(settings.getKickMessage().replace("%NEWLINE%", "\n")));
-            getProxy().broadcast(settings.getMaintenanceActivated());
+            getProxy().broadcast(settings.getMessage("maintenanceActivated"));
         } else
-            getProxy().broadcast(settings.getMaintenanceDeactivated());
+            getProxy().broadcast(settings.getMessage("maintenanceDeactivated"));
     }
 
     @Override
-    public int schedule(final Runnable runnable) {
-        return getProxy().getScheduler().schedule(plugin, runnable, 0, 1, TimeUnit.MINUTES).getId();
+    public int startMaintenanceRunnable(final Runnable runnable) {
+        return getProxy().getScheduler().schedule(plugin, runnable, 0, 1, TimeUnit.SECONDS).getId();
     }
 
     @Override
@@ -88,7 +92,8 @@ public final class MaintenanceBungeePlugin extends MaintenanceModePlugin {
     @Override
     public void cancelTask() {
         getProxy().getScheduler().cancel(taskId);
-        setTaskId(0);
+        runnable = null;
+        taskId = 0;
     }
 
     @Override

Maintenance-Bungee/src/main/java/eu/kennytv/maintenance/bungee/SettingsBungee.java

@@ -21,15 +21,19 @@ public final class SettingsBungee extends Settings {
     private final String maintenanceQuery;
     private final MySQL mySQL;
 
+    private final MaintenanceBungeePlugin maintenancePlugin;
     private final MaintenanceBungeeBase plugin;
     private final IPingListener pingListener;
     private Configuration config;
+    private Configuration language;
     private Configuration whitelist;
 
     private long millisecondsToCheck;
     private long lastMySQLCheck;
 
-    SettingsBungee(final MaintenanceBungeeBase plugin) {
+    SettingsBungee(final MaintenanceBungeePlugin maintenancePlugin, final MaintenanceBungeeBase plugin) {
+        super(maintenancePlugin);
+        this.maintenancePlugin = maintenancePlugin;
         this.plugin = plugin;
 
         final PluginManager pm = plugin.getProxy().getPluginManager();
@@ -37,7 +41,13 @@ public final class SettingsBungee extends Settings {
         pm.registerListener(plugin, listener);
         pingListener = listener;
 
-        reloadConfigs(createFiles());
+        if (!plugin.getDataFolder().exists())
+            plugin.getDataFolder().mkdirs();
+        createFile("bungee-config.yml");
+        createFile("language.yml");
+        createFile("WhitelistedPlayers.yml");
+
+        reloadConfigs();
 
         final Configuration mySQLSection = config.getSection("mysql");
         if (mySQLSection.getBoolean("use-mysql", false)) {
@@ -61,19 +71,40 @@ public final class SettingsBungee extends Settings {
         }
     }
 
-    @Override
-    public void updateExtraConfig() {
-        // 2.3.1 mysql.update-interval
-        if (!configContains("mysql.update-interval")) {
-            setToConfig("mysql.update-interval", 15);
-            saveConfig();
-            reloadConfigs();
+    private void createFile(final String name) {
+        final File file = new File(plugin.getDataFolder(), name);
+        if (!file.exists()) {
+            try (final InputStream in = plugin.getResourceAsStream(name)) {
+                Files.copy(in, file.toPath());
+            } catch (final IOException e) {
+                throw new RuntimeException("Unable to create " + name + " file for MaintenanceBungee", e);
+            }
         }
     }
 
+    @Override
+    public boolean updateExtraConfig() {
+        // 2.3.1 mysql.update-interval
+        if (!configContains("mysql.update-interval")) {
+            setToConfig("mysql.update-interval", 15);
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public void reloadConfigs() {
-        reloadConfigs(false);
+        try {
+            config = YamlConfiguration.getProvider(YamlConfiguration.class)
+                    .load(new InputStreamReader(new FileInputStream(new File(plugin.getDataFolder(), "bungee-config.yml")), StandardCharsets.UTF_8));
+            language = YamlConfiguration.getProvider(YamlConfiguration.class)
+                    .load(new InputStreamReader(new FileInputStream(new File(plugin.getDataFolder(), "language.yml")), StandardCharsets.UTF_8));
+            whitelist = YamlConfiguration.getProvider(YamlConfiguration.class).load(new File(plugin.getDataFolder(), "WhitelistedPlayers.yml"));
+        } catch (final IOException e) {
+            throw new RuntimeException("Unable to load Maintenance files!", e);
+        }
+
+        loadSettings();
     }
 
     @Override
@@ -96,23 +127,6 @@ public final class SettingsBungee extends Settings {
         }
     }
 
-    private void reloadConfigs(final boolean createdNewWhitelist) {
-        final File file = new File(plugin.getDataFolder(), "bungee-config.yml");
-        try {
-            config = YamlConfiguration.getProvider(YamlConfiguration.class).load(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
-            whitelist = YamlConfiguration.getProvider(YamlConfiguration.class).load(new File(plugin.getDataFolder(), "WhitelistedPlayers.yml"));
-        } catch (final IOException e) {
-            throw new RuntimeException("Unable to load bungee-config.yml!", e);
-        }
-
-        if (createdNewWhitelist) {
-            whitelist.set("a8179ff3-c201-4a75-bdaa-9d14aca6f83f", "KennyTV");
-            saveWhitelistedPlayers();
-        }
-
-        loadSettings();
-    }
-
     @Override
     public void loadExtraSettings() {
         whitelistedPlayers.clear();
@@ -129,34 +143,6 @@ public final class SettingsBungee extends Settings {
         whitelist.set(uuid, s);
     }
 
-    @Override
-    public boolean createFiles() {
-        if (!plugin.getDataFolder().exists())
-            plugin.getDataFolder().mkdirs();
-
-        final File file = new File(plugin.getDataFolder(), "bungee-config.yml");
-        if (!file.exists()) {
-            try (final InputStream in = plugin.getResourceAsStream("bungee-config.yml")) {
-                Files.copy(in, file.toPath());
-            } catch (final IOException e) {
-                throw new RuntimeException("Unable to create bungee-config.yml file for MaintenanceBungee", e);
-            }
-        }
-
-        boolean createdNewWhitelist = false;
-        final File whitelistFile = new File(plugin.getDataFolder(), "WhitelistedPlayers.yml");
-        if (!whitelistFile.exists()) {
-            createdNewWhitelist = true;
-            try {
-                whitelistFile.createNewFile();
-            } catch (final IOException e) {
-                throw new RuntimeException("Unable to create WhitelistedPlayers.yml file for MaintenanceBungee", e);
-            }
-        }
-
-        return createdNewWhitelist;
-    }
-
     @Override
     public String getConfigString(final String path) {
         final String s = config.getString(path);
@@ -164,6 +150,16 @@ public final class SettingsBungee extends Settings {
             plugin.getLogger().warning("The config is missing the following string: " + path);
             return "null";
         }
+        return s;
+    }
+
+    @Override
+    public String getMessage(final String path) {
+        final String s = language.getString(path);
+        if (s == null) {
+            plugin.getLogger().warning("The language file is missing the following string: " + path);
+            return "null";
+        }
         return ChatColor.translateAlternateColorCodes('&', s);
     }
 
@@ -202,8 +198,14 @@ public final class SettingsBungee extends Settings {
         if (mySQL != null && (millisecondsToCheck == -1 || System.currentTimeMillis() - lastMySQLCheck > millisecondsToCheck)) {
             mySQL.executeQuery(maintenanceQuery, rs -> {
                 try {
-                    if (rs.next())
-                        maintenance = Boolean.parseBoolean(rs.getString("value"));
+                    if (rs.next()) {
+                        final boolean databaseValue = Boolean.parseBoolean(rs.getString("value"));
+                        if (databaseValue != maintenance)
+                            maintenancePlugin.serverActions(maintenance);
+
+                        maintenance = databaseValue;
+                    }
+
                 } catch (final SQLException e) {
                     e.printStackTrace();
                 }

Maintenance-Bungee/src/main/java/eu/kennytv/maintenance/bungee/command/MaintenanceBungeeCommand.java

@@ -21,37 +21,37 @@ public final class MaintenanceBungeeCommand extends MaintenanceCommand {
     protected void addPlayerToWhitelist(final SenderInfo sender, final String name) {
         final ProxiedPlayer selected = ProxyServer.getInstance().getPlayer(name);
         if (selected == null) {
-            sender.sendMessage(plugin.getPrefix() + "§cThere's no player online with that name.");
+            sender.sendMessage(settings.getMessage("playerNotOnline"));
             return;
         }
 
         if (settings.addWhitelistedPlayer(selected.getUniqueId(), selected.getName()))
-            sender.sendMessage(plugin.getPrefix() + "§aAdded §b" + selected.getName() + " §ato the maintenance whitelist!");
+            sender.sendMessage(settings.getMessage("whitelistAdded").replace("%PLAYER%", selected.getName()));
         else
-            sender.sendMessage(plugin.getPrefix() + "§b" + selected.getName() + " §calready is in the maintenance whitelist!");
+            sender.sendMessage(settings.getMessage("whitelistAlreadyAdded").replace("%PLAYER%", selected.getName()));
     }
 
     @Override
     protected void removePlayerFromWhitelist(final SenderInfo sender, final String name) {
         final ProxiedPlayer selected = ProxyServer.getInstance().getPlayer(name);
         if (selected == null) {
-            if (settings.removeWhitelistedPlayer(name.toLowerCase()))
-                sender.sendMessage(plugin.getPrefix() + "§aRemoved §b" + name.toLowerCase() + " §afrom the maintenance whitelist!");
+            if (settings.removeWhitelistedPlayer(name))
+                sender.sendMessage(settings.getMessage("whitelistRemoved").replace("%PLAYER%", name));
             else
-                sender.sendMessage(plugin.getPrefix() + "§cThere is no player with that name in the maintenance whitelist!");
+                sender.sendMessage(settings.getMessage("whitelistNotFound"));
             return;
         }
 
         if (settings.removeWhitelistedPlayer(selected.getUniqueId()))
-            sender.sendMessage(plugin.getPrefix() + "§aRemoved §b" + selected.getName() + " §afrom the maintenance whitelist!");
+            sender.sendMessage(settings.getMessage("whitelistRemoved").replace("%PLAYER%", selected.getName()));
         else
-            sender.sendMessage(plugin.getPrefix() + "§cThis player is not in the maintenance whitelist!");
+            sender.sendMessage(settings.getMessage("whitelistNotFound"));
     }
 
     @Override
     protected void checkForUpdate(final SenderInfo sender) {
         if (plugin.updateAvailable()) {
-            sender.sendMessage(plugin.getPrefix() + "§cNewest version available: §aVersion " + plugin.getNewestVersion() + "§c, you're still on §a" + plugin.getVersion());
+            sender.sendMessage(plugin.getPrefix() + "§cNewest version available: §aVersion " + plugin.getNewestVersion() + "§c, you're on §a" + plugin.getVersion());
             sender.sendMessage(plugin.getPrefix() + "§c§lWARNING: §cYou will have to restart the proxy to prevent further issues and to complete the update!" +
                     " If you can't do that, don't update!");
             final TextComponent tc = new TextComponent("§6× §8[§aUpdate§8]");

Maintenance-Bungee/src/main/java/eu/kennytv/maintenance/bungee/listener/PostLoginListener.java

@@ -1,5 +1,6 @@
 package eu.kennytv.maintenance.bungee.listener;
 
+import com.google.common.collect.Sets;
 import eu.kennytv.maintenance.bungee.MaintenanceBungeePlugin;
 import eu.kennytv.maintenance.bungee.SettingsBungee;
 import net.md_5.bungee.api.chat.ClickEvent;
@@ -12,9 +13,13 @@ import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 
+import java.util.Set;
+import java.util.UUID;
+
 public final class PostLoginListener implements Listener {
     private final MaintenanceBungeePlugin plugin;
     private final SettingsBungee settings;
+    private final Set<UUID> notifiedPlayers = Sets.newHashSet();
 
     public PostLoginListener(final MaintenanceBungeePlugin plugin, final SettingsBungee settings) {
         this.plugin = plugin;
@@ -32,16 +37,17 @@ public final class PostLoginListener implements Listener {
 
                 if (settings.isJoinNotifications())
                     plugin.getProxy().getPlayers().stream().filter(player -> player.hasPermission("maintenance.joinnotification"))
-                            .forEach(player -> player.sendMessage(settings.getJoinNotification().replace("%PLAYER%", p.getName())));
+                            .forEach(player -> player.sendMessage(settings.getMessage("joinNotification").replace("%PLAYER%", p.getName())));
                 return;
             }
         }
 
-        if (!p.hasPermission("maintenance.admin")) return;
+        if (!p.hasPermission("maintenance.admin") || notifiedPlayers.contains(p.getUniqueId())) return;
 
         plugin.async(() -> {
             if (plugin.updateAvailable()) {
-                p.sendMessage(plugin.getPrefix() + "§cThere is a newer version available: §aVersion " + plugin.getNewestVersion() + "§c, you're still on §a" + plugin.getVersion());
+                p.sendMessage(plugin.getPrefix() + "§cThere is a newer version available: §aVersion " + plugin.getNewestVersion() + "§c, you're on §a" + plugin.getVersion());
+                notifiedPlayers.add(p.getUniqueId());
 
                 final TextComponent tc1 = new TextComponent(TextComponent.fromLegacyText(plugin.getPrefix() + " "));
                 final TextComponent tc2 = new TextComponent(TextComponent.fromLegacyText("§cDownload it at: §6https://www.spigotmc.org/resources/maintenancemode.40699/"));

Maintenance-Bungee/src/main/java/eu/kennytv/maintenance/bungee/listener/ProxyPingListener.java

@@ -29,8 +29,13 @@ public final class ProxyPingListener implements Listener, IPingListener {
         if (!settings.isMaintenance()) return;
 
         final ServerPing ping = event.getResponse();
-        ping.getVersion().setProtocol(1);
-        ping.getVersion().setName(settings.getPlayerCountMessage());
+        if (settings.hasCustomPlayerCountMessage()) {
+            ping.getVersion().setProtocol(1);
+            ping.getVersion().setName(settings.getPlayerCountMessage()
+                    .replace("%ONLINE%", Integer.toString(ping.getPlayers().getOnline()))
+                    .replace("%MAX%", Integer.toString(ping.getPlayers().getMax())));
+        }
+
         ping.setDescription(settings.getRandomPingMessage());
         ping.getPlayers().setOnline(0);
         ping.getPlayers().setMax(0);

Maintenance-Bungee/src/main/java/eu/kennytv/maintenance/bungee/metrics/MetricsLite.java

@@ -12,6 +12,7 @@ import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -266,7 +267,7 @@ public final class MetricsLite {
         }
         final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         final GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
-        gzip.write(str.getBytes("UTF-8"));
+        gzip.write(str.getBytes(StandardCharsets.UTF_8));
         gzip.close();
         return outputStream.toByteArray();
     }

Maintenance-Bungee/src/main/resources/bungee-config.yml

@@ -10,32 +10,26 @@ pingmessages:
   - "&cMaintenance mode!%NEWLINE%&6We will be back soon!"
  #- "Another entry"
 
-# Is shown at the top right corner of the server in the serverlist,
+# If set to true, the message below will be shown at the top right corner of the server in the serverlist,
 # where the playercount would normally be displayed.
+# If set to false, the normal playercount will be shown.
+# Alternatively you can use '%ONLINE%' and '%MAX% if you want to include the playercount in a custom message (e.g. '&cMaintenance &7%ONLINE%&8/&7%MAX%').
+enable-playercountmessage: true
 playercountmessage: "&4Maintenance"
 
 # Is shown when you move your mouse above the text at the top right corner of the server in the serverlist,
 # where the playercount would normally be displayed.
 playercounthovermessage: "&cCurrently under%NEWLINE%&cmaintenance"
 
-# Will be shown, when a player tries to join on the server without the permission.
+# Is shown when a player tries to join while maintenance is enabled and they don't have the permission to bypass it.
 kickmessage: "&cThe server is currently under maintenance!%NEWLINE%Try again later!"
 
-# Some self explanatory messages
-no-permission: "&cYou do not have the permission to execute that command."
-maintenance-activated: "&6Maintenance mode is now activated."
-maintenance-deactivated: "&6Maintenance mode is now deactivated."
-
-starttimer-broadcast-mesage: '&8[&eMaintenance&8] &7Maintenance mode will be enabled in &6%MINUTES% minutes&7.'
-endtimer-broadcast-mesage: '&8[&eMaintenance&8] &7Maintenance mode will be disabled in &6%MINUTES% minutes&7.'
-
 # If using the timer command: In what intervalls before enabling/disabling maintenance there will be a broadcast.
-timer-broadcasts-for-minutes: [60, 30, 15, 10, 5, 4, 3, 2, 1]
+timer-broadcast-for-seconds: [1200, 900, 600, 300, 120, 60, 30, 20, 10, 5, 4, 3, 2, 1]
 
 # If set to true, players with the maintenance.joinnotification permission will receive a message,
 # that a player tried to join the server while maintenance is enabled.
 send-join-notification: false
-join-notification: "&e%PLAYER% &ctried to join the server."
 
 # If set to true, the server icon will be changed to maintenance-icon.png in the Bungee main/base-folder.
 custom-maintenance-icon: false
@@ -52,5 +46,5 @@ mysql:
   table: maintenance_settings
   # Requests to the database will only be made at least x seconds after the last request,
   # so there won't be a request on every single ping on a server with many players.
-  # Set to 0 to make a database request on every single ping.
+  # Set this to 0 to make a database request on every single ping.
   update-interval: 15

Maintenance-Core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>maintenance-base</artifactId>
         <groupId>eu.kennytv</groupId>
-        <version>2.3.1</version>
+        <version>2.4</version>
     </parent>
 
     <artifactId>maintenance-core</artifactId>

Maintenance-Core/src/main/java/eu/kennytv/maintenance/core/MaintenanceModePlugin.java

@@ -2,6 +2,7 @@ package eu.kennytv.maintenance.core;
 
 import eu.kennytv.maintenance.api.IMaintenance;
 import eu.kennytv.maintenance.core.hook.ServerListPlusHook;
+import eu.kennytv.maintenance.core.runnable.MaintenanceRunnable;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -11,8 +12,9 @@ import java.net.URLConnection;
 
 public abstract class MaintenanceModePlugin implements IMaintenance {
     protected final String version;
-    protected int taskId;
     protected ServerListPlusHook serverListPlusHook;
+    protected MaintenanceRunnable runnable;
+    protected int taskId;
     private final String prefix;
     private String newestVersion;
 
@@ -33,18 +35,19 @@ public abstract class MaintenanceModePlugin implements IMaintenance {
 
     @Override
     public boolean isTaskRunning() {
-        return taskId != 0;
+        return taskId != 0 && runnable != null;
     }
 
-    public void setTaskId(final int taskId) {
-        this.taskId = taskId;
+    public void startMaintenanceRunnable(final int minutes, final boolean enable) {
+        runnable = new MaintenanceRunnable(this, (Settings) getSettings(), minutes, enable);
+        taskId = startMaintenanceRunnable(runnable);
     }
 
     public String getNewestVersion() {
         return newestVersion;
     }
 
-    public abstract int schedule(Runnable runnable);
+    public abstract int startMaintenanceRunnable(Runnable runnable);
 
     public abstract void async(Runnable runnable);
 
@@ -54,10 +57,22 @@ public abstract class MaintenanceModePlugin implements IMaintenance {
 
     public abstract void broadcast(String message);
 
+    public MaintenanceRunnable getRunnable() {
+        return runnable;
+    }
+
     public String getPrefix() {
         return prefix;
     }
 
+    public String formatedTimer() {
+        if (!isTaskRunning()) return "-";
+        final int preHours = runnable.getSecondsLeft() / 60;
+        final int minutes = preHours % 60;
+        final int seconds = runnable.getSecondsLeft() % 60;
+        return String.format("%02d:%02d:%02d", preHours / 60, minutes, seconds);
+    }
+
     public boolean updateAvailable() {
         try {
             final HttpURLConnection c = (HttpURLConnection) new URL("https://api.spigotmc.org/legacy/update.php?resource=40699").openConnection();

Maintenance-Core/src/main/java/eu/kennytv/maintenance/core/Settings.java

@@ -7,38 +7,33 @@ import java.util.*;
 public abstract class Settings implements ISettings {
     private static final Random RANDOM = new Random();
     protected final Map<UUID, String> whitelistedPlayers = new HashMap<>();
+    private final MaintenanceModePlugin plugin;
     protected boolean maintenance;
     private Set<Integer> broadcastIntervalls;
     private List<String> pingMessages;
-    private String timerBroadcastMessage;
-    private String endtimerBroadcastMessage;
-    private String kickMessage;
-    private String joinNotification;
-    private String noPermMessage;
-    private String maintenanceActivated;
-    private String maintenanceDeactivated;
     private String playerCountMessage;
     private String playerCountHoverMessage;
-    private boolean joinNotifications;
+    private String kickMessage;
+    private boolean customPlayerCountMessage;
     private boolean customMaintenanceIcon;
+    private boolean joinNotifications;
+
+    protected Settings(final MaintenanceModePlugin plugin) {
+        this.plugin = plugin;
+    }
 
     protected void loadSettings() {
         updateConfig();
 
         pingMessages = getConfigList("pingmessages");
-        timerBroadcastMessage = getConfigString("starttimer-broadcast-mesage");
-        endtimerBroadcastMessage = getConfigString("endtimer-broadcast-mesage");
-        kickMessage = getConfigString("kickmessage");
-        joinNotification = getConfigString("join-notification");
-        noPermMessage = getConfigString("no-permission");
-        maintenanceActivated = getConfigString("maintenance-activated");
-        maintenanceDeactivated = getConfigString("maintenance-deactivated");
         maintenance = getConfigBoolean("enable-maintenance-mode");
-        joinNotifications = getConfigBoolean("send-join-notification");
+        customPlayerCountMessage = getConfigBoolean("enable-playercountmessage");
         customMaintenanceIcon = getConfigBoolean("custom-maintenance-icon");
-        broadcastIntervalls = new HashSet<>(getConfigIntList("timer-broadcasts-for-minutes"));
-        playerCountMessage = getConfigString("playercountmessage");
-        playerCountHoverMessage = getConfigString("playercounthovermessage");
+        joinNotifications = getConfigBoolean("send-join-notification");
+        broadcastIntervalls = new HashSet<>(getConfigIntList("timer-broadcast-for-seconds"));
+        playerCountMessage = getColoredString(getConfigString("playercountmessage"));
+        playerCountHoverMessage = getColoredString(getConfigString("playercounthovermessage"));
+        kickMessage = getColoredString(getConfigString("kickmessage"));
         if (customMaintenanceIcon)
             reloadMaintenanceIcon();
 
@@ -46,28 +41,44 @@ public abstract class Settings implements ISettings {
     }
 
     private void updateConfig() {
+        boolean fileChanged = false;
+
         // 2.3 pingmessage -> pingmessages
         if (configContains("pingmessage")) {
-            final List<Object> list = new ArrayList<>();
+            final List<String> list = new ArrayList<>();
             list.add(getConfigString("pingmessage"));
             setToConfig("pingmessages", list);
             setToConfig("pingmessage", null);
+            fileChanged = true;
+        }
+        // 2.4 enable-playercountmessage
+        if (!configContains("enable-playercountmessage")) {
+            setToConfig("enable-playercountmessage", true);
+            fileChanged = true;
+        }
+        // 2.4. timer-broadcasts-for-minutes -> timer-broadcast-for-seconds
+        if (configContains("timer-broadcasts-for-minutes") || !configContains("timer-broadcast-for-seconds")) {
+            setToConfig("timer-broadcast-for-seconds", Arrays.asList(1200, 900, 600, 300, 120, 60, 30, 20, 10, 5, 4, 3, 2, 1));
+            setToConfig("timer-broadcasts-for-minutes", null);
+            fileChanged = true;
+        }
+
+        if (updateExtraConfig() || fileChanged) {
             saveConfig();
             reloadConfigs();
         }
-
-        updateExtraConfig();
     }
 
-    public void updateExtraConfig() {
+    public boolean updateExtraConfig() {
+        return false;
     }
 
     public abstract void saveWhitelistedPlayers();
 
-    public abstract boolean createFiles();
-
     public abstract String getConfigString(String path);
 
+    public abstract String getMessage(String path);
+
     public abstract boolean getConfigBoolean(String path);
 
     public abstract List<Integer> getConfigIntList(String path);
@@ -96,34 +107,6 @@ public abstract class Settings implements ISettings {
         return broadcastIntervalls;
     }
 
-    public String getTimerBroadcastMessage() {
-        return timerBroadcastMessage;
-    }
-
-    public String getEndtimerBroadcastMessage() {
-        return endtimerBroadcastMessage;
-    }
-
-    public String getKickMessage() {
-        return kickMessage;
-    }
-
-    public String getJoinNotification() {
-        return joinNotification;
-    }
-
-    public String getNoPermMessage() {
-        return noPermMessage;
-    }
-
-    public String getMaintenanceActivated() {
-        return maintenanceActivated;
-    }
-
-    public String getMaintenanceDeactivated() {
-        return maintenanceDeactivated;
-    }
-
     public String getPlayerCountMessage() {
         return playerCountMessage;
     }
@@ -132,6 +115,10 @@ public abstract class Settings implements ISettings {
         return playerCountHoverMessage;
     }
 
+    public String getKickMessage() {
+        return kickMessage;
+    }
+
     public void setMaintenance(final boolean maintenance) {
         this.maintenance = maintenance;
     }
@@ -139,7 +126,11 @@ public abstract class Settings implements ISettings {
     public String getRandomPingMessage() {
         if (pingMessages.isEmpty()) return "";
         final String s = pingMessages.size() > 1 ? pingMessages.get(RANDOM.nextInt(pingMessages.size())) : pingMessages.get(0);
-        return getColoredString(s.replace("%NEWLINE%", "\n"));
+        return getColoredString(s.replace("%NEWLINE%", "\n").replace("%TIMER%", plugin.formatedTimer()));
+    }
+
+    public boolean hasCustomPlayerCountMessage() {
+        return customPlayerCountMessage;
     }
 
     @Override
@@ -174,8 +165,10 @@ public abstract class Settings implements ISettings {
     @Deprecated
     @Override
     public boolean removeWhitelistedPlayer(final String name) {
-        if (!whitelistedPlayers.containsValue(name)) return false;
-        final UUID uuid = whitelistedPlayers.entrySet().stream().filter(entry -> entry.getValue().equals(name)).findAny().get().getKey();
+        final Map.Entry<UUID, String> entry = whitelistedPlayers.entrySet().stream().filter(e -> e.getValue().equalsIgnoreCase(name)).findAny().orElse(null);
+        if (entry == null) return false;
+
+        final UUID uuid = entry.getKey();
         whitelistedPlayers.remove(uuid);
         setWhitelist(uuid.toString(), null);
         saveWhitelistedPlayers();

Maintenance-Core/src/main/java/eu/kennytv/maintenance/core/command/MaintenanceCommand.java

@@ -2,7 +2,6 @@ package eu.kennytv.maintenance.core.command;
 
 import eu.kennytv.maintenance.core.MaintenanceModePlugin;
 import eu.kennytv.maintenance.core.Settings;
-import eu.kennytv.maintenance.core.runnable.MaintenanceRunnable;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 
 import java.util.Arrays;
@@ -23,42 +22,47 @@ public abstract class MaintenanceCommand {
     public void execute(final SenderInfo sender, final String[] args) {
         if (checkPermission(sender, "command")) return;
         if (args.length == 1) {
-            if (args[0].equalsIgnoreCase("on")) {
+            if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("off")) {
                 if (checkPermission(sender, "toggle")) return;
-                plugin.setMaintenance(true);
-            } else if (args[0].equalsIgnoreCase("off")) {
-                if (checkPermission(sender, "toggle")) return;
-                plugin.setMaintenance(false);
+
+                final boolean maintenance = args[0].equalsIgnoreCase("on");
+                if (maintenance == plugin.isMaintenance()) {
+                    sender.sendMessage(settings.getMessage(maintenance ? "alreadyEnabled" : "alreadyDisabled"));
+                    return;
+                }
+
+                plugin.setMaintenance(maintenance);
             } else if (args[0].equalsIgnoreCase("reload")) {
                 if (checkPermission(sender, "reload")) return;
                 settings.reloadConfigs();
-                sender.sendMessage(plugin.getPrefix() + "§aReloaded config, whitelistedplayers and the maintenance icon");
+                sender.sendMessage(settings.getMessage("reload"));
             } else if (args[0].equalsIgnoreCase("update")) {
                 if (checkPermission(sender, "update")) return;
                 checkForUpdate(sender);
             } else if (args[0].equals("forceupdate")) {
                 if (checkPermission(sender, "update")) return;
-                sender.sendMessage(plugin.getPrefix() + "§c§lDownloading update...");
+                sender.sendMessage(settings.getMessage("updateDownloading"));
 
                 if (plugin.installUpdate())
-                    sender.sendMessage(plugin.getPrefix() + "§a§lThe update was successful! To prevent issues with tasks and to complete the update, you have to restart the proxy!");
+                    sender.sendMessage(settings.getMessage("updateFinished"));
                 else
-                    sender.sendMessage(plugin.getPrefix() + "§4Failed!");
+                    sender.sendMessage(settings.getMessage("updateFailed"));
             } else if (args[0].equalsIgnoreCase("whitelist")) {
                 if (checkPermission(sender, "whitelist.list")) return;
                 final Map<UUID, String> players = settings.getWhitelistedPlayers();
                 if (players.isEmpty()) {
-                    sender.sendMessage(plugin.getPrefix() + "§cThe maintenance whitelist is empty! Use \"/maintenance add <player>\" to add someone!");
+                    sender.sendMessage(settings.getMessage("whitelistEmtpy"));
                 } else if (players.size() == 1 && players.containsKey(UUID.fromString("a8179ff3-c201-4a75-bdaa-9d14aca6f83f"))) {
-                    sender.sendMessage(plugin.getPrefix() + "§cUse \"/maintenance add <player>\" to add someone. Alternatively, you can add the uuid of a player to the WhitelistedPlayers.yml as seen in the example in the file!");
+                    sender.sendMessage(settings.getMessage("whitelistEmptyDefault"));
                 } else {
-                    sender.sendMessage("§6Whitelisted players for maintenance:");
-                    players.forEach((key, value) -> sender.sendMessage("§8- §e" + value + " §8(§7" + key + "§8)"));
+                    sender.sendMessage(settings.getMessage("whitelistedPlayers"));
+                    final String format = settings.getMessage("whitelistedPlayersFormat");
+                    players.forEach((key, value) -> sender.sendMessage(format.replace("%NAME%", value).replace("%UUID%", key.toString())));
                     sender.sendMessage("");
                 }
             } else if (args[0].equalsIgnoreCase("motd")) {
                 if (checkPermission(sender, "motd")) return;
-                sender.sendMessage(plugin.getPrefix() + "§7List of your maintenance motds:");
+                sender.sendMessage(settings.getMessage("motdList"));
                 for (int i = 0; i < settings.getPingMessages().size(); i++) {
                     sender.sendMessage("§b" + (i + 1) + "§8§m---------");
                     for (final String motd : settings.getColoredString(settings.getPingMessages().get(i)).split("%NEWLINE%")) {
@@ -72,60 +76,65 @@ public abstract class MaintenanceCommand {
             if (args[0].equalsIgnoreCase("endtimer")) {
                 if (checkPermission(sender, "timer")) return;
                 if (!isNumeric(args[1])) {
-                    sender.sendMessage(plugin.getPrefix() + "§6/maintenance endtimer <minutes>");
+                    sender.sendMessage(settings.getMessage("endtimerUsage"));
                     return;
                 }
                 if (plugin.isTaskRunning()) {
-                    sender.sendMessage(plugin.getPrefix() + "§cThere's already a starttimer scheduled!");
+                    sender.sendMessage(settings.getMessage("timerAlreadyRunning"));
                     return;
                 }
 
                 final int minutes = Integer.parseInt(args[1]);
                 if (minutes > 40320) {
-                    sender.sendMessage(plugin.getPrefix() + "§cThe number has to be less than 40320 (28 days)!");
+                    sender.sendMessage(settings.getMessage("timerTooLong"));
                     return;
                 }
                 if (minutes < 1) {
-                    sender.sendMessage(plugin.getPrefix() + "§cThink about running a timer for a negative amount of minutes. Doesn't work §othat §r§cwell.");
+                    sender.sendMessage("§8§o[KennyTV whispers to you] §c§oThink about running a timer for a negative amount of minutes. Doesn't work §lthat §c§owell.");
                     return;
                 }
 
-                plugin.setMaintenance(true);
-                sender.sendMessage(plugin.getPrefix() + "§aStarted timer: §7Maintenance mode will be deactivated in §6" + minutes + " minutes§7.");
-                plugin.setTaskId(plugin.schedule(new MaintenanceRunnable(plugin, settings, minutes, false)));
+                if (!plugin.isMaintenance())
+                    plugin.setMaintenance(true);
+                plugin.startMaintenanceRunnable(minutes, false);
+                sender.sendMessage(settings.getMessage("endtimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
             } else if (args[0].equalsIgnoreCase("starttimer")) {
                 if (checkPermission(sender, "timer")) return;
                 if (!isNumeric(args[1])) {
-                    sender.sendMessage(plugin.getPrefix() + "§6/maintenance starttimer <minutes>");
+                    sender.sendMessage(settings.getMessage("starttimerUsage"));
+                    return;
+                }
+                if (plugin.isMaintenance()) {
+                    sender.sendMessage(settings.getMessage("alreadyEnabled"));
                     return;
                 }
                 if (plugin.isTaskRunning()) {
-                    sender.sendMessage(plugin.getPrefix() + "§cThere's already running a timer!");
+                    sender.sendMessage(settings.getMessage("timerAlreadyRunning"));
                     return;
                 }
 
                 final int minutes = Integer.parseInt(args[1]);
                 if (minutes > 40320) {
-                    sender.sendMessage(plugin.getPrefix() + "§cThe number has to be less than 40320 (28 days)!");
+                    sender.sendMessage(settings.getMessage("timerTooLong"));
                     return;
                 }
                 if (minutes < 1) {
-                    sender.sendMessage(plugin.getPrefix() + "§cThink about running a timer for a negative amount of minutes. Doesn't work §othat §cwell.");
+                    sender.sendMessage("§8§o[KennyTV whispers to you] §c§oThink about running a timer for a negative amount of minutes. Doesn't work §lthat §c§owell.");
                     return;
                 }
 
-                sender.sendMessage(plugin.getPrefix() + "§aStarted timer: §7Maintenance mode will be activated in §6" + minutes + " minutes§7.");
-                plugin.setTaskId(plugin.schedule(new MaintenanceRunnable(plugin, settings, minutes, true)));
+                sender.sendMessage(settings.getMessage("starttimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+                plugin.startMaintenanceRunnable(minutes, true);
             } else if (args[0].equalsIgnoreCase("timer")) {
                 if (args[1].equalsIgnoreCase("abort") || args[1].equalsIgnoreCase("stop") || args[1].equalsIgnoreCase("cancel")) {
                     if (checkPermission(sender, "timer")) return;
                     if (!plugin.isTaskRunning()) {
-                        sender.sendMessage(plugin.getPrefix() + "§cThere's currently no running timer.");
+                        sender.sendMessage(settings.getMessage("timerNotRunning"));
                         return;
                     }
 
                     plugin.cancelTask();
-                    sender.sendMessage(plugin.getPrefix() + "§cThe timer has been disabled.");
+                    sender.sendMessage(settings.getMessage("timerCancelled"));
                 } else
                     sendUsage(sender);
             } else if (args[0].equalsIgnoreCase("add")) {
@@ -134,30 +143,53 @@ public abstract class MaintenanceCommand {
             } else if (args[0].equalsIgnoreCase("remove")) {
                 if (checkPermission(sender, "whitelist.remove")) return;
                 removePlayerFromWhitelist(sender, args[1]);
+            } else if (args[0].equalsIgnoreCase("removemotd")) {
+                if (checkPermission(sender, "setmotd")) return;
+                if (!isNumeric(args[1])) {
+                    sender.sendMessage(settings.getMessage("removeMotdUsage"));
+                    return;
+                }
+                if (settings.getPingMessages().size() < 2) {
+                    sender.sendMessage(settings.getMessage("removeMotdError"));
+                    return;
+                }
+
+                final int index = Integer.parseInt(args[1]);
+                if (index > settings.getPingMessages().size()) {
+                    sender.sendMessage(settings.getMessage("setMotdIndexError").replace("%MOTDS%", Integer.toString(settings.getPingMessages().size()))
+                            .replace("%NEWAMOUNT%", Integer.toString(settings.getPingMessages().size())));
+                    return;
+                }
+
+                settings.getPingMessages().remove(index - 1);
+                settings.setToConfig("pingmessages", settings.getPingMessages());
+                settings.saveConfig();
+                settings.reloadConfigs();
+                sender.sendMessage(settings.getMessage("removedMotd").replace("%INDEX%", args[1]));
             } else
                 sendUsage(sender);
         } else if (args.length > 3 && args[0].equalsIgnoreCase("setmotd")) {
             if (checkPermission(sender, "setmotd")) return;
             if (!isNumeric(args[1])) {
-                sender.sendMessage(plugin.getPrefix() + "§cThe first argument has to be the motd index!");
+                sender.sendMessage(settings.getMessage("setMotdUsage"));
                 return;
             }
 
             final int index = Integer.parseInt(args[1]);
             if (index < 1 || index > settings.getPingMessages().size() + 1) {
-                sender.sendMessage(plugin.getPrefix() + "§cYou currently have " + settings.getPingMessages().size()
-                        + " motds, so you have to pick a number between 1 and " + (settings.getPingMessages().size() + 1));
+                sender.sendMessage(settings.getMessage("setMotdIndexError").replace("%MOTDS%", Integer.toString(settings.getPingMessages().size()))
+                        .replace("%NEWAMOUNT%", Integer.toString(settings.getPingMessages().size() + 1)));
                 return;
             }
 
             if (!isNumeric(args[2])) {
-                sender.sendMessage(plugin.getPrefix() + "§cThe second argument has to be the line number (1 or 2)!");
+                sender.sendMessage(settings.getMessage("setMotdLineError"));
                 return;
             }
 
             final int line = Integer.parseInt(args[2]);
             if (line != 1 && line != 2) {
-                sender.sendMessage(plugin.getPrefix() + "§cThe second argument has to be the line number (1 or 2)!");
+                sender.sendMessage(settings.getMessage("setMotdLineError"));
                 return;
             }
 
@@ -178,7 +210,8 @@ public abstract class MaintenanceCommand {
             settings.setToConfig("pingmessages", settings.getPingMessages());
             settings.saveConfig();
             settings.reloadConfigs();
-            sender.sendMessage(plugin.getPrefix() + "§aSet line " + line + " of the " + index + ". maintenance motd to §f" + settings.getColoredString(message));
+            sender.sendMessage(settings.getMessage("setMotd").replace("%LINE%", args[2]).replace("%INDEX%", args[1])
+                    .replace("%MOTD%", "§f" + settings.getColoredString(message)));
         } else
             sendUsage(sender);
     }
@@ -193,7 +226,7 @@ public abstract class MaintenanceCommand {
             sender.sendMessage("§6/maintenance off §7(Disables maintenance mode)");
         }
         if (sender.hasPermission("maintenance.timer")) {
-            sender.sendMessage("§6/maintenance starttimer <minutes> §7(After the given time in minutes, maintenance mode will be enabled. Broadcast settings for the timer can be found in the config)");
+            sender.sendMessage("§6/maintenance starttimer <minutes> §7(After the given time in minutes, maintenance mode will be enabled)");
             sender.sendMessage("§6/maintenance endtimer <minutes> §7(Enables maintenance mode. After the given time in minutes, maintenance mode will be disabled)");
             sender.sendMessage("§6/maintenance timer abort §7(If running, the current timer will be aborted)");
         }
@@ -203,20 +236,22 @@ public abstract class MaintenanceCommand {
             sender.sendMessage("§6/maintenance add <player> §7(Adds the player to the maintenance whitelist, so they can join the server even though maintenance is enabled)");
         if (sender.hasPermission("maintenance.whitelist.remove"))
             sender.sendMessage("§6/maintenance remove <player> §7(Removes the player from the maintenance whitelist)");
-        if (sender.hasPermission("maintenance.setmotd"))
+        if (sender.hasPermission("maintenance.setmotd")) {
             sender.sendMessage("§6/maintenance setmotd <index> <1/2> <message> §7(Sets a motd for maintenance mode)");
+            sender.sendMessage("§6/maintenance removemotd <index> §7(Removes a maintenance motd)");
+        }
         if (sender.hasPermission("maintenance.motd"))
             sender.sendMessage("§6/maintenance motd §7(Lists the currently set maintenance motds)");
         if (sender.hasPermission("maintenance.update"))
             sender.sendMessage("§6/maintenance update §7(Remotely downloads the newest version of the plugin onto your server)");
-        sender.sendMessage("§7Created by §bKennyTV");
+        sender.sendMessage("§8× §7Created by §bKennyTV");
         sender.sendMessage("§8===========[ §e" + name + " §8| §eVersion: §e" + plugin.getVersion() + " §8]===========");
         sender.sendMessage("");
     }
 
     private boolean checkPermission(final SenderInfo sender, final String permission) {
         if (!sender.hasPermission("maintenance." + permission)) {
-            sender.sendMessage(settings.getNoPermMessage());
+            sender.sendMessage(settings.getMessage("noPermission"));
             return true;
         }
         return false;

Maintenance-Core/src/main/java/eu/kennytv/maintenance/core/runnable/MaintenanceRunnable.java

@@ -7,28 +7,51 @@ public final class MaintenanceRunnable implements Runnable {
     private final MaintenanceModePlugin plugin;
     private final Settings settings;
     private final boolean enable;
-    private int minutes;
+    private int seconds;
 
     public MaintenanceRunnable(final MaintenanceModePlugin plugin, final Settings settings, final int minutes, final boolean enable) {
         this.plugin = plugin;
         this.settings = settings;
-        this.minutes = minutes;
+        this.seconds = minutes * 60;
         this.enable = enable;
     }
 
     @Override
     public void run() {
-        if (minutes <= 0) {
+        if (seconds == 0) {
             plugin.setMaintenance(enable);
             if (plugin.isTaskRunning())
                 plugin.cancelTask();
-        } else if (settings.getBroadcastIntervalls().contains(minutes)) {
+        } else if (settings.getBroadcastIntervalls().contains(seconds)) {
             if (enable)
-                plugin.broadcast(settings.getTimerBroadcastMessage().replaceAll("%MINUTES%", String.valueOf(minutes)));
+                plugin.broadcast(settings.getMessage("starttimerBroadcast").replaceAll("%TIME%", getTime()));
             else
-                plugin.broadcast(settings.getEndtimerBroadcastMessage().replaceAll("%MINUTES%", String.valueOf(minutes)));
+                plugin.broadcast(settings.getMessage("endtimerBroadcast").replaceAll("%TIME%", getTime()));
         }
 
-        minutes--;
+        seconds--;
+    }
+
+    public String getTime() {
+        final int preHours = this.seconds / 60;
+        final int minutes = preHours % 60;
+        final int seconds = this.seconds % 60;
+
+        final StringBuilder buider = new StringBuilder();
+        append(buider, "hour", preHours / 60);
+        append(buider, "minute", minutes);
+        append(buider, "second", seconds);
+        return buider.toString();
+    }
+
+    private void append(final StringBuilder builder, final String timeUnit, final int time) {
+        if (time == 0) return;
+        if (builder.length() != 0)
+            builder.append(" ");
+        builder.append(time).append(" ").append(settings.getMessage(time == 1 ? timeUnit : timeUnit + "s"));
+    }
+
+    public int getSecondsLeft() {
+        return seconds;
     }
 }

Maintenance-Core/src/main/resources/language.yml

@@ -0,0 +1,48 @@
+# Maintenance Plugin by KennyTV
+# Don't remove words inbetween the '%' if you don't exactly know why you're doing it
+
+noPermission: "&cYou do not have the permission to execute that command."
+reload: "&8[&eMaintenance&8] &aReloaded config, whitelistedplayers, language file and the maintenance icon."
+alreadyEnabled: "&8[&eMaintenance&8] &cMaintenance already is enabled!"
+alreadyDisabled: "&8[&eMaintenance&8] &cMaintenance already is disabled!"
+maintenanceActivated: "&8[&eMaintenance&8] &6Maintenance mode is now activated."
+maintenanceDeactivated: "&8[&eMaintenance&8] &6Maintenance mode is now deactivated."
+starttimerUsage: "&8[&eMaintenance&8] &c/maintenance starttimer <minutes>"
+starttimerStarted: "&8[&eMaintenance&8] &aStarted timer: &7Maintenance mode will be activated in &6%TIME%&7."
+starttimerBroadcast: "&8[&eMaintenance&8] &7Maintenance mode will be enabled in &6%TIME%&7."
+endtimerUsage: "&8[&eMaintenance&8] &c/maintenance endtimer <minutes>"
+endtimerStarted: "&8[&eMaintenance&8] &aStarted timer: &7Maintenance mode will be deactivated in &6%TIME%&7."
+endtimerBroadcast: "&8[&eMaintenance&8] &7Maintenance mode will be disabled in &6%TIME%&7."
+timerTooLong: "&8[&eMaintenance&8] &cThe number has to be less than 40320 (28 days)!"
+timerAlreadyRunning: "&8[&eMaintenance&8] &cThere's already a starttimer scheduled!"
+timerNotRunning: "&8[&eMaintenance&8] &cThere's currently no running timer."
+timerCancelled: "&8[&eMaintenance&8] &cThe current timer has been disabled."
+joinNotification: "&8[&eMaintenance&8] &e%PLAYER% &ctried to join the server."
+updateDownloading: "&8[&eMaintenance&8] &c&lDownloading update..."
+updateFinished: "&8[&eMaintenance&8] &a&lThe update was successful! To prevent issues with tasks and to complete the update, you have to restart the server!"
+updateFailed: "&8[&eMaintenance&8] &4&lUpdate failed!"
+setMotdUsage: "&8[&eMaintenance&8] &c/maintenance setmotd <index> <1/2> <message>"
+setMotdLineError: "&8[&eMaintenance&8] &cThe second argument has to be the line number (1 or 2)!"
+setMotdIndexError: "&8[&eMaintenance&8] §cYou currently have %MOTDS% motds, so you have to pick a number between 1 and %NEWAMOUNT%."
+setMotd: "&8[&eMaintenance&8] &aSet line %LINE% of the %INDEX%. maintenance motd to %MOTD%"
+removeMotdUsage: "&8[&eMaintenance&8] &c/maintenance removemotd <index>"
+removeMotdError: "&8[&eMaintenance&8] &cYou only have one motd, so you can't remove any!"
+removedMotd: "&8[&eMaintenance&8] &aRemoved motd number %INDEX%."
+motdList: "&8[&eMaintenance&8] &7List of your maintenance motds:"
+whitelistEmtpy: "&8[&eMaintenance&8] &cThe maintenance whitelist is empty! Use '/maintenance add <player>' to add someone!"
+whitelistEmptyDefault: "&8[&eMaintenance&8] &cUse '/maintenance add <player>' to add someone. Alternatively, you can add the uuid of a player to the WhitelistedPlayers.yml as seen in the example in the file!"
+whitelistedPlayers: "&8[&eMaintenance&8] &6Whitelisted players for maintenance:"
+whitelistedPlayersFormat: "&8- &e%NAME% &8(&7%UUID%&8)"
+whitelistNotFound: "&8[&eMaintenance&8] &cThis player is not in the maintenance whitelist!"
+whitelistAlreadyAdded: "&8[&eMaintenance&8] &b%PLAYER% &calready is in the maintenance whitelist!"
+whitelistAdded: "&8[&eMaintenance&8] &aAdded &b%PLAYER% &ato the maintenance whitelist!"
+whitelistRemoved: "&8[&eMaintenance&8] &aRemoved &b%PLAYER% &afrom the maintenance whitelist!"
+playerNotOnline: "&8[&eMaintenance&8] &cThere's no player online with that name."
+playerNotFound: "&8[&eMaintenance&8] &cNo player with this name has played on this server before."
+
+second: "second"
+seconds: "seconds"
+minute: "minute"
+minutes: "minutes"
+hour: "hour"
+hours: "hours"

Maintenance-Parent/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>maintenance-base</artifactId>
         <groupId>eu.kennytv</groupId>
-        <version>2.3.1</version>
+        <version>2.4</version>
     </parent>
 
     <artifactId>maintenance-parent</artifactId>

Maintenance-Spigot/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>maintenance-base</artifactId>
         <groupId>eu.kennytv</groupId>
-        <version>2.3.1</version>
+        <version>2.4</version>
     </parent>
 
     <artifactId>maintenance-spigot</artifactId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <version>1.13.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib-API</artifactId>
-            <version>4.3.0</version>
+            <version>4.4.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Maintenance-Spigot/src/main/java/eu/kennytv/maintenance/spigot/MaintenanceSpigotPlugin.java

@@ -27,7 +27,7 @@ public final class MaintenanceSpigotPlugin extends MaintenanceModePlugin {
         super("§8[§eMaintenanceSpigot§8] ", plugin.getDescription().getVersion());
 
         this.plugin = plugin;
-        settings = new SettingsSpigot(plugin);
+        settings = new SettingsSpigot(this, plugin);
 
         plugin.getLogger().info("Plugin by KennyTV");
         plugin.getCommand("maintenancespigot").setExecutor(new MaintenanceSpigotCommand(this, settings));
@@ -63,14 +63,14 @@ public final class MaintenanceSpigotPlugin extends MaintenanceModePlugin {
             getServer().getOnlinePlayers().stream()
                     .filter(p -> !p.hasPermission("maintenance.bypass") && !settings.getWhitelistedPlayers().containsKey(p.getUniqueId()))
                     .forEach(p -> p.kickPlayer(settings.getKickMessage().replace("%NEWLINE%", "\n")));
-            getServer().broadcastMessage(settings.getMaintenanceActivated());
+            getServer().broadcastMessage(settings.getMessage("maintenanceActivated"));
         } else
-            getServer().broadcastMessage(settings.getMaintenanceDeactivated());
+            getServer().broadcastMessage(settings.getMessage("maintenanceDeactivated"));
     }
 
     @Override
-    public int schedule(final Runnable runnable) {
-        return getServer().getScheduler().scheduleSyncRepeatingTask(plugin, runnable, 0, 1200);
+    public int startMaintenanceRunnable(final Runnable runnable) {
+        return getServer().getScheduler().scheduleSyncRepeatingTask(plugin, runnable, 0, 20);
     }
 
     @Override
@@ -81,7 +81,8 @@ public final class MaintenanceSpigotPlugin extends MaintenanceModePlugin {
     @Override
     public void cancelTask() {
         getServer().getScheduler().cancelTask(taskId);
-        setTaskId(0);
+        runnable = null;
+        taskId = 0;
     }
 
     @Override

Maintenance-Spigot/src/main/java/eu/kennytv/maintenance/spigot/SettingsSpigot.java

@@ -19,9 +19,11 @@ public final class SettingsSpigot extends Settings {
     private final MaintenanceSpigotBase plugin;
     private final IPingListener pingListener;
     private FileConfiguration config;
+    private FileConfiguration language;
     private FileConfiguration whitelist;
 
-    SettingsSpigot(final MaintenanceSpigotBase plugin) {
+    SettingsSpigot(final MaintenanceSpigotPlugin pl, final MaintenanceSpigotBase plugin) {
+        super(pl);
         this.plugin = plugin;
 
         final PluginManager pm = plugin.getServer().getPluginManager();
@@ -33,10 +35,26 @@ public final class SettingsSpigot extends Settings {
             pingListener = listener;
         }
 
-        createFiles();
+        if (!plugin.getDataFolder().exists())
+            plugin.getDataFolder().mkdirs();
+        createFile("spigot-config.yml");
+        createFile("language.yml");
+        createFile("WhitelistedPlayers.yml");
+
         reloadConfigs();
     }
 
+    private void createFile(final String name) {
+        final File file = new File(plugin.getDataFolder(), name);
+        if (!file.exists()) {
+            try (final InputStream in = plugin.getResource(name)) {
+                Files.copy(in, file.toPath());
+            } catch (final IOException e) {
+                throw new RuntimeException("Unable to create " + name + " file for Maintenance!", e);
+            }
+        }
+    }
+
     @Override
     public void saveConfig() {
         try {
@@ -57,12 +75,14 @@ public final class SettingsSpigot extends Settings {
 
     @Override
     public void reloadConfigs() {
-        final File file = new File(plugin.getDataFolder(), "spigot-config.yml");
         try {
+            final File file = new File(plugin.getDataFolder(), "spigot-config.yml");
             config = YamlConfiguration.loadConfiguration(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
+            final File languageFile = new File(plugin.getDataFolder(), "language.yml");
+            language = YamlConfiguration.loadConfiguration(new InputStreamReader(new FileInputStream(languageFile), StandardCharsets.UTF_8));
             whitelist = YamlConfiguration.loadConfiguration(new File(plugin.getDataFolder(), "WhitelistedPlayers.yml"));
         } catch (final IOException e) {
-            throw new RuntimeException("Unable to load spigot-config.yml!", e);
+            throw new RuntimeException("Unable to load Maintenance files!", e);
         }
 
         loadSettings();
@@ -79,31 +99,6 @@ public final class SettingsSpigot extends Settings {
         whitelist.set(uuid, s);
     }
 
-    @Override
-    public boolean createFiles() {
-        if (!plugin.getDataFolder().exists())
-            plugin.getDataFolder().mkdirs();
-
-        final File file = new File(plugin.getDataFolder(), "spigot-config.yml");
-        if (!file.exists()) {
-            try (final InputStream in = plugin.getResource("spigot-config.yml")) {
-                Files.copy(in, file.toPath());
-            } catch (final IOException e) {
-                throw new RuntimeException("Unable to create spigot-config.yml file for Maintenance!", e);
-            }
-        }
-
-        final File whitelistFile = new File(plugin.getDataFolder(), "WhitelistedPlayers.yml");
-        if (!whitelistFile.exists()) {
-            try (final InputStream in = plugin.getResource("WhitelistedPlayers.yml")) {
-                Files.copy(in, whitelistFile.toPath());
-            } catch (final IOException e) {
-                throw new RuntimeException("Unable to create WhitelistedPlayers.yml file for Maintenance!", e);
-            }
-        }
-        return true;
-    }
-
     @Override
     public String getConfigString(final String path) {
         final String s = config.getString(path);
@@ -111,6 +106,16 @@ public final class SettingsSpigot extends Settings {
             plugin.getLogger().warning("The config is missing the following string: " + path);
             return "null";
         }
+        return s;
+    }
+
+    @Override
+    public String getMessage(final String path) {
+        final String s = language.getString(path);
+        if (s == null) {
+            plugin.getLogger().warning("The language file is missing the following string: " + path);
+            return "null";
+        }
         return ChatColor.translateAlternateColorCodes('&', s);
     }
 

Maintenance-Spigot/src/main/java/eu/kennytv/maintenance/spigot/command/MaintenanceSpigotCommand.java

@@ -28,48 +28,52 @@ public final class MaintenanceSpigotCommand extends MaintenanceCommand implement
     protected void addPlayerToWhitelist(final SenderInfo sender, final String name) {
         final Player selected = Bukkit.getPlayer(name);
         if (selected != null) {
-            settings.addWhitelistedPlayer(selected.getUniqueId(), selected.getName());
-            sender.sendMessage(plugin.getPrefix() + "§aAdded §b" + selected.getName() + " §ato the maintenance whitelist!");
+            if (settings.addWhitelistedPlayer(selected.getUniqueId(), selected.getName()))
+                sender.sendMessage(settings.getMessage("whitelistAdded").replace("%PLAYER%", selected.getName()));
+            else
+                sender.sendMessage(settings.getMessage("whitelistAlreadyAdded").replace("%PLAYER%", selected.getName()));
             return;
         }
 
         final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(name);
         if (!offlinePlayer.hasPlayedBefore()) {
-            sender.sendMessage(plugin.getPrefix() + "§cNo player with this name has played on this server before.");
+            sender.sendMessage(settings.getMessage("playerNotFound"));
             return;
         }
 
         if (settings.addWhitelistedPlayer(offlinePlayer.getUniqueId(), offlinePlayer.getName()))
-            sender.sendMessage(plugin.getPrefix() + "§aAdded §b" + offlinePlayer.getName() + " §ato the maintenance whitelist!");
+            sender.sendMessage(settings.getMessage("whitelistAdded").replace("%PLAYER%", offlinePlayer.getName()));
         else
-            sender.sendMessage(plugin.getPrefix() + "§b" + offlinePlayer.getName() + " §calready is in the maintenance whitelist!");
+            sender.sendMessage(settings.getMessage("whitelistAlreadyAdded").replace("%PLAYER%", offlinePlayer.getName()));
     }
 
     @Override
     protected void removePlayerFromWhitelist(final SenderInfo sender, final String name) {
         final Player selected = Bukkit.getPlayer(name);
         if (selected != null) {
-            settings.removeWhitelistedPlayer(selected.getUniqueId());
-            sender.sendMessage(plugin.getPrefix() + "§aRemoved §b" + selected.getName() + " §afrom the maintenance whitelist!");
+            if (settings.removeWhitelistedPlayer(selected.getUniqueId()))
+                sender.sendMessage(settings.getMessage("whitelistRemoved").replace("%PLAYER%", selected.getName()));
+            else
+                sender.sendMessage(settings.getMessage("whitelistNotFound"));
             return;
         }
 
         final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(name);
         if (!offlinePlayer.hasPlayedBefore()) {
-            sender.sendMessage(plugin.getPrefix() + "§cNo player with this name has played on this server before.");
+            sender.sendMessage(settings.getMessage("playerNotFound"));
             return;
         }
 
         if (settings.removeWhitelistedPlayer(offlinePlayer.getUniqueId()))
-            sender.sendMessage(plugin.getPrefix() + "§aRemoved §b" + offlinePlayer.getName() + " §afrom the maintenance whitelist!");
+            sender.sendMessage(settings.getMessage("whitelistRemoved").replace("%PLAYER%", offlinePlayer.getName()));
         else
-            sender.sendMessage(plugin.getPrefix() + "§cThis player is not in the maintenance whitelist!");
+            sender.sendMessage(settings.getMessage("whitelistNotFound"));
     }
 
     @Override
     protected void checkForUpdate(final SenderInfo sender) {
         if (plugin.updateAvailable()) {
-            sender.sendMessage(plugin.getPrefix() + "§cNewest version available: §aVersion " + plugin.getNewestVersion() + "§c, you're still on §a" + plugin.getVersion());
+            sender.sendMessage(plugin.getPrefix() + "§cNewest version available: §aVersion " + plugin.getNewestVersion() + "§c, you're on §a" + plugin.getVersion());
             sender.sendMessage(plugin.getPrefix() + "§c§lWARNING: §cYou will have to restart the server to prevent further issues and to complete the update!" +
                     " If you can't do that, don't update!");
             sender.sendMessage(plugin.getPrefix() + "§eUse §c§l/maintenance forceupdate §eto update!");

Maintenance-Spigot/src/main/java/eu/kennytv/maintenance/spigot/listener/PacketListener.java

@@ -30,9 +30,14 @@ public final class PacketListener implements IPingListener {
                 if (!settings.isMaintenance()) return;
 
                 final WrappedServerPing ping = event.getPacket().getServerPings().read(0);
-                ping.setVersionProtocol(0);
                 ping.setMotD(settings.getRandomPingMessage());
-                ping.setVersionName(settings.getPlayerCountMessage());
+
+                if (settings.hasCustomPlayerCountMessage()) {
+                    ping.setVersionProtocol(0);
+                    ping.setVersionName(settings.getPlayerCountMessage()
+                            .replace("%ONLINE%", Integer.toString(pl.getServer().getOnlinePlayers().size()))
+                            .replace("%MAX%", Integer.toString(pl.getServer().getMaxPlayers())));
+                }
 
                 final List<WrappedGameProfile> players = Lists.newArrayList();
                 for (final String string : settings.getPlayerCountHoverMessage().split("%NEWLINE%"))

Maintenance-Spigot/src/main/java/eu/kennytv/maintenance/spigot/listener/PlayerLoginListener.java

@@ -1,5 +1,6 @@
 package eu.kennytv.maintenance.spigot.listener;
 
+import com.google.common.collect.Sets;
 import eu.kennytv.maintenance.spigot.MaintenanceSpigotPlugin;
 import eu.kennytv.maintenance.spigot.SettingsSpigot;
 import net.md_5.bungee.api.chat.ClickEvent;
@@ -13,14 +14,13 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerLoginEvent;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
+import java.util.Set;
+import java.util.UUID;
 
 public final class PlayerLoginListener implements Listener {
     private final MaintenanceSpigotPlugin plugin;
     private final SettingsSpigot settings;
+    private final Set<UUID> notifiedPlayers = Sets.newHashSet();
 
     public PlayerLoginListener(final MaintenanceSpigotPlugin plugin, final SettingsSpigot settings) {
         this.plugin = plugin;
@@ -39,21 +39,19 @@ public final class PlayerLoginListener implements Listener {
 
                 if (settings.isJoinNotifications())
                     Bukkit.getOnlinePlayers().stream().filter(player -> player.hasPermission("maintenance.joinnotification"))
-                            .forEach(player -> player.sendMessage(settings.getJoinNotification().replace("%PLAYER%", p.getName())));
+                            .forEach(player -> player.sendMessage(settings.getMessage("joinNotification").replace("%PLAYER%", p.getName())));
                 return;
             }
         }
 
-        if (!p.hasPermission("maintenance.admin")) return;
+        if (!p.hasPermission("maintenance.admin") || notifiedPlayers.contains(p.getUniqueId())) return;
 
         plugin.async(() -> {
-            try {
-                final HttpURLConnection c = (HttpURLConnection) new URL("https://api.spigotmc.org/legacy/update.php?resource=40699").openConnection();
-                final String newVersion = new BufferedReader(new InputStreamReader(c.getInputStream())).readLine();
-
-                if (!newVersion.equals(plugin.getVersion())) {
-                    p.sendMessage(plugin.getPrefix() + "§cThere is a newer version available: §aVersion " + newVersion + "§c, you're still on §a" + plugin.getVersion());
+            if (plugin.updateAvailable()) {
+                p.sendMessage(plugin.getPrefix() + "§cThere is a newer version available: §aVersion " + plugin.getNewestVersion() + "§c, you're on §a" + plugin.getVersion());
+                notifiedPlayers.add(p.getUniqueId());
 
+                try {
                     final TextComponent tc1 = new TextComponent(TextComponent.fromLegacyText(plugin.getPrefix()));
                     final TextComponent tc2 = new TextComponent(TextComponent.fromLegacyText("§cDownload it at: §6https://www.spigotmc.org/resources/maintenancemode.40699/"));
                     final TextComponent click = new TextComponent(TextComponent.fromLegacyText(" §7§l§o(CLICK ME)"));
@@ -63,8 +61,9 @@ public final class PlayerLoginListener implements Listener {
                     tc1.addExtra(click);
 
                     p.spigot().sendMessage(tc1);
+                } catch (final Exception e) {
+                    p.sendMessage(plugin.getPrefix() + "§cDownload it at: §6https://www.spigotmc.org/resources/maintenancemode.40699/");
                 }
-            } catch (final Exception ignored) {
             }
         });
     }

Maintenance-Spigot/src/main/resources/spigot-config.yml

@@ -1,5 +1,6 @@
 # MaintenanceSpigot Plugin by KennyTV
 # Version ${project.version}
+# Important note: To use this plugin to its full extend, it requires the plugin 'ProtocolLib'
 
 # Enables maintenance-mode.
 enable-maintenance-mode: false
@@ -10,32 +11,26 @@ pingmessages:
   - "&cMaintenance mode!%NEWLINE%&6We will be back soon!"
  #- "Another entry"
 
-# Is shown at the top right corner of the server in the serverlist,
+# If set to true, the message below will be shown at the top right corner of the server in the serverlist,
 # where the playercount would normally be displayed.
+# If set to false, the normal playercount will be shown.
+# Alternatively you can use '%ONLINE%' and '%MAX% if you want to include the playercount in a custom message (e.g. '&cMaintenance &7%ONLINE%&8/&7%MAX%').
+enable-playercountmessage: true
 playercountmessage: "&4Maintenance"
 
 # Is shown when you move your mouse above the text at the top right corner of the server in the serverlist,
 # where the playercount would normally be displayed.
 playercounthovermessage: "&cCurrently under%NEWLINE%&cmaintenance"
 
-# Will be shown, when a player tries to join on the server without the permission.
+# Is shown when a player tries to join while maintenance is enabled and they don't have the permission to bypass it.
 kickmessage: "&cThe server is currently under maintenance!%NEWLINE%Try again later!"
 
-# Some self explanatory messages
-no-permission: "&cYou do not have the permission to execute that command."
-maintenance-activated: "&6Maintenance mode is now activated."
-maintenance-deactivated: "&6Maintenance mode is now deactivated."
-
-starttimer-broadcast-mesage: '&8[&eMaintenance&8] &7Maintenance mode will be enabled in &6%MINUTES% minutes&7.'
-endtimer-broadcast-mesage: '&8[&eMaintenance&8] &7Maintenance mode will be disabled in &6%MINUTES% minutes&7.'
-
 # If using the timer command: In what intervalls before enabling/disabling maintenance there will be a broadcast.
-timer-broadcasts-for-minutes: [60, 30, 15, 10, 5, 4, 3, 2, 1]
+timer-broadcast-for-seconds: [1200, 900, 600, 300, 120, 60, 30, 20, 10, 5, 4, 3, 2, 1]
 
 # If set to true, players with the maintenance.joinnotification permission will receive a message,
 # that a player tried to join the server while maintenance is enabled.
 send-join-notification: false
-join-notification: "&e%PLAYER% &ctried to join the server."
 
 # If set to true, the server icon will be changed to maintenance-icon.png in the Bungee main/base-folder.
 custom-maintenance-icon: false

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>eu.kennytv</groupId>
     <artifactId>maintenance-base</artifactId>
-    <version>2.3.1</version>
+    <version>2.4</version>
     <name>Maintenance</name>
     <packaging>pom</packaging>
 
@@ -38,6 +38,14 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>com.zaxxer.hikari</pattern>
+                                    <shadedPattern>eu.kennytv.lib.hikari</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>