refactor: make more resilient against invalid effect types

Spigot has a potion effect API lookup mismatch bug (SPIGOT-7674) due to the deprecated methods we use to support 1.17
build: bump to 3.5.3
2025-12-24 17:19:19 +00:00 · 2024-05-29 00:08:40 +01:00 · 2024-05-28 21:57:56 +01:00 · 2024-05-28 21:57:26 +01:00 · 2024-05-27 17:04:08 +01:00 · 2024-05-27 01:52:24 +01:00
43 changed files with 433 additions and 118 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -168,11 +168,20 @@ logger.lifecycle("Building HuskSync ${version} by William278")

@SuppressWarnings('GrMethodMayBeStatic')
 def versionMetadata() {
-    // Get the last commit hash and if it's a clean head
+    // Require grgit
    if (grgit == null) {
-        return '-' + System.getenv("GITHUB_RUN_NUMBER") ? 'build.' + System.getenv("GITHUB_RUN_NUMBER") : 'unknown'
+        return '-unknown'
    }
-    // If grgit DOES exist, get tag for this commit
+
+    // If unclean, return the last commit hash with -indev
+    if (!grgit.status().clean) {
+        return '-' + grgit.head().abbreviatedId  + '-indev'
+    }
+
+    // Otherwise if this matches a tag, return nothing
    def tag = grgit.tag.list().find { it.commit.id == grgit.head().id }
-    return '-' + grgit.head().abbreviatedId + (grgit.status().clean ? '' : '-indev')
+    if (tag != null) {
+        return ''
+    }
+    return '-' + grgit.head().abbreviatedId
 }
--- a/bukkit/build.gradle
+++ b/bukkit/build.gradle
@@ -10,12 +10,13 @@ dependencies {
    implementation 'net.kyori:adventure-platform-bukkit:4.3.2'
    implementation 'dev.triumphteam:triumph-gui:3.1.7'
    implementation 'space.arim.morepaperlib:morepaperlib:0.4.4'
-    implementation 'de.tr7zw:item-nbt-api:2.12.3'
+    implementation 'de.tr7zw:item-nbt-api:2.12.4'

    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
+    compileOnly 'com.github.retrooper.packetevents:spigot:2.3.0'
    compileOnly 'com.comphenix.protocol:ProtocolLib:5.1.0'
    compileOnly 'org.projectlombok:lombok:1.18.32'
-    compileOnly 'commons-io:commons-io:2.16.0'
+    compileOnly 'commons-io:commons-io:2.16.1'
    compileOnly 'org.json:json:20240303'
    compileOnly 'net.william278:minedown:1.8.2'
    compileOnly 'de.exlll:configlib-yaml:4.5.0'
--- a/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java
+++ b/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java
@@ -46,7 +46,6 @@ import net.william278.husksync.database.PostgresDatabase;
 import net.william278.husksync.event.BukkitEventDispatcher;
 import net.william278.husksync.hook.PlanHook;
 import net.william278.husksync.listener.BukkitEventListener;
-import net.william278.husksync.listener.EventListener;
 import net.william278.husksync.migrator.LegacyMigrator;
 import net.william278.husksync.migrator.Migrator;
 import net.william278.husksync.migrator.MpdbMigrator;
@@ -65,7 +64,10 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import space.arim.morepaperlib.MorePaperLib;
 import space.arim.morepaperlib.commands.CommandRegistration;
-import space.arim.morepaperlib.scheduling.*;
+import space.arim.morepaperlib.scheduling.AsynchronousScheduler;
+import space.arim.morepaperlib.scheduling.AttachedScheduler;
+import space.arim.morepaperlib.scheduling.GracefulScheduling;
+import space.arim.morepaperlib.scheduling.RegionalScheduler;

 import java.nio.file.Path;
 import java.util.*;
@@ -95,7 +97,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
    private MorePaperLib paperLib;
    private Database database;
    private RedisManager redisManager;
-    private EventListener eventListener;
+    private BukkitEventListener eventListener;
    private DataAdapter dataAdapter;
    private DataSyncer dataSyncer;
    private LegacyConverter legacyConverter;
@@ -110,11 +112,10 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
    private Server serverName;

    @Override
-    public void onEnable() {
+    public void onLoad() {
        // Initial plugin setup
        this.disabling = false;
        this.gson = createGson();
-        this.audiences = BukkitAudiences.create(this);
        this.paperLib = new MorePaperLib(this);

        // Load settings and locales
@@ -124,6 +125,13 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
            loadServer();
        });

+        this.eventListener = createEventListener();
+        eventListener.onLoad();
+    }
+
+    @Override
+    public void onEnable() {
+        this.audiences = BukkitAudiences.create(this);
        // Prepare data adapter
        initialize("data adapter", (plugin) -> {
            if (settings.getSynchronization().isCompressData()) {
@@ -182,7 +190,7 @@ public class BukkitHuskSync extends JavaPlugin implements HuskSync, BukkitTask.S
        });

        // Register events
-        initialize("events", (plugin) -> this.eventListener = createEventListener());
+        initialize("events", (plugin) -> eventListener.onEnable());

        // Register commands
        initialize("commands", (plugin) -> BukkitCommand.Type.registerCommands(this));
--- a/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
+++ b/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
@@ -30,7 +30,10 @@ import net.william278.husksync.BukkitHuskSync;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.adapter.Adaptable;
 import net.william278.husksync.user.BukkitUser;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.Registry;
+import org.bukkit.Statistic;
 import org.bukkit.advancement.AdvancementProgress;
 import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.attribute.AttributeModifier;
@@ -66,7 +69,8 @@ public abstract class BukkitData implements Data {
        private final @Nullable ItemStack @NotNull [] contents;

        private Items(@Nullable ItemStack @NotNull [] contents) {
-            this.contents = Arrays.stream(contents)
+
+            this.contents = Arrays.stream(contents.clone())
                    .map(i -> i == null || i.getType() == Material.AIR ? null : i)
                    .toArray(ItemStack[]::new);
        }
@@ -128,13 +132,13 @@ public abstract class BukkitData implements Data {
            @Range(from = 0, to = 8)
            private int heldItemSlot;

-            private Inventory(@NotNull ItemStack[] contents, int heldItemSlot) {
+            private Inventory(@Nullable ItemStack @NotNull [] contents, int heldItemSlot) {
                super(contents);
                this.heldItemSlot = heldItemSlot;
            }

            @NotNull
-            public static BukkitData.Items.Inventory from(@NotNull ItemStack[] contents, int heldItemSlot) {
+            public static BukkitData.Items.Inventory from(@Nullable ItemStack @NotNull [] contents, int heldItemSlot) {
                return new BukkitData.Items.Inventory(contents, heldItemSlot);
            }

@@ -233,21 +237,20 @@ public abstract class BukkitData implements Data {

        @NotNull
        public static BukkitData.PotionEffects adapt(@NotNull Collection<Effect> effects) {
-            return from(
-                    effects.stream()
-                            .map(effect -> new PotionEffect(
-                                    Objects.requireNonNull(
-                                            PotionEffectType.getByName(effect.type()),
-                                            "Invalid potion effect type"
-                                    ),
-                                    effect.duration(),
-                                    effect.amplifier(),
-                                    effect.isAmbient(),
-                                    effect.showParticles(),
-                                    effect.hasIcon()
-                            ))
-                            .toList()
-            );
+            return from(effects.stream()
+                    .map(effect -> {
+                        final PotionEffectType type = matchEffectType(effect.type());
+                        return type != null ? new PotionEffect(
+                                type,
+                                effect.duration(),
+                                effect.amplifier(),
+                                effect.isAmbient(),
+                                effect.showParticles(),
+                                effect.hasIcon()
+                        ) : null;
+                    })
+                    .filter(Objects::nonNull)
+                    .toList());
        }

        @NotNull
@@ -341,16 +344,10 @@ public abstract class BukkitData implements Data {
        private void setAdvancement(@NotNull HuskSync plugin, @NotNull org.bukkit.advancement.Advancement advancement,
                                    @NotNull Player player, @NotNull BukkitUser user,
                                    @NotNull Collection<String> toAward, @NotNull Collection<String> toRevoke) {
-            final boolean folia = ((BukkitHuskSync) plugin).getScheduler().isUsingFolia();
            plugin.runSync(() -> {
                // Track player exp level & progress
                final int expLevel = player.getLevel();
                final float expProgress = player.getExp();
-                boolean gameRuleUpdated = false;
-                if (!folia && Boolean.TRUE.equals(player.getWorld().getGameRuleValue(GameRule.ANNOUNCE_ADVANCEMENTS))) {
-                    player.getWorld().setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false);
-                    gameRuleUpdated = true;
-                }

                // Award and revoke advancement criteria
                final AdvancementProgress progress = player.getAdvancementProgress(advancement);
@@ -362,9 +359,6 @@ public abstract class BukkitData implements Data {
                    player.setLevel(expLevel);
                    player.setExp(expProgress);
                }
-                if (gameRuleUpdated) {
-                    player.getWorld().setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, true);
-                }
            }, user);
        }

@@ -621,7 +615,7 @@ public abstract class BukkitData implements Data {
            if (instance == null) {
                return;
            }
-            instance.setBaseValue(attribute == null ? instance.getDefaultValue() : instance.getBaseValue());
+            instance.setBaseValue(attribute == null ? instance.getDefaultValue() : attribute.baseValue());
            instance.getModifiers().forEach(instance::removeModifier);
            if (attribute != null) {
                attribute.modifiers().forEach(modifier -> instance.addModifier(new AttributeModifier(
--- a/bukkit/src/main/java/net/william278/husksync/data/BukkitSerializer.java
+++ b/bukkit/src/main/java/net/william278/husksync/data/BukkitSerializer.java
@@ -21,16 +21,22 @@ package net.william278.husksync.data;

 import com.google.gson.reflect.TypeToken;
 import de.tr7zw.changeme.nbtapi.NBT;
+import de.tr7zw.changeme.nbtapi.NBTCompound;
 import de.tr7zw.changeme.nbtapi.NBTContainer;
 import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT;
+import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBTCompoundList;
+import de.tr7zw.changeme.nbtapi.utils.DataFixerUtil;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
+import net.william278.desertwell.util.Version;
 import net.william278.husksync.HuskSync;
 import net.william278.husksync.adapter.Adaptable;
 import net.william278.husksync.api.HuskSyncAPI;
+import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;

 import java.util.List;

@@ -52,7 +58,8 @@ public class BukkitSerializer {
        return plugin;
    }

-    public static class Inventory extends BukkitSerializer implements Serializer<BukkitData.Items.Inventory> {
+    public static class Inventory extends BukkitSerializer implements Serializer<BukkitData.Items.Inventory>,
+            ItemDeserializer {
        private static final String ITEMS_TAG = "items";
        private static final String HELD_ITEM_SLOT_TAG = "held_item_slot";

@@ -61,16 +68,21 @@ public class BukkitSerializer {
        }

        @Override
-        public BukkitData.Items.Inventory deserialize(@NotNull String serialized) throws DeserializationException {
+        public BukkitData.Items.Inventory deserialize(@NotNull String serialized, @NotNull Version dataMcVersion)
+                throws DeserializationException {
            final ReadWriteNBT root = NBT.parseNBT(serialized);
-            final ItemStack[] items = root.getItemStackArray(ITEMS_TAG);
-            final int heldItemSlot = root.getInteger(HELD_ITEM_SLOT_TAG);
+            final ReadWriteNBT items = root.hasTag(ITEMS_TAG) ? root.getCompound(ITEMS_TAG) : null;
            return BukkitData.Items.Inventory.from(
-                    items == null ? new ItemStack[INVENTORY_SLOT_COUNT] : items,
-                    heldItemSlot
+                    items != null ? getItems(items, dataMcVersion) : new ItemStack[INVENTORY_SLOT_COUNT],
+                    root.getInteger(HELD_ITEM_SLOT_TAG)
            );
        }

+        @Override
+        public BukkitData.Items.Inventory deserialize(@NotNull String serialized) {
+            return deserialize(serialized, plugin.getMinecraftVersion());
+        }
+
        @NotNull
        @Override
        public String serialize(@NotNull BukkitData.Items.Inventory data) throws SerializationException {
@@ -82,18 +94,25 @@ public class BukkitSerializer {

    }

-    public static class EnderChest extends BukkitSerializer implements Serializer<BukkitData.Items.EnderChest> {
+    public static class EnderChest extends BukkitSerializer implements Serializer<BukkitData.Items.EnderChest>,
+            ItemDeserializer {

        public EnderChest(@NotNull HuskSync plugin) {
            super(plugin);
        }

        @Override
-        public BukkitData.Items.EnderChest deserialize(@NotNull String serialized) throws DeserializationException {
-            final ItemStack[] items = NBT.itemStackArrayFromNBT(NBT.parseNBT(serialized));
+        public BukkitData.Items.EnderChest deserialize(@NotNull String serialized, @NotNull Version dataMcVersion)
+                throws DeserializationException {
+            final ItemStack[] items = getItems(NBT.parseNBT(serialized), dataMcVersion);
            return items == null ? BukkitData.Items.EnderChest.empty() : BukkitData.Items.EnderChest.adapt(items);
        }

+        @Override
+        public BukkitData.Items.EnderChest deserialize(@NotNull String serialized) {
+            return deserialize(serialized, plugin.getMinecraftVersion());
+        }
+
        @NotNull
        @Override
        public String serialize(@NotNull BukkitData.Items.EnderChest data) throws SerializationException {
@@ -101,6 +120,57 @@ public class BukkitSerializer {
        }
    }

+    // Utility interface for deserializing and upgrading item stacks from legacy versions
+    private interface ItemDeserializer {
+
+        @Nullable
+        default ItemStack[] getItems(@NotNull ReadWriteNBT tag, @NotNull Version mcVersion) {
+            if (mcVersion.compareTo(getPlugin().getMinecraftVersion()) < 0) {
+                return upgradeItemStack((NBTCompound) tag, mcVersion);
+            }
+            return NBT.itemStackArrayFromNBT(tag);
+        }
+
+        @NotNull
+        private ItemStack @NotNull [] upgradeItemStack(@NotNull NBTCompound compound, @NotNull Version mcVersion) {
+            final ReadWriteNBTCompoundList items = compound.getCompoundList("items");
+            final ItemStack[] itemStacks = new ItemStack[compound.getInteger("size")];
+            for (int i = 0; i < items.size(); i++) {
+                if (items.get(i) == null) {
+                    itemStacks[i] = new ItemStack(Material.AIR);
+                    continue;
+                }
+                try {
+                    itemStacks[i] = NBT.itemStackFromNBT(upgradeItemData(items.get(i), mcVersion));
+                } catch (Throwable e) {
+                    itemStacks[i] = new ItemStack(Material.AIR);
+                }
+            }
+            return itemStacks;
+        }
+
+        @NotNull
+        private ReadWriteNBT upgradeItemData(@NotNull ReadWriteNBT tag, @NotNull Version mcVersion)
+                throws NoSuchFieldException, IllegalAccessException {
+            return DataFixerUtil.fixUpItemData(tag, getDataVersion(mcVersion), DataFixerUtil.getCurrentVersion());
+        }
+
+        private int getDataVersion(@NotNull Version mcVersion) {
+            return switch (mcVersion.toStringWithoutMetadata()) {
+                case "1.16", "1.16.1", "1.16.2", "1.16.3", "1.16.4", "1.16.5" -> DataFixerUtil.VERSION1_16_5;
+                case "1.17", "1.17.1" -> DataFixerUtil.VERSION1_17_1;
+                case "1.18", "1.18.1", "1.18.2" -> DataFixerUtil.VERSION1_18_2;
+                case "1.19", "1.19.1", "1.19.2" -> DataFixerUtil.VERSION1_19_2;
+                case "1.20", "1.20.1", "1.20.2" -> DataFixerUtil.VERSION1_20_2;
+                case "1.20.3", "1.20.4" -> DataFixerUtil.VERSION1_20_4;
+                default -> DataFixerUtil.getCurrentVersion();
+            };
+        }
+
+        @NotNull
+        HuskSync getPlugin();
+    }
+
    public static class PotionEffects extends BukkitSerializer implements Serializer<BukkitData.PotionEffects> {

        private static final TypeToken<List<Data.PotionEffects.Effect>> TYPE = new TypeToken<>() {
--- a/bukkit/src/main/java/net/william278/husksync/listener/BukkitEventListener.java
+++ b/bukkit/src/main/java/net/william278/husksync/listener/BukkitEventListener.java
@@ -20,7 +20,6 @@
 package net.william278.husksync.listener;

 import net.william278.husksync.BukkitHuskSync;
-import net.william278.husksync.HuskSync;
 import net.william278.husksync.data.BukkitData;
 import net.william278.husksync.user.BukkitUser;
 import net.william278.husksync.user.OnlineUser;
@@ -40,21 +39,38 @@ import java.util.stream.Collectors;
 public class BukkitEventListener extends EventListener implements BukkitJoinEventListener, BukkitQuitEventListener,
        BukkitDeathEventListener, Listener {

-    protected final LockedHandler lockedHandler;
+    protected LockedHandler lockedHandler;

    public BukkitEventListener(@NotNull BukkitHuskSync plugin) {
        super(plugin);
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
-        this.lockedHandler = createLockedHandler(plugin);
+    }
+
+    public void onLoad() {
+        this.lockedHandler = createLockedHandler((BukkitHuskSync) plugin);
+    }
+
+    public void onEnable() {
+        getPlugin().getServer().getPluginManager().registerEvents(this, getPlugin());
+        lockedHandler.onEnable();
+    }
+
+    public void handlePluginDisable() {
+        super.handlePluginDisable();
+        lockedHandler.onDisable();
    }

    @NotNull
    private LockedHandler createLockedHandler(@NotNull BukkitHuskSync plugin) {
-        if (getPlugin().isDependencyLoaded("ProtocolLib") && getPlugin().getSettings().isCancelPackets()) {
-            return new BukkitLockedPacketListener(plugin);
-        } else {
+        if (!getPlugin().getSettings().isCancelPackets()) {
            return new BukkitLockedEventListener(plugin);
        }
+        if (getPlugin().isDependencyLoaded("PacketEvents")) {
+            return new BukkitPacketEventsLockedPacketListener(plugin);
+        } else if (getPlugin().isDependencyLoaded("ProtocolLib")) {
+            return new BukkitProtocolLibLockedPacketListener(plugin);
+        }
+
+        return new BukkitLockedEventListener(plugin);
    }

    @Override
@@ -134,8 +150,8 @@ public class BukkitEventListener extends EventListener implements BukkitJoinEven

    @NotNull
    @Override
-    public HuskSync getPlugin() {
-        return plugin;
+    public BukkitHuskSync getPlugin() {
+        return (BukkitHuskSync) plugin;
    }

 }
--- a/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedEventListener.java
+++ b/bukkit/src/main/java/net/william278/husksync/listener/BukkitLockedEventListener.java
@@ -50,6 +50,10 @@ public class BukkitLockedEventListener implements LockedHandler, Listener {

    protected BukkitLockedEventListener(@NotNull BukkitHuskSync plugin) {
        this.plugin = plugin;
+    }
+
+    @Override
+    public void onEnable() {
        plugin.getServer().getPluginManager().registerEvents(this, plugin);
    }

--- a/bukkit/src/main/java/net/william278/husksync/listener/BukkitPacketEventsLockedPacketListener.java
+++ b/bukkit/src/main/java/net/william278/husksync/listener/BukkitPacketEventsLockedPacketListener.java
@@ -0,0 +1,103 @@
+/*
+ * This file is part of HuskSync, licensed under the Apache License 2.0.
+ *
+ *  Copyright (c) William278 <will27528@gmail.com>
+ *  Copyright (c) contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package net.william278.husksync.listener;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.PacketListenerAbstract;
+import com.github.retrooper.packetevents.event.PacketListenerPriority;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
+import com.google.common.collect.Sets;
+import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
+import net.william278.husksync.BukkitHuskSync;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+import java.util.logging.Level;
+
+public class BukkitPacketEventsLockedPacketListener extends BukkitLockedEventListener implements LockedHandler {
+
+    protected BukkitPacketEventsLockedPacketListener(@NotNull BukkitHuskSync plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void onLoad() {
+        super.onLoad();
+        PacketEvents.setAPI(SpigotPacketEventsBuilder.build(getPlugin()));
+        PacketEvents.getAPI().getSettings().reEncodeByDefault(false)
+                .checkForUpdates(false)
+                .bStats(true);
+        PacketEvents.getAPI().load();
+    }
+
+    @Override
+    public void onEnable() {
+        super.onEnable();
+        PacketEvents.getAPI().getEventManager().registerListener(new PlayerPacketAdapter(this));
+        PacketEvents.getAPI().init();
+        plugin.log(Level.INFO, "Using PacketEvents to cancel packets for locked players");
+    }
+
+    private static class PlayerPacketAdapter extends PacketListenerAbstract {
+
+        private static final Set<PacketType.Play.Client> ALLOWED_PACKETS = Set.of(
+                PacketType.Play.Client.KEEP_ALIVE, PacketType.Play.Client.PONG, PacketType.Play.Client.PLUGIN_MESSAGE, // Connection packets
+                PacketType.Play.Client.CHAT_MESSAGE, PacketType.Play.Client.CHAT_COMMAND, PacketType.Play.Client.CHAT_SESSION_UPDATE, // Chat / command packets
+                PacketType.Play.Client.PLAYER_POSITION, PacketType.Play.Client.PLAYER_POSITION_AND_ROTATION, PacketType.Play.Client.PLAYER_ROTATION, // Movement packets
+                PacketType.Play.Client.HELD_ITEM_CHANGE, PacketType.Play.Client.ANIMATION, PacketType.Play.Client.TELEPORT_CONFIRM, // Animation packets
+                PacketType.Play.Client.CLIENT_SETTINGS // Video setting packets
+        );
+
+        private static final Set<PacketType.Play.Client> CANCEL_PACKETS = getPacketsToListenFor();
+
+
+        private final BukkitPacketEventsLockedPacketListener listener;
+
+        public PlayerPacketAdapter(@NotNull BukkitPacketEventsLockedPacketListener listener) {
+            super(PacketListenerPriority.HIGH);
+            this.listener = listener;
+        }
+
+        @Override
+        public void onPacketReceive(PacketReceiveEvent event) {
+            if(!(event.getPacketType() instanceof PacketType.Play.Client client)) {
+                return;
+            }
+            if (!CANCEL_PACKETS.contains(client)) {
+                return;
+            }
+            if (listener.cancelPlayerEvent(event.getUser().getUUID())) {
+                event.setCancelled(true);
+            }
+        }
+
+        // Returns the set of ALL Server packets, excluding the set of allowed packets
+        @NotNull
+        private static Set<PacketType.Play.Client> getPacketsToListenFor() {
+            return Sets.difference(
+                    Sets.newHashSet(PacketType.Play.Client.values()),
+                    ALLOWED_PACKETS
+            );
+        }
+
+    }
+
+}
--- a/bukkit/src/main/java/net/william278/husksync/listener/BukkitProtocolLibLockedPacketListener.java
+++ b/bukkit/src/main/java/net/william278/husksync/listener/BukkitProtocolLibLockedPacketListener.java
@@ -34,10 +34,15 @@ import java.util.stream.Collectors;

 import static com.comphenix.protocol.PacketType.Play.Client;

-public class BukkitLockedPacketListener extends BukkitLockedEventListener implements LockedHandler {
+public class BukkitProtocolLibLockedPacketListener extends BukkitLockedEventListener implements LockedHandler {

-    protected BukkitLockedPacketListener(@NotNull BukkitHuskSync plugin) {
+    protected BukkitProtocolLibLockedPacketListener(@NotNull BukkitHuskSync plugin) {
        super(plugin);
+    }
+
+    @Override
+    public void onEnable() {
+        super.onEnable();
        ProtocolLibrary.getProtocolManager().addPacketListener(new PlayerPacketAdapter(this));
        plugin.log(Level.INFO, "Using ProtocolLib to cancel packets for locked players");
    }
@@ -49,12 +54,13 @@ public class BukkitLockedPacketListener extends BukkitLockedEventListener implem
                Client.KEEP_ALIVE, Client.PONG, Client.CUSTOM_PAYLOAD, // Connection packets
                Client.CHAT_COMMAND, Client.CLIENT_COMMAND, Client.CHAT, Client.CHAT_SESSION_UPDATE, // Chat / command packets
                Client.POSITION, Client.POSITION_LOOK, Client.LOOK, // Movement packets
-                Client.HELD_ITEM_SLOT, Client.ARM_ANIMATION, Client.TELEPORT_ACCEPT // Animation packets
+                Client.HELD_ITEM_SLOT, Client.ARM_ANIMATION, Client.TELEPORT_ACCEPT, // Animation packets
+                Client.SETTINGS // Video setting packets
        );

-        private final BukkitLockedPacketListener listener;
+        private final BukkitProtocolLibLockedPacketListener listener;

-        public PlayerPacketAdapter(@NotNull BukkitLockedPacketListener listener) {
+        public PlayerPacketAdapter(@NotNull BukkitProtocolLibLockedPacketListener listener) {
            super(listener.getPlugin(), ListenerPriority.HIGHEST, getPacketsToListenFor());
            this.listener = listener;
        }
--- a/bukkit/src/main/java/net/william278/husksync/util/BukkitKeyedAdapter.java
+++ b/bukkit/src/main/java/net/william278/husksync/util/BukkitKeyedAdapter.java
@@ -19,38 +19,44 @@

 package net.william278.husksync.util;

-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Registry;
-import org.bukkit.Statistic;
+import org.bukkit.*;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.EntityType;
+import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

-import java.util.Objects;
-
 // Utility class for adapting "Keyed" Bukkit objects
 public final class BukkitKeyedAdapter {

    @Nullable
    public static Statistic matchStatistic(@NotNull String key) {
-        return Registry.STATISTIC.get(Objects.requireNonNull(NamespacedKey.fromString(key), "Null key"));
+        return getRegistryValue(Registry.STATISTIC, key);
    }

    @Nullable
    public static EntityType matchEntityType(@NotNull String key) {
-        return Registry.ENTITY_TYPE.get(Objects.requireNonNull(NamespacedKey.fromString(key), "Null key"));
+        return getRegistryValue(Registry.ENTITY_TYPE, key);
    }

    @Nullable
    public static Material matchMaterial(@NotNull String key) {
-        return Registry.MATERIAL.get(Objects.requireNonNull(NamespacedKey.fromString(key), "Null key"));
+        return getRegistryValue(Registry.MATERIAL, key);
    }

    @Nullable
    public static Attribute matchAttribute(@NotNull String key) {
-        return Registry.ATTRIBUTE.get(Objects.requireNonNull(NamespacedKey.fromString(key), "Null key"));
+        return getRegistryValue(Registry.ATTRIBUTE, key);
+    }
+
+    @Nullable
+    public static PotionEffectType matchEffectType(@NotNull String key) {
+        return PotionEffectType.getByName(key); // No registry for this in 1.17 API
+    }
+
+    private static <T extends Keyed> T getRegistryValue(@NotNull Registry<T> registry, @NotNull String keyString) {
+        final NamespacedKey key = NamespacedKey.fromString(keyString);
+        return key != null ? registry.get(key) : null;
    }

 }
--- a/bukkit/src/main/java/net/william278/husksync/util/BukkitLegacyConverter.java
+++ b/bukkit/src/main/java/net/william278/husksync/util/BukkitLegacyConverter.java
@@ -186,7 +186,7 @@ public class BukkitLegacyConverter extends LegacyConverter {

    @NotNull
    private Optional<Data.Statistics> readStatistics(@NotNull JSONObject object) {
-        if (!object.has("statistics") || !shouldImport(Identifier.ADVANCEMENTS)) {
+        if (!object.has("statistics") || !shouldImport(Identifier.STATISTICS)) {
            return Optional.empty();
        }

--- a/bukkit/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
@@ -7,6 +7,7 @@ description: '${description}'
 website: 'https://william278.net'
 folia-supported: true
 softdepend:
+  - 'packetevents'
  - 'ProtocolLib'
  - 'MysqlPlayerDataBridge'
  - 'Plan'
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -3,11 +3,11 @@ plugins {
 }

 dependencies {
-    api 'commons-io:commons-io:2.16.0'
-    api 'org.apache.commons:commons-text:1.11.0'
+    api 'commons-io:commons-io:2.16.1'
+    api 'org.apache.commons:commons-text:1.12.0'
    api 'net.william278:minedown:1.8.2'
    api 'org.json:json:20240303'
-    api 'com.google.code.gson:gson:2.10.1'
+    api 'com.google.code.gson:gson:2.11.0'
    api 'com.fatboyindustrial.gson-javatime-serialisers:gson-javatime-serialisers:1.1.2'
    api 'de.exlll:configlib-yaml:4.5.0'
    api 'net.william278:paginedown:1.1.2'
@@ -18,9 +18,9 @@ dependencies {

    compileOnly 'org.projectlombok:lombok:1.18.32'
    compileOnly 'org.jetbrains:annotations:24.1.0'
-    compileOnly 'net.kyori:adventure-api:4.16.0'
+    compileOnly 'net.kyori:adventure-api:4.17.0'
    compileOnly 'net.kyori:adventure-platform-api:4.3.2'
-    compileOnly 'com.google.guava:guava:33.1.0-jre'
+    compileOnly 'com.google.guava:guava:33.2.0-jre'
    compileOnly 'com.github.plan-player-analytics:Plan:5.5.2272'
    compileOnly "redis.clients:jedis:$jedis_version"
    compileOnly "com.mysql:mysql-connector-j:$mysql_driver_version"
@@ -31,7 +31,7 @@ dependencies {

    testImplementation "redis.clients:jedis:$jedis_version"
    testImplementation "org.xerial.snappy:snappy-java:$snappy_version"
-    testImplementation 'com.google.guava:guava:33.1.0-jre'
+    testImplementation 'com.google.guava:guava:33.2.0-jre'
    testImplementation 'com.github.plan-player-analytics:Plan:5.5.2272'
    testCompileOnly 'de.exlll:configlib-yaml:4.5.0'
    testCompileOnly 'org.jetbrains:annotations:24.1.0'
--- a/common/src/main/java/net/william278/husksync/command/HuskSyncCommand.java
+++ b/common/src/main/java/net/william278/husksync/command/HuskSyncCommand.java
@@ -83,7 +83,8 @@ public class HuskSyncCommand extends Command implements TabProvider {
                        AboutMenu.Credit.of("xF3d3").description("Italian (it-it)"),
                        AboutMenu.Credit.of("cada3141").description("Korean (ko-kr)"),
                        AboutMenu.Credit.of("Wirayuda5620").description("Indonesian (id-id)"),
-                        AboutMenu.Credit.of("WinTone01").description("Turkish (tr-tr)"))
+                        AboutMenu.Credit.of("WinTone01").description("Turkish (tr-tr)"),
+                        AboutMenu.Credit.of("IbanEtchep").description("French (fr-fr)"))
                .buttons(
                        AboutMenu.Link.of("https://william278.net/docs/husksync").text("Documentation").icon("⛏"),
                        AboutMenu.Link.of("https://github.com/WiIIiam278/HuskSync/issues").text("Issues").icon("❌").color(TextColor.color(0xff9f0f)),
--- a/common/src/main/java/net/william278/husksync/config/Settings.java
+++ b/common/src/main/java/net/william278/husksync/config/Settings.java
@@ -75,7 +75,7 @@ public class Settings {
    @Comment({"Whether to enable the Player Analytics hook.", "Docs: https://william278.net/docs/husksync/plan-hook"})
    private boolean enablePlanHook = true;

-    @Comment("Whether to cancel game event packets directly when handling locked players if ProtocolLib is installed")
+    @Comment("Whether to cancel game event packets directly when handling locked players if ProtocolLib or PacketEvents is installed")
    private boolean cancelPackets = true;


--- a/common/src/main/java/net/william278/husksync/data/DataSnapshot.java
+++ b/common/src/main/java/net/william278/husksync/data/DataSnapshot.java
@@ -392,7 +392,7 @@ public class DataSnapshot {
        private Map<Identifier, Data> deserializeData(@NotNull HuskSync plugin) {
            return data.entrySet().stream()
                    .map((entry) -> plugin.getIdentifier(entry.getKey()).map(id -> Map.entry(
-                            id, plugin.getSerializers().get(id).deserialize(entry.getValue())
+                            id, plugin.getSerializers().get(id).deserialize(entry.getValue(), getMinecraftVersion())
                    )).orElse(null))
                    .filter(Objects::nonNull)
                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
--- a/common/src/main/java/net/william278/husksync/data/Serializer.java
+++ b/common/src/main/java/net/william278/husksync/data/Serializer.java
@@ -19,22 +19,27 @@

 package net.william278.husksync.data;

+import net.william278.desertwell.util.Version;
 import org.jetbrains.annotations.NotNull;

 public interface Serializer<T extends Data> {

-    T deserialize(@NotNull String serialized) throws DeserializationException;
+    T deserialize(@NotNull String serialized);
+
+    default T deserialize(@NotNull String serialized, @NotNull Version dataMcVersion) throws DeserializationException {
+        return deserialize(serialized);
+    }

    @NotNull
    String serialize(@NotNull T element) throws SerializationException;

-    static final class DeserializationException extends IllegalStateException {
+    final class DeserializationException extends IllegalStateException {
        DeserializationException(@NotNull String message, @NotNull Throwable cause) {
            super(message, cause);
        }
    }

-    static final class SerializationException extends IllegalStateException {
+    final class SerializationException extends IllegalStateException {
        SerializationException(@NotNull String message, @NotNull Throwable cause) {
            super(message, cause);
        }
--- a/common/src/main/java/net/william278/husksync/database/MongoDbDatabase.java
+++ b/common/src/main/java/net/william278/husksync/database/MongoDbDatabase.java
@@ -113,7 +113,7 @@ public class MongoDbDatabase extends Database {
                                    throw new MongoException("User document returned null!");
                                }

-                                Bson updates = Updates.set("uuid", user.getUuid().toString());
+                                Bson updates = Updates.set("username", user.getUsername());
                                mongoCollectionHelper.updateDocument(usersTable, doc, updates);
                            } catch (MongoException e) {
                                plugin.log(Level.SEVERE, "Failed to insert a user into the database", e);
--- a/common/src/main/java/net/william278/husksync/listener/EventListener.java
+++ b/common/src/main/java/net/william278/husksync/listener/EventListener.java
@@ -107,7 +107,7 @@ public abstract class EventListener {
    /**
     * Handle the plugin disabling
     */
-    public final void handlePluginDisable() {
+    public void handlePluginDisable() {
        // Save for all online players
        plugin.getOnlineUsers().stream()
                .filter(user -> !plugin.isLocked(user.getUuid()) && !user.isNpc())
--- a/common/src/main/java/net/william278/husksync/listener/LockedHandler.java
+++ b/common/src/main/java/net/william278/husksync/listener/LockedHandler.java
@@ -54,4 +54,16 @@ public interface LockedHandler {
    @ApiStatus.Internal
    HuskSync getPlugin();

+    default void onLoad() {
+
+    }
+
+    default void onEnable() {
+
+    }
+
+    default void onDisable() {
+
+    }
+
 }
--- a/common/src/main/resources/database/postgresql_schema.sql
+++ b/common/src/main/resources/database/postgresql_schema.sql
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS "%user_data_table%"
    timestamp    timestamp   NOT NULL,
    save_cause   varchar(32) NOT NULL,
    pinned       boolean     NOT NULL DEFAULT FALSE,
-    data         longblob       NOT NULL,
+    data         bytea       NOT NULL,

    PRIMARY KEY (version_uuid, player_uuid),
    FOREIGN KEY (player_uuid) REFERENCES "%users_table%" (uuid) ON DELETE CASCADE
--- a/common/src/main/resources/locales/bg-bg.yml
+++ b/common/src/main/resources/locales/bg-bg.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Грешка:](#ff3300) [Неправилен синтаксис. Използвайте:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
  error_invalid_player: '[Грешка:](#ff3300) [Не можахме да открием играч с това име.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Грешка:](#ff3300) [Нямате право да използвате тази команда](#ff7e5e)'
  error_console_command_only: '[Грешка:](#ff3300) [Тази команда може да бъде използвана единствено през конзолата](#ff7e5e)'
  error_in_game_command_only: 'Грешка: Тази команда може да бъде използвана само от играта.'
--- a/common/src/main/resources/locales/de-de.yml
+++ b/common/src/main/resources/locales/de-de.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Fehler:](#ff3300) [Falsche Syntax. Nutze:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
  error_invalid_player: '[Fehler:](#ff3300) [Es konnte kein Spieler mit diesem Namen gefunden werden.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Fehler:](#ff3300) [Du hast nicht die benötigten Berechtigungen um diesen Befehl auszuführen](#ff7e5e)'
  error_console_command_only: '[Fehler:](#ff3300) [Dieser Befehl kann nur über die Konsole ausgeführt werden.](#ff7e5e)'
  error_in_game_command_only: 'Fehler: Dieser Befehl kann nur im Spiel genutzt werden.'
--- a/common/src/main/resources/locales/en-gb.yml
+++ b/common/src/main/resources/locales/en-gb.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Error:](#ff3300) [Incorrect syntax. Usage:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
  error_invalid_player: '[Error:](#ff3300) [Could not find a player by that name.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Error:](#ff3300) [You do not have permission to execute this command](#ff7e5e)'
  error_console_command_only: '[Error:](#ff3300) [That command can only be run through console](#ff7e5e)'
  error_in_game_command_only: 'Error: That command can only be used in-game.'
--- a/common/src/main/resources/locales/es-es.yml
+++ b/common/src/main/resources/locales/es-es.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Error:](#ff3300) [Sintanxis incorrecta. Usa:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
  error_invalid_player: '[Error:](#ff3300) [No se ha podido encontrar un jugador con ese nombre.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Error:](#ff3300) [No tienes permisos para ejecutar este comando.](#ff7e5e)'
  error_console_command_only: '[Error:](#ff3300) [Este comando solo se puede ejecutar desde la consola.](#ff7e5e)'
  error_in_game_command_only: 'Error: Ese comando solo se puede utilizar desde el juego.'
--- a/common/src/main/resources/locales/fr-fr.yml
+++ b/common/src/main/resources/locales/fr-fr.yml
@@ -0,0 +1,65 @@
+locales:
+  synchronization_complete: '[⏵ Données synchronisées!](#00fb9a)'
+  synchronization_failed: '[⏵ Impossible de synchroniser vos données! Veuillez contacter un administrateur.](#ff7e5e)'
+  inventory_viewer_menu_title: '&0Inventaire de %1%'
+  ender_chest_viewer_menu_title: '&0Coffre de l''Ender de %1%'
+  inventory_viewer_opened: '[Visualisation de l''instantané de](#00fb9a) [%1%](#00fb9a bold)[''s inventaire à partir de ⌚ %2%](#00fb9a)'
+  ender_chest_viewer_opened: '[Visualisation de l''instantané du](#00fb9a) [%1%](#00fb9a bold)[''s coffre de l''Ender à partir de ⌚ %2%](#00fb9a)'
+  data_update_complete: '[🔔 Vos données ont été mises à jour!](#00fb9a)'
+  data_update_failed: '[🔔 Échec de la mise à jour de vos données! Veuillez contacter un administrateur.](#ff7e5e)'
+  user_registration_complete: '[⭐ Inscription de l''utilisateur complète!](#00fb9a)'
+  data_manager_title: '[Visualisation de l''instantané des données utilisateur](#00fb9a) [%1%](#00fb9a show_text=&7UUID de la version:\n&8%2%) [pour](#00fb9a) [%3%](#00fb9a bold show_text=&7UUID du joueur:\n&8%4%)[:](#00fb9a)'
+  data_manager_timestamp: '[⌚ %1%](#ffc43b-#f5c962 show_text=&7Horodatage de la version:\n&8Quand les données ont été enregistrées)'
+  data_manager_pinned: '[※ Instantané épinglé](#d8ff2b show_text=&7Épinglé:\n&8Cet instantané des données utilisateur ne sera pas automatiquement supprimé.)'
+  data_manager_cause: '[⚑ %1%](#23a825-#36f539 show_text=&7Cause de la sauvegarde:\n&8Ce qui a causé l''enregistrement des données)'
+  data_manager_server: '[☁ %1%](#ff87b3-#f5538e show_text=&7Serveur:\n&8Nom du serveur sur lequel les données ont été enregistrées)'
+  data_manager_size: '[⏏ %1%](color=#62a9f5-#7ab8fa show_text=&7Taille de l''instantané:\n&8Taille du fichier estimée de l''instantané (en KiB))\n'
+  data_manger_status: '[%1%](red)[/](gray)[%2%](red)[×](gray)[❤](red show_text=&7Points de vie)   [%3%](yellow)[×](gray)[🍖](yellow show_text=&7Points de faim)   [ʟᴠ](green)[.](gray)[%4%](greenshow_text=&7Niveau XP)   [🏹 %5%](dark_aqua show_text=&7Mode de jeu)'
+  data_manager_advancements_statistics: '[⭐ Avancements: %1%](color=#ffc43b-#f5c962show_text=&7Avancements dans lesquels vous avez progressé:\n&8%2%)   [⌛ Temps de jeu: %3%ʜʀs](color=#62a9f5-#7ab8fashow_text=&7Temps de jeu en jeu\n&8⚠ Basé sur les statistiques en jeu)\n'
+  data_manager_item_buttons: '[Voir:](gray) [[🪣 Inventaire…]](color=#a17b5f-#f5b98cshow_text=&7Cliquez pour voir run_command=/inventory %1% %2%)   [[⌀ Coffre de l''Ender…]](#b649c4-#d254ffshow_text=&7Cliquez pour voir run_command=/enderchest %1% %2%)'
+  data_manager_management_buttons: '[Gérer:](gray) [[❌ Supprimer…]](#ff3300 show_text=&7Cliquezpour supprimer cet instantané des données utilisateur.\n&8Cela n''affectera pas les données actuelles de l''utilisateur.\n&#ff3300&⚠ Cette action est irréversible! suggest_command=/husksync:userdata delete%1% %2%)   [[⏪ Restaurer…]](#00fb9a show_text=&7Cliquez pour restaurer ces données utilisateur.\n&8Cela définira les données de l''utilisateur sur cet instantané.\n&#ff3300&⚠ Les données actuelles de %1% serontremplacées! suggest_command=/husksync:userdata restore %1% %2%)   [[※ Épingler/Détacher…]](#d8ff2bshow_text=&7Cliquez pour épingler ou détacher cet instantané des données utilisateur\n&8Les instantanés épinglés ne seront pas automatiquement supprimés run_command=/userdata pin %1% %2%)'
+  data_manager_system_buttons: '[Système:](gray) [[⏷ Export fichier…]](dark_gray show_text=&7Cliquezpour exporter cet instantané des données utilisateur à un fichier.\n&8Les exports de données peuvent être trouvés dans ~/plugins/HuskSync/dumps/run_command=/husksync:userdata dump %1% %2% file)   [[☂ Export web…]](dark_grayshow_text=&7Cliquez pour exporter cet instantané des données utilisateur au service mc-logs\n&8Vousobtiendrez une URL contenant les données. run_command=/husksync:userdatadump %1% %2% web)'
+  data_manager_advancements_preview_remaining: 'et %1% autres…'
+  data_list_title: '[Les instantanés des données utilisateur de %1%:](#00fb9a) [(%2%-%3% sur](#00fb9a)[%4%](#00fb9a bold)[)](#00fb9a)\n'
+  data_list_item: '[%1%](gray show_text=&7Instantané des données utilisateur pour %2%\n&8⚡ %4% run_command=/userdataview %2% %3%) [%5%](#d8ff2b show_text=&7Épinglé:\n&8Les instantanés épinglés ne serontpas automatiquement supprimés. run_command=/userdata view %2% %3%) [%6%](color=#ffc43b-#f5c962show_text=&7Horodatage de la version:&7\n&8Quand les données ont été enregistrées\n&8%7% run_command=/userdataview %2% %3%)   [⚑ %8%](#23a825-#36f539 show_text=&7Cause de la sauvegarde:\n&8Ce qui a causél''enregistrement des données run_command=/userdata view %2% %3%)   [⏏ %9%](color=#62a9f5-#7ab8fashow_text=&7Taille de l''instantané:&7\n&8Taille du fichier estimée de l''instantané (en KiB) run_command=/userdataview %2% %3%)'
+  data_list_item_invalid: '[%1%](dark_gray show_text=&7Instantané des données utilisateur pour %2%\n&8⚡%4% suggest_command=/userdata delete %2% %3%) [%5%](dark_gray show_text=&7Épinglé:\n&8Lesinstantanés épinglés ne seront pas automatiquement supprimés. suggest_command=/userdata delete %2%%3%) [%6%   ⚑ %8%   ⏏ %9%](gray strikethrough show_text=&#ff3300&Instantané des donnéesinvalide\n&#ff7e5e&Cliquez pour supprimer\n\n&7⚠ %10% suggest_command=/userdata delete%2% %3%)'
+  data_deleted: '[❌ Instantané des données utilisateur supprimé avec succès](#00fb9a) [%1%](#00fb9ashow_text=&7UUID de la version:\n&8%2%) [pour](#00fb9a) [%3%.](#00fb9a show_text=&7UUID du joueur:\n&8%4%)'
+  data_restored: '[⏪ Données utilisateur actuelles de %1% restaurées avec succès à partir de l''instantané](#00fb9a) [%3%.](#00fb9a show_text=&7UUID de la version:\n&8%4%)'
+  data_pinned: '[※ Instantané des données utilisateur épinglé avec succès](#00fb9a) [%1%](#00fb9ashow_text=&7UUID de la version:\n&8%2%) [pour](#00fb9a) [%3%.](#00fb9a show_text=&7UUID du joueur:\n&8%4%)'
+  data_unpinned: '[※ Instantané des données utilisateur détaché avec succès](#00fb9a) [%1%](#00fb9ashow_text=&7UUID de la version:\n&8%2%) [pour](#00fb9a) [%3%.](#00fb9a show_text=&7UUID du joueur:\n&8%4%)'
+  data_dumped: '[☂ Dump de l''instantané des données utilisateur %1% pour %2% à:](#00fb9a)&7%3%'
+  list_footer: '\n%1%[Page](#00fb9a) [%2%](#00fb9a)/[%3%](#00fb9a)%4%   %5%'
+  list_previous_page_button: '[◀](white show_text=&7Voir la page précédente run_command=%2%%1%) '
+  list_next_page_button: ' [▶](white show_text=&7Voir la page suivante run_command=%2% %1%)'
+  list_page_jumpers: '(%1%)'
+  list_page_jumper_button: '[%1%](show_text=&7Aller à la page %1% run_command=%2% %1%)'
+  list_page_jumper_current_page: '[%1%](#00fb9a)'
+  list_page_jumper_separator: ' '
+  list_page_jumper_group_separator: '…'
+  save_cause_disconnect: 'déconnexion'
+  save_cause_world_save: 'sauvegarde du monde'
+  save_cause_death: 'mort'
+  save_cause_server_shutdown: 'arrêt du serveur'
+  save_cause_inventory_command: 'commande d''inventaire'
+  save_cause_enderchest_command: 'commande du coffre de l''Ender'
+  save_cause_backup_restore: 'restauration de sauvegarde'
+  save_cause_api: 'API'
+  save_cause_mpdb_migration: 'migration MPDB'
+  save_cause_legacy_migration: 'migration legacy'
+  save_cause_converted_from_v2: 'converti de v2'
+  up_to_date: '[HuskSync](#00fb9a bold) [| Vous utilisez la dernière version de HuskSync(v%1%).](#00fb9a)'
+  update_available: '[HuskSync](#ff7e5e bold) [| Une nouvelle version de HuskSync est disponible:v%1% (version actuelle: v%2%).](#ff7e5e)'
+  reload_complete: '[HuskSync](#00fb9a bold) [| Config et messages rechargés.](#00fb9a)\n[⚠Assurez-vous que les fichiers de configuration sont à jour sur tous les serveurs!](#00fb9a)\n[Un redémarrage est nécessairepour que les modifications de configuration prennent effet.](#00fb9a italic)'
+  system_status_header: '[HuskSync](#00fb9a bold) [| Rapport d''état du système:](#00fb9a)'
+  error_invalid_syntax: '[Erreur:](#ff3300) [Syntaxe incorrecte. Utilisation:](#ff7e5e) [%1%](#ff7e5eitalic show_text=&#ff7e5e&Cliquez pour suggérer suggest_command=%1%)'
+  error_invalid_player: '[Erreur:](#ff3300) [Impossible de trouver un joueur avec ce nom.](#ff7e5e)'
+  error_invalid_data: '[Erreur:](#ff3300) [Impossible de déballer les données de l''instantané car elles sont invalides ou corrompues.](#ff7e5e) [(Détails…)](gray show_text=&7⚠ %1%)'
+  error_no_permission: '[Erreur:](#ff3300) [Vous n''avez pas la permission d''exécuter cettecommande](#ff7e5e)'
+  error_console_command_only: '[Erreur:](#ff3300) [Cette commande peut seulement être exécutée via la console](#ff7e5e)'
+  error_in_game_command_only: 'Erreur: Cette commande peut uniquement être utilisée en jeu.'
+  error_no_data_to_display: '[Erreur:](#ff3300) [Impossible de trouver des données utilisateur à afficher.](#ff7e5e)'
+  error_invalid_version_uuid: '[Erreur:](#ff3300) [Impossible de trouver des données utilisateur pour cet UUID de version.](#ff7e5e)'
+  husksync_command_description: 'Gérer le plugin HuskSync'
+  userdata_command_description: 'Voir, gérer & restaurer les données utilisateur des joueurs'
+  inventory_command_description: 'Voir & modifier l''inventaire d''un joueur'
+  enderchest_command_description: 'Voir & modifier le Coffre de l''Ender d''un joueur'
--- a/common/src/main/resources/locales/id-id.yml
+++ b/common/src/main/resources/locales/id-id.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| Laporan status sistem:](#00fb9a)'
  error_invalid_syntax: '[Kesalahan:](#ff3300) [Sintaks salah. Penggunaan:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Klik untuk menyarankan suggest_command=%1%)'
  error_invalid_player: '[Kesalahan:](#ff3300) [Tidak dapat menemukan pemain dengan nama tersebut.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Kesalahan:](#ff3300) [Kamu tidak memiliki izin untuk menjalankan perintah ini](#ff7e5e)'
  error_console_command_only: '[Kesalahan:](#ff3300) [Perintah itu hanya dapat dijalankan melalui konsol](#ff7e5e)'
  error_in_game_command_only: 'Kesalahan: Perintah itu hanya dapat dijalankan dalam game.'
--- a/common/src/main/resources/locales/it-it.yml
+++ b/common/src/main/resources/locales/it-it.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Errore:](#ff3300) [Sintassi errata. Usa:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
  error_invalid_player: '[Errore:](#ff3300) [Impossibile trovare un giocatore con questo nome.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Errore:](#ff3300) [Non hai il permesso di usare questo comando](#ff7e5e)'
  error_console_command_only: '[Errore:](#ff3300) [Questo comando può essere eseguito solo dalla](#ff7e5e)'
  error_in_game_command_only: 'Errore: Questo comando può essere utilizzato solo in gioco.'
--- a/common/src/main/resources/locales/ja-jp.yml
+++ b/common/src/main/resources/locales/ja-jp.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Error:](#ff3300) [構文が正しくありません。使用法:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&クリックでサジェスト suggest_command=%1%)'
  error_invalid_player: '[Error:](#ff3300) [そのプレイヤーは見つかりませんでした](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Error:](#ff3300) [このコマンドを実行する権限がありません](#ff7e5e)'
  error_console_command_only: '[Error:](#ff3300) [そのコマンドは%1%コンソールからのみ実行できます](#ff7e5e)'
  error_in_game_command_only: 'Error: そのコマンドはゲーム内でしか使えません。'
--- a/common/src/main/resources/locales/ko-kr.yml
+++ b/common/src/main/resources/locales/ko-kr.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[오류:](#ff3300) [잘못된 사용법. 사용법:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&클릭하여 입력할 수 있습니다. suggest_command=%1%)'
  error_invalid_player: '[오류:](#ff3300) [해당 이름의 사용자를 찾을 수 없습니다.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[오류:](#ff3300) [해당 명령어를 사용할 권한이 없습니다.](#ff7e5e)'
  error_console_command_only: '[오류:](#ff3300) [해당 명령어는 콘솔을 통해서만 사용할 수 있습니다.](#ff7e5e)'
  error_in_game_command_only: '오류: 해당 명령어는 게임 내부에서만 사용할 수 있습니다.'
--- a/common/src/main/resources/locales/nl-nl.yml
+++ b/common/src/main/resources/locales/nl-nl.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Error:](#ff3300) [Onjuiste syntaxis. Gebruik:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
  error_invalid_player: '[Error:](#ff3300) [Kan geen speler met die naam vinden.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Error:](#ff3300) [Je hebt geen toestemming om deze opdracht uit te voeren](#ff7e5e)'
  error_console_command_only: '[Error:](#ff3300) [Dat command kan alleen via de console worden uitgevoerd](#ff7e5e)'
  error_in_game_command_only: 'Error: Dat command kan alleen in-game worden gebruikt.'
--- a/common/src/main/resources/locales/pt-br.yml
+++ b/common/src/main/resources/locales/pt-br.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Error:](#ff3300) [Sintaxe incorreta. Utilize:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
  error_invalid_player: '[Error:](#ff3300) [Não foi possível encontrar um jogador com esse nome.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Error:](#ff3300) [Você não tem permissão para executar este comando](#ff7e5e)'
  error_console_command_only: '[Error:](#ff3300) [Esse comando só pode ser executado através do console](#ff7e5e)'
  error_in_game_command_only: 'Error: Esse comando só pode ser usado dentro do jogo.'
--- a/common/src/main/resources/locales/ru-ru.yml
+++ b/common/src/main/resources/locales/ru-ru.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Ошибка:](#ff3300) [Неправильный синтаксис. Используйте:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
  error_invalid_player: '[Ошибка:](#ff3300) [Не удалось найти игрока с данным именем.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Ошибка:](#ff3300) [У вас недостаточно прав для выполнения данной команды.](#ff7e5e)'
  error_console_command_only: '[Ошибка:](#ff3300) [Данная команда может быть выполнена только из консоли.](#ff7e5e)'
  error_in_game_command_only: 'Ошибка: Данная команда может быть выполнена только в игре.'
--- a/common/src/main/resources/locales/tr-tr.yml
+++ b/common/src/main/resources/locales/tr-tr.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| Sistem durumu raporu:](#00fb9a)'
  error_invalid_syntax: '[Hata:](#ff3300) [Yanlış sözdizimi. Kullanım:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Öneri için tıklayın Suggest_command=%1%)'
  error_invalid_player: '[Hata:](#ff3300) [Bu isimde bir oyuncu bulunamadı.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Hata:](#ff3300) [Bu komutu gerçekleştirmek için izniniz yok](#ff7e5e)'
  error_console_command_only: '[Hata:](#ff3300) [Bu komut yalnızca konsoldan çalıştırılabilir](#ff7e5e)'
  error_in_game_command_only: 'Hata: Bu komut yalnızca oyun içinde kullanılabilir.'
--- a/common/src/main/resources/locales/uk-ua.yml
+++ b/common/src/main/resources/locales/uk-ua.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| System status report:](#00fb9a)'
  error_invalid_syntax: '[Помилка:](#ff3300) [Неправильний синтакс. Використання:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&Click to suggest suggest_command=%1%)'
  error_invalid_player: '[Помилка:](#ff3300) [Гравця не знайдено](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[Помилка:](#ff3300) [Ввас немає дозволу на використання цієї команди](#ff7e5e)'
  error_console_command_only: '[Помилка:](#ff3300) [Ця команда може бути використана лише з допомогою %1% консолі](#ff7e5e)'
  error_in_game_command_only: 'Error: That command can only be used in-game.'
--- a/common/src/main/resources/locales/zh-tw.yml
+++ b/common/src/main/resources/locales/zh-tw.yml
@@ -53,7 +53,7 @@ locales:
  system_status_header: '[HuskSync](#00fb9a bold) [| 系統狀態報告:](#00fb9a)'
  error_invalid_syntax: '[錯誤:](#ff3300) [語法不正確，用法:](#ff7e5e) [%1%](#ff7e5e italic show_text=&#ff7e5e&點擊建議 suggest_command=%1%)'
  error_invalid_player: '[錯誤:](#ff3300) [找不到這位玩家.](#ff7e5e)'
-  error_invalid_data: '[Error:](#ff3300) [Could not unpack snapshot data as it invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
+  error_invalid_data: '[Error:](#ff3300) [Failed to unpack user data as the snapshot is invalid or corrupt.](#ff7e5e) [(Details…)](gray show_text=&7⚠ %1%)'
  error_no_permission: '[錯誤:](#ff3300) [您沒有權限執行這個指令](#ff7e5e)'
  error_console_command_only: '[錯誤:](#ff3300) [該指令只能透過 控制台 執行](#ff7e5e)'
  error_in_game_command_only: '錯誤: 該指令只能在遊戲內執行.'
--- a/docs/Config-File.md
+++ b/docs/Config-File.md
@@ -33,7 +33,7 @@ brigadier_tab_completion: false
 # Whether to enable the Player Analytics hook.
 # Docs: https://william278.net/docs/husksync/plan-hook
 enable_plan_hook: true
-# Whether to cancel game event packets directly when handling locked players if ProtocolLib is installed
+# Whether to cancel game event packets directly when handling locked players if ProtocolLib or PacketEvents is installed
 cancel_packets: true
 # Database settings
 database:
--- a/docs/Setup.md
+++ b/docs/Setup.md
@@ -11,7 +11,7 @@ This will walk you through installing HuskSync on your network of Spigot servers
 ### 1. Install the jar
 - Place the plugin jar file in the `/plugins/` directory of each Spigot server.
 - You do not need to install HuskSync as a proxy plugin.
- You can additionally install [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/) for better locked user handling, and [Plan](https://www.spigotmc.org/resources/plan-player-analytics.32536/) for analytics.
+- You can additionally install [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/) or [PacketEvents](https://www.spigotmc.org/resources/packetevents-api.80279/) for better locked user handling, and [Plan](https://www.spigotmc.org/resources/plan-player-analytics.32536/) for analytics.

 ### 2. Restart servers
 - Start, then stop every server to let HuskSync generate the [[config file]].
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,13 +3,13 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.daemon=true
 javaVersion=17

-plugin_version=3.5
+plugin_version=3.5.3
 plugin_archive=husksync
 plugin_description=A modern, cross-server player data synchronization system

-jedis_version=5.1.2
-mysql_driver_version=8.3.0
-mariadb_driver_version=3.3.3
+jedis_version=5.1.3
+mysql_driver_version=8.4.0
+mariadb_driver_version=3.4.0
 postgres_driver_version=42.7.3
-mongodb_driver_version=5.0.1
+mongodb_driver_version=5.1.0
 snappy_version=1.1.10.5
--- a/paper/src/main/java/net/william278/husksync/listener/PaperEventListener.java
+++ b/paper/src/main/java/net/william278/husksync/listener/PaperEventListener.java
@@ -24,7 +24,10 @@ import net.william278.husksync.BukkitHuskSync;
 import net.william278.husksync.data.BukkitData;
 import net.william278.husksync.user.BukkitUser;
 import net.william278.husksync.user.OnlineUser;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerAdvancementDoneEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.jetbrains.annotations.NotNull;
@@ -68,6 +71,13 @@ public class PaperEventListener extends BukkitEventListener {
        super.saveOnPlayerDeath(user, BukkitData.Items.ItemArray.adapt(itemsToSave));
    }

+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerAdvancementDone(@NotNull PlayerAdvancementDoneEvent event) {
+        if (lockedHandler.cancelPlayerEvent(event.getPlayer().getUniqueId())) {
+            event.message(null);
+        }
+    }
+
    @NotNull
    private List<ItemStack> preserveOrder(@NotNull PlayerInventory inventory, @NotNull List<ItemStack> toKeep) {
        final List<ItemStack> preserved = Lists.newArrayList();
--- a/paper/src/main/resources/paper-plugin.yml
+++ b/paper/src/main/resources/paper-plugin.yml
@@ -9,6 +9,10 @@ api-version: '1.19'
 folia-supported: true
 dependencies:
  server:
+    packetevents:
+      required: false
+      load: BEFORE
+      join-classpath: true
    ProtocolLib:
      required: false
      load: BEFORE
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -2,6 +2,6 @@ certifi==2023.7.22
 charset-normalizer==3.2.0
 colorama==0.4.6
 idna==3.7
-requests==2.31.0
-tqdm==4.66.1
+requests==2.32.0
+tqdm==4.66.3
 urllib3==2.0.7
--- a/test/spin_network.py
+++ b/test/spin_network.py
@@ -13,7 +13,7 @@ from tqdm import tqdm
 class Parameters:
    root_dir = './servers/'
    proxy_version = "1.20"
-    minecraft_version = '1.20.4'
+    minecraft_version = '1.20.6'
    eula_agreement = 'true'

    backend_names = ['alpha', 'beta']
@@ -102,8 +102,8 @@ def create_backend_server(name, port, parameters):
        # Download the latest paper for the version and place it in the server folder
        server_jar = "paper.jar"
        download_paper_build("paper", parameters.minecraft_version,
-                             get_latest_paper_build_number("paper", parameters.minecraft_version),
-                             f"{server_dir}/{server_jar}")
+                            get_latest_paper_build_number("paper", parameters.minecraft_version),
+                            f"{server_dir}/{server_jar}")

        # Create eula.text and set eula=true
        with open(server_dir + "/eula.txt", "w") as file:
@@ -176,8 +176,8 @@ def create_proxy_server(parameters):
        # Download the latest paper for the version and place it in the server folder
        proxy_jar = "waterfall.jar"
        download_paper_build("waterfall", parameters.proxy_version,
-                             get_latest_paper_build_number("waterfall", parameters.proxy_version),
-                             f"{server_dir}/{proxy_jar}")
+                            get_latest_paper_build_number("waterfall", parameters.proxy_version),
+                            f"{server_dir}/{proxy_jar}")

        # Create the config.yml
        with open(server_dir + "/config.yml", "w") as file:
Author	SHA1	Message	Date
William	c4adec3082	refactor: make more resilient against invalid effect types Spigot has a potion effect API lookup mismatch bug (SPIGOT-7674) due to the deprecated methods we use to support 1.17	2024-05-29 00:08:40 +01:00
William	107238360c	build: bump to 3.5.3	2024-05-28 21:57:56 +01:00
William	6141adbdb9	fix: attribute base values not being applied modifiers were being applied, but in cases where the base value was edited, this was not	2024-05-28 21:57:26 +01:00
dependabot[bot]	eaa2ed74a6	deps: bump com.github.retrooper.packetevents:spigot from 2.2.1 to 2.3.0 (#305 ) Bumps com.github.retrooper.packetevents:spigot from 2.2.1 to 2.3.0. --- updated-dependencies: - dependency-name: com.github.retrooper.packetevents:spigot dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-27 17:04:08 +01:00
William	44c652c452	Merge remote-tracking branch 'origin/master'	2024-05-27 01:52:24 +01:00
William	78cf6bff63	docs: add PacketEvents docs to config	2024-05-27 01:52:18 +01:00
William	8ad4158ec0	docs: document PacketEvents support	2024-05-27 01:52:08 +01:00
William	405e6d7162	deps: bump runtime dependencies	2024-05-27 01:50:27 +01:00
AlexDev_	cff1c8f982	feat: added PacketEvents support as ProtocolLib alternative (#296 )	2024-05-27 01:46:44 +01:00
William	f43ca2f043	refactor: adjust BukkitKeyedAdapter logic, close #304	2024-05-27 01:43:47 +01:00
dependabot[bot]	3114ab1a62	deps: bump com.google.code.gson:gson from 2.10.1 to 2.11.0 (#302 ) Bumps [com.google.code.gson:gson](https://github.com/google/gson) from 2.10.1 to 2.11.0. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/main/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.10.1...gson-parent-2.11.0) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-27 01:11:02 +01:00
dependabot[bot]	2da9749b0c	deps: bump net.kyori:adventure-api from 4.16.0 to 4.17.0 (#300 ) Bumps [net.kyori:adventure-api](https://github.com/KyoriPowered/adventure) from 4.16.0 to 4.17.0. - [Release notes](https://github.com/KyoriPowered/adventure/releases) - [Commits](https://github.com/KyoriPowered/adventure/compare/v4.16.0...v4.17.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-27 01:10:54 +01:00
dependabot[bot]	d4d510e100	--- (#303 ) updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-27 01:10:29 +01:00
Preva1l	550ea26097	fix: MongoDB duplicate user table entries & not updating cached username (#301 )	2024-05-13 10:50:58 +01:00
Preva1l	2b1e72a42e	fix: wrong type in PostgreSQL schema (#299 ) * Started impl for mongo * fix silly mistake with postgresql * fix silly mistake with postgresql	2024-05-10 19:06:34 +01:00
William	75f8bee706	build: adjust version meta for release builds	2024-05-06 17:05:52 +01:00
William	a3b50a0bf5	fix: advancement messages being improperly canceled	2024-05-06 16:48:15 +01:00
dependabot[bot]	e9ab0909ce	deps: bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#298 ) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.1.0-jre to 33.2.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-06 16:28:05 +01:00
dependabot[bot]	1e91b4b4ce	build(deps): bump tqdm from 4.66.1 to 4.66.3 in /test (#297 ) Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.66.1 to 4.66.3. - [Release notes](https://github.com/tqdm/tqdm/releases) - [Commits](https://github.com/tqdm/tqdm/compare/v4.66.1...v4.66.3) --- updated-dependencies: - dependency-name: tqdm dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-05-06 16:27:58 +01:00
William	043b51d812	test: update test suite to Paper 1.20.6	2024-05-01 12:35:19 +01:00
William	fa5cea2aa3	refactor: adjust way advancement messages are cleared, close #285	2024-05-01 12:30:18 +01:00
William	e35dcf3aad	feat: Minecraft 1.20.5/6 support (#295 ) * feat: start 1.20.5 update testing nbt-api seems to work great already :) * feat: add DFU support for legacy upgrade Adds an optional overload to `deserialize` to support passing the MC Version of the snapshot data * refactor: `clone` ItemStack[] bukkit data arrays, close #294 Don't perform async operations on mutable player data	2024-05-01 12:08:42 +01:00
IbanEtc	68ec79add6	locales: add French (fr-fr) locales, courtesy of IbanEtchep (#293 ) * french translation * locales: fix line spacing in `fr-fr` * locales: credit French (fr-fr) --------- Co-authored-by: William <will27528@gmail.com>	2024-04-23 16:56:45 +01:00
dependabot[bot]	70235963ba	deps: bump org.apache.commons:commons-text from 1.11.0 to 1.12.0 (#291 ) Bumps org.apache.commons:commons-text from 1.11.0 to 1.12.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-04-23 16:50:24 +01:00
William	245fbec80c	fix: wrong check in legacy stats loading	2024-04-19 14:39:26 +01:00
Nhan Le	4d1a465c03	fix: add Settings packet to allow list (#287 ) fix player skin and chunk loading actions get cancelled	2024-04-16 10:57:34 +01:00
dependabot[bot]	07dc0b8c12	deps: bump commons-io:commons-io from 2.16.0 to 2.16.1 (#284 ) Bumps commons-io:commons-io from 2.16.0 to 2.16.1. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-04-15 14:23:47 +01:00
William	525f15e65b	locales: correct typo in `error_invalid_data`, fix #283	2024-04-14 16:44:26 +01:00
William	017d26673a	refactor: adjust imports	2024-04-13 15:23:05 +01:00