Merge branch 'development' of https://git.t2code.net/JaTiTV/T2CodeLib into development

- Update auf Minecraft Version 1.20
- Kyori MiniMessage API Update auf 4.14.0

pom.xml

@@ -6,7 +6,10 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>T2CodeLib</artifactId>
-    <version>14.4</version>
+    <version>15.0</version>
+    <!--version>VERSION_snapshot-0</version-->
+    <!--version>VERSION_beta-0</version-->
+    <!--version>VERSION_dev-0</version-->
     <packaging>jar</packaging>
 
     <name>T2CodeLib</name>
@@ -115,7 +118,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.19.3-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -131,7 +134,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.1-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -163,7 +166,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.2</version>
+            <version>2.11.3</version>
             <scope>provided</scope>
         </dependency>
 
@@ -179,7 +182,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.13.1</version>
+            <version>4.14.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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

@@ -5,6 +5,7 @@ import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.t2code.t2codelib.BUNGEE.api.messages.T2CBsend;
 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 net.t2code.t2codelib.UpdateType;
@@ -48,8 +49,13 @@ public class T2CBupdateAPI {
     private static String pluginVersion;
 
     public static void onUpdateCheckTimer(Plugin plugin, String prefix, String discord, Integer spigotID, String url) {
+        Integer finalInterval;
+        if (T2CBlibConfig.getUpdateTimer() < 1){
+            finalInterval = 1;
+        } else finalInterval = T2CBlibConfig.getUpdateTimer();
         ProxyServer.getInstance().getScheduler().schedule(plugin, new Runnable() {
             public void run() {
+                if (T2CBlibConfig.getUpdateCheckFullDisable()) return;
                 (new T2CBupdateCheckerGit(plugin, spigotID)).getVersion((webData) -> {
                     pluginVersion = plugin.getDescription().getVersion();
                     T2CupdateObject update = new T2CupdateObject(
@@ -72,6 +78,6 @@ public class T2CBupdateAPI {
                     }
                 }, pluginVersion, spigotID, url);
             }
-        }, 0, T2CBlibConfig.getUpdateTimer() * 60 * 20L, TimeUnit.SECONDS);
+        }, 0, finalInterval * 60 * 20L, TimeUnit.SECONDS);
     }
 }

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

@@ -26,6 +26,7 @@ public class T2CBupdateCheckerGit {
     }
 
     public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String gitKey) {
+        if (T2CBlibConfig.getUpdateCheckFullDisable()) return;
         String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1";
         if (!T2CBlibConfig.getSeePreReleaseUpdates()) {
             RepoURL = RepoURL + "&pre-release=false";

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

@@ -1,5 +1,6 @@
 package net.t2code.t2codelib.BUNGEE.system.config;
 
+import lombok.Getter;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
@@ -22,6 +23,8 @@ public class T2CBlibConfig {
         }
         Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(config);
         T2CBconfig.set("UpdateCheck.TimerInMin", 60, configuration);
+        T2CBconfig.set("UpdateCheck.SeePreReleaseUpdates", true, configuration);
+        T2CBconfig.set("Plugin.UpdateCheck.AllPlugins.FullDisable", false, configuration);
 
         T2CBconfig.set("API.CommandGUI.Enable", false, configuration);
         T2CBconfig.set("API.AutoResponse.Enable", false, configuration);
@@ -37,35 +40,24 @@ public class T2CBlibConfig {
 
         updateTimer = configuration.getInt("UpdateCheck.TimerInMin");
         seePreReleaseUpdates = configuration.getBoolean("UpdateCheck.SeePreReleaseUpdates");
+        updateCheckFullDisable = configuration.getBoolean("Plugin.UpdateCheck.AllPlugins.FullDisable");
 
         apiCommandGUIEnable = configuration.getBoolean("API.CommandGUI.Enable");
         apiAutoResponse = configuration.getBoolean("API.AutoResponse.Enable");
         apiOpSecurity = configuration.getBoolean("API.OPSecurity.Enable");
     }
 
+    @Getter
     private static Integer updateTimer;
+    @Getter
     private static Boolean seePreReleaseUpdates;
+    @Getter
+    private static Boolean updateCheckFullDisable;
+    @Getter
     private static Boolean apiCommandGUIEnable;
+    @Getter
     private static Boolean apiAutoResponse;
+    @Getter
     private static Boolean apiOpSecurity;
 
-    public static Integer getUpdateTimer() {
-        return updateTimer;
-    }
-
-    public static Boolean getSeePreReleaseUpdates() {
-        return seePreReleaseUpdates;
-    }
-
-    public static Boolean getApiCommandGUIEnable() {
-        return apiCommandGUIEnable;
-    }
-
-    public static Boolean getApiAutoResponse() {
-        return apiAutoResponse;
-    }
-
-    public static Boolean getApiOpSecurity() {
-        return apiOpSecurity;
-    }
 }

src/main/java/net/t2code/t2codelib/SPIGOT/api/player/T2CnameHistory.java

@@ -5,7 +5,6 @@ import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -13,6 +12,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Date;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 public class T2CnameHistory {
     public static class NameLookup {
@@ -93,7 +93,7 @@ public class T2CnameHistory {
             con.setReadTimeout(2000);
             con.connect();
             BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
-            String response = in.readLine();
+            String response = in.lines().collect(Collectors.joining());
             in.close();
             return response;
         }

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

@@ -2,6 +2,7 @@ package net.t2code.t2codelib.SPIGOT.api.update;
 
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
 import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain;
+import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig;
 import net.t2code.t2codelib.UpdateType;
 import net.t2code.t2codelib.T2CupdateObject;
 import net.t2code.t2codelib.T2CupdateWebData;
@@ -180,6 +181,7 @@ public class T2CupdateAPI {
     }
 
     public static void onUpdateCheck(Plugin plugin, String prefix, String gitKey, Integer spigotID, String discord, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) {
+        if (SelectLibConfig.getUpdateCheckFullDisable()) return;
         new T2CupdateCheckerGit((JavaPlugin) plugin, prefix, gitKey, spigotID, discord, updateCheckOnJoin, seePreReleaseUpdates, timeInterval);
     }
 }

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

@@ -1,6 +1,8 @@
 package net.t2code.t2codelib.SPIGOT.api.update;
 
 import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain;
+import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig;
 import net.t2code.t2codelib.T2CupdateObject;
 import net.t2code.t2codelib.T2CupdateWebData;
 import org.bukkit.Bukkit;
@@ -30,9 +32,15 @@ public class T2CupdateCheckerGit {
         }
         String finalRepoURL = RepoURL;
 
+        Integer finalInterval;
+        if (timeInterval < 1){
+            finalInterval = 1;
+        } else finalInterval = timeInterval;
+
         Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
             @Override
             public void run() {
+                if (SelectLibConfig.getUpdateCheckFullDisable()) return;
                 getVersion((webData) -> {
                     T2CupdateObject update = new T2CupdateObject(
                             plugin.getName(),
@@ -65,7 +73,7 @@ public class T2CupdateCheckerGit {
 
                 }, plugin.getDescription().getVersion(), spigotID, finalRepoURL, updateCheckOnJoin, seePreReleaseUpdates, timeInterval);
             }
-        }, 0L, timeInterval * 60 * 20L);
+        }, 0L, finalInterval * 60 * 20L);
     }
 
     public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String URL, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) {

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

@@ -96,6 +96,9 @@ public final class T2CodeLibMain extends JavaPlugin {
             T2Csend.console(prefix + " §3PlaceholderAPI: §6connected" + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
         }
 
+        T2Csend.console(prefix + " §3Kyori MiniMessage Support: "+ (getMmIsLoad() ? "§2load" : "§4not load")  + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
+
+
         plugin.getCommand("t2code").setExecutor(new CmdExecuter());
         ConfigCreate.configCreate();
         T2CitemVersion.scan();

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

@@ -22,9 +22,11 @@ public class ConfigCreate {
         File config = new File(T2CodeLibMain.getPath(), "config.yml");
         YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
 
+
         T2Cconfig.set("Plugin.UpdateCheck.OnJoin", true, yamlConfiguration);
         T2Cconfig.set("Plugin.UpdateCheck.TimeInterval", 60, yamlConfiguration);
         T2Cconfig.set("Plugin.UpdateCheck.SeePreReleaseUpdates", true, yamlConfiguration);
+        T2Cconfig.set("Plugin.UpdateCheck.AllPlugins.FullDisable", false, yamlConfiguration);
         T2Cconfig.set("Plugin.language", "english", yamlConfiguration);
 
         T2Cconfig.set("BungeeCord.Enable", T2CodeLibMain.getIsBungee(), yamlConfiguration);

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

@@ -17,6 +17,8 @@ public class SelectLibConfig {
     @Getter
     private static Boolean seePreReleaseUpdates;
     @Getter
+    private static Boolean updateCheckFullDisable;
+    @Getter
     private static Boolean debug;
     @Getter
     private static String language;
@@ -36,6 +38,7 @@ public class SelectLibConfig {
         updateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheck.OnJoin");
         updateCheckTimeInterval = yamlConfiguration.getInt("Plugin.UpdateCheck.TimeInterval");
         seePreReleaseUpdates = yamlConfiguration.getBoolean("Plugin.UpdateCheck.SeePreReleaseUpdates");
+        updateCheckFullDisable = yamlConfiguration.getBoolean("Plugin.UpdateCheck.AllPlugins.FullDisable");
         debug = yamlConfiguration.getBoolean("Plugin.Debug");
         language = yamlConfiguration.getString("Plugin.language");
         bungee = yamlConfiguration.getBoolean("BungeeCord.Enable");