diff --git a/README.md b/README.md index 14aca4db..12abba9b 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ # GeyserUpdater ### GeyserUpdater is a plugin that downloads and applies new builds of Geyser on Spigot/CraftBukkit, BungeeCord, and Velocity either manually or automatically. -##### Supports Minecraft 1.8 〜 1.19 +##### Supports Minecraft 1.8 〜 1.21 If you'd like, click [here](https://discord.gg/xXzzdAXa2b) to join our Discord server! You can come here to receive support, ask about contributing, get GitHub feeds, or just simply hang out. Please do not ping anyone that doesn't have the "Pingable" role! @@ -16,9 +16,7 @@ If you'd like, click [here](https://discord.gg/xXzzdAXa2b) to join our Discord s ## Downloading -Please download the plugin from [our Spigot page](https://www.spigotmc.org/resources/geyserupdater.88555/), so we can get an idea of how many people are downloading the plugin. - -If you don't want to use the Spigot website, you can download the plugin from [our Github](https://github.com/kejonaMC/GeyserUpdater/releases), or use the actions button in the GitHub bar and download the zip with the GeyserUpdater jar inside. +If you don't want to use the Spigot website, you can download the plugin from [our GitHub](https://github.com/kejonaMC/GeyserUpdater/releases). ## Installation @@ -39,7 +37,7 @@ Please note that for BungeeCord and Velocity, if the server is not shut down cle ## Configuration ### `Auto-Update-Geyser`: -*Default:* `false` +*Default:* `false` If enabled, GeyserUpdater will check for new Geyser builds on server start, and on the interval specified by `Auto-Update-Interval`. If a new build exists, it will be downloaded. @@ -49,29 +47,36 @@ If enabled, GeyserUpdater will check for new Geyser builds on server start, and The interval in hours between each auto update check. ### `Auto-Restart-Server`: -*Default:* `false` +*Default:* `false` -If enabled, GeyserUpdater will attempt to restart the server 10 seconds after a new version of Geyser has been successfully downloaded. +If enabled, GeyserUpdater will attempt to restart the server after a new version of Geyser has been successfully downloaded. - **Spigot:** Attempts to restart using Spigot's `/restart`. A restart script _must_ be defined in [spigot.yml](https://www.spigotmc.org/wiki/spigot-configuration/) in order for Spigot's restart feature to work properly. If you are using a hosting provider, a [server wrapper](https://minecraftservers.fandom.com/wiki/Server_wrappers), or a `systemd` unit (or similar) to run the server, leave the `restart-script` value in spigot.yml blank. Your server should automatically restart without needing a script. -- **BungeeCord/Velocity:** The server will simply stop. If you are using a hosting provider, a [server wrapper](https://minecraftservers.fandom.com/wiki/Server_wrappers), or a `systemd` unit (or similar) to run the server, your proxy should automatically restart. If not, you can use a script to *start* the proxy that will make it start again once it has stopped. +- **BungeeCord/Velocity:** The server will simply stop. If you are using a hosting provider, a [server wrapper](https://minecraftservers.fandom.com/wiki/Server_wrappers), or a `systemd` unit (or similar) to run the server, your proxy should automatically restart. If not, you can use a script to *start* the proxy that will make it start again once it has stopped. ### `Auto-Script-Generating`: -*Default:* `false` +*Default:* `false` Do not use this if you are using a hosting provider, a [server wrapper](https://minecraftservers.fandom.com/wiki/Server_wrappers), or a `systemd` unit (or similar) to run your server. -When enabled, a restart script named `ServerRestartScript.sh` (macOS, Linux) or `ServerRestartScript.bat` (Windows) will be generated for you. It will attempt to use the same JVM flags that your server started with. Although it should typically work without any issue, it is recommended to verify and modify the generated script to your liking. +When enabled, a restart script named `ServerRestartScript.sh` (macOS, Linux) or `ServerRestartScript.bat` (Windows) will be generated for you. It will attempt to use the same JVM flags that your server started with. Although it should typically work without any issue, it is recommended to verify and modify the generated script to your liking. -- **Spigot:** The `restart-script` value in [spigot.yml](https://www.spigotmc.org/wiki/spigot-configuration/) will be automatically set to use the generated restart script. This will allow Spigot's restart feature to work if you have `Auto-Restart-Server` enabled, and if you run `/restart`. If you are running your server on Linux, it is recommended to modify the script so that your server starts in a [screen](https://www.gnu.org/software/screen/) or [tmux](https://github.com/tmux/tmux/wiki) session so that you can attach to the console of the server after it has restarted. +- **Spigot:** The `restart-script` value in [spigot.yml](https://www.spigotmc.org/wiki/spigot-configuration/) will be automatically set to use the generated restart script. This will allow Spigot's restart feature to work if you have `Auto-Restart-Server` enabled, and if you run `/restart`. If you are running your server on Linux, it is recommended to modify the script so that your server starts in a [screen](https://www.gnu.org/software/screen/) or [tmux](https://github.com/tmux/tmux/wiki) session so that you can attach to the console of the server after it has restarted. -- **BungeeCord/Velocity:** You must use the generated script to start the proxy. This will make the server restart after it has stopped. +- **BungeeCord/Velocity:** You must use the generated script to start the proxy. This will make the server restart after it has stopped. ### `Restart-Message-Players`: -*Default:* `'&2This server will be restarting in 10 seconds!'` +*Default:* `'&2This server will be restarting in 30 seconds!'` + +This is the message that is sent to all players when `Auto-Restart-Server` is going to restart the server in 30 seconds. + +### `Restart-Timer`: +*Default:* `30` + +The countdown in seconds before the server restarts. + -This is the message that is sent to all players when `Auto-Restart-Server` is going to restart the server in 10 seconds. ## bStats [Spigot stats](https://bstats.org/plugin/bukkit/GeyserUpdater/10202) @@ -82,42 +87,42 @@ This is the message that is sent to all players when `Auto-Restart-Server` is go ## Release History * 1.6.1 - * Update for Geyser's resource system refactor (Build #943, commit [763743a](https://github.com/GeyserMC/Geyser/commit/763743a845796e4619ba596b82d4eabb39045448)) + * Update for Geyser's resource system refactor (Build #943, commit [763743a](https://github.com/GeyserMC/Geyser/commit/763743a845796e4619ba596b82d4eabb39045448)) * 1.6.0 - * Update for Geyser 2.0, bump to Java 16 + * Update for Geyser 2.0, bump to Java 16 * 1.5.0 - * This update breaks existing configurations. Please rename or delete the old one to generate a new configuration. - * Add option to automatically check for updates on a custom interval. - * Add debug logger config option. - * All warn and error log messages are now coloured correctly (if the platform supports it). + * This update breaks existing configurations. Please rename or delete the old one to generate a new configuration. + * Add option to automatically check for updates on a custom interval. + * Add debug logger config option. + * All warn and error log messages are now coloured correctly (if the platform supports it). * 1.4.0 - * Any branch of Geyser that is available on their Jenkins CI can now be updated. - * Added support for CraftBukkit. - * Added support for non-default Bukkit/Spigot world-containers - * Important bugfixes, general increase in quality and better documentation. + * Any branch of Geyser that is available on their Jenkins CI can now be updated. + * Added support for CraftBukkit. + * Added support for non-default Bukkit/Spigot world-containers + * Important bugfixes, general increase in quality and better documentation. * 1.3.0 - * Added Velocity support. + * Added Velocity support. * 1.2.0 - * Added Restart script generating depended on OS, and setting it up on spigot.yml. - * Added config version check. + * Added Restart script generating depended on OS, and setting it up on spigot.yml. + * Added config version check. * 1.1.0 - * Added message if GeyserUpdater has an available update on startup + * Added message if GeyserUpdater has an available update on startup * 1.0.0 - * Full release! (No changes but we decided we are ready for it now, we will still update more if we need to) + * Full release! (No changes but we decided we are ready for it now, we will still update more if we need to) * 0.2.6 - * Add warning for players in config option + * Add warning for players in config option * 0.2.5 - * Added bStats support + * Added bStats support * 0.2.4 - * Added auto restart on Spigot/Bungeecord after downloading update. - * If you use this build you will need to regenerate config.yml file due to changes! + * Added auto restart on Spigot/Bungeecord after downloading update. + * If you use this build you will need to regenerate config.yml file due to changes! * 0.2.2 - * Mini-rework > Common classes. - * Jenkins CI has been setup. - * Pipeline has been added. + * Mini-rework > Common classes. + * Jenkins CI has been setup. + * Pipeline has been added. * 0.1.0 - * Merged Spigot & Bungeecord updater into 1 plugin. - * Added maven + * Merged Spigot & Bungeecord updater into 1 plugin. + * Added maven Special thanks to: diff --git a/pom.xml b/pom.xml index 552edd67..ff3a7a6d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,10 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.projectg + com.kejonamc GeyserUpdater GeyserUpdater - 1.6.4 + 1.6.5 UTF-8 @@ -74,7 +74,7 @@ org.projectlombok lombok - 1.18.28 + 1.18.42 provided diff --git a/src/main/java/com/projectg/geyserupdater/bungee/BungeeUpdater.java b/src/main/java/com/kejonamc/geyserupdater/bungee/BungeeUpdater.java similarity index 91% rename from src/main/java/com/projectg/geyserupdater/bungee/BungeeUpdater.java rename to src/main/java/com/kejonamc/geyserupdater/bungee/BungeeUpdater.java index 6c946f00..e70a976d 100644 --- a/src/main/java/com/projectg/geyserupdater/bungee/BungeeUpdater.java +++ b/src/main/java/com/kejonamc/geyserupdater/bungee/BungeeUpdater.java @@ -1,16 +1,16 @@ -package com.projectg.geyserupdater.bungee; - -import com.projectg.geyserupdater.bungee.command.GeyserUpdateCommand; -import com.projectg.geyserupdater.bungee.listeners.BungeeJoinListener; -import com.projectg.geyserupdater.bungee.util.GeyserBungeeDownloader; -import com.projectg.geyserupdater.bungee.util.bstats.Metrics; -import com.projectg.geyserupdater.common.logger.JavaUtilUpdaterLogger; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; -import com.projectg.geyserupdater.common.util.FileUtils; -import com.projectg.geyserupdater.common.util.GeyserProperties; -import com.projectg.geyserupdater.common.util.ScriptCreator; - -import com.projectg.geyserupdater.common.util.SpigotResourceUpdateChecker; +package com.kejonamc.geyserupdater.bungee; + +import com.kejonamc.geyserupdater.bungee.command.GeyserUpdateCommand; +import com.kejonamc.geyserupdater.bungee.listeners.BungeeJoinListener; +import com.kejonamc.geyserupdater.bungee.util.GeyserBungeeDownloader; +import com.kejonamc.geyserupdater.bungee.util.bstats.Metrics; +import com.kejonamc.geyserupdater.common.logger.JavaUtilUpdaterLogger; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.util.FileUtils; +import com.kejonamc.geyserupdater.common.util.GeyserProperties; +import com.kejonamc.geyserupdater.common.util.ScriptCreator; + +import com.kejonamc.geyserupdater.common.util.SpigotResourceUpdateChecker; import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.ConfigurationProvider; @@ -114,9 +114,9 @@ public void loadConfig() { */ public void checkConfigVersion(){ //Change version number only when editing config.yml! - if (configuration.getInt("Config-Version", 0) != 2){ + if (configuration.getInt("Config-Version", 0) != 3){ logger.error("Your copy of config.yml is outdated. Please delete it and let a fresh copy of config.yml be regenerated!"); - } + } } /** diff --git a/src/main/java/com/projectg/geyserupdater/bungee/Config.java b/src/main/java/com/kejonamc/geyserupdater/bungee/Config.java similarity index 95% rename from src/main/java/com/projectg/geyserupdater/bungee/Config.java rename to src/main/java/com/kejonamc/geyserupdater/bungee/Config.java index 8993d637..114aa11f 100644 --- a/src/main/java/com/projectg/geyserupdater/bungee/Config.java +++ b/src/main/java/com/kejonamc/geyserupdater/bungee/Config.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.bungee; +package com.kejonamc.geyserupdater.bungee; import net.md_5.bungee.api.plugin.Plugin; diff --git a/src/main/java/com/projectg/geyserupdater/bungee/command/GeyserUpdateCommand.java b/src/main/java/com/kejonamc/geyserupdater/bungee/command/GeyserUpdateCommand.java similarity index 86% rename from src/main/java/com/projectg/geyserupdater/bungee/command/GeyserUpdateCommand.java rename to src/main/java/com/kejonamc/geyserupdater/bungee/command/GeyserUpdateCommand.java index 0f51c189..133c4588 100644 --- a/src/main/java/com/projectg/geyserupdater/bungee/command/GeyserUpdateCommand.java +++ b/src/main/java/com/kejonamc/geyserupdater/bungee/command/GeyserUpdateCommand.java @@ -1,9 +1,9 @@ -package com.projectg.geyserupdater.bungee.command; +package com.kejonamc.geyserupdater.bungee.command; -import com.projectg.geyserupdater.bungee.util.GeyserBungeeDownloader; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; -import com.projectg.geyserupdater.common.util.Constants; -import com.projectg.geyserupdater.common.util.GeyserProperties; +import com.kejonamc.geyserupdater.bungee.util.GeyserBungeeDownloader; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.util.Constants; +import com.kejonamc.geyserupdater.common.util.GeyserProperties; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.CommandSender; diff --git a/src/main/java/com/projectg/geyserupdater/bungee/listeners/BungeeJoinListener.java b/src/main/java/com/kejonamc/geyserupdater/bungee/listeners/BungeeJoinListener.java similarity index 87% rename from src/main/java/com/projectg/geyserupdater/bungee/listeners/BungeeJoinListener.java rename to src/main/java/com/kejonamc/geyserupdater/bungee/listeners/BungeeJoinListener.java index 8e8eb787..201e3652 100644 --- a/src/main/java/com/projectg/geyserupdater/bungee/listeners/BungeeJoinListener.java +++ b/src/main/java/com/kejonamc/geyserupdater/bungee/listeners/BungeeJoinListener.java @@ -1,6 +1,6 @@ -package com.projectg.geyserupdater.bungee.listeners; +package com.kejonamc.geyserupdater.bungee.listeners; -import com.projectg.geyserupdater.common.util.FileUtils; +import com.kejonamc.geyserupdater.common.util.FileUtils; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.event.PostLoginEvent; diff --git a/src/main/java/com/projectg/geyserupdater/bungee/util/GeyserBungeeDownloader.java b/src/main/java/com/kejonamc/geyserupdater/bungee/util/GeyserBungeeDownloader.java similarity index 85% rename from src/main/java/com/projectg/geyserupdater/bungee/util/GeyserBungeeDownloader.java rename to src/main/java/com/kejonamc/geyserupdater/bungee/util/GeyserBungeeDownloader.java index 9121acba..9ec2ef93 100644 --- a/src/main/java/com/projectg/geyserupdater/bungee/util/GeyserBungeeDownloader.java +++ b/src/main/java/com/kejonamc/geyserupdater/bungee/util/GeyserBungeeDownloader.java @@ -1,12 +1,12 @@ -package com.projectg.geyserupdater.bungee.util; +package com.kejonamc.geyserupdater.bungee.util; -import com.projectg.geyserupdater.bungee.BungeeUpdater; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; -import com.projectg.geyserupdater.common.util.Constants; -import com.projectg.geyserupdater.common.util.FileUtils; +import com.kejonamc.geyserupdater.bungee.BungeeUpdater; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.util.Constants; +import com.kejonamc.geyserupdater.common.util.FileUtils; -import com.projectg.geyserupdater.common.util.GeyserDownloadApi; -import com.projectg.geyserupdater.common.util.ServerPlatform; +import com.kejonamc.geyserupdater.common.util.GeyserDownloadApi; +import com.kejonamc.geyserupdater.common.util.ServerPlatform; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; @@ -82,10 +82,11 @@ private static boolean downloadGeyser() { * Attempt to restart the server */ private static void restartServer() { - logger.warn("The server will be restarting in 10 seconds!"); + long restartTimer = plugin.getConfig().getLong("Restart-Timer"); + logger.warn("The server will be restarting in " + restartTimer + " seconds!"); for (ProxiedPlayer player : plugin.getProxy().getPlayers()) { player.sendMessage(new TextComponent(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("Restart-Message-Players")))); } - plugin.getProxy().getScheduler().schedule(plugin, () -> plugin.getProxy().stop(), 10L, TimeUnit.SECONDS); + plugin.getProxy().getScheduler().schedule(plugin, () -> plugin.getProxy().stop(), restartTimer, TimeUnit.SECONDS); } } \ No newline at end of file diff --git a/src/main/java/com/projectg/geyserupdater/bungee/util/bstats/Metrics.java b/src/main/java/com/kejonamc/geyserupdater/bungee/util/bstats/Metrics.java similarity index 99% rename from src/main/java/com/projectg/geyserupdater/bungee/util/bstats/Metrics.java rename to src/main/java/com/kejonamc/geyserupdater/bungee/util/bstats/Metrics.java index f9579f84..87c17e8f 100644 --- a/src/main/java/com/projectg/geyserupdater/bungee/util/bstats/Metrics.java +++ b/src/main/java/com/kejonamc/geyserupdater/bungee/util/bstats/Metrics.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.bungee.util.bstats; +package com.kejonamc.geyserupdater.bungee.util.bstats; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/com/projectg/geyserupdater/common/json_schema/EndpointResponse.java b/src/main/java/com/kejonamc/geyserupdater/common/json_schema/EndpointResponse.java similarity index 96% rename from src/main/java/com/projectg/geyserupdater/common/json_schema/EndpointResponse.java rename to src/main/java/com/kejonamc/geyserupdater/common/json_schema/EndpointResponse.java index 48338b81..8372724f 100644 --- a/src/main/java/com/projectg/geyserupdater/common/json_schema/EndpointResponse.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/json_schema/EndpointResponse.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.common.json_schema; +package com.kejonamc.geyserupdater.common.json_schema; import lombok.Getter; import lombok.experimental.Accessors; diff --git a/src/main/java/com/projectg/geyserupdater/common/logger/JavaUtilUpdaterLogger.java b/src/main/java/com/kejonamc/geyserupdater/common/logger/JavaUtilUpdaterLogger.java similarity index 96% rename from src/main/java/com/projectg/geyserupdater/common/logger/JavaUtilUpdaterLogger.java rename to src/main/java/com/kejonamc/geyserupdater/common/logger/JavaUtilUpdaterLogger.java index 2710bdd1..1f4d8991 100644 --- a/src/main/java/com/projectg/geyserupdater/common/logger/JavaUtilUpdaterLogger.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/logger/JavaUtilUpdaterLogger.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.common.logger; +package com.kejonamc.geyserupdater.common.logger; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/com/projectg/geyserupdater/common/logger/UpdaterLogger.java b/src/main/java/com/kejonamc/geyserupdater/common/logger/UpdaterLogger.java similarity index 97% rename from src/main/java/com/projectg/geyserupdater/common/logger/UpdaterLogger.java rename to src/main/java/com/kejonamc/geyserupdater/common/logger/UpdaterLogger.java index 7683ae03..d029af03 100644 --- a/src/main/java/com/projectg/geyserupdater/common/logger/UpdaterLogger.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/logger/UpdaterLogger.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.common.logger; +package com.kejonamc.geyserupdater.common.logger; public interface UpdaterLogger { diff --git a/src/main/java/com/projectg/geyserupdater/common/logger/UpdaterLoggerHolder.java b/src/main/java/com/kejonamc/geyserupdater/common/logger/UpdaterLoggerHolder.java similarity index 59% rename from src/main/java/com/projectg/geyserupdater/common/logger/UpdaterLoggerHolder.java rename to src/main/java/com/kejonamc/geyserupdater/common/logger/UpdaterLoggerHolder.java index 046a8f95..be24230c 100644 --- a/src/main/java/com/projectg/geyserupdater/common/logger/UpdaterLoggerHolder.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/logger/UpdaterLoggerHolder.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.common.logger; +package com.kejonamc.geyserupdater.common.logger; class UpdaterLoggerHolder { diff --git a/src/main/java/com/projectg/geyserupdater/common/util/Constants.java b/src/main/java/com/kejonamc/geyserupdater/common/util/Constants.java similarity index 94% rename from src/main/java/com/projectg/geyserupdater/common/util/Constants.java rename to src/main/java/com/kejonamc/geyserupdater/common/util/Constants.java index 3b016368..bc4a8860 100644 --- a/src/main/java/com/projectg/geyserupdater/common/util/Constants.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/util/Constants.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.common.util; +package com.kejonamc.geyserupdater.common.util; public class Constants { public static final String GEYSER_BASE_URL = "https://download.geysermc.org"; diff --git a/src/main/java/com/projectg/geyserupdater/common/util/FileUtils.java b/src/main/java/com/kejonamc/geyserupdater/common/util/FileUtils.java similarity index 97% rename from src/main/java/com/projectg/geyserupdater/common/util/FileUtils.java rename to src/main/java/com/kejonamc/geyserupdater/common/util/FileUtils.java index c5375fb9..751763fa 100644 --- a/src/main/java/com/projectg/geyserupdater/common/util/FileUtils.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/util/FileUtils.java @@ -1,8 +1,8 @@ -package com.projectg.geyserupdater.common.util; +package com.kejonamc.geyserupdater.common.util; import com.google.common.hash.Hashing; import com.google.common.io.ByteSource; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; import org.jetbrains.annotations.Nullable; import java.io.*; diff --git a/src/main/java/com/projectg/geyserupdater/common/util/GeyserDownloadApi.java b/src/main/java/com/kejonamc/geyserupdater/common/util/GeyserDownloadApi.java similarity index 88% rename from src/main/java/com/projectg/geyserupdater/common/util/GeyserDownloadApi.java rename to src/main/java/com/kejonamc/geyserupdater/common/util/GeyserDownloadApi.java index 02e10ef7..36b4646f 100644 --- a/src/main/java/com/projectg/geyserupdater/common/util/GeyserDownloadApi.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/util/GeyserDownloadApi.java @@ -1,7 +1,7 @@ -package com.projectg.geyserupdater.common.util; +package com.kejonamc.geyserupdater.common.util; import com.google.gson.Gson; -import com.projectg.geyserupdater.common.json_schema.EndpointResponse; +import com.kejonamc.geyserupdater.common.json_schema.EndpointResponse; import java.io.InputStreamReader; import java.net.HttpURLConnection; diff --git a/src/main/java/com/projectg/geyserupdater/common/util/GeyserProperties.java b/src/main/java/com/kejonamc/geyserupdater/common/util/GeyserProperties.java similarity index 95% rename from src/main/java/com/projectg/geyserupdater/common/util/GeyserProperties.java rename to src/main/java/com/kejonamc/geyserupdater/common/util/GeyserProperties.java index 993aabfb..02bf45a2 100644 --- a/src/main/java/com/projectg/geyserupdater/common/util/GeyserProperties.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/util/GeyserProperties.java @@ -1,6 +1,6 @@ -package com.projectg.geyserupdater.common.util; +package com.kejonamc.geyserupdater.common.util; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; import org.geysermc.geyser.GeyserImpl; import java.io.IOException; diff --git a/src/main/java/com/projectg/geyserupdater/common/util/OsUtils.java b/src/main/java/com/kejonamc/geyserupdater/common/util/OsUtils.java similarity index 95% rename from src/main/java/com/projectg/geyserupdater/common/util/OsUtils.java rename to src/main/java/com/kejonamc/geyserupdater/common/util/OsUtils.java index 473d7739..0f6b24a6 100644 --- a/src/main/java/com/projectg/geyserupdater/common/util/OsUtils.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/util/OsUtils.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.common.util; +package com.kejonamc.geyserupdater.common.util; public class OsUtils { diff --git a/src/main/java/com/projectg/geyserupdater/common/util/ScriptCreator.java b/src/main/java/com/kejonamc/geyserupdater/common/util/ScriptCreator.java similarity index 96% rename from src/main/java/com/projectg/geyserupdater/common/util/ScriptCreator.java rename to src/main/java/com/kejonamc/geyserupdater/common/util/ScriptCreator.java index c5883dcc..f943e31d 100644 --- a/src/main/java/com/projectg/geyserupdater/common/util/ScriptCreator.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/util/ScriptCreator.java @@ -1,6 +1,6 @@ -package com.projectg.geyserupdater.common.util; +package com.kejonamc.geyserupdater.common.util; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; import java.io.DataOutputStream; import java.io.File; diff --git a/src/main/java/com/projectg/geyserupdater/common/util/ServerPlatform.java b/src/main/java/com/kejonamc/geyserupdater/common/util/ServerPlatform.java similarity index 86% rename from src/main/java/com/projectg/geyserupdater/common/util/ServerPlatform.java rename to src/main/java/com/kejonamc/geyserupdater/common/util/ServerPlatform.java index 6366ae7d..e1c668a1 100644 --- a/src/main/java/com/projectg/geyserupdater/common/util/ServerPlatform.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/util/ServerPlatform.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.common.util; +package com.kejonamc.geyserupdater.common.util; public enum ServerPlatform { SPIGOT("spigot"), diff --git a/src/main/java/com/projectg/geyserupdater/common/util/SpigotResourceUpdateChecker.java b/src/main/java/com/kejonamc/geyserupdater/common/util/SpigotResourceUpdateChecker.java similarity index 91% rename from src/main/java/com/projectg/geyserupdater/common/util/SpigotResourceUpdateChecker.java rename to src/main/java/com/kejonamc/geyserupdater/common/util/SpigotResourceUpdateChecker.java index c81fc9d5..df74f860 100644 --- a/src/main/java/com/projectg/geyserupdater/common/util/SpigotResourceUpdateChecker.java +++ b/src/main/java/com/kejonamc/geyserupdater/common/util/SpigotResourceUpdateChecker.java @@ -1,6 +1,6 @@ -package com.projectg.geyserupdater.common.util; +package com.kejonamc.geyserupdater.common.util; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/projectg/geyserupdater/spigot/SpigotUpdater.java b/src/main/java/com/kejonamc/geyserupdater/spigot/SpigotUpdater.java similarity index 88% rename from src/main/java/com/projectg/geyserupdater/spigot/SpigotUpdater.java rename to src/main/java/com/kejonamc/geyserupdater/spigot/SpigotUpdater.java index 56a987da..5d5e154e 100644 --- a/src/main/java/com/projectg/geyserupdater/spigot/SpigotUpdater.java +++ b/src/main/java/com/kejonamc/geyserupdater/spigot/SpigotUpdater.java @@ -1,15 +1,15 @@ -package com.projectg.geyserupdater.spigot; - -import com.projectg.geyserupdater.common.logger.JavaUtilUpdaterLogger; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; -import com.projectg.geyserupdater.common.util.FileUtils; -import com.projectg.geyserupdater.common.util.GeyserProperties; -import com.projectg.geyserupdater.spigot.command.GeyserUpdateCommand; -import com.projectg.geyserupdater.spigot.listeners.SpigotJoinListener; -import com.projectg.geyserupdater.spigot.util.CheckSpigotRestart; -import com.projectg.geyserupdater.spigot.util.GeyserSpigotDownloader; -import com.projectg.geyserupdater.common.util.SpigotResourceUpdateChecker; -import com.projectg.geyserupdater.spigot.util.bstats.Metrics; +package com.kejonamc.geyserupdater.spigot; + +import com.kejonamc.geyserupdater.common.logger.JavaUtilUpdaterLogger; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.util.FileUtils; +import com.kejonamc.geyserupdater.common.util.GeyserProperties; +import com.kejonamc.geyserupdater.spigot.command.GeyserUpdateCommand; +import com.kejonamc.geyserupdater.spigot.listeners.SpigotJoinListener; +import com.kejonamc.geyserupdater.spigot.util.CheckSpigotRestart; +import com.kejonamc.geyserupdater.spigot.util.GeyserSpigotDownloader; +import com.kejonamc.geyserupdater.common.util.SpigotResourceUpdateChecker; +import com.kejonamc.geyserupdater.spigot.util.bstats.Metrics; import org.bukkit.Bukkit; import org.bukkit.configuration.InvalidConfigurationException; @@ -93,7 +93,7 @@ private void loadConfig() { */ public void checkConfigVersion() { //Change version number only when editing config.yml! - if (getConfig().getInt("Config-Version", 0) != 2) { + if (getConfig().getInt("Config-Version", 0) != 3) { UpdaterLogger.getLogger().warn("Your copy of config.yml is outdated. Please delete it and let a fresh copy of config.yml be regenerated!"); } } diff --git a/src/main/java/com/projectg/geyserupdater/spigot/command/GeyserUpdateCommand.java b/src/main/java/com/kejonamc/geyserupdater/spigot/command/GeyserUpdateCommand.java similarity index 87% rename from src/main/java/com/projectg/geyserupdater/spigot/command/GeyserUpdateCommand.java rename to src/main/java/com/kejonamc/geyserupdater/spigot/command/GeyserUpdateCommand.java index b274da3e..f0dd0a81 100644 --- a/src/main/java/com/projectg/geyserupdater/spigot/command/GeyserUpdateCommand.java +++ b/src/main/java/com/kejonamc/geyserupdater/spigot/command/GeyserUpdateCommand.java @@ -1,9 +1,9 @@ -package com.projectg.geyserupdater.spigot.command; +package com.kejonamc.geyserupdater.spigot.command; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; -import com.projectg.geyserupdater.common.util.Constants; -import com.projectg.geyserupdater.common.util.GeyserProperties; -import com.projectg.geyserupdater.spigot.util.GeyserSpigotDownloader; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.util.Constants; +import com.kejonamc.geyserupdater.common.util.GeyserProperties; +import com.kejonamc.geyserupdater.spigot.util.GeyserSpigotDownloader; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/src/main/java/com/projectg/geyserupdater/spigot/listeners/SpigotJoinListener.java b/src/main/java/com/kejonamc/geyserupdater/spigot/listeners/SpigotJoinListener.java similarity index 85% rename from src/main/java/com/projectg/geyserupdater/spigot/listeners/SpigotJoinListener.java rename to src/main/java/com/kejonamc/geyserupdater/spigot/listeners/SpigotJoinListener.java index 6e21a573..21ddba55 100644 --- a/src/main/java/com/projectg/geyserupdater/spigot/listeners/SpigotJoinListener.java +++ b/src/main/java/com/kejonamc/geyserupdater/spigot/listeners/SpigotJoinListener.java @@ -1,6 +1,6 @@ -package com.projectg.geyserupdater.spigot.listeners; +package com.kejonamc.geyserupdater.spigot.listeners; -import com.projectg.geyserupdater.common.util.FileUtils; +import com.kejonamc.geyserupdater.common.util.FileUtils; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/com/projectg/geyserupdater/spigot/util/CheckSpigotRestart.java b/src/main/java/com/kejonamc/geyserupdater/spigot/util/CheckSpigotRestart.java similarity index 90% rename from src/main/java/com/projectg/geyserupdater/spigot/util/CheckSpigotRestart.java rename to src/main/java/com/kejonamc/geyserupdater/spigot/util/CheckSpigotRestart.java index 3c85fdcd..b3319cbe 100644 --- a/src/main/java/com/projectg/geyserupdater/spigot/util/CheckSpigotRestart.java +++ b/src/main/java/com/kejonamc/geyserupdater/spigot/util/CheckSpigotRestart.java @@ -1,8 +1,8 @@ -package com.projectg.geyserupdater.spigot.util; +package com.kejonamc.geyserupdater.spigot.util; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; -import com.projectg.geyserupdater.common.util.OsUtils; -import com.projectg.geyserupdater.common.util.ScriptCreator; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.util.OsUtils; +import com.kejonamc.geyserupdater.common.util.ScriptCreator; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/com/projectg/geyserupdater/spigot/util/GeyserSpigotDownloader.java b/src/main/java/com/kejonamc/geyserupdater/spigot/util/GeyserSpigotDownloader.java similarity index 89% rename from src/main/java/com/projectg/geyserupdater/spigot/util/GeyserSpigotDownloader.java rename to src/main/java/com/kejonamc/geyserupdater/spigot/util/GeyserSpigotDownloader.java index e0b208be..acfae1e9 100644 --- a/src/main/java/com/projectg/geyserupdater/spigot/util/GeyserSpigotDownloader.java +++ b/src/main/java/com/kejonamc/geyserupdater/spigot/util/GeyserSpigotDownloader.java @@ -1,11 +1,11 @@ -package com.projectg.geyserupdater.spigot.util; +package com.kejonamc.geyserupdater.spigot.util; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; -import com.projectg.geyserupdater.common.util.Constants; -import com.projectg.geyserupdater.common.util.FileUtils; -import com.projectg.geyserupdater.common.util.GeyserDownloadApi; -import com.projectg.geyserupdater.common.util.ServerPlatform; -import com.projectg.geyserupdater.spigot.SpigotUpdater; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.util.Constants; +import com.kejonamc.geyserupdater.common.util.FileUtils; +import com.kejonamc.geyserupdater.common.util.GeyserDownloadApi; +import com.kejonamc.geyserupdater.common.util.ServerPlatform; +import com.kejonamc.geyserupdater.spigot.SpigotUpdater; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -97,7 +97,8 @@ private static boolean downloadGeyser() { * Attempt to restart the server */ private static void restartServer() { - logger.warn("The server will be restarting in 10 seconds!"); + long restartTimer = plugin.getConfig().getLong("Restart-Timer"); + logger.warn("The server will be restarting in " + restartTimer + " seconds!"); for (Player player : Bukkit.getOnlinePlayers()) { player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("Restart-Message-Players"))); } @@ -113,6 +114,7 @@ public void run() { logger.error("You are not running Spigot (or a fork of it, such as Paper)! GeyserUpdater cannot automatically restart your server!", e); return; } + Method restartMethod = spigotServer.getClass().getMethod("restart"); restartMethod.setAccessible(true); restartMethod.invoke(spigotServer); @@ -122,6 +124,6 @@ public void run() { logger.error("Failed to restart the server!", e); } } - }.runTaskLater(plugin, 200); // 200 ticks is around 10 seconds (at 20 TPS) + }.runTaskLater(plugin, restartTimer * 20); // 20 ticks is around 1 seconds (at 20 TPS) } } \ No newline at end of file diff --git a/src/main/java/com/projectg/geyserupdater/spigot/util/bstats/Metrics.java b/src/main/java/com/kejonamc/geyserupdater/spigot/util/bstats/Metrics.java similarity index 99% rename from src/main/java/com/projectg/geyserupdater/spigot/util/bstats/Metrics.java rename to src/main/java/com/kejonamc/geyserupdater/spigot/util/bstats/Metrics.java index 54c664b9..860f6d86 100644 --- a/src/main/java/com/projectg/geyserupdater/spigot/util/bstats/Metrics.java +++ b/src/main/java/com/kejonamc/geyserupdater/spigot/util/bstats/Metrics.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.spigot.util.bstats; +package com.kejonamc.geyserupdater.spigot.util.bstats; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/com/projectg/geyserupdater/velocity/VelocityUpdater.java b/src/main/java/com/kejonamc/geyserupdater/velocity/VelocityUpdater.java similarity index 93% rename from src/main/java/com/projectg/geyserupdater/velocity/VelocityUpdater.java rename to src/main/java/com/kejonamc/geyserupdater/velocity/VelocityUpdater.java index 5d0abf8c..e0a9bcdf 100644 --- a/src/main/java/com/projectg/geyserupdater/velocity/VelocityUpdater.java +++ b/src/main/java/com/kejonamc/geyserupdater/velocity/VelocityUpdater.java @@ -1,14 +1,14 @@ -package com.projectg.geyserupdater.velocity; - -import com.projectg.geyserupdater.common.logger.UpdaterLogger; -import com.projectg.geyserupdater.common.util.FileUtils; -import com.projectg.geyserupdater.common.util.GeyserProperties; -import com.projectg.geyserupdater.common.util.ScriptCreator; -import com.projectg.geyserupdater.velocity.command.GeyserUpdateCommand; -import com.projectg.geyserupdater.velocity.listeners.VelocityJoinListener; -import com.projectg.geyserupdater.velocity.logger.Slf4jUpdaterLogger; -import com.projectg.geyserupdater.velocity.util.GeyserVelocityDownloader; -import com.projectg.geyserupdater.velocity.util.bstats.Metrics; +package com.kejonamc.geyserupdater.velocity; + +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.util.FileUtils; +import com.kejonamc.geyserupdater.common.util.GeyserProperties; +import com.kejonamc.geyserupdater.common.util.ScriptCreator; +import com.kejonamc.geyserupdater.velocity.command.GeyserUpdateCommand; +import com.kejonamc.geyserupdater.velocity.listeners.VelocityJoinListener; +import com.kejonamc.geyserupdater.velocity.logger.Slf4jUpdaterLogger; +import com.kejonamc.geyserupdater.velocity.util.GeyserVelocityDownloader; +import com.kejonamc.geyserupdater.velocity.util.bstats.Metrics; import com.google.inject.Inject; @@ -36,7 +36,7 @@ import java.nio.file.Paths; import java.util.concurrent.TimeUnit; -@Plugin(id = "geyserupdater", name = "GeyserUpdater", version = "1.6.4", description = "Automatically or manually downloads new builds of Geyser and applies them on server restart.", authors = {"KejonaMC"}, +@Plugin(id = "geyserupdater", name = "GeyserUpdater", version = "1.6.5", description = "Automatically or manually downloads new builds of Geyser and applies them on server restart.", authors = {"KejonaMC"}, dependencies = {@Dependency(id = "geyser")}) public class VelocityUpdater { @@ -157,7 +157,7 @@ private Toml loadConfig(Path path) { */ public void checkConfigVersion() { //Change version number only when editing config.yml! - if (getConfig().getLong("Config-Version", 0L).compareTo(2L) != 0) { + if (getConfig().getLong("Config-Version", 0L).compareTo(3L) != 0) { UpdaterLogger.getLogger().warn("Your copy of config.yml is outdated. Please delete it and let a fresh copy of config.yml be regenerated!"); } } diff --git a/src/main/java/com/projectg/geyserupdater/velocity/command/GeyserUpdateCommand.java b/src/main/java/com/kejonamc/geyserupdater/velocity/command/GeyserUpdateCommand.java similarity index 82% rename from src/main/java/com/projectg/geyserupdater/velocity/command/GeyserUpdateCommand.java rename to src/main/java/com/kejonamc/geyserupdater/velocity/command/GeyserUpdateCommand.java index b50ade15..b70273c6 100644 --- a/src/main/java/com/projectg/geyserupdater/velocity/command/GeyserUpdateCommand.java +++ b/src/main/java/com/kejonamc/geyserupdater/velocity/command/GeyserUpdateCommand.java @@ -1,8 +1,8 @@ -package com.projectg.geyserupdater.velocity.command; +package com.kejonamc.geyserupdater.velocity.command; -import com.projectg.geyserupdater.common.util.Constants; -import com.projectg.geyserupdater.common.util.GeyserProperties; -import com.projectg.geyserupdater.velocity.util.GeyserVelocityDownloader; +import com.kejonamc.geyserupdater.common.util.Constants; +import com.kejonamc.geyserupdater.common.util.GeyserProperties; +import com.kejonamc.geyserupdater.velocity.util.GeyserVelocityDownloader; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.RawCommand; diff --git a/src/main/java/com/projectg/geyserupdater/velocity/listeners/VelocityJoinListener.java b/src/main/java/com/kejonamc/geyserupdater/velocity/listeners/VelocityJoinListener.java similarity index 86% rename from src/main/java/com/projectg/geyserupdater/velocity/listeners/VelocityJoinListener.java rename to src/main/java/com/kejonamc/geyserupdater/velocity/listeners/VelocityJoinListener.java index 70b404fa..119c888f 100644 --- a/src/main/java/com/projectg/geyserupdater/velocity/listeners/VelocityJoinListener.java +++ b/src/main/java/com/kejonamc/geyserupdater/velocity/listeners/VelocityJoinListener.java @@ -1,6 +1,6 @@ -package com.projectg.geyserupdater.velocity.listeners; +package com.kejonamc.geyserupdater.velocity.listeners; -import com.projectg.geyserupdater.common.util.FileUtils; +import com.kejonamc.geyserupdater.common.util.FileUtils; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PostLoginEvent; diff --git a/src/main/java/com/projectg/geyserupdater/velocity/logger/Slf4jUpdaterLogger.java b/src/main/java/com/kejonamc/geyserupdater/velocity/logger/Slf4jUpdaterLogger.java similarity index 92% rename from src/main/java/com/projectg/geyserupdater/velocity/logger/Slf4jUpdaterLogger.java rename to src/main/java/com/kejonamc/geyserupdater/velocity/logger/Slf4jUpdaterLogger.java index fd5b8440..4d20172f 100644 --- a/src/main/java/com/projectg/geyserupdater/velocity/logger/Slf4jUpdaterLogger.java +++ b/src/main/java/com/kejonamc/geyserupdater/velocity/logger/Slf4jUpdaterLogger.java @@ -1,6 +1,6 @@ -package com.projectg.geyserupdater.velocity.logger; +package com.kejonamc.geyserupdater.velocity.logger; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.config.Configurator; import org.slf4j.Logger; diff --git a/src/main/java/com/projectg/geyserupdater/velocity/util/GeyserVelocityDownloader.java b/src/main/java/com/kejonamc/geyserupdater/velocity/util/GeyserVelocityDownloader.java similarity index 85% rename from src/main/java/com/projectg/geyserupdater/velocity/util/GeyserVelocityDownloader.java rename to src/main/java/com/kejonamc/geyserupdater/velocity/util/GeyserVelocityDownloader.java index 697165ab..2dd908e0 100644 --- a/src/main/java/com/projectg/geyserupdater/velocity/util/GeyserVelocityDownloader.java +++ b/src/main/java/com/kejonamc/geyserupdater/velocity/util/GeyserVelocityDownloader.java @@ -1,11 +1,11 @@ -package com.projectg.geyserupdater.velocity.util; +package com.kejonamc.geyserupdater.velocity.util; -import com.projectg.geyserupdater.common.logger.UpdaterLogger; -import com.projectg.geyserupdater.common.util.Constants; -import com.projectg.geyserupdater.common.util.FileUtils; -import com.projectg.geyserupdater.common.util.GeyserDownloadApi; -import com.projectg.geyserupdater.common.util.ServerPlatform; -import com.projectg.geyserupdater.velocity.VelocityUpdater; +import com.kejonamc.geyserupdater.common.logger.UpdaterLogger; +import com.kejonamc.geyserupdater.common.util.Constants; +import com.kejonamc.geyserupdater.common.util.FileUtils; +import com.kejonamc.geyserupdater.common.util.GeyserDownloadApi; +import com.kejonamc.geyserupdater.common.util.ServerPlatform; +import com.kejonamc.geyserupdater.velocity.VelocityUpdater; import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; @@ -86,13 +86,14 @@ private static boolean downloadGeyser() { * Attempt to restart the server */ private static void restartServer() { - logger.warn("The server will be restarting in 10 seconds!"); + long restartTimer = plugin.getConfig().getLong("Restart-Timer"); + logger.warn("The server will be restarting in " + restartTimer + " seconds!"); for (Player player : server.getAllPlayers()) { player.sendMessage(Component.text(plugin.getConfig().getString("Restart-Message-Players"))); } server.getScheduler() .buildTask(plugin, server::shutdown) - .delay(10L, TimeUnit.SECONDS) + .delay(restartTimer, TimeUnit.SECONDS) .schedule(); } } diff --git a/src/main/java/com/projectg/geyserupdater/velocity/util/bstats/Metrics.java b/src/main/java/com/kejonamc/geyserupdater/velocity/util/bstats/Metrics.java similarity index 99% rename from src/main/java/com/projectg/geyserupdater/velocity/util/bstats/Metrics.java rename to src/main/java/com/kejonamc/geyserupdater/velocity/util/bstats/Metrics.java index c1956535..229ed8c7 100644 --- a/src/main/java/com/projectg/geyserupdater/velocity/util/bstats/Metrics.java +++ b/src/main/java/com/kejonamc/geyserupdater/velocity/util/bstats/Metrics.java @@ -1,4 +1,4 @@ -package com.projectg.geyserupdater.velocity.util.bstats; +package com.kejonamc.geyserupdater.velocity.util.bstats; import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.plugin.PluginDescription; diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml index 26733528..7af552c1 100644 --- a/src/main/resources/bungee.yml +++ b/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: ${project.name} -main: com.projectg.geyserupdater.bungee.BungeeUpdater +main: com.kejonamc.geyserupdater.bungee.BungeeUpdater version: ${project.version} description: Automatically or manually downloads new builds of Geyser and applies them on server restart. author: KejonaMC diff --git a/src/main/resources/config.toml b/src/main/resources/config.toml index 24a572d7..290932f2 100644 --- a/src/main/resources/config.toml +++ b/src/main/resources/config.toml @@ -1,26 +1,28 @@ # GeyserUpdater -# Made by Jens & YHDiamond # NOTICE: Please read the README on our github page for full information regarding these options! -# https://github.com/ProjectG-Plugins/GeyserUpdater +# https://github.com/kejonaMC/GeyserUpdater # If enabled, GeyserUpdater will check for new Geyser builds on server start, and on the interval specified by Auto-Update-Interval. If a new build exists, it will be downloaded. Auto-Update-Geyser=false # The interval in hours between each auto update check. Auto-Update-Interval=24 -# If enabled, GeyserUpdater will attempt to restart the server 10 seconds after a new version of Geyser has been successfully downloaded. +# If enabled, GeyserUpdater will attempt to restart the server after a new version of Geyser has been successfully downloaded. # If you aren't using a hosting provider or a server wrapper, you will need a restart script. Auto-Restart-Server=false # When enabled, GeyserUpdater will automatically generate a restart script for you. If you are using CraftBukkit or a proxy # you will need to use the generated script to start your server! If you are using a hosting provider or a server wrapper you probably don't need this. Auto-Script-Generating=false -# Configure the message that is sent to all online players warning them that the server will be restarting in 10 seconds. -Restart-Message-Players='&2This server will be restarting in 10 seconds!' +# Configure the message that is sent to all online players warning them that the server will be restarting in 30 seconds. +Restart-Message-Players='&2This server will be restarting in 30 seconds!' + +# Restart-Timer: The countdown in seconds before the server restarts. +Restart-Timer=30 # Enable debug logging Enable-Debug=false # Please do not change this version value! -Config-Version=2 \ No newline at end of file +Config-Version=3 \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 78e0f5e8..bb7224e8 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,26 +1,29 @@ # GeyserUpdater -# Made by Jens & YHDiamond # NOTICE: Please read the README on our github page for full information regarding these options! -# https://github.com/ProjectG-Plugins/GeyserUpdater +# https://github.com/kejonaMC/GeyserUpdater # If enabled, GeyserUpdater will check for new Geyser builds on server start, and on the interval specified by Auto-Update-Interval. If a new build exists, it will be downloaded. Auto-Update-Geyser: false # The interval in hours between each auto update check. Auto-Update-Interval: 24 -# If enabled, GeyserUpdater will attempt to restart the server 10 seconds after a new version of Geyser has been successfully downloaded. +# If enabled, GeyserUpdater will attempt to restart the server after a new version of Geyser has been successfully downloaded. # If you aren't using a hosting provider or a server wrapper, you will need a restart script. Auto-Restart-Server: false + # When enabled, GeyserUpdater will automatically generate a restart script for you. If you are using CraftBukkit or a proxy # you will need to use the generated script to start your server! If you are using a hosting provider or a server wrapper you probably don't need this. Auto-Script-Generating: false -# Configure the message that is sent to all online players warning them that the server will be restarting in 10 seconds. -Restart-Message-Players: '&2This server will be restarting in 10 seconds!' +# Configure the message that is sent to all online players warning them that the server will be restarting in 30 seconds. +Restart-Message-Players: '&2This server will be restarting in 30 seconds!' + +# Restart-Timer: The countdown in seconds before the server restarts. +Restart-Timer: 30 # Enable debug logging Enable-Debug: false # Please do not change this version value! -Config-Version: 2 \ No newline at end of file +Config-Version: 3 \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6e6c49fe..b9ccb813 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ${project.name} -main: com.projectg.geyserupdater.spigot.SpigotUpdater +main: com.kejonamc.geyserupdater.spigot.SpigotUpdater version: ${project.version} depend: [Geyser-Spigot] description: Automatically or manually downloads new builds of Geyser and applies them on server restart.