Update for Minecraft 1.21.3

Author: n2klasse

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1'
     id 'kr.entree.spigradle' version '2.4.3'
-    id 'io.freefair.lombok' version '8.6'
+    id 'io.freefair.lombok' version '8.10.2'
     id 'java'
     id 'jacoco'
 }

gradle.properties

@@ -1,11 +1,9 @@
 group = de.butzlabben
 pluginName = WorldSystem
-author = Trainerlord, Butzlabben & CrazyCloudCraft
-mcVersion = 1.20.2
-apiVersion = 1.20
-version = 2.4.37
+author = Trainerlord, Butzlabben & N1klasse
+mcVersion = 1.21.3
+apiVersion = 1.21
+version = 2.4.38
 Vault = Vault
 WorldEdit = WorldEdit
-FAWE = FAWE
-
-
+FAWE = FAWE

gradle/wrapper/gradle-wrapper.jar

@@ -7,12 +7,17 @@
 import com.mojang.util.UUIDTypeAdapter;
 import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 
+/* DEPRECATED
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStreamReader;
-import java.lang.reflect.Type;
-import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.HttpURLConnection; */ 
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.util.*;
 
 /**
@@ -29,6 +34,8 @@ public class GameProfileBuilder {
     private static final Object sync = new Object();
     private static long cacheTime = -1L;
 
+    private static final HttpClient client = HttpClient.newHttpClient();
+
     public static GameProfile fetch(UUID uuid) throws IOException {
         return fetch(uuid, false);
     }
@@ -38,11 +45,33 @@ public static GameProfile fetch(UUID uuid, boolean forceNew) throws IOException
             return cache.get(uuid).profile;
         }
 
-        HttpURLConnection connection;
+        String url = String.format("https://sessionserver.mojang.com/session/minecraft/profile/%s?unsigned=false", UUIDTypeAdapter.fromUUID(uuid));
+        HttpRequest request = HttpRequest.newBuilder()
+            .uri(URI.create(url))
+            .GET()
+            .timeout(java.time.Duration.ofSeconds(5)) // Set timeout for request
+            .build();
+        
+        synchronized (sync) {
+            try {
+                HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+                if (response.statusCode() == 200) {
+                    String json = response.body();
+                    GameProfile result = gson.fromJson(json, GameProfile.class);
+                    cache.put(uuid, new CachedProfile(result));
+                    return result;
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new IOException("Request interrupted", e);
+            }
+        }
+
+        //DEPRECATED
+        /*HttpURLConnection connection;
         synchronized (sync) {
             connection = (HttpURLConnection) new URL(
-                    String.format("https://sessionserver.mojang.com/session/minecraft/profile/%s?unsigned=false",
-                            UUIDTypeAdapter.fromUUID(uuid))).openConnection();
+                    String.format("https://sessionserver.mojang.com/session/minecraft/profile/%s?unsigned=false", UUIDTypeAdapter.fromUUID(uuid))).openConnection();
             connection.setReadTimeout(5000);
         }
         if (connection.getResponseCode() == 200) {
@@ -52,11 +81,12 @@ public static GameProfile fetch(UUID uuid, boolean forceNew) throws IOException
             GameProfile result = gson.fromJson(json, GameProfile.class);
             cache.put(uuid, new CachedProfile(result));
             return result;
-        }
+        }*/
+
         if ((!forceNew) && (cache.containsKey(uuid))) {
             return cache.get(uuid).profile;
         }
-        throw new IOException("Could not connect to mojang servers for unknown player: " + uuid.toString());
+        throw new IOException("Could not connect to mojang servers for unknown player: "+ uuid); //+ uuid.toString());
     }
 
     public static GameProfile getProfile(UUID uuid, String name, String skin) {

src/main/java/de/butzlabben/world/GameProfileBuilder.java

@@ -5,6 +5,8 @@
 import de.butzlabben.world.config.PluginConfig;
 import de.butzlabben.world.util.database.DatabaseProvider;
 import de.butzlabben.world.util.database.DatabaseUtil;
+
+import org.apache.commons.lang3.ObjectUtils.Null;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -78,6 +80,24 @@ private static UUID getUUID(String name) {
         return null;
     }
 
+    public static OfflinePlayer getOfflinePlayer(String name) {
+        Player player = Bukkit.getPlayer(name); // Check if the player is currently online
+        if (player != null) {
+            // Return the OfflinePlayer using the online player's UUID
+            return Bukkit.getOfflinePlayer(player.getUniqueId());
+        }
+    
+        // If the player is not online, attempt to get the UUID from the database
+        UUID uuid = PlayerWrapper.getUUID(name);
+        if (uuid != null) {
+            return Bukkit.getOfflinePlayer(uuid);
+        }
+    
+        // If the UUID is not in the database, return null or handle accordingly
+        return null;
+    }
+
+    /*
     public static OfflinePlayer getOfflinePlayer(String name) {
         Player player = Bukkit.getPlayer(name);
         if(player != null)
@@ -88,7 +108,7 @@ public static OfflinePlayer getOfflinePlayer(String name) {
             return Bukkit.getOfflinePlayer(uuid);
 
         return Bukkit.getOfflinePlayer(name);
-    }
+    }*/
 
     public static OfflinePlayer getOfflinePlayer(UUID uuid) {
         return Bukkit.getOfflinePlayer(uuid);

src/main/java/de/butzlabben/world/util/PlayerWrapper.java

@@ -15,7 +15,7 @@ public class VersionUtil {
     private VersionUtil() {
     }
 
-    public static int getVersion() {
+    /*public static int getVersion() {
         if (version == 0) {
             // Detect version
             String v = Bukkit.getVersion();
@@ -44,7 +44,33 @@ public static int getVersion() {
             version = 12;
         }
         return version;
-    }
+    }*/
+
+    public static int getVersion() {
+        if (version == 0) {
+            // Detect version
+            String v = Bukkit.getVersion();
+            
+            // Extract minor version number
+            int minorVersion = 0;
+            if (v.matches(".*1\\.(\\d+).*")) {
+                minorVersion = Integer.parseInt(v.replaceAll(".*1\\.(\\d+).*", "$1"));
+            }
+    
+            // Set version based on minor version number
+            switch (minorVersion) {
+                case 21 -> version = 21;
+                case 20 -> version = 20;
+                case 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3 -> version = minorVersion;
+                default -> {
+                    System.err.println("[WorldSystem] Unknown version: " + v);
+                    System.err.println("[WorldSystem] Choosing version 1.12.2");
+                    version = 12; // Default to 1.12 if version is unrecognized
+                }
+            }
+        }
+        return version;
+    }    
 
     public static boolean isCancelled(BukkitTask task) {
         if (getVersion() <= 12)