Add nice starting message and add PistonUtils

AlexProgrammerDE · Dec 14, 2020 · 1d89fce · 1d89fce
1 parent 6af901e
commit 1d89fce
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 155 deletions.
diff --git a/pistonmotd-api/pom.xml b/pistonmotd-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PistonMOTD</artifactId>
         <groupId>me.alexprogrammerde</groupId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-utils</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>

diff --git a/pistonmotd-bukkit/pom.xml b/pistonmotd-bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PistonMOTD</artifactId>
         <groupId>me.alexprogrammerde</groupId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -50,12 +50,12 @@
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-api</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-utils</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>

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
@@ -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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PistonMOTD</artifactId>
         <groupId>me.alexprogrammerde</groupId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -50,12 +50,12 @@
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-api</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-utils</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>

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
@@ -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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PistonMOTD</artifactId>
         <groupId>me.alexprogrammerde</groupId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -79,37 +79,37 @@
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-api</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-utils</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-bukkit</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-bungee</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-sponge</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-velocity</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/pistonmotd-sponge/pom.xml b/pistonmotd-sponge/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PistonMOTD</artifactId>
         <groupId>me.alexprogrammerde</groupId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -50,12 +50,12 @@
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-api</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>me.alexprogrammerde</groupId>
             <artifactId>pistonmotd-utils</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>

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
@@ -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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>PistonMOTD</artifactId>
         <groupId>me.alexprogrammerde</groupId>
-        <version>4.2.0</version>
+        <version>4.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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
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
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