15.1 | Stable 1.20 support

Stable 1.20 support

pom.xml

@@ -6,7 +6,10 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>T2CodeLib</artifactId>
-    <version>14.4_DEV-6</version>
+    <version>15.1</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>
 
@@ -171,7 +174,7 @@
         <dependency>
             <groupId>com.bencodez</groupId>
             <artifactId>votingplugin</artifactId>
-            <version>6.10.0</version>
+            <version>6.12.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -179,19 +182,19 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.12.0</version>
+            <version>4.14.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
             <scope>compile</scope>
         </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";
@@ -62,6 +63,7 @@ public class T2CBupdateCheckerGit {
                 String formattedDate = outputFormat.format(parsedDate);
 
                 JSONArray downloadArray = obj.getJSONArray("assets");
+                String gitURL = updateurl;
                 String downloadURL;
                 if (downloadArray.isEmpty()) {
                     downloadURL = "https://www.spigotmc.org/resources/" + spigotID;
@@ -74,7 +76,7 @@ public class T2CBupdateCheckerGit {
                     updateurl = "https://www.spigotmc.org/resources/" + spigotID;
                 }
 
-                T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, prerelease);
+                T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, gitURL, prerelease);
                 consumer.accept(webData);
             } catch (Exception var10) {
                 Boolean load = 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/debug/T2Cdebug.java

@@ -0,0 +1,37 @@
+package net.t2code.t2codelib.SPIGOT.api.debug;
+
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+import java.util.UUID;
+
+public class T2Cdebug {
+    public static void debug(Plugin plugin, String msg) {
+        debug(plugin, msg, null);
+    }
+
+    public static void debug(Plugin plugin, String msg, Integer stage) {
+        //  if (!new File(Main.getPath(), "config.yml").exists()) return;
+        if (stage == null) {
+            if (plugin.getConfig().getBoolean("Plugin.Debug") || plugin.getConfig().getBoolean("plugin.debug") || plugin.getConfig().getBoolean("Debug") || plugin.getConfig().getBoolean("debug")){
+                T2Csend.info(plugin, "");
+                Bukkit.getConsoleSender().sendMessage(plugin.getDescription().getPrefix() + " §5DEBUG: §6" + msg);
+            }
+            return;
+        }
+        if (plugin.getConfig().getInt("Plugin.Debug") >= stage || plugin.getConfig().getInt("plugin.debug") >= stage || plugin.getConfig().getInt("Debug") >= stage || plugin.getConfig().getInt("debug") >= stage) {
+            T2Csend.info(plugin, "");
+            Bukkit.getConsoleSender().sendMessage(plugin.getDescription().getPrefix() + " §5DEBUG: §6" + msg);
+        }
+    }
+
+    public static void debugmsg(Plugin plugin, String msg) {
+        T2Csend.warning(plugin, "");
+        Bukkit.getConsoleSender().sendMessage("§e[" + plugin.getDescription().getPrefix() + "] §5DEBUG-MSG: §6" + msg);
+    }
+
+    public static String debugCode(){
+        return UUID.randomUUID().toString().substring(0, 7);
+    }
+}

src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2Csend.java

@@ -1,5 +1,6 @@
 package net.t2code.t2codelib.SPIGOT.api.messages;
 
+import net.t2code.t2codelib.SPIGOT.api.debug.T2Cdebug;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -61,22 +62,11 @@ public class T2Csend {
 
     public static void debug(Plugin plugin, String msg, Integer stage) {
         //  if (!new File(Main.getPath(), "config.yml").exists()) return;
-        if (stage == null) {
-            if (plugin.getConfig().getBoolean("Plugin.Debug") || plugin.getConfig().getBoolean("plugin.debug") || plugin.getConfig().getBoolean("Debug") || plugin.getConfig().getBoolean("debug")){
-                info(plugin, "");
-                Bukkit.getConsoleSender().sendMessage(plugin.getDescription().getPrefix() + " §5DEBUG: §6" + msg);
-            }
-            return;
-        }
-        if (plugin.getConfig().getInt("Plugin.Debug") >= stage || plugin.getConfig().getInt("plugin.debug") >= stage || plugin.getConfig().getInt("Debug") >= stage || plugin.getConfig().getInt("debug") >= stage) {
-            info(plugin, "");
-            Bukkit.getConsoleSender().sendMessage(plugin.getDescription().getPrefix() + " §5DEBUG: §6" + msg);
-        }
+        T2Cdebug.debug(plugin, msg, stage);
     }
 
     public static void debugmsg(Plugin plugin, String msg) {
-        warning(plugin, "");
-        Bukkit.getConsoleSender().sendMessage("§e[" + plugin.getDescription().getPrefix() + "] §5DEBUG-MSG: §6" + msg);
+        T2Cdebug.debugmsg(plugin, msg);
     }
 
     public static void info(Plugin plugin, String msg) {

src/main/java/net/t2code/t2codelib/SPIGOT/api/minecraftVersion/T2CmcVersion.java

@@ -43,6 +43,7 @@ public class T2CmcVersion {
         nms1_19_R1 = nms.contains("1_19_R1");
         nms1_19_R2 = nms.contains("1_19_R2");
         nms1_20_R1 = nms.contains("1_20_R1");
+        nms1_20_R2 = nms.contains("1_20_R2");
     }
 
     private static String mcVersion;
@@ -83,6 +84,7 @@ public class T2CmcVersion {
     private static boolean nms1_19_R1;
     private static boolean nms1_19_R2;
     private static boolean nms1_20_R1;
+    private static boolean nms1_20_R2;
 
     public static String getMcVersion() {
         return mcVersion;
@@ -231,4 +233,7 @@ public class T2CmcVersion {
     public static boolean isNms1_20_R1() {
         return nms1_20_R1;
     }
+    public static boolean isNms1_20_R2() {
+        return nms1_20_R2;
+    }
 }

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;
@@ -156,7 +157,7 @@ public class T2CupdateAPI {
         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> <color:#ff9499><hover:show_text:'" + updateDescription + "'>Update Description</hover></color>";
+                    + "'>Download</click></hover></color> <dark_gray>|</dark_gray> <color:#ff9499><hover:show_text:'" + updateDescription + "'><click:open_url:'" + webData.getGitURL() + "'>Update Description</click></hover></color>";
         } else updateButton = "<br><dark_red>║</dark_red> <color:#5eff89>Download:</color> <gold>" + updateUpdate + "</gold>";
 
         String text;
@@ -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) {
@@ -102,6 +110,7 @@ public class T2CupdateCheckerGit {
                 Date parsedDate = inputFormat.parse(date);
                 String formattedDate = outputFormat.format(parsedDate);
 
+                String gitURL = updateurl;
                 JSONArray downloadArray = obj.getJSONArray("assets");
                 String downloadURL;
                 if (downloadArray.isEmpty()) {
@@ -115,7 +124,7 @@ public class T2CupdateCheckerGit {
                     updateurl = "https://www.spigotmc.org/resources/" + spigotID;
                 }
 
-                T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, prerelease);
+                T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, gitURL, prerelease);
                 consumer.accept(webData);
             } catch (Exception var10) {
                 Boolean load = false;

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

@@ -61,10 +61,10 @@ public final class T2CodeLibMain extends JavaPlugin {
         }
         T2CmcVersion.onCheck();
 
-        if (T2CmcVersion.isMc1_20()) {
+        if (T2CmcVersion.isNms1_20_R2()) {
             T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!");
             T2Csend.console(prefix);
-            T2Csend.warning(plugin, "The 1.20.* is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net");
+            T2Csend.warning(plugin, "The 1.20.* (R2) is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net");
             T2Csend.console(prefix);
             T2Csend.console(prefix + " §4!!!!!!!!!!!!!!!!!!!!");
             if (!SelectLibConfig.getT2cTestDevelopment()) {
@@ -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");

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

@@ -16,15 +16,18 @@ public class T2CupdateWebData {
     @Getter
     private String downloadURL;
     @Getter
+    private String gitURL;
+    @Getter
     private boolean preRelease;
 
-    public T2CupdateWebData(String updateTitle, String version, String updateDescription, String updateUrl, String publishedAt, String downloadURL, boolean preRelease) {
+    public T2CupdateWebData(String updateTitle, String version, String updateDescription, String updateUrl, String publishedAt, String downloadURL, String gitURL, boolean preRelease) {
         this.updateTitle = updateTitle;
         this.version = version;
         this.updateDescription = updateDescription;
         this.updateUrl = updateUrl;
         this.publishedAt = publishedAt;
         this.downloadURL = downloadURL;
+        this.gitURL = gitURL;
         this.preRelease = preRelease;
     }
 }