diff --git a/pistonmotd-api/pom.xml b/pistonmotd-api/pom.xml index 5bfc109c..6ae5dc5b 100644 --- a/pistonmotd-api/pom.xml +++ b/pistonmotd-api/pom.xml @@ -5,7 +5,7 @@ PistonMOTD me.alexprogrammerde - 4.2.0 + 4.3.0 4.0.0 @@ -50,7 +50,7 @@ me.alexprogrammerde pistonmotd-utils - 4.2.0 + 4.3.0 net.kyori diff --git a/pistonmotd-bukkit/pom.xml b/pistonmotd-bukkit/pom.xml index 88098c72..de9d7104 100644 --- a/pistonmotd-bukkit/pom.xml +++ b/pistonmotd-bukkit/pom.xml @@ -5,7 +5,7 @@ PistonMOTD me.alexprogrammerde - 4.2.0 + 4.3.0 4.0.0 @@ -50,12 +50,12 @@ me.alexprogrammerde pistonmotd-api - 4.2.0 + 4.3.0 me.alexprogrammerde pistonmotd-utils - 4.2.0 + 4.3.0 com.destroystokyo.paper diff --git a/pistonmotd-bukkit/src/main/java/me/alexprogrammerde/pistonmotd/bukkit/PistonMOTDBukkit.java b/pistonmotd-bukkit/src/main/java/me/alexprogrammerde/pistonmotd/bukkit/PistonMOTDBukkit.java index dce8e4ba..e7a865ea 100644 --- a/pistonmotd-bukkit/src/main/java/me/alexprogrammerde/pistonmotd/bukkit/PistonMOTDBukkit.java +++ b/pistonmotd-bukkit/src/main/java/me/alexprogrammerde/pistonmotd/bukkit/PistonMOTDBukkit.java @@ -3,9 +3,10 @@ import io.papermc.lib.PaperLib; import me.alexprogrammerde.pistonmotd.api.PlaceholderUtil; import me.alexprogrammerde.pistonmotd.utils.LuckPermsWrapper; -import me.alexprogrammerde.pistonmotd.utils.UpdateChecker; -import me.alexprogrammerde.pistonmotd.utils.UpdateParser; -import me.alexprogrammerde.pistonmotd.utils.UpdateType; +import me.alexprogrammerde.pistonutils.PistonLogger; +import me.alexprogrammerde.pistonutils.UpdateChecker; +import me.alexprogrammerde.pistonutils.UpdateParser; +import me.alexprogrammerde.pistonutils.UpdateType; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import org.bstats.bukkit.Metrics; import org.bukkit.ChatColor; @@ -76,7 +77,7 @@ public void onEnable() { Objects.requireNonNull(getServer().getPluginCommand("pistonmotd")).setExecutor(new BukkitCommand(this)); log.info(ChatColor.AQUA + "Checking for a newer version"); - new UpdateChecker(getLogger()).getVersion(version -> new UpdateParser(getDescription().getVersion(), version).parseUpdate(updateType -> { + new UpdateChecker(new PistonLogger(getLogger())).getVersion("https://www.pistonmaster.net/PistonMOTD/VERSION.txt", version -> new UpdateParser(getDescription().getVersion(), version).parseUpdate(updateType -> { if (updateType == UpdateType.NONE || updateType == UpdateType.AHEAD) { log.info(ChatColor.AQUA + "Your up to date!"); } else { @@ -89,12 +90,14 @@ public void onEnable() { } log.info(ChatColor.RED + "Current version: " + this.getDescription().getVersion() + " New version: " + version); - log.info(ChatColor.RED + "Download it at: https://www.spigotmc.org/resources/80567/updates"); + log.info(ChatColor.RED + "Download it at: https://github.com/AlexProgrammerDE/PistonMOTD/releases"); } })); log.info(ChatColor.AQUA + "Loading metrics"); new Metrics(this, 9100); + + log.info(ChatColor.AQUA + "Done! :D"); } @Override diff --git a/pistonmotd-bungee/pom.xml b/pistonmotd-bungee/pom.xml index e5f5227e..d701ff34 100644 --- a/pistonmotd-bungee/pom.xml +++ b/pistonmotd-bungee/pom.xml @@ -5,7 +5,7 @@ PistonMOTD me.alexprogrammerde - 4.2.0 + 4.3.0 4.0.0 @@ -50,12 +50,12 @@ me.alexprogrammerde pistonmotd-api - 4.2.0 + 4.3.0 me.alexprogrammerde pistonmotd-utils - 4.2.0 + 4.3.0 net.md-5 diff --git a/pistonmotd-bungee/src/main/java/me/alexprogrammerde/pistonmotd/bungee/PistonMOTDBungee.java b/pistonmotd-bungee/src/main/java/me/alexprogrammerde/pistonmotd/bungee/PistonMOTDBungee.java index 952c49ee..62c23d2c 100644 --- a/pistonmotd-bungee/src/main/java/me/alexprogrammerde/pistonmotd/bungee/PistonMOTDBungee.java +++ b/pistonmotd-bungee/src/main/java/me/alexprogrammerde/pistonmotd/bungee/PistonMOTDBungee.java @@ -2,9 +2,10 @@ import me.alexprogrammerde.pistonmotd.api.PlaceholderUtil; import me.alexprogrammerde.pistonmotd.utils.LuckPermsWrapper; -import me.alexprogrammerde.pistonmotd.utils.UpdateChecker; -import me.alexprogrammerde.pistonmotd.utils.UpdateParser; -import me.alexprogrammerde.pistonmotd.utils.UpdateType; +import me.alexprogrammerde.pistonutils.PistonLogger; +import me.alexprogrammerde.pistonutils.UpdateChecker; +import me.alexprogrammerde.pistonutils.UpdateParser; +import me.alexprogrammerde.pistonutils.UpdateType; import net.kyori.adventure.platform.bungeecord.BungeeAudiences; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.plugin.Plugin; @@ -74,7 +75,7 @@ public void onEnable() { getProxy().getPluginManager().registerCommand(this, new BungeeCommand(this)); log.info(ChatColor.AQUA + "Checking for a newer version"); - new UpdateChecker(getLogger()).getVersion(version -> new UpdateParser(getDescription().getVersion(), version).parseUpdate(updateType -> { + new UpdateChecker(new PistonLogger(getLogger())).getVersion("https://www.pistonmaster.net/PistonMOTD/VERSION.txt", version -> new UpdateParser(getDescription().getVersion(), version).parseUpdate(updateType -> { if (updateType == UpdateType.NONE || updateType == UpdateType.AHEAD) { log.info(ChatColor.AQUA + "Your up to date!"); } else { @@ -87,12 +88,14 @@ public void onEnable() { } log.info(ChatColor.RED + "Current version: " + this.getDescription().getVersion() + " New version: " + version); - log.info(ChatColor.RED + "Download it at: https://www.spigotmc.org/resources/80567/updates"); + log.info(ChatColor.RED + "Download it at: https://github.com/AlexProgrammerDE/PistonMOTD/releases"); } })); log.info(ChatColor.AQUA + "Loading metrics"); new Metrics(this, 8968); + + log.info(ChatColor.AQUA + "Done! :D"); } @Override diff --git a/pistonmotd-plugin/pom.xml b/pistonmotd-plugin/pom.xml index c1d5a587..ed177ffb 100644 --- a/pistonmotd-plugin/pom.xml +++ b/pistonmotd-plugin/pom.xml @@ -5,7 +5,7 @@ PistonMOTD me.alexprogrammerde - 4.2.0 + 4.3.0 4.0.0 @@ -79,37 +79,37 @@ me.alexprogrammerde pistonmotd-api - 4.2.0 + 4.3.0 compile me.alexprogrammerde pistonmotd-utils - 4.2.0 + 4.3.0 compile me.alexprogrammerde pistonmotd-bukkit - 4.2.0 + 4.3.0 compile me.alexprogrammerde pistonmotd-bungee - 4.2.0 + 4.3.0 compile me.alexprogrammerde pistonmotd-sponge - 4.2.0 + 4.3.0 compile me.alexprogrammerde pistonmotd-velocity - 4.2.0 + 4.3.0 compile diff --git a/pistonmotd-sponge/pom.xml b/pistonmotd-sponge/pom.xml index c1ea38e4..a41d2912 100644 --- a/pistonmotd-sponge/pom.xml +++ b/pistonmotd-sponge/pom.xml @@ -5,7 +5,7 @@ PistonMOTD me.alexprogrammerde - 4.2.0 + 4.3.0 4.0.0 @@ -50,12 +50,12 @@ me.alexprogrammerde pistonmotd-api - 4.2.0 + 4.3.0 me.alexprogrammerde pistonmotd-utils - 4.2.0 + 4.3.0 net.kyori diff --git a/pistonmotd-sponge/src/main/java/me/alexprogrammerde/pistonmotd/sponge/PistonMOTDSponge.java b/pistonmotd-sponge/src/main/java/me/alexprogrammerde/pistonmotd/sponge/PistonMOTDSponge.java index 47c2f351..1985f8a2 100644 --- a/pistonmotd-sponge/src/main/java/me/alexprogrammerde/pistonmotd/sponge/PistonMOTDSponge.java +++ b/pistonmotd-sponge/src/main/java/me/alexprogrammerde/pistonmotd/sponge/PistonMOTDSponge.java @@ -3,7 +3,12 @@ import com.google.inject.Inject; import me.alexprogrammerde.pistonmotd.api.PlaceholderUtil; import me.alexprogrammerde.pistonmotd.data.PluginData; -import me.alexprogrammerde.pistonmotd.utils.*; +import me.alexprogrammerde.pistonmotd.utils.ConsoleColor; +import me.alexprogrammerde.pistonmotd.utils.LuckPermsWrapper; +import me.alexprogrammerde.pistonutils.PistonLogger; +import me.alexprogrammerde.pistonutils.UpdateChecker; +import me.alexprogrammerde.pistonutils.UpdateParser; +import me.alexprogrammerde.pistonutils.UpdateType; import net.kyori.adventure.platform.spongeapi.SpongeAudiences; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.commented.CommentedConfigurationNode; @@ -117,7 +122,7 @@ public void onServerStart(GameStartedServerEvent event) { if (container.getVersion().isPresent() && rootNode.getNode("updatechecking").getBoolean()) { log.info(ConsoleColor.CYAN + "Checking for a newer version" + ConsoleColor.RESET); - new UpdateChecker(log).getVersion(version -> new UpdateParser(container.getVersion().get(), version).parseUpdate(updateType -> { + new UpdateChecker(new PistonLogger(log)).getVersion("https://www.pistonmaster.net/PistonMOTD/VERSION.txt", version -> new UpdateParser(container.getVersion().get(), version).parseUpdate(updateType -> { if (updateType == UpdateType.NONE || updateType == UpdateType.AHEAD) { log.info(ConsoleColor.CYAN + "Your up to date!" + ConsoleColor.RESET); } else { @@ -145,6 +150,8 @@ public void onServerStart(GameStartedServerEvent event) { log.info(ConsoleColor.CYAN + "This info is just to give me small info about the server," + ConsoleColor.RESET); log.info(ConsoleColor.CYAN + "like its version and the plugin version." + ConsoleColor.RESET); } + + log.info(ConsoleColor.CYAN + "Done! :D" + ConsoleColor.RESET); } protected void loadConfig() { diff --git a/pistonmotd-utils/pom.xml b/pistonmotd-utils/pom.xml index e4175984..6bf4a351 100644 --- a/pistonmotd-utils/pom.xml +++ b/pistonmotd-utils/pom.xml @@ -5,7 +5,7 @@ PistonMOTD me.alexprogrammerde - 4.2.0 + 4.3.0 4.0.0 diff --git a/pistonmotd-utils/src/main/java/me/alexprogrammerde/pistonmotd/utils/UpdateChecker.java b/pistonmotd-utils/src/main/java/me/alexprogrammerde/pistonmotd/utils/UpdateChecker.java deleted file mode 100644 index 7fc913b4..00000000 --- a/pistonmotd-utils/src/main/java/me/alexprogrammerde/pistonmotd/utils/UpdateChecker.java +++ /dev/null @@ -1,30 +0,0 @@ -package me.alexprogrammerde.pistonmotd.utils; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.Scanner; -import java.util.function.Consumer; -import java.util.logging.Logger; - -public class UpdateChecker { - private final Object log; - - public UpdateChecker(Object log) { - this.log = log; - } - - public void getVersion(final Consumer consumer) { - try (InputStream inputStream = new URL("https://www.pistonmaster.net/PistonMOTD/VERSION.txt").openStream(); Scanner scanner = new Scanner(inputStream)) { - if (scanner.hasNext()) { - consumer.accept(scanner.next()); - } - } catch (IOException exception) { - if (log instanceof Logger) { - ((Logger) log).info(ConsoleColor.RED_BOLD + "Cannot look for updates: " + exception.getMessage() + ConsoleColor.RESET); - } else if (log instanceof org.slf4j.Logger) { - ((org.slf4j.Logger) log).info(ConsoleColor.RED_BOLD + "Cannot look for updates: " + exception.getMessage() + ConsoleColor.RESET); - } - } - } -} \ No newline at end of file diff --git a/pistonmotd-utils/src/main/java/me/alexprogrammerde/pistonmotd/utils/UpdateParser.java b/pistonmotd-utils/src/main/java/me/alexprogrammerde/pistonmotd/utils/UpdateParser.java deleted file mode 100644 index 5cb4bb57..00000000 --- a/pistonmotd-utils/src/main/java/me/alexprogrammerde/pistonmotd/utils/UpdateParser.java +++ /dev/null @@ -1,83 +0,0 @@ -package me.alexprogrammerde.pistonmotd.utils; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; - -public class UpdateParser { - private final String currentV; - private final String webV; - - public UpdateParser(@Nonnull String currentV, @Nonnull String webV) { - this.currentV = currentV; - this.webV = webV; - } - - public void parseUpdate(Consumer consumer) { - WebVersion web = new WebVersion(); - CurrentVersion current = new CurrentVersion(); - - if (web.MAJOR > current.MAJOR) { - consumer.accept(UpdateType.MAJOR); - } else if (web.MAJOR < current.MAJOR) { - consumer.accept(UpdateType.AHEAD); - } else if (web.MINOR > current.MINOR) { - consumer.accept(UpdateType.MINOR); - } else if (web.MINOR < current.MINOR) { - consumer.accept(UpdateType.AHEAD); - } else if (web.PATCH > current.PATCH) { - consumer.accept(UpdateType.PATCH); - } else if (web.PATCH < current.PATCH) { - consumer.accept(UpdateType.AHEAD); - } else { - consumer.accept(UpdateType.NONE); - } - } - - private class WebVersion { - public WebVersion() { - String[] webArr = webV.split("\\."); - List webList = new ArrayList<>(); - - for (String str : webArr) { - webList.add(Integer.parseInt(str)); - } - - MAJOR = webList.get(0); - - MINOR = webList.get(1); - - PATCH = webList.get(2); - } - - public final int MAJOR; - - public final int MINOR; - - public final int PATCH; - } - - private class CurrentVersion { - public CurrentVersion() { - String[] currentArr = currentV.split("\\."); - List currentList = new ArrayList<>(); - - for (String str : currentArr) { - currentList.add(Integer.parseInt(str)); - } - - MAJOR = currentList.get(0); - - MINOR = currentList.get(1); - - PATCH = currentList.get(2); - } - - public final int MAJOR; - - public final int MINOR; - - public final int PATCH; - } -} diff --git a/pistonmotd-utils/src/main/java/me/alexprogrammerde/pistonmotd/utils/UpdateType.java b/pistonmotd-utils/src/main/java/me/alexprogrammerde/pistonmotd/utils/UpdateType.java deleted file mode 100644 index c00aafd7..00000000 --- a/pistonmotd-utils/src/main/java/me/alexprogrammerde/pistonmotd/utils/UpdateType.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.alexprogrammerde.pistonmotd.utils; - -public enum UpdateType { - PATCH, MINOR, MAJOR, AHEAD, NONE -} diff --git a/pistonmotd-velocity/pom.xml b/pistonmotd-velocity/pom.xml index 8a7951dd..d6797b48 100644 --- a/pistonmotd-velocity/pom.xml +++ b/pistonmotd-velocity/pom.xml @@ -5,7 +5,7 @@ PistonMOTD me.alexprogrammerde - 4.2.0 + 4.3.0 4.0.0 @@ -50,12 +50,12 @@ me.alexprogrammerde pistonmotd-api - 4.2.0 + 4.3.0 me.alexprogrammerde pistonmotd-utils - 4.2.0 + 4.3.0 com.velocitypowered diff --git a/pistonmotd-velocity/src/main/java/me/alexprogrammerde/pistonmotd/velocity/PistonMOTDVelocity.java b/pistonmotd-velocity/src/main/java/me/alexprogrammerde/pistonmotd/velocity/PistonMOTDVelocity.java index c28cd24c..939b13f2 100644 --- a/pistonmotd-velocity/src/main/java/me/alexprogrammerde/pistonmotd/velocity/PistonMOTDVelocity.java +++ b/pistonmotd-velocity/src/main/java/me/alexprogrammerde/pistonmotd/velocity/PistonMOTDVelocity.java @@ -9,7 +9,12 @@ import com.velocitypowered.api.proxy.ProxyServer; import me.alexprogrammerde.pistonmotd.api.PlaceholderUtil; import me.alexprogrammerde.pistonmotd.data.PluginData; -import me.alexprogrammerde.pistonmotd.utils.*; +import me.alexprogrammerde.pistonmotd.utils.ConsoleColor; +import me.alexprogrammerde.pistonmotd.utils.LuckPermsWrapper; +import me.alexprogrammerde.pistonutils.PistonLogger; +import me.alexprogrammerde.pistonutils.UpdateChecker; +import me.alexprogrammerde.pistonutils.UpdateParser; +import me.alexprogrammerde.pistonutils.UpdateType; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.hocon.HoconConfigurationLoader; import ninja.leaping.configurate.yaml.YAMLConfigurationLoader; @@ -74,7 +79,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) { if (container.getDescription().getVersion().isPresent()) { log.info(ConsoleColor.CYAN + "Checking for a newer version" + ConsoleColor.RESET); - new UpdateChecker(log).getVersion(version -> new UpdateParser(container.getDescription().getVersion().get(), version).parseUpdate(updateType -> { + new UpdateChecker(new PistonLogger(log)).getVersion("https://www.pistonmaster.net/PistonMOTD/VERSION.txt", version -> new UpdateParser(container.getDescription().getVersion().get(), version).parseUpdate(updateType -> { if (updateType == UpdateType.NONE || updateType == UpdateType.AHEAD) { log.info(ConsoleColor.CYAN + "Your up to date!" + ConsoleColor.RESET); } else { @@ -91,6 +96,8 @@ public void onProxyInitialization(ProxyInitializeEvent event) { } })); } + + log.info(ConsoleColor.CYAN + "Done! :D" + ConsoleColor.RESET); } protected void loadConfig() { diff --git a/pom.xml b/pom.xml index 6ebc9503..f683f5fe 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,6 @@ licenses help - @@ -197,5 +196,10 @@ 1.3.9 compile + + me.alexprogrammerde + PistonUtils + 1.0.0 +