1.20r2 Support

.idea/misc.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <list size="2">
@@ -12,6 +13,7 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" />
 </project>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.t2code</groupId>
     <artifactId>T2CodeLib</artifactId>
-    <version>15.9</version>
+    <version>16.2</version>
     <!--version>VERSION_snapshot-0</version-->
     <!--version>VERSION_beta-0</version-->
     <!--version>VERSION_dev-0</version-->
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -188,13 +188,13 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.3.0</version>
+            <version>4.3.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>
-            <version>4.3.0</version>
+            <version>4.3.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -221,6 +221,12 @@
             <version>4.5.14</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20230227</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

src/main/java/net/t2code/t2codelib/BUNGEE/system/pluginMessaging/T2CplmsgBcmd.java

@@ -6,6 +6,7 @@ import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.t2code.t2codelib.Util;
+import org.junit.Ignore;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -20,7 +21,13 @@ public class T2CplmsgBcmd implements Listener {
             try {
                 String channel = stream.readUTF();
                 String input = stream.readUTF();
-                String serverID = stream.readUTF();
+                String serverID;
+                try {
+                    serverID = stream.readUTF();
+                } catch (Exception i){
+                    serverID = "not Found";
+                }
+
                 if (channel.equals("T2Code-Console")) {
                     ProxyServer.getInstance().getConsole().sendMessage(Util.getPrefix()+" [§6"+serverID+"§r] §cT2C BCMD Command Console: §r"+ input);
                     ProxyServer.getInstance().getPluginManager().dispatchCommand(ProxyServer.getInstance().getConsole(), input);

src/main/java/net/t2code/t2codelib/SPIGOT/api/items/T2CitemBuilder.java

@@ -3,13 +3,23 @@ package net.t2code.t2codelib.SPIGOT.api.items;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
+import net.t2code.t2codelib.SPIGOT.system.bstats.Metrics;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
+import org.bukkit.profile.PlayerProfile;
+import org.bukkit.profile.PlayerTextures;
 
 import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Base64;
+
+import org.json.JSONObject;
+
 import java.util.List;
 import java.util.UUID;
 
@@ -66,7 +76,13 @@ public class T2CitemBuilder {
         inventory.setItem(slot, item);
     }
 
-    public static ItemStack base64(String base64Value, Integer amount, String displayName, List<String> lore) {
+    public static ItemStack base64(String base64Value) {
+        if (!T2CmcVersion.minMc1_20() || T2CmcVersion.isNms1_20_R1()) {
+            return base64Old(base64Value);
+        } else return base64New(base64Value);
+    }
+
+    private static ItemStack base64Old(String base64Value) {
         ItemStack itemStack = new ItemStack(T2CitemVersion.getHead());
         SkullMeta itemMeta = (SkullMeta) itemStack.getItemMeta();
 
@@ -81,11 +97,33 @@ public class T2CitemBuilder {
             e.printStackTrace();
         }
 
-        itemMeta.setDisplayName(displayName);
-        itemMeta.setLore(lore);
         itemStack.setItemMeta(itemMeta);
-
-        itemStack.setAmount(amount);
         return itemStack;
     }
+
+    private static ItemStack base64New(String base64Value) {
+        ItemStack itemStack = new ItemStack(T2CitemVersion.getHead());
+        SkullMeta itemMeta = (SkullMeta) itemStack.getItemMeta();
+
+        PlayerProfile profile = Bukkit.createPlayerProfile(UUID.randomUUID());
+        PlayerTextures textures = profile.getTextures();
+        try {
+            textures.setSkin(new URL(base64Convert(base64Value)));
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
+        profile.setTextures(textures);
+        itemMeta.setOwnerProfile(profile);
+        itemStack.setItemMeta(itemMeta);
+        return itemStack;
+    }
+
+    private static String base64Convert(String base64Value) {
+        String jsonString = new String(Base64.getDecoder().decode(base64Value));
+        JSONObject obj = new JSONObject(jsonString);
+        String output = obj.getJSONObject("textures").getJSONObject("SKIN").getString("url");
+        if (output.startsWith("http://textures.minecraft.net/texture/")){
+            return output;
+        } else return "http://textures.minecraft.net/texture/d5d20330da59c207d78352838e91a48ea1e42b45a9893226144b251fe9b9d535";
+    }
 }

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

@@ -53,6 +53,10 @@ public class T2CupdateCheckerGit {
                     );
 
                     T2CupdateAPI.pluginVersions.put(plugin.getName(), update);
+                    if (T2CupdateAPI.pluginVersions.get(plugin.getName()) == null){
+                        T2Csend.debugmsg(T2CodeLibMain.getPlugin(),plugin.getName() + " UpdateAPI T2CupdateAPI.pluginVersions.get(plugin.getName()) == null");
+                        return;
+                    }
                     if (T2CupdateAPI.pluginVersions.get(plugin.getName()).updateAvailable) {
                         if (!update.load) {
                             new BukkitRunnable() {
@@ -74,7 +78,7 @@ public class T2CupdateCheckerGit {
 
                 }, plugin.getDescription().getVersion(), spigotID, finalRepoURL, updateCheckOnJoin, seePreReleaseUpdates, timeInterval);
             }
-        }, 0L, finalInterval * 60 * 20L);
+        }, 10L, 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/cmd/CreateReportLog.java

@@ -198,7 +198,7 @@ public class CreateReportLog {
                     "<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] <click:run_command:'/t2code debug deleteReportLog [key]'><hover:show_text:'<yellow>Click to delete</yellow>'><green>You can <b>delete</b> your 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()));
         }
@@ -206,7 +206,7 @@ public class CreateReportLog {
                 "<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>.")
+                "<br><dark_red>You can delete your Debug-File with the following command:</dark_red> <red>/t2code debug deleteReportLog [key]</red>.")
                 .replace("[key]", fileID).replace("[url]", downloadURL));
         ReportLogStorage.add(fileID);
     }