From 49685bf63c39d17e8ac3475ff9683799ea532d8d Mon Sep 17 00:00:00 2001 From: EinfacheSache Date: Sat, 22 Jul 2023 17:40:51 +0200 Subject: [PATCH] Changes -> Added in-game restart required message --- pom.xml | 2 +- .../cubeattack/neoprotect/bungee/listener/LoginListener.java | 4 ++++ .../cubeattack/neoprotect/core/request/RestAPIRequests.java | 2 +- .../cubeattack/neoprotect/spigot/listener/LoginListener.java | 4 ++++ .../neoprotect/velocity/listener/LoginListener.java | 4 ++++ src/main/resources/language_de.properties | 2 ++ src/main/resources/language_en.properties | 2 ++ 7 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3aef927..787b452 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ com.github.CubeAttack EasyAPI - f0e587ac69 + 596efd829f io.netty diff --git a/src/main/java/de/cubeattack/neoprotect/bungee/listener/LoginListener.java b/src/main/java/de/cubeattack/neoprotect/bungee/listener/LoginListener.java index 3c472e7..70aafba 100644 --- a/src/main/java/de/cubeattack/neoprotect/bungee/listener/LoginListener.java +++ b/src/main/java/de/cubeattack/neoprotect/bungee/listener/LoginListener.java @@ -41,6 +41,10 @@ public void run() { "OPEN_URL", result.getReleaseUrl(), null, null); } + if (result.getVersionStatus().equals(VersionUtils.VersionStatus.REQUIRED_RESTART)) { + instance.sendMessage(player, localization.get("plugin.restart-required.message", result.getCurrentVersion(), result.getLatestVersion())); + } + if (!instance.getCore().isSetup() && instance.getCore().getPlayerInSetup().isEmpty()) { instance.sendMessage(player, localization.get("setup.required.first")); instance.sendMessage(player, localization.get("setup.required.second")); diff --git a/src/main/java/de/cubeattack/neoprotect/core/request/RestAPIRequests.java b/src/main/java/de/cubeattack/neoprotect/core/request/RestAPIRequests.java index 03651cc..5b01a39 100644 --- a/src/main/java/de/cubeattack/neoprotect/core/request/RestAPIRequests.java +++ b/src/main/java/de/cubeattack/neoprotect/core/request/RestAPIRequests.java @@ -189,7 +189,7 @@ private void versionCheckSchedule() { public void run() { core.setVersionResult(VersionUtils.checkVersion("NeoProtect", "NeoPlugin", "v" + core.getPlugin().getVersion(), Config.isAutoUpdater())); } - }, 1000 * 15, 1000 * 60 * 3); + }, 1000 * 10, 1000 * 60 * 3); } private void attackCheckSchedule() { diff --git a/src/main/java/de/cubeattack/neoprotect/spigot/listener/LoginListener.java b/src/main/java/de/cubeattack/neoprotect/spigot/listener/LoginListener.java index 51b819f..ecf0065 100644 --- a/src/main/java/de/cubeattack/neoprotect/spigot/listener/LoginListener.java +++ b/src/main/java/de/cubeattack/neoprotect/spigot/listener/LoginListener.java @@ -37,6 +37,10 @@ public void onLogin(PlayerJoinEvent event) { "OPEN_URL", result.getReleaseUrl(), null, null); } + if (result.getVersionStatus().equals(VersionUtils.VersionStatus.REQUIRED_RESTART)) { + instance.sendMessage(player, localization.get("plugin.restart-required.message", result.getCurrentVersion(), result.getLatestVersion())); + } + if (!instance.getCore().isSetup() && instance.getCore().getPlayerInSetup().isEmpty()) { instance.sendMessage(player, localization.get("setup.required.first")); instance.sendMessage(player, localization.get("setup.required.second")); diff --git a/src/main/java/de/cubeattack/neoprotect/velocity/listener/LoginListener.java b/src/main/java/de/cubeattack/neoprotect/velocity/listener/LoginListener.java index e783877..99aba2a 100644 --- a/src/main/java/de/cubeattack/neoprotect/velocity/listener/LoginListener.java +++ b/src/main/java/de/cubeattack/neoprotect/velocity/listener/LoginListener.java @@ -41,6 +41,10 @@ public void run() { "OPEN_URL", result.getReleaseUrl(), null, null); } + if (result.getVersionStatus().equals(VersionUtils.VersionStatus.REQUIRED_RESTART)) { + instance.sendMessage(player, localization.get("plugin.restart-required.message", result.getCurrentVersion(), result.getLatestVersion())); + } + if (!instance.getCore().isSetup() && instance.getCore().getPlayerInSetup().isEmpty()) { instance.sendMessage(player, localization.get("setup.required.first")); instance.sendMessage(player, localization.get("setup.required.second")); diff --git a/src/main/resources/language_de.properties b/src/main/resources/language_de.properties index 2799780..2bb9e6e 100644 --- a/src/main/resources/language_de.properties +++ b/src/main/resources/language_de.properties @@ -37,6 +37,8 @@ utils.activated=§aaktiviert utils.deactivated=§cdeaktiviert plugin.outdated.message=§cDas Plugin {0} ist veraltet, bitte downloade die aktuelle Version {1} +plugin.restart-required.message=§cDie Plugin {0} entspricht nicht dem neuesten Release. Bitte starte den Server neu, um auf die aktuelle Version {1} zu aktualisieren + debug.spigot=Dieser Befehl ist nur für Proxy-Server verfügbar debug.starting=§aDebug-Tool wird gestartet... debug.running=§cDebug-Tool läuft aktuell bereits diff --git a/src/main/resources/language_en.properties b/src/main/resources/language_en.properties index eb82c94..9dc66ce 100644 --- a/src/main/resources/language_en.properties +++ b/src/main/resources/language_en.properties @@ -37,6 +37,8 @@ utils.activated=§aactivated utils.deactivated=§cdeactivated plugin.outdated.message=§cThe plugin {0} is outdated, please download the latest version {1} +plugin.restart-required.message=§cThe plugin {0} does not match the latest release. Please restart the server to update to the version {1} + debug.spigot=This command is only available for proxy-server debug.starting=§aStarting debug tool... debug.running=§cDebug tool is progressing right now