Merge branch '13.4'

- From now on a different temporary path is used to create the debug zip to avoid data garbage.
- The design of the update messages was changed

README.md

@@ -0,0 +1,35 @@
+<p align="center">
+    <img src="https://i.imgur.com/0pSf6jl.png" width="300">
+</p>
+
+---
+# Links
+* [Spigot](https://www.spigotmc.org/resources/t2codelib.96388/)
+* [Discord](http://dc.T2Code.net)
+---
+
+T2CodeLib is a library for the plugins of T2Code.
+
+Main library file to centralize the main functions for multiple plugins, allowing better maintenance capabilities and reducing the overall size of the plugins.
+
+Maven:
+```
+<repositories>
+   <repository>
+       <id>T2Code</id>
+       <url>https://repo.t2code.net/repository/T2Code/</url>
+   </repository>
+</repositories>
+
+<dependencies>
+   <dependency>
+       <groupId>net.t2code</groupId>
+       <artifactId>T2CodeLib</artifactId>
+       <version>VERSION</version>
+   </dependency>
+</dependencies>
+```
+
+---
+<img src="https://i.imgur.com/HoZSt7c.png" width="600">
+<img src="https://bstats.org/signatures/bukkit/T2CodeLib.svg" width="600">

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>T2CodeLib</artifactId>
-    <version>13.4_SNAPSHOT-1</version>
+    <version>13.4</version>
     <packaging>jar</packaging>
 
     <name>T2CodeLib</name>
@@ -94,7 +94,6 @@
             <url>https://nexus.bencodez.com/repository/maven-public/</url>
         </repository>
         <!--Kyori MiniMessage
-
         <repository>
             <id>sonatype-oss-snapshots1</id>
             <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
@@ -110,7 +109,6 @@
             <version>1.19.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-
         <!-- repo.t2code / T2Code -->
         <dependency>
             <groupId>net.t2code</groupId>

src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateAPI.java

@@ -61,14 +61,15 @@ public class T2CBupdateAPI {
     public static void onUpdateCheckTimer(Plugin plugin, String prefix, String discord, Integer spigotID, String url) {
         ProxyServer.getInstance().getScheduler().schedule(plugin, new Runnable() {
             public void run() {
-                (new T2CBupdateAPI(plugin, spigotID)).getVersion((webData) -> {
+                (new T2CBupdateCheckerGit(plugin, spigotID)).getVersion((webData) -> {
                     pluginVersion = plugin.getDescription().getVersion();
                     T2CupdateObject update = new T2CupdateObject(
                             plugin.getDescription().getName(),
                             plugin.getDescription().getVersion(),
                             webData,
                             false,
-                            !plugin.getDescription().getVersion().equals(webData.getVersion())
+                            !plugin.getDescription().getVersion().equals(webData.getVersion()),
+                            true
                     );
                     bungeePluginVersins.put(plugin.getDescription().getName(), update);
                     if (!pluginVersion.replace("_Bungee", "").equalsIgnoreCase(webData.getVersion())) {
@@ -84,76 +85,4 @@ public class T2CBupdateAPI {
             }
         }, 0, T2CBlibConfig.getUpdateTimer() * 60 * 20L, TimeUnit.SECONDS);
     }
-
-    private Plugin plugin;
-    private int resourceId;
-
-    public T2CBupdateAPI(Plugin plugin, int resourceId) {
-        this.plugin = plugin;
-        this.resourceId = resourceId;
-    }
-
-    public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String URL) {
-        BungeeCord.getInstance().getScheduler().runAsync(this.plugin, () -> {
-            try {
-                URL url = new URL(URL);
-                URLConnection yc = url.openConnection();
-                BufferedReader in = new BufferedReader(
-                        new InputStreamReader(
-                                yc.getInputStream()));
-                String inputLine;
-                String data = "";
-                while ((inputLine = in.readLine()) != null)
-                    data = inputLine;
-                in.close();
-                data = data.substring(1, data.length() - 1);
-                if (data.isEmpty()) {
-                    consumer.accept(null);
-                    return;
-                }
-                JSONObject obj = new JSONObject(data);
-                String UpdateName = obj.getString("name");
-                String tag_name = obj.getString("tag_name");
-                String body = obj.getString("body").replace("\n", "<br>").replace("\r", "").replace("'", "''");
-                String updateurl = obj.getString("html_url");
-                boolean prerelease = obj.getBoolean("prerelease");
-
-                String date = obj.getString("published_at");
-                SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-                SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss a");
-                Date parsedDate = inputFormat.parse(date);
-                String formattedDate = outputFormat.format(parsedDate);
-
-                JSONArray downloadArray = obj.getJSONArray("assets");
-                String downloadURL;
-                if (downloadArray.isEmpty()) {
-                    downloadURL = "https://www.spigotmc.org/resources/" + spigotID;
-                } else {
-                    downloadURL = downloadArray.getJSONObject(0).getString("browser_download_url");
-                }
-
-                if (!prerelease) {
-                    downloadURL = "https://www.spigotmc.org/resources/" + spigotID;
-                    updateurl = "https://www.spigotmc.org/resources/" + spigotID;
-                }
-
-                T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, prerelease);
-                consumer.accept(webData);
-            } catch (Exception var10) {
-                Boolean load = false;
-                if (bungeePluginVersins.containsKey(plugin.getDescription().getName())) {
-                    load = bungeePluginVersins.get(plugin.getDescription().getName()).load;
-                }
-                T2CupdateObject update = new T2CupdateObject(
-                        plugin.getDescription().getName(),
-                        pluginVersion,
-                        null,
-                        load,
-                        false
-                );
-                bungeePluginVersins.put(plugin.getDescription().getName(), update);
-                this.plugin.getLogger().severe("§4 Cannot look for updates: " + var10.getMessage());
-            }
-        });
-    }
 }

src/main/java/net/t2code/t2codelib/BUNGEE/api/update/T2CBupdateCheckerGit.java

@@ -0,0 +1,98 @@
+package net.t2code.t2codelib.BUNGEE.api.update;
+
+import net.md_5.bungee.BungeeCord;
+import net.md_5.bungee.api.plugin.Plugin;
+import net.t2code.t2codelib.BUNGEE.system.config.T2CBlibConfig;
+import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig;
+import net.t2code.t2codelib.T2CupdateObject;
+import net.t2code.t2codelib.T2CupdateWebData;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.function.Consumer;
+
+public class T2CBupdateCheckerGit {
+    private Plugin plugin;
+    private int resourceId;
+
+    public T2CBupdateCheckerGit(Plugin plugin, int resourceId) {
+        this.plugin = plugin;
+        this.resourceId = resourceId;
+    }
+
+    public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String gitKey) {
+        String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1";
+        if (!T2CBlibConfig.getSeePreReleaseUpdates()){
+            RepoURL = RepoURL + "&pre-release=false";
+        }
+        String finalRepoURL = RepoURL;
+        BungeeCord.getInstance().getScheduler().runAsync(this.plugin, () -> {
+            try {
+                URL url = new URL(finalRepoURL);
+                URLConnection yc = url.openConnection();
+                BufferedReader in = new BufferedReader(
+                        new InputStreamReader(
+                                yc.getInputStream()));
+                String inputLine;
+                String data = "";
+                while ((inputLine = in.readLine()) != null)
+                    data = inputLine;
+                in.close();
+                data = data.substring(1, data.length() - 1);
+                if (data.isEmpty()) {
+                    consumer.accept(null);
+                    return;
+                }
+                JSONObject obj = new JSONObject(data);
+                String UpdateName = obj.getString("name");
+                String tag_name = obj.getString("tag_name");
+                String body = obj.getString("body").replace("\n", "<br>").replace("\r", "").replace("'", "''");
+                String updateurl = obj.getString("html_url");
+                boolean prerelease = obj.getBoolean("prerelease");
+
+                String date = obj.getString("published_at");
+                SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+                SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss a");
+                Date parsedDate = inputFormat.parse(date);
+                String formattedDate = outputFormat.format(parsedDate);
+
+                JSONArray downloadArray = obj.getJSONArray("assets");
+                String downloadURL;
+                if (downloadArray.isEmpty()) {
+                    downloadURL = "https://www.spigotmc.org/resources/" + spigotID;
+                } else {
+                    downloadURL = downloadArray.getJSONObject(0).getString("browser_download_url");
+                }
+
+                if (!prerelease) {
+                    downloadURL = "https://www.spigotmc.org/resources/" + spigotID;
+                    updateurl = "https://www.spigotmc.org/resources/" + spigotID;
+                }
+
+                T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, prerelease);
+                consumer.accept(webData);
+            } catch (Exception var10) {
+                Boolean load = false;
+                if (T2CBupdateAPI.bungeePluginVersins.containsKey(plugin.getDescription().getName())) {
+                    load = T2CBupdateAPI.bungeePluginVersins.get(plugin.getDescription().getName()).load;
+                }
+                T2CupdateObject update = new T2CupdateObject(
+                        plugin.getDescription().getName(),
+                        pluginVersion,
+                        null,
+                        load,
+                        false,
+                        true
+                );
+                T2CBupdateAPI.bungeePluginVersins.put(plugin.getDescription().getName(), update);
+                this.plugin.getLogger().severe("§4 Cannot look for updates: " + var10.getMessage());
+            }
+        });
+    }
+}

src/main/java/net/t2code/t2codelib/BUNGEE/system/config/T2CBlibConfig.java

@@ -36,6 +36,7 @@ public class T2CBlibConfig {
         Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(config);
 
         updateTimer = configuration.getInt("UpdateCheck.TimerInMin");
+        seePreReleaseUpdates = configuration.getBoolean("UpdateCheck.SeePreReleaseUpdates");
 
         apiCommandGUIEnable = configuration.getBoolean("API.CommandGUI.Enable");
         apiAutoResponse = configuration.getBoolean("API.AutoResponse.Enable");
@@ -43,6 +44,7 @@ public class T2CBlibConfig {
     }
 
     private static Integer updateTimer;
+    private static Boolean seePreReleaseUpdates;
     private static Boolean apiCommandGUIEnable;
     private static Boolean apiAutoResponse;
     private static Boolean apiOpSecurity;
@@ -51,6 +53,10 @@ public class T2CBlibConfig {
         return updateTimer;
     }
 
+    public static Boolean getSeePreReleaseUpdates() {
+        return seePreReleaseUpdates;
+    }
+
     public static Boolean getApiCommandGUIEnable() {
         return apiCommandGUIEnable;
     }

src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateAPI.java

@@ -1,5 +1,6 @@
 package net.t2code.t2codelib.SPIGOT.api.update;
 
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain;
 import net.t2code.t2codelib.UpdateType;
@@ -17,7 +18,7 @@ public class T2CupdateAPI {
     public static HashMap<String, T2CupdateObject> pluginVersions = new HashMap<>();
 
     public static void join(Plugin plugin, String prefix, String perm, Player player, Integer spigotID, String discord) {
-        if (!SelectLibConfig.getUpdateCheckOnJoin()) {
+        if (! pluginVersions.get(plugin.getName()).updateCheckOnJoin) {
             return;
         }
         if (!player.hasPermission(perm) && !player.isOp()) {
@@ -33,7 +34,6 @@ public class T2CupdateAPI {
             return;
         }
         T2CupdateWebData webData = pluginVersions.get(plugin.getName()).webData;
-        String pluginVersion = plugin.getDescription().getVersion();
         if (!pluginVersions.get(plugin.getName()).updateAvailable) return;
         new BukkitRunnable() {
             @Override
@@ -50,17 +50,18 @@ public class T2CupdateAPI {
             return;
         }
         String st = "[prefix]<br>" +
-                "<click:open_url:'[link]'><hover:show_text:'<gold>You can download it here: <yellow>[link]</yellow></gold>'>[prefix] <gold>A new</gold> [value] <gold>version was" +
-                " found!</gold></hover></click><br>" +
-                "<click:open_url:'[link]'><hover:show_text:'<gold>You can download it here: <yellow>[link]</yellow></gold>'>[prefix] <red>[plv]</red> <gray>-></gray> " +
+                "<click:open_url:'[link]'><hover:show_text:'<color:#6e90ff>You can download it here: <yellow>[link]</yellow></color>'>[prefix] <color:#6e90ff>A new</color> [value] <color:#6e90ff>version was" +
+                " found!</color></hover></click><br>" +
+                "<click:open_url:'[link]'><hover:show_text:'<color:#6e90ff>You can download it here: <yellow>[link]</yellow></color>'>[prefix] <red>[plv]</red> <gray>-></gray> " +
                 "<green>[puv]</green></hover></click><br>" +
-                "<click:open_url:'[dc]'><hover:show_text:'<yellow>[dc]</yellow>'>[prefix] <gold>You can find more information on Discord.</gold></hover></click><br>" +
-                "[prefix] <blue><hover:show_text:'<red>Click for more information</red>'><click:run_command:'/t2c updateinfo " + plugin.getName() + "'>Update information</click></hover></blue><br>" +
+                "<click:open_url:'[dc]'><hover:show_text:'<yellow>[dc]</yellow>'>[prefix] <color:#6e90ff>You can find more information on Discord.</color></hover></click><br>" +
+                "[prefix] <color:#ff9499><hover:show_text:'<red>Click for more information</red>'><click:run_command:'/t2c updateinfo " + plugin.getName() + "'>Update information</click></hover></color><br>" +
                 "[prefix]";
 
         String value;
 
         if (webData.isPreRelease()) {
+            //todo if (!SelectLibConfig.getSeePreReleaseUpdates()) return;
             value = UpdateType.PRERELEASE.text;
             if (publicVersion.toLowerCase().contains("dev")) {
                 value = UpdateType.DEVELOPMENT.text;
@@ -94,10 +95,10 @@ public class T2CupdateAPI {
             }
         } else value = UpdateType.STABLE.text;
         String h = "<br><dark_red>╔══════════════</dark_red>" + prefix + "<dark_red>══════════════</dark_red>";
-        String s1 = "<br><dark_red>║</dark_red> <gold>A new [value] version was found!</gold>".replace("[value]", value);
-        String s2 = "<br><dark_red>║</dark_red> <gold>Your version: <red>" + pluginVersion + "</red> <gray>-</gray> Current version:</gold> <green>" + webData.getVersion() + "</green>";
-        String s3 = "<br><dark_red>║</dark_red> <gold>You can download it here:</gold> <yellow>" + webData.getUpdateUrl() + "</yellow>";
-        String s4 = "<br><dark_red>║</dark_red> <gold>You can find more information on Discord:</gold> <yellow>" + discord + "</yellow>";
+        String s1 = "<br><dark_red>║</dark_red> <color:#6e90ff>A new [value] version was found!</color>".replace("[value]", value);
+        String s2 = "<br><dark_red>║</dark_red> <color:#6e90ff>Your version: <red>" + pluginVersion + "</red> <gray>-</gray> Current version:</color> <green>" + webData.getVersion() + "</green>";
+        String s3 = "<br><dark_red>║</dark_red> <color:#6e90ff>You can download it here:</color> <yellow>" + webData.getUpdateUrl() + "</yellow>";
+        String s4 = "<br><dark_red>║</dark_red> <color:#6e90ff>You can find more information on Discord:</color> <yellow>" + discord + "</yellow>";
         String f = "<br><dark_red>╚══════════════</dark_red>" + prefix + "<dark_red>══════════════</dark_red>";
         String text = h + s1 + s2 + s3 + s4 + f;
         T2Csend.console(text);
@@ -135,17 +136,18 @@ public class T2CupdateAPI {
         String updateUpdate = webData.getUpdateUrl();
         String updateDescription = webData.getUpdateDescription();
 
-        String pluginNameString = "<br><dark_red>║</dark_red> <yellow>Plugin:</yellow> <color:#5eff89>" + pluginName + "</color>";
-        String pluginVersionString = "<br><dark_red>║</dark_red> <yellow>Your version:</yellow> <color:#5eff89>" + pluginVersion + "</color>";
-        String updateInfoString = "<br><dark_red>║</dark_red> <color:#308aff>[value]:</color>";
-        String updateTitleString = "<br><dark_red>║</dark_red> <yellow>Title:</yellow> <color:#5eff89>" + updateTitle + "</color>";
-        String updateVersionString = "<br><dark_red>║</dark_red> <yellow>Version:</yellow> <color:#5eff89>" + updateVersion + "</color>";
-        String updateAtString = "<br><dark_red>║</dark_red> <yellow>Published on:</yellow> <color:#5eff89>" + updateAt + "</color>";
-        String updateTypeString = "<br><dark_red>║</dark_red> <yellow>Version type:</yellow> <color:#5eff89>" + updateType + "</color>";
+        String pluginNameString = "<br><dark_red>║</dark_red> <color:#6e90ff>Plugin:</color> <color:#5eff89>" + pluginName + "</color>";
+        String pluginVersionString = "<br><dark_red>║</dark_red> <color:#6e90ff>Your version:</color> <color:#5eff89>" + pluginVersion + "</color>";
+        String updateInfoString = "<br><dark_red>║</dark_red> <color:#09ff00>[value]:</color>";
+        String updateTitleString = "<br><dark_red>║</dark_red> <color:#6e90ff>Title:</color> <color:#5eff89>" + updateTitle + "</color>";
+        String updateVersionString = "<br><dark_red>║</dark_red> <color:#6e90ff>Version:</color> <color:#5eff89>" + updateVersion + "</color>";
+        String updateAtString = "<br><dark_red>║</dark_red> <color:#6e90ff>Published on:</color> <color:#5eff89>" + updateAt + "</color>";
+        String updateTypeString = "<br><dark_red>║</dark_red> <color:#6e90ff>Version type:</color> <color:#5eff89>" + updateType + "</color>";
 
         String updateButton;
         if (player) {
-            updateButton = "<br><dark_red>║</dark_red> <color:#5eff89><hover:show_text:'<gold>" + updateUpdate + "</gold>'><click:open_url:'" + updateUpdate + "'>Download</click></hover></color> <dark_gray>|</dark_gray> <blue><hover:show_text:'" + updateDescription + "'>Update Description</hover></blue>";
+            updateButton = "<br><dark_red>║</dark_red> <color:#5eff89><hover:show_text:'<gold>" + updateUpdate + "</gold>'><click:open_url:'" + updateUpdate
+                    + "'>Download</click></hover></color> <dark_gray>|</dark_gray> <color:#ff9499><hover:show_text:'" + updateDescription + "'>Update Description</hover></color>";
         } else updateButton = "<br><dark_red>║</dark_red> <color:#5eff89>Download:</color> <gold>" + updateUpdate + "</gold>";
 
         String text;
@@ -158,8 +160,7 @@ public class T2CupdateAPI {
         if (object.updateAvailable) text = text + updateVersionString;
         if (!updateTitle.equals("OLD")) text = text + updateAtString;
         if (!updateTitle.equals("OLD")) text = text + updateTypeString;
-        if (object.updateAvailable)
-            text = text + updateButton;
+        text = text + updateButton;
 
         if (updateTitle.equals("OLD")) text = text + "<br><dark_gray>This plugin does not have the new update checker yet, so there is no exact update / " +
                 "version information available!</dark_gray>";
@@ -179,7 +180,9 @@ public class T2CupdateAPI {
                             plugin.getDescription().getVersion(),
                             new T2CupdateWebData("OLD", update_version, "", "https://www.spigotmc.org/resources/" + spigotID, "",
                                     "https://www.spigotmc.org/resources/" + spigotID, false),
-                            false, !plugin.getDescription().getVersion().equals(update_version)
+                            false,
+                            !plugin.getDescription().getVersion().equals(update_version),
+                            true
                     );
                     pluginVersions.put(plugin.getName(), update);
                     if (pluginVersions.get(plugin.getName()).updateAvailable) {
@@ -190,7 +193,7 @@ public class T2CupdateAPI {
                                     update.load = true;
                                     sendUpdateMsg(prefix, discord, update.webData, plugin);
                                 }
-                            }.runTaskLaterAsynchronously(plugin, 600L);
+                            }.runTaskLaterAsynchronously(plugin, 200L);
                         } else sendUpdateMsg(prefix, discord, update.webData, plugin);
                     } else {
                         if (!update.load) {
@@ -198,12 +201,16 @@ public class T2CupdateAPI {
                             update.load = true;
                         }
                     }
-                }, prefix, plugin.getDescription().getVersion());
+                }, prefix, plugin.getDescription().getVersion(),true,true,60);
             }
         }.runTaskTimerAsynchronously(plugin, 0L, SelectLibConfig.getUpdateCheckTimeInterval() * 60 * 20L);
     }
 
-    public static void onUpdateCheck(Plugin plugin, String prefix, String RepoURL, Integer spigotID, String discord) {
+    public static void onUpdateCheck(Plugin plugin, String prefix, String gitKey, Integer spigotID, String discord, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) {
+        String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1";
+        if (!seePreReleaseUpdates) {
+            RepoURL = RepoURL + "&pre-release=false";
+        }
         if (!RepoURL.contains("?limit=1")) {
             RepoURL = RepoURL + "?limit=1";
         }
@@ -217,7 +224,8 @@ public class T2CupdateAPI {
                             plugin.getDescription().getVersion(),
                             webData,
                             false,
-                            !plugin.getDescription().getVersion().equals(webData.getVersion())
+                            !plugin.getDescription().getVersion().equals(webData.getVersion()),
+                            updateCheckOnJoin
                     );
                     pluginVersions.put(plugin.getName(), update);
                     if (pluginVersions.get(plugin.getName()).updateAvailable) {
@@ -236,8 +244,8 @@ public class T2CupdateAPI {
                             update.load = true;
                         }
                     }
-                }, plugin.getDescription().getVersion(), spigotID, finalRepoURL);
+                }, plugin.getDescription().getVersion(), spigotID, finalRepoURL, updateCheckOnJoin, seePreReleaseUpdates, timeInterval);
             }
-        }.runTaskTimerAsynchronously(plugin, 0L, SelectLibConfig.getUpdateCheckTimeInterval() * 60 * 20L);
+        }.runTaskTimerAsynchronously(plugin, 0L, timeInterval * 60 * 20L);
     }
 }

src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateChecker.java

@@ -19,7 +19,7 @@ public class T2CupdateChecker {
         this.resourceId = resourceId;
     }
 
-    public void getVersion(Consumer<String> consumer, String Prefix, String pluginVersion) {
+    public void getVersion(Consumer<String> consumer, String Prefix, String pluginVersion, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) {
         if (!plugin.isEnabled()) {
             return;
         }
@@ -64,7 +64,9 @@ public class T2CupdateChecker {
                         pluginVersion,
                         null,
                         load,
-                        false
+                        false,
+                        updateCheckOnJoin
+
                 );
                 T2CupdateAPI.pluginVersions.put(plugin.getName(), update);
                 this.plugin.getLogger().severe("§4 Cannot look for updates: " + var10.getMessage());

src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateCheckerGit.java

@@ -21,7 +21,7 @@ public class T2CupdateCheckerGit {
         this.plugin = plugin;
     }
 
-    public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String URL) {
+    public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String URL, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) {
         if (!plugin.isEnabled()) {
             return;
         }
@@ -45,7 +45,7 @@ public class T2CupdateCheckerGit {
                 JSONObject obj = new JSONObject(data);
                 String UpdateName = obj.getString("name");
                 String tag_name = obj.getString("tag_name");
-                String body = obj.getString("body").replace("\n","<br>").replace("\r","").replace("'","''");
+                String body = obj.getString("body").replace("\n", "<br>").replace("\r", "").replace("'", "''").replace("**", "");
                 String updateurl = obj.getString("html_url");
                 boolean prerelease = obj.getBoolean("prerelease");
 
@@ -80,7 +80,8 @@ public class T2CupdateCheckerGit {
                         pluginVersion,
                         null,
                         load,
-                        false
+                        false,
+                        updateCheckOnJoin
                 );
                 T2CupdateAPI.pluginVersions.put(plugin.getName(), update);
                 this.plugin.getLogger().severe("§4 Cannot look for updates: " + var10.getMessage());

src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java

@@ -99,7 +99,8 @@ public final class T2CodeLibMain extends JavaPlugin {
         SelectLibConfig.onSelect();
         SelectLibMsg.onSelect();
 
-        T2CupdateAPI.onUpdateCheck(plugin, prefix, Util.getGit(), Util.getSpigotID(), Util.getDiscord());
+        T2CupdateAPI.onUpdateCheck(plugin, prefix, Util.getGit(), Util.getSpigotID(), Util.getDiscord(), SelectLibConfig.getUpdateCheckOnJoin(), SelectLibConfig.getSeePreReleaseUpdates(),
+                SelectLibConfig.getUpdateCheckTimeInterval());
         Metrics.Bstats(plugin, Util.getBstatsID());
         if (SelectLibConfig.getBungee()) {
             Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "t2c:bcmd");
@@ -171,7 +172,6 @@ public final class T2CodeLibMain extends JavaPlugin {
         if (adventure == null) {
             throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!");
         }
-        Bukkit.getConsoleSender().sendMessage(Util.getPrefix() + " Adventure load");
         return adventure;
     }
 

src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/Commands.java

@@ -23,16 +23,39 @@ public class Commands {
         }
         switch (args[1].toLowerCase()) {
             case "createreportlog":
-                Bukkit.getScheduler().runTaskAsynchronously(T2CodeLibMain.getPlugin(), new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            CreateReportLog.create(sender);
-                        } catch (IOException e) {
-                            throw new RuntimeException(e);
-                        }
-                    }
-                });
+                switch (args.length){
+                    case 2:
+                        if (sender instanceof Player) {
+                            T2Csend.sender(sender, "<dark_red>The debug zip file is <red>automatically uploaded</red> to T2Code's servers<br>and <red>automatically deleted</red> " +
+                                    "after <red>14</red> days!<br>The file can also be deleted manually by you via command!</dark_red><br><dark_green><hover:show_text:'<yellow>Confirm the" +
+                                    " upload</yellow>'><click:run_command:'/t2c debug createReportLog confirmupload'>upload</click></hover></dark_green> <dark_gray>|</dark_gray> " +
+                                    "<gold><hover:show_text:'<red>Do not upload</red>'><click:run_command:'/t2c debug createReportLog noupload'>keep the file on your server</click></hover></gold>");
+                        } else T2Csend.sender(sender, "<dark_red>The debug zip file is <red>automatically uploaded</red> to T2Code's servers</dark_red>" +
+                                "<br><dark_red>and <red>automatically deleted</red> after <red>14</red> days!</dark_red>" +
+                                "<br><dark_red>The file can also be deleted manually by you via command!</dark_red>" +
+                                "<br><green>Confirm the upload with the command:</green>" +
+                                "<br><yellow>/t2c debug createReportLog confirmupload</yellow>" +
+                                "<br><red>Keep the file on your server and do not upload it with the command:</red>" +
+                                "<br><yellow>/t2c debug createReportLog noupload</yellow>");
+                        break;
+                    case 3:
+                        Boolean upload = args[2].equalsIgnoreCase("confirmupload");
+                        Bukkit.getScheduler().runTaskAsynchronously(T2CodeLibMain.getPlugin(), new Runnable() {
+                            @Override
+                            public void run() {
+                                try {
+                                    CreateReportLog.create(sender, upload);
+                                } catch (IOException e) {
+                                    T2Csend.sender(sender, Util.getPrefix() + " <red>An error occurred while creating a report log! Please look in the console!</red>");
+                                    throw new RuntimeException(e);
+                                }
+                            }
+                        });
+                        break;
+                    default:
+                        T2Csend.sender(sender, "§4Use: §7/t2code debug createReportLog");
+                        return;
+                }
                 break;
             case "deletereportlog":
                 if (args.length != 3) {

src/main/java/net/t2code/t2codelib/SPIGOT/system/cmd/CreateReportLog.java

@@ -27,22 +27,27 @@ import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 public class CreateReportLog {
-    protected static void create(CommandSender sender) throws IOException {
+    protected static void create(CommandSender sender, Boolean confirmUpload) throws IOException {
         T2Csend.sender(sender, Util.getPrefix() + " §6A DebugLog is created...");
         String timeStampFile = new SimpleDateFormat("HH_mm_ss-dd_MM_yyyy").format(Calendar.getInstance().getTime());
 
         File directory = new File(T2CodeLibMain.getPath() + "/DebugLogs");
+        File directoryTemp = new File("T2CDebugLogsTemp");
         if (!directory.exists()) {
             directory.mkdir();
         }
+        if (!directoryTemp.exists()) {
+            directoryTemp.mkdir();
+        }
 
-        File file = new File(T2CodeLibMain.getPath(), "/DebugLogs/T2CodeLog.txt");
+        File file = new File("T2CDebugLogsTemp/T2CodeLog.txt");
         PrintWriter pWriter = null;
         try {
             pWriter = new PrintWriter(new FileWriter(file.getPath()));
@@ -117,9 +122,9 @@ public class CreateReportLog {
             }
         }
 
-        String filePath = T2CodeLibMain.getPath() + "/DebugLogs/T2CodeLog.txt";
+        String filePath = "T2CDebugLogsTemp/T2CodeLog.txt";
         String log = "logs/latest.log";
-        String zipPath = "plugins/T2CodeLib/DebugLogs/T2CLog-" + timeStampFile + ".zip";
+        String zipPath = "T2CDebugLogsTemp/T2CLog-" + timeStampFile + ".zip";
         try (ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(zipPath))) {
             File fileToZip = new File(filePath);
             zip.putNextEntry(new ZipEntry(fileToZip.getName()));
@@ -136,9 +141,23 @@ public class CreateReportLog {
             e.printStackTrace();
         }
         file.delete();
+        File zipFile = new File(zipPath);
+
+        if (!confirmUpload){
+            if (sender instanceof Player) {
+                T2Csend.sender(sender, Util.getPrefix() + " §6A DebugLog zip has been created. you can find it on in the files on your server under the path: §e" + zipPath);
+            }
+            T2Csend.console(Util.getPrefix() + " §6A DebugLog zip has been created. you can find it on in the files on your server under the path: §e" + zipPath);
+
+           Files.move(Paths.get(zipPath),Paths.get(directory+"/"+zipFile.getName()));
+           zipFile.delete();
+            directoryTemp.delete();
+            return;
+        }
+
         HttpClient httpclient = new DefaultHttpClient();
         HttpPost httppost = new HttpPost("https://debug.t2code.net/uploadFile");
-        File zipFile = new File(zipPath);
+
         FileBody bin = new FileBody(zipFile);
         MultipartEntity reqEntity = new MultipartEntity();
         reqEntity.addPart("file", bin);
@@ -152,15 +171,21 @@ public class CreateReportLog {
         String fileType = obj.getString("fileType");
         Integer fileSize = obj.getInt("size");
         zipFile.delete();
+        directoryTemp.delete();
         if (sender instanceof Player) {
-            T2Csend.sender(sender, Util.getPrefix() + ("<green>A DebugLog zip has been created. You can download it <click:open_url:'[url]'>" +
-                    "<gold><hover:show_text:'<yellow>Download the debug file</yellow>'>here</hover></gold></click>. Please enter the following key " +
-                    "in the ticket: <gold><click:copy_to_clipboard:[key]><hover:show_text:'<yellow>Copy to clipboard</yellow>'>[key]</hover></click></gold></green>" +
-                    "<br><dark_red>Do not share the download URL with anyone!</dark_red><br><click:run_command:'/t2code debug deleteReportLog [key]'>" +
-                    "<green>You can <b>delte </b>yor Debug-File by clicking me.</green></click>").replace("[key]", fileID).replace("[url]", downloadURL));
+            T2Csend.sender(sender, ("[prefix] <green>A DebugLog zip has been created." +
+                    "<br>[prefix] <green>You can download it <click:open_url:'[url]'><gold><hover:show_text:'<yellow>Download the debug file</yellow>'>here</hover></gold></click>." +
+                    "<br>[prefix] <green>Please enter the following key in the ticket: <gold><click:copy_to_clipboard:[key]><hover:show_text:'<yellow>Copy to clipboard</yellow>'>[key]</hover></click></gold></green>" +
+                    "<br>[prefix] <dark_red>Do not share the download URL with anyone!</dark_red>" +
+                    "<br><hover:show_text:'<yellow>Click to delete</yellow>'><click:run_command:'/t2code debug deleteReportLog [key]'>[prefix] <green>You can <b>delte</b> yor Debug-File by clicking me.</green>" +
+                    "<br>[prefix] <color:#910d06>(If you do not delete the debug file, it will be deleted automatically after <red>14</red> days!)</color></click></hover>")
+                    .replace("[key]", fileID).replace("[url]", downloadURL).replace("[prefix]",Util.getPrefix()));
         }
-        T2Csend.console(Util.getPrefix() + (" §6A DebugLog zip has been created. You can download it here: [url].\n§6Please enter the following key in the ticket:" +
-                " §e[key].\n§4Do not share the download URL with anyone!\nYou can delte yor Debug-File with the following command: /t2code debug deleteReportLog [key].")
+        T2Csend.console(Util.getPrefix() + (" <gold>A DebugLog zip has been created. You can download it here:</gold> <yellow>[url]</yellow>" +
+                "<br><gold>Please enter the following key in the ticket:</gold> <yellow>[key]</yellow>." +
+                "<br><dark_red>Do not share the download URL with anyone!</dark_red>" +
+                "<br><color:#910d06>(If you do not delete the debug file, it will be deleted automatically after <red>14</red> days!)</color>" +
+                "<br><dark_red>You can delte yor Debug-File with the following command:</dark_red> <red>/t2code debug deleteReportLog [key]</red>.")
                 .replace("[key]", fileID).replace("[url]", downloadURL));
         ReportLogStorage.add(fileID);
     }

src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/ConfigCreate.java

@@ -24,6 +24,7 @@ public class ConfigCreate {
 
         T2Cconfig.set("Plugin.UpdateCheck.OnJoin", true, yamlConfiguration);
         T2Cconfig.set("Plugin.UpdateCheck.TimeInterval", 60, yamlConfiguration);
+        T2Cconfig.set("Plugin.UpdateCheck.SeePreReleaseUpdates", true, yamlConfiguration);
         T2Cconfig.set("Plugin.language", "english", yamlConfiguration);
 
         T2Cconfig.set("BungeeCord.Enable", false, yamlConfiguration);

src/main/java/net/t2code/t2codelib/SPIGOT/system/config/config/SelectLibConfig.java

@@ -7,29 +7,34 @@ import java.io.File;
 
 public class SelectLibConfig {
 
-    private static Boolean UpdateCheckOnJoin;
+    private static Boolean updateCheckOnJoin;
     private static Boolean t2cTestDevelopment = false;
-    private static Integer UpdateCheckTimeInterval;
-    private static Boolean Debug;
+    private static Integer updateCheckTimeInterval;
+    private static Boolean seePreReleaseUpdates;
+    private static Boolean debug;
     private static String language;
     private static Boolean bungee;
-    private static Boolean InventoriesCloseByServerStop;
+    private static Boolean inventoriesCloseByServerStop;
 
     public static void onSelect() {
         File config = new File(T2CodeLibMain.getPath(), "config.yml");
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
 
-        UpdateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheck.OnJoin");
-        t2cTestDevelopment = yamlConfiguration.getBoolean("t2cTestDevelopment");
-        UpdateCheckTimeInterval = yamlConfiguration.getInt("Plugin.UpdateCheck.TimeInterval");
-        Debug = yamlConfiguration.getBoolean("Plugin.Debug");
+        if (yamlConfiguration.contains("t2cTestDevelopment")){
+            t2cTestDevelopment = yamlConfiguration.getBoolean("t2cTestDevelopment");
+        }
+
+        updateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheck.OnJoin");
+        updateCheckTimeInterval = yamlConfiguration.getInt("Plugin.UpdateCheck.TimeInterval");
+        seePreReleaseUpdates = yamlConfiguration.getBoolean("Plugin.UpdateCheck.SeePreReleaseUpdates");
+        debug = yamlConfiguration.getBoolean("Plugin.Debug");
         language = yamlConfiguration.getString("Plugin.language");
         bungee = yamlConfiguration.getBoolean("BungeeCord.Enable");
-        InventoriesCloseByServerStop = yamlConfiguration.getBoolean("Player.Inventories.CloseByServerStop");
+        inventoriesCloseByServerStop = yamlConfiguration.getBoolean("Player.Inventories.CloseByServerStop");
     }
 
     public static Boolean getUpdateCheckOnJoin() {
-        return UpdateCheckOnJoin;
+        return updateCheckOnJoin;
     }
 
     public static Boolean getT2cTestDevelopment() {
@@ -37,11 +42,15 @@ public class SelectLibConfig {
     }
 
     public static Integer getUpdateCheckTimeInterval() {
-        return UpdateCheckTimeInterval;
+        return updateCheckTimeInterval;
+    }
+
+    public static Boolean getSeePreReleaseUpdates() {
+        return seePreReleaseUpdates;
     }
 
     public static Boolean getDebug() {
-        return Debug;
+        return debug;
     }
 
     public static String getLanguage() {
@@ -53,7 +62,7 @@ public class SelectLibConfig {
     }
 
     public static Boolean getInventoriesCloseByServerStop() {
-        return InventoriesCloseByServerStop;
+        return inventoriesCloseByServerStop;
     }
 
 }

src/main/java/net/t2code/t2codelib/T2CupdateObject.java

@@ -8,16 +8,19 @@ public class T2CupdateObject {
     public T2CupdateWebData webData;
     public Boolean load;
     public Boolean updateAvailable;
+    public Boolean updateCheckOnJoin;
 
     public T2CupdateObject(String pluginName,
                            String pluginVersion,
                            T2CupdateWebData webData,
                            Boolean load,
-                           Boolean updateAvailable) {
+                           Boolean updateAvailable,
+                           Boolean updateCheckOnJoin) {
         this.pluginName = pluginName;
         this.pluginVersion = pluginVersion;
         this.webData = webData;
         this.load = load;
         this.updateAvailable = updateAvailable;
+        this.updateCheckOnJoin = updateCheckOnJoin;
     }
 }

src/main/java/net/t2code/t2codelib/Util.java

@@ -10,7 +10,7 @@ public class Util {
     }
 
     public static String getPrefix() {
-        return "§8[§4T2Code§5Lib§8]";
+        return "<dark_gray>[<dark_red>T2Code</dark_red><dark_purple>Lib</dark_purple>]</dark_gray>";
     }
 
     public static Integer getSpigotID() {
@@ -18,7 +18,7 @@ public class Util {
     }
 
     public static String getGit() {
-        return "https://git.t2code.net/api/v1/repos/JaTiTV/T2CodeLib/releases?limit=1";
+        return "JaTiTV/T2CodeLib";
     }
 
     public static Integer getBstatsID() {