Merge remote-tracking branch 'upstream/master' into upstreamClean

# Conflicts:
#	src/main/java/de/minebench/syncinv/SyncInv.java
#	src/main/java/de/minebench/syncinv/listeners/PlayerFreezeListener.java
#	src/main/java/de/minebench/syncinv/listeners/PlayerJoinListener.java

Author: FireInstall

pom.xml

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.4-R0.1-SNAPSHOT</version>
+            <version>1.21.10-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/de/minebench/syncinv/PlayerData.java

@@ -87,7 +87,7 @@ public class PlayerData implements Serializable {
         this.inventory = serializeItems(player.getInventory().getContents());
         this.enderchest = serializeItems(player.getEnderChest().getContents());
         this.potionEffects = player.getActivePotionEffects();
-        this.maxHealth = player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getBaseValue();
+        this.maxHealth = player.getMaxHealth();
         this.health = player.getHealth();
         this.isHealthScaled = player.isHealthScaled();
         this.healthScale = player.getHealthScale();

src/main/java/de/minebench/syncinv/SyncInv.java

@@ -8,8 +8,10 @@
 import com.lishid.openinv.command.OpenInvCommand;
 import com.mojang.authlib.GameProfile;
 import de.minebench.syncinv.listeners.MapCreationListener;
+import de.minebench.syncinv.listeners.PlayerConnectionValidateLoginListener;
 import de.minebench.syncinv.listeners.PlayerFreezeListener;
 import de.minebench.syncinv.listeners.PlayerJoinListener;
+import de.minebench.syncinv.listeners.PlayerLoginListener;
 import de.minebench.syncinv.listeners.PlayerQuitListener;
 import de.minebench.syncinv.messenger.Message;
 import de.minebench.syncinv.messenger.MessageType;
@@ -28,7 +30,6 @@
 import org.bukkit.WorldType;
 import org.bukkit.advancement.Advancement;
 import org.bukkit.advancement.AdvancementProgress;
-import org.bukkit.attribute.Attribute;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -45,6 +46,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -61,6 +63,7 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.logging.Level;
 
 /*
@@ -155,7 +158,7 @@ public final class SyncInv extends JavaPlugin {
     private int newestMap = 0;
 
     // Unknown player storing
-    private Method methodGetOfflinePlayer = null;
+    private Function<GameProfile, OfflinePlayer> getOfflinePlayer = null;
     private Method methodGetHandle = null;
     private Method methodSetPositionRaw;
     private Field fieldYaw = null;
@@ -178,13 +181,38 @@ public void onEnable() {
         // Plugin startup logic
         loadConfig();
 
-        playerDataFolder = new File(getServer().getWorlds().get(0).getWorldFolder(), "playerdata");
+        playerDataFolder = getServer().getMinecraftVersion().startsWith("1.")
+                ? new File(getServer().getWorlds().get(0).getWorldFolder(), "playerdata")
+                : new File(new File(getServer().getWorlds().get(0).getWorldFolder(), "players"), "data");
         try {
-            methodGetOfflinePlayer = getServer().getClass().getMethod("getOfflinePlayer", GameProfile.class);
+            Method methodGetOfflinePlayer = getServer().getClass().getMethod("getOfflinePlayer", GameProfile.class);
+            getOfflinePlayer = (gameProfile -> {
+                try {
+                    return  (OfflinePlayer) methodGetOfflinePlayer.invoke(getServer(), gameProfile);
+                } catch (IllegalAccessException | InvocationTargetException e) {
+                    logDebug("Could not create offline player for " + gameProfile.getId() + "! " + e.getMessage());
+                }
+                return null;
+            });
         } catch (NoSuchMethodException e) {
-            if (storeUnknownPlayers) {
-                getLogger().log(Level.WARNING, "Could not load method required to store unknown players. Disabling it!", e);
-                storeUnknownPlayers = false;
+            try {
+                Class nameAndIdClass = Class.forName("net.minecraft.server.players.NameAndId");
+                Constructor nameAndIdConstructor = nameAndIdClass.getConstructor(GameProfile.class);
+                Method methodGetOfflinePlayer = getServer().getClass().getMethod("getOfflinePlayer", nameAndIdClass);
+                getOfflinePlayer = (gameProfile -> {
+                    try {
+                        Object nameAndId = nameAndIdConstructor.newInstance(gameProfile);
+                        return  (OfflinePlayer) methodGetOfflinePlayer.invoke(getServer(), nameAndId);
+                    } catch (IllegalAccessException | InvocationTargetException | InstantiationException e1) {
+                        logDebug("Could not create offline player for " + gameProfile.getId() + "! " + e.getMessage());
+                    }
+                    return null;
+                });
+            } catch (NoSuchMethodException | ClassNotFoundException e2) {
+                if (storeUnknownPlayers) {
+                    getLogger().log(Level.WARNING, "Could not load method required to store unknown players. Disabling it!", e);
+                    storeUnknownPlayers = false;
+                }
             }
         }
         playerDataCache = CacheBuilder.newBuilder().expireAfterWrite(queryTimeout, TimeUnit.SECONDS).build();
@@ -196,6 +224,14 @@ public void onEnable() {
         }
 
         getServer().getPluginManager().registerEvents(new PlayerJoinListener(this), this);
+        try {
+            Class.forName("io.papermc.paper.event.connection.PlayerConnectionValidateLoginEvent");
+            getServer().getPluginManager().registerEvents(new PlayerConnectionValidateLoginListener(this), this);
+            logDebug("Using Paper connection validate login event");
+        } catch (ClassNotFoundException e) {
+            getServer().getPluginManager().registerEvents(new PlayerLoginListener(this), this);
+            logDebug("Using legacy login event");
+        }
         getServer().getPluginManager().registerEvents(new PlayerQuitListener(this), this);
         getServer().getPluginManager().registerEvents(new PlayerFreezeListener(this), this);
         getServer().getPluginManager().registerEvents(new MapCreationListener(this), this);
@@ -226,7 +262,7 @@ public void onEnable() {
                                         openInvCommand.onCommand(sender, command, label, args);
                                     } else {
                                         sender.sendMessage(ChatColor.RED + "Current server does not have newest player data! "
-                                            + ChatColor.GRAY + "Connecting to server " + query.getYoungestServer() + " which has the newest data...");
+                                                + ChatColor.GRAY + "Connecting to server " + query.getYoungestServer() + " which has the newest data...");
                                         connectToServer(((Player) sender).getUniqueId(), query.getYoungestServer());
                                     }
                                 });
@@ -304,7 +340,7 @@ public void loadConfig() {
         for (SyncType syncType : SyncType.values()) {
             String key = "sync." + syncType.getKey();
             if (!getConfig().contains(key, true)
-                && getConfig().contains("sync-" + syncType.getKey(), true)) {
+                    && getConfig().contains("sync-" + syncType.getKey(), true)) {
                 key = "sync-" + syncType.getKey();
             }
             if (getConfig().getBoolean(key)) {
@@ -362,15 +398,11 @@ && getConfig().contains("sync-" + syncType.getKey(), true)) {
                 fieldWorldMap.setAccessible(true);
                 Object worldMap = fieldWorldMap.get(map);
                 try {
-                    fieldMapColor = worldMap.getClass().getField("g");
-                } catch (NoSuchFieldException e) {
-                    try {
-                        fieldMapColor = worldMap.getClass().getField("colors");
-                    } catch (NoSuchFieldException e1) {
-                        for (Field field : worldMap.getClass().getFields()) {
-                            if (field.getType() == byte[].class) {
-                                fieldMapColor = field;
-                            }
+                    fieldMapColor = worldMap.getClass().getField("colors");
+                } catch (NoSuchFieldException e1) {
+                    for (Field field : worldMap.getClass().getFields()) {
+                        if (field.getType() == byte[].class) {
+                            fieldMapColor = field;
                         }
                     }
                 }
@@ -391,8 +423,8 @@ && getConfig().contains("sync-" + syncType.getKey(), true)) {
         if (storeUnknownPlayers && getServer().getWorld("world") == null && getConfig().getBoolean("create-world")) {
             getLogger().log(Level.INFO, "No world with the name 'world' exists while 'store-unknown-players' is enabled. This world is needed for that functionality to work correctly, creating it... (can be disabled with 'create-world' in the config)");
             World world = getServer().createWorld(new WorldCreator("world")
-                .type(WorldType.FLAT)
-                .generateStructures(false));
+                    .type(WorldType.FLAT)
+                    .generateStructures(false));
             world.setAutoSave(false);
             world.setViewDistance(2);
             world.setKeepSpawnInMemory(false);
@@ -417,14 +449,14 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
     /**
      * Get a language message from the config and replace variables in it
-     * @param key          The key of the message (lang.<key>)
+     * @param key The key of the message (lang.<key>)
      * @param replacements An array of variables to be replaced with certain strings in the format [var,repl,var,repl,...]
      * @return The message string with colorcodes and variables replaced
      */
     public String getLang(String key, String... replacements) {
         String msg = ChatColor.translateAlternateColorCodes('&', getConfig().getString("lang." + key, getName() + ": &cMissing language key &6" + key));
         for (int i = 0; i + 1 < replacements.length; i += 2) {
-            msg = msg.replace("%" + replacements[i] + "%", replacements[i + 1]);
+            msg = msg.replace("%" + replacements[i] + "%", replacements[i+1]);
         }
         return msg;
     }
@@ -440,10 +472,10 @@ public boolean isLocked(UUID playerId) {
 
     /**
      * Get the date when a player last logged out
-     * @param playerId The UUID of the player
-     * @param online   Whether or not it should return the current time if the player is online
-     * @return The timestamp of his last known data on the server in milliseconds;
-     * 0 if the file doesn't exist or an error occurs. (Take a look at {File#lastModified})
+     * @param playerId  The UUID of the player
+     * @param online    Whether or not it should return the current time if the player is online
+     * @return          The timestamp of his last known data on the server in milliseconds;
+     *                  0 if the file doesn't exist or an error occurs. (Take a look at {File#lastModified})
      */
     public long getLastSeen(UUID playerId, boolean online) {
         if (online) {
@@ -473,7 +505,7 @@ public long getLastSeen(UUID playerId, boolean online) {
      * @param playerId  The UUID of the player
      * @param timeStamp The timestamp to set as the last modify time of the file in
      *                  milliseconds.
-     * @return true if the time was successfully set
+     * @return          true if the time was successfully set
      */
     public boolean setLastSeen(UUID playerId, long timeStamp) {
         File playerDat = getPlayerDataFile(playerId);
@@ -528,7 +560,7 @@ public boolean applyTimedOutQueries() {
     /**
      * Connect a player to a bungee server
      * @param playerId The UUID of the player
-     * @param server   The name of the server
+     * @param server The name of the server
      */
     public void connectToServer(UUID playerId, String server) {
         Player player = getServer().getPlayer(playerId);
@@ -542,16 +574,16 @@ public void connectToServer(UUID playerId, String server) {
 
     /**
      * Apply a PlayerData object to its player
-     * @param data The data to apply
+     * @param data  The data to apply
      */
     public void applyData(PlayerData data, Runnable finished) {
         if (data == null)
             return;
 
         if (data.getDataVersion() != getServer().getUnsafe().getDataVersion()) {
             getLogger().log(Level.WARNING, "Received data with "
-                + (data.getDataVersion() < getServer().getUnsafe().getDataVersion() ? "older" : "newer")
-                + " Minecraft data version (" + data.getDataVersion() + ") than this server (" + getServer().getUnsafe().getDataVersion() + "). Trying to apply anyways but there will most likely be errors! Please try running the same Server version on all synced servers.");
+                    + (data.getDataVersion() < getServer().getUnsafe().getDataVersion() ? "older" : "newer")
+                    + " Minecraft data version (" + data.getDataVersion() + ") than this server (" + getServer().getUnsafe().getDataVersion() + "). Trying to apply anyways but there will most likely be errors! Please try running the same Server version on all synced servers.");
         }
 
         runSync(() -> {
@@ -572,10 +604,9 @@ public void applyData(PlayerData data, Runnable finished) {
                     OfflinePlayer offlinePlayer = getServer().getOfflinePlayer(data.getPlayerId());
                     if (storeUnknownPlayers && !offlinePlayer.hasPlayedBefore()) {
                         if (offlinePlayer.getName() == null) {
-                            try {
-                                offlinePlayer = (OfflinePlayer) methodGetOfflinePlayer.invoke(getServer(), new GameProfile(data.getPlayerId(), data.getPlayerName()));
-                            } catch (IllegalAccessException | InvocationTargetException e) {
-                                logDebug("Could not create offline player for " + data.getPlayerId() + "! " + e.getMessage());
+                            OfflinePlayer internalOfflinePlayer = getOfflinePlayer.apply(new GameProfile(data.getPlayerId(), data.getPlayerName()));
+                            if (internalOfflinePlayer != null) {
+                                offlinePlayer = internalOfflinePlayer;
                             }
                         }
                         createdNewFile = createNewEmptyData(offlinePlayer.getUniqueId());
@@ -638,7 +669,7 @@ public void applyData(PlayerData data, Runnable finished) {
             }
             if (player == null) {
                 logDebug("Could not apply data for player " + data.getPlayerId() + " as he isn't online and "
-                    + (getOpenInv() == null ? "this server doesn't have OpenInv installed!" : "never was online on this server before!"));
+                        + (getOpenInv() == null ? "this server doesn't have OpenInv installed!" : "never was online on this server before!"));
                 if (createdNewFile) {
                     getPlayerDataFile(data.getPlayerId()).delete();
                 }
@@ -720,7 +751,7 @@ public void applyData(PlayerData data, Runnable finished) {
                     }
                 }
                 if (shouldSync(SyncType.HEALTH)) {
-                    player.getAttribute(Attribute.GENERIC_MAX_HEALTH).setBaseValue(data.getMaxHealth());
+                    player.setMaxHealth(data.getMaxHealth());
                 }
                 if (shouldSync(SyncType.HUNGER))
                     player.setFoodLevel(data.getFoodLevel());
@@ -761,7 +792,7 @@ public void applyData(PlayerData data, Runnable finished) {
                     } catch (NullPointerException ignored) {
                         // world is not known
                     }
-                    for (Iterator<Advancement> it = getServer().advancementIterator(); it.hasNext(); ) {
+                    for (Iterator<Advancement> it = getServer().advancementIterator(); it.hasNext();) {
                         Advancement advancement = it.next();
                         Map<String, Long> awarded = data.getAdvancementProgress().get(advancement.getKey().toString());
                         if (awarded != null) {
@@ -988,7 +1019,7 @@ public PlayerData getData(Player player) {
         }
 
         if (shouldSync(SyncType.ADVANCEMENTS)) {
-            for (Iterator<Advancement> it = getServer().advancementIterator(); it.hasNext(); ) {
+            for (Iterator<Advancement> it = getServer().advancementIterator(); it.hasNext();) {
                 Advancement advancement = it.next();
                 AdvancementProgress progress = player.getAdvancementProgress(advancement);
                 Map<String, Long> awarded = new HashMap<>();
@@ -1075,12 +1106,12 @@ public PlayerData getData(Player player) {
                     }
 
                     MapData mapData = new MapData(
-                        map.getId(),
-                        worldId,
-                        map.getCenterX(),
-                        map.getCenterZ(),
-                        map.getScale(),
-                        colors
+                            map.getId(),
+                            worldId,
+                            map.getCenterX(),
+                            map.getCenterZ(),
+                            map.getScale(),
+                            colors
                     );
                     try {
                         // Newer map info