Bump version to 4.4.3 for release

Fix game type not loading (#180 )
Bump pascalgn/automerge-action from 0.15.6 to 0.16.2 (#179 )
2024-02-08 13:11:18 -05:00 · 2024-02-08 13:07:23 -05:00 · 2024-02-08 13:02:28 -05:00 · 2024-01-01 16:26:41 -05:00 · 2024-01-01 16:26:27 -05:00 · 2024-01-01 18:07:35 +00:00
22 changed files with 561 additions and 199 deletions
@@ -15,7 +15,7 @@ jobs:
      # Note: this is directly from GitHub's example for using data from a triggering workflow:
      # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#using-data-from-the-triggering-workflow
      - name: 'Download artifact'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
        with:
          script: |
            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -47,7 +47,7 @@ jobs:
          github-token: "${{ secrets.GITHUB_TOKEN }}"
          pull-request-number: "${{ env.PR_NUMBER }}"
      - name: Merge
-        uses: pascalgn/automerge-action@v0.15.6
+        uses: pascalgn/automerge-action@v0.16.2
        env:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
          MERGE_LABELS: "dependencies,java"
@@ -15,7 +15,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
        with:
          distribution: 'temurin'
          java-version: '17'
@@ -31,13 +31,13 @@ jobs:
      # Upload artifacts
      - name: Upload Distributable Jar
        id: upload-final
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: dist
          path: ./target/OpenInv.jar
      - name: Upload API Jar
        id: upload-api
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        with:
          name: api
          path: ./api/target/openinvapi*.jar
@@ -21,7 +21,7 @@ jobs:
        run: bash ./scripts/set_release_env.sh

      - name: Download Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
        with:
          name: dist
          path: dist
@@ -16,7 +16,7 @@ jobs:
        run: |
          mkdir -p ./pr
          echo ${{ github.event.number }} > ./pr/pr_number
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: pr_number
          path: pr/
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>openinvparent</artifactId>
    <groupId>com.lishid</groupId>
-    <version>4.4.0</version>
+    <version>4.4.3</version>
  </parent>

  <artifactId>openinvapi</artifactId>
@@ -21,7 +21,7 @@
  <parent>
    <groupId>com.lishid</groupId>
    <artifactId>openinvparent</artifactId>
-    <version>4.4.0</version>
+    <version>4.4.3</version>
  </parent>

  <artifactId>openinvassembly</artifactId>
@@ -23,7 +23,7 @@
    <artifactId>openinvparent</artifactId>
    <groupId>com.lishid</groupId>
    <relativePath>../../pom.xml</relativePath>
-    <version>4.4.0</version>
+    <version>4.4.3</version>
  </parent>

  <artifactId>openinvadapter1_19_R3</artifactId>
@@ -16,15 +16,21 @@

 package com.lishid.openinv.internal.v1_19_R3;

-import java.io.File;
 import net.minecraft.Util;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.storage.PlayerDataStorage;
 import org.apache.logging.log4j.LogManager;
 import org.bukkit.craftbukkit.v1_19_R3.CraftServer;
 import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;

 public class OpenPlayer extends CraftPlayer {

@@ -35,9 +41,11 @@ public class OpenPlayer extends CraftPlayer {
    @Override
    public void loadData() {
        // See CraftPlayer#loadData
-        CompoundTag loaded = this.server.getHandle().playerIo.load(this.getHandle());
+        ServerPlayer serverPlayer = getHandle();
+        CompoundTag loaded = this.server.getHandle().playerIo.load(serverPlayer);
        if (loaded != null) {
-            getHandle().readAdditionalSaveData(loaded);
+            serverPlayer.readAdditionalSaveData(loaded);
+            serverPlayer.loadGameTypes(loaded);
        }
    }

@@ -52,13 +60,9 @@ public class OpenPlayer extends CraftPlayer {
            setExtraData(playerData);

            if (!isOnline()) {
-                // Special case: save old vehicle data
+                // Preserve certain data when offline.
                CompoundTag oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.contains("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.put("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
+                revertSpecialValues(playerData, oldData);
            }

            File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir());
@@ -71,4 +75,71 @@ public class OpenPlayer extends CraftPlayer {
        }
    }

+    private void revertSpecialValues(@NotNull CompoundTag newData, @Nullable CompoundTag oldData) {
+        if (oldData == null) {
+            return;
+        }
+
+        // Prevent vehicle deletion.
+        if (oldData.contains("RootVehicle", Tag.TAG_COMPOUND)) {
+            // See net.minecraft.server.players.PlayerList#save(ServerPlayer)
+            // See net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
+            try {
+                Tag attach = oldData.get("Attach");
+                if (attach != null) {
+                    newData.putUUID("Attach", NbtUtils.loadUUID(attach));
+                }
+            } catch (IllegalArgumentException ignored) {
+                // Likely will not re-mount successfully, but at least the mount will not be deleted.
+            }
+            newData.put("Entity", oldData.getCompound("Entity"));
+            newData.put("RootVehicle", oldData.getCompound("RootVehicle"));
+        }
+
+        // Revert automatic updates to play timestamps.
+        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
+    }
+
+    private <T extends Tag> void copyValue(
+        @NotNull CompoundTag source,
+        @NotNull CompoundTag target,
+        @NotNull String container,
+        @NotNull String key,
+        @NotNull Class<T> tagType) {
+        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
+        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
+
+        // Container being null means the server implementation doesn't store this data.
+        if (oldContainer == null || newContainer == null) {
+            return;
+        }
+
+        // If old tag exists, copy it to new location, removing otherwise.
+        setTag(newContainer, key, getTag(oldContainer, key, tagType));
+    }
+
+    private <T extends Tag> @Nullable T getTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @NotNull Class<T> dataType) {
+        Tag value = container.get(key);
+        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
+            return null;
+        }
+        return dataType.cast(value);
+    }
+
+    private <T extends Tag> void setTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @Nullable T data) {
+        if (data == null) {
+            container.remove(key);
+        } else {
+            container.put(key, data);
+        }
+    }
+
 }
@@ -21,8 +21,6 @@ import com.lishid.openinv.internal.IPlayerDataManager;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.OpenInventoryView;
 import com.mojang.authlib.GameProfile;
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
@@ -47,6 +45,9 @@ import org.bukkit.inventory.InventoryView;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.lang.reflect.Field;
+import java.util.logging.Logger;
+
 public class PlayerDataManager implements IPlayerDataManager {

    private @Nullable Field bukkitEntity;
@@ -123,6 +124,7 @@ public class PlayerDataManager implements IPlayerDataManager {

        // Also read "extra" data.
        entity.readAdditionalSaveData(loadedData);
+        entity.loadGameTypes(loadedData);

        if (entity.level == null) {
            // Paper: Move player to spawn
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2011-2023 lishid. All rights reserved.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.lishid.openinv.internal.v1_20_R1;
-
-import com.mojang.logging.LogUtils;
-import java.io.File;
-import net.minecraft.Util;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtIo;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.storage.PlayerDataStorage;
-import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
-
-public class OpenPlayer extends CraftPlayer {
-
-    public OpenPlayer(CraftServer server, ServerPlayer entity) {
-        super(server, entity);
-    }
-
-    @Override
-    public void loadData() {
-        // See CraftPlayer#loadData
-        CompoundTag loaded = this.server.getHandle().playerIo.load(this.getHandle());
-        if (loaded != null) {
-            getHandle().readAdditionalSaveData(loaded);
-        }
-    }
-
-    @Override
-    public void saveData() {
-        ServerPlayer player = this.getHandle();
-        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
-        try {
-            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
-
-            CompoundTag playerData = player.saveWithoutId(new CompoundTag());
-            setExtraData(playerData);
-
-            if (!isOnline()) {
-                // Special case: save old vehicle data
-                CompoundTag oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.contains("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.put("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
-            }
-
-            File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir());
-            NbtIo.writeCompressed(playerData, file);
-            File file1 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat");
-            File file2 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat_old");
-            Util.safeReplaceFile(file1, file, file2);
-        } catch (Exception e) {
-            LogUtils.getLogger().warn("Failed to save player data for {}: {}", player.getScoreboardName(), e);
-        }
-    }
-
-}
@@ -23,7 +23,7 @@
    <artifactId>openinvparent</artifactId>
    <groupId>com.lishid</groupId>
    <relativePath>../../pom.xml</relativePath>
-    <version>4.4.0</version>
+    <version>4.4.3</version>
  </parent>

  <artifactId>openinvadapter1_20_R2</artifactId>
@@ -17,14 +17,20 @@
 package com.lishid.openinv.internal.v1_20_R2;

 import com.mojang.logging.LogUtils;
-import java.io.File;
 import net.minecraft.Util;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.storage.PlayerDataStorage;
 import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
 import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;

 public class OpenPlayer extends CraftPlayer {

@@ -34,11 +40,7 @@ public class OpenPlayer extends CraftPlayer {

    @Override
    public void loadData() {
-        // See CraftPlayer#loadData
-        CompoundTag loaded = this.server.getHandle().playerIo.load(this.getHandle());
-        if (loaded != null) {
-            getHandle().readAdditionalSaveData(loaded);
-        }
+        PlayerDataManager.loadData(getHandle());
    }

    @Override
@@ -52,13 +54,9 @@ public class OpenPlayer extends CraftPlayer {
            setExtraData(playerData);

            if (!isOnline()) {
-                // Special case: save old vehicle data
+                // Preserve certain data when offline.
                CompoundTag oldData = worldNBTStorage.load(player);
-
-                if (oldData != null && oldData.contains("RootVehicle", 10)) {
-                    // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound)
-                    playerData.put("RootVehicle", oldData.getCompound("RootVehicle"));
-                }
+                revertSpecialValues(playerData, oldData);
            }

            File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir());
@@ -71,4 +69,71 @@ public class OpenPlayer extends CraftPlayer {
        }
    }

+    private void revertSpecialValues(@NotNull CompoundTag newData, @Nullable CompoundTag oldData) {
+        if (oldData == null) {
+            return;
+        }
+
+        // Prevent vehicle deletion.
+        if (oldData.contains("RootVehicle", Tag.TAG_COMPOUND)) {
+            // See net.minecraft.server.players.PlayerList#save(ServerPlayer)
+            // See net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
+            try {
+                Tag attach = oldData.get("Attach");
+                if (attach != null) {
+                    newData.putUUID("Attach", NbtUtils.loadUUID(attach));
+                }
+            } catch (IllegalArgumentException ignored) {
+                // Likely will not re-mount successfully, but at least the mount will not be deleted.
+            }
+            newData.put("Entity", oldData.getCompound("Entity"));
+            newData.put("RootVehicle", oldData.getCompound("RootVehicle"));
+        }
+
+        // Revert automatic updates to play timestamps.
+        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
+    }
+
+    private <T extends Tag> void copyValue(
+        @NotNull CompoundTag source,
+        @NotNull CompoundTag target,
+        @NotNull String container,
+        @NotNull String key,
+        @NotNull Class<T> tagType) {
+        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
+        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
+
+        // Container being null means the server implementation doesn't store this data.
+        if (oldContainer == null || newContainer == null) {
+            return;
+        }
+
+        // If old tag exists, copy it to new location, removing otherwise.
+        setTag(newContainer, key, getTag(oldContainer, key, tagType));
+    }
+
+    private <T extends Tag> @Nullable T getTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @NotNull Class<T> dataType) {
+        Tag value = container.get(key);
+        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
+            return null;
+        }
+        return dataType.cast(value);
+    }
+
+    private <T extends Tag> void setTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @Nullable T data) {
+        if (data == null) {
+            container.remove(key);
+        } else {
+            container.put(key, data);
+        }
+    }
+
 }
@@ -21,7 +21,9 @@ import com.lishid.openinv.internal.IPlayerDataManager;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.OpenInventoryView;
 import com.mojang.authlib.GameProfile;
+import com.mojang.serialization.Dynamic;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
@@ -33,31 +35,47 @@ import net.minecraft.world.entity.player.ChatVisiblity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
+import org.bukkit.World;
 import org.bukkit.craftbukkit.v1_20_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
 import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_20_R2.event.CraftEventFactory;
 import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftContainer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.lang.reflect.Field;
+import java.util.UUID;
 import java.util.logging.Logger;

 public class PlayerDataManager implements IPlayerDataManager {

+    private static boolean paper;
+
+    static {
+        try {
+            Class.forName("io.papermc.paper.configuration.Configuration");
+            paper = true;
+        } catch (ClassNotFoundException ignored) {
+            paper = false;
+        }
+    }
+
    private @Nullable Field bukkitEntity;

    public PlayerDataManager() {
        try {
            bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
        } catch (NoSuchFieldException e) {
-            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
-            logger.warning("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
+            Logger logger = JavaPlugin.getPlugin(OpenInv.class).getLogger();
+            logger.warning("Unable to obtain field to inject custom save process - certain player data may be lost when saving!");
            logger.log(java.util.logging.Level.WARNING, e.getMessage(), e);
            bukkitEntity = null;
        }
@@ -77,7 +95,7 @@ public class PlayerDataManager implements IPlayerDataManager {

        if (nmsPlayer == null) {
            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+            throw new RuntimeException("Unable to fetch EntityPlayer from Player implementation " + player.getClass().getName());
        }

        return nmsPlayer;
@@ -90,11 +108,6 @@ public class PlayerDataManager implements IPlayerDataManager {
            return null;
        }

-        // Create a profile and entity to load the player data
-        // See net.minecraft.server.players.PlayerList#canPlayerLogin
-        // and net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello
-        GameProfile profile = new GameProfile(offline.getUniqueId(),
-                offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
        ServerLevel worldServer = server.getLevel(Level.OVERWORLD);

@@ -102,6 +115,30 @@ public class PlayerDataManager implements IPlayerDataManager {
            return null;
        }

+        // Create a new ServerPlayer.
+        ServerPlayer entity = createNewPlayer(server, worldServer, offline);
+
+        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
+        entity.getAdvancements().stopListening();
+
+        // Try to load the player's data.
+        if (loadData(entity)) {
+            // If data is loaded successfully, return the Bukkit entity.
+            return entity.getBukkitEntity();
+        }
+
+        return null;
+    }
+
+    private @NotNull ServerPlayer createNewPlayer(
+        @NotNull MinecraftServer server,
+        @NotNull ServerLevel worldServer,
+        @NotNull final OfflinePlayer offline) {
+        // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
+        // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
+        GameProfile profile = new GameProfile(offline.getUniqueId(),
+            offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
+
        ClientInformation dummyInfo = new ClientInformation(
            "en_us",
            1, // Reduce distance just in case.
@@ -115,37 +152,68 @@ public class PlayerDataManager implements IPlayerDataManager {

        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);

-        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
-        entity.getAdvancements().stopListening();
-
        try {
            injectPlayer(entity);
        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
        }

-        // Load data. This also reads basic data into the player.
+        return entity;
+    }
+
+    static boolean loadData(@NotNull ServerPlayer player) {
        // See CraftPlayer#loadData
-        CompoundTag loadedData = server.getPlayerList().playerIo.load(entity);
+        CompoundTag loadedData = player.server.getPlayerList().playerIo.load(player);

        if (loadedData == null) {
            // Exceptions with loading are logged by Mojang.
-            return null;
+            return false;
        }

+        // Read basic data into the player.
+        player.load(loadedData);
        // Also read "extra" data.
-        entity.readAdditionalSaveData(loadedData);
+        player.readAdditionalSaveData(loadedData);
+        // Game type settings are also loaded separately.
+        player.loadGameTypes(loadedData);

-        if (entity.level() == null) {
-            // Paper: Move player to spawn
-            entity.spawnIn(null);
+        if (paper) {
+            // Paper: world is not loaded by ServerPlayer#load(CompoundTag).
+            parseWorld(player, loadedData);
        }

-        // Return the Bukkit entity.
-        return entity.getBukkitEntity();
+        return true;
    }

-    void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+    private static void parseWorld(@NotNull ServerPlayer player, @NotNull CompoundTag loadedData) {
+        // See PlayerList#placeNewPlayer
+        World bukkitWorld;
+        if (loadedData.contains("WorldUUIDMost") && loadedData.contains("WorldUUIDLeast")) {
+            // Modern Bukkit world.
+            bukkitWorld = org.bukkit.Bukkit.getServer().getWorld(new UUID(loadedData.getLong("WorldUUIDMost"), loadedData.getLong("WorldUUIDLeast")));
+        } else if (loadedData.contains("world", net.minecraft.nbt.Tag.TAG_STRING)) {
+            // Legacy Bukkit world.
+            bukkitWorld = org.bukkit.Bukkit.getServer().getWorld(loadedData.getString("world"));
+        } else {
+            // Vanilla player data.
+            DimensionType.parseLegacy(new Dynamic<>(NbtOps.INSTANCE, loadedData.get("Dimension")))
+                .resultOrPartial(JavaPlugin.getPlugin(OpenInv.class).getLogger()::warning)
+                .map(player.server::getLevel)
+                // If ServerLevel exists, set, otherwise move to spawn.
+                .ifPresentOrElse(player::setServerLevel, () -> player.spawnIn(null));
+            return;
+        }
+        if (bukkitWorld == null) {
+            player.spawnIn(null);
+            return;
+        }
+        player.setServerLevel(((CraftWorld) bukkitWorld).getHandle());
+    }
+
+    private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
        if (bukkitEntity == null) {
            return;
        }
@@ -155,9 +223,8 @@ public class PlayerDataManager implements IPlayerDataManager {
        bukkitEntity.set(player, new OpenPlayer(player.server.server, player));
    }

-    @NotNull
    @Override
-    public Player inject(@NotNull Player player) {
+    public @NotNull Player inject(@NotNull Player player) {
        try {
            ServerPlayer nmsPlayer = getHandle(player);
            if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
@@ -166,14 +233,16 @@ public class PlayerDataManager implements IPlayerDataManager {
            injectPlayer(nmsPlayer);
            return nmsPlayer.getBukkitEntity();
        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
            return player;
        }
    }

-    @Nullable
    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+    public @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {

        ServerPlayer nmsPlayer = getHandle(player);

@@ -23,16 +23,16 @@
    <artifactId>openinvparent</artifactId>
    <groupId>com.lishid</groupId>
    <relativePath>../../pom.xml</relativePath>
-    <version>4.4.0</version>
+    <version>4.4.3</version>
  </parent>

-  <artifactId>openinvadapter1_20_R1</artifactId>
-  <name>OpenInvAdapter1_20_R1</name>
+  <artifactId>openinvadapter1_20_R3</artifactId>
+  <name>OpenInvAdapter1_20_R3</name>

  <properties>
    <maven.compiler.source>17</maven.compiler.source>
    <maven.compiler.target>17</maven.compiler.target>
-    <spigot.version>1.20.1-R0.1-SNAPSHOT</spigot.version>
+    <spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
  </properties>

  <dependencies>
@@ -14,13 +14,11 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package com.lishid.openinv.internal.v1_20_R1;
+package com.lishid.openinv.internal.v1_20_R3;

 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IAnySilentContainer;
 import com.lishid.openinv.util.ReflectionHelper;
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
@@ -49,11 +47,14 @@ import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Statistic;
 import org.bukkit.block.ShulkerBox;
-import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.lang.reflect.Field;
+import java.util.logging.Logger;
+
 public class AnySilentContainer implements IAnySilentContainer {

    private @Nullable Field serverPlayerGameModeGameType;
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2011-2023 lishid. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lishid.openinv.internal.v1_20_R3;
+
+import com.mojang.logging.LogUtils;
+import net.minecraft.Util;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.storage.PlayerDataStorage;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class OpenPlayer extends CraftPlayer {
+
+    public OpenPlayer(CraftServer server, ServerPlayer entity) {
+        super(server, entity);
+    }
+
+    @Override
+    public void loadData() {
+        PlayerDataManager.loadData(getHandle());
+    }
+
+    @Override
+    public void saveData() {
+        ServerPlayer player = this.getHandle();
+        // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman)
+        try {
+            PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo;
+
+            CompoundTag playerData = player.saveWithoutId(new CompoundTag());
+            setExtraData(playerData);
+
+            if (!isOnline()) {
+                // Preserve certain data when offline.
+                CompoundTag oldData = worldNBTStorage.load(player);
+                revertSpecialValues(playerData, oldData);
+            }
+
+            Path playerDataDir = worldNBTStorage.getPlayerDir().toPath();
+            Path file = Files.createTempFile(playerDataDir, player.getStringUUID() + "-", ".dat");
+            NbtIo.writeCompressed(playerData, file);
+            Path dataFile = playerDataDir.resolve(player.getStringUUID() + ".dat");
+            Path backupFile = playerDataDir.resolve(player.getStringUUID() + ".dat_old");
+            Util.safeReplaceFile(dataFile, file, backupFile);
+        } catch (Exception e) {
+            LogUtils.getLogger().warn("Failed to save player data for {}: {}", player.getScoreboardName(), e);
+        }
+    }
+
+    private void revertSpecialValues(@NotNull CompoundTag newData, @Nullable CompoundTag oldData) {
+        if (oldData == null) {
+            return;
+        }
+
+        // Prevent vehicle deletion.
+        if (oldData.contains("RootVehicle", Tag.TAG_COMPOUND)) {
+            // See net.minecraft.server.players.PlayerList#save(ServerPlayer)
+            // See net.minecraft.server.level.ServerPlayer#addAdditionalSaveData(CompoundTag)
+            try {
+                Tag attach = oldData.get("Attach");
+                if (attach != null) {
+                    newData.putUUID("Attach", NbtUtils.loadUUID(attach));
+                }
+            } catch (IllegalArgumentException ignored) {
+                // Likely will not re-mount successfully, but at least the mount will not be deleted.
+            }
+            newData.put("Entity", oldData.getCompound("Entity"));
+            newData.put("RootVehicle", oldData.getCompound("RootVehicle"));
+        }
+
+        // Revert automatic updates to play timestamps.
+        copyValue(oldData, newData, "bukkit", "lastPlayed", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastSeen", NumericTag.class);
+        copyValue(oldData, newData, "Paper", "LastLogin", NumericTag.class);
+    }
+
+    private <T extends Tag> void copyValue(
+        @NotNull CompoundTag source,
+        @NotNull CompoundTag target,
+        @NotNull String container,
+        @NotNull String key,
+        @NotNull Class<T> tagType) {
+        CompoundTag oldContainer = getTag(source, container, CompoundTag.class);
+        CompoundTag newContainer = getTag(target, container, CompoundTag.class);
+
+        // Container being null means the server implementation doesn't store this data.
+        if (oldContainer == null || newContainer == null) {
+            return;
+        }
+
+        // If old tag exists, copy it to new location, removing otherwise.
+        setTag(newContainer, key, getTag(oldContainer, key, tagType));
+    }
+
+    private <T extends Tag> @Nullable T getTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @NotNull Class<T> dataType) {
+        Tag value = container.get(key);
+        if (value == null || !dataType.isAssignableFrom(value.getClass())) {
+            return null;
+        }
+        return dataType.cast(value);
+    }
+
+    private <T extends Tag> void setTag(
+        @NotNull CompoundTag container,
+        @NotNull String key,
+        @Nullable T data) {
+        if (data == null) {
+            container.remove(key);
+        } else {
+            container.put(key, data);
+        }
+    }
+
+}
@@ -14,47 +14,68 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package com.lishid.openinv.internal.v1_20_R1;
+package com.lishid.openinv.internal.v1_20_R3;

 import com.lishid.openinv.OpenInv;
 import com.lishid.openinv.internal.IPlayerDataManager;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.OpenInventoryView;
 import com.mojang.authlib.GameProfile;
-import java.lang.reflect.Field;
-import java.util.logging.Logger;
+import com.mojang.serialization.Dynamic;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ClientInformation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.ChatVisiblity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.dimension.DimensionType;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
-import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_20_R1.event.CraftEventFactory;
-import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftContainer;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.event.CraftEventFactory;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftContainer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.InventoryView;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.lang.reflect.Field;
+import java.util.UUID;
+import java.util.logging.Logger;
+
 public class PlayerDataManager implements IPlayerDataManager {

+    private static boolean paper;
+
+    static {
+        try {
+            Class.forName("io.papermc.paper.configuration.Configuration");
+            paper = true;
+        } catch (ClassNotFoundException ignored) {
+            paper = false;
+        }
+    }
+
    private @Nullable Field bukkitEntity;

    public PlayerDataManager() {
        try {
            bukkitEntity = Entity.class.getDeclaredField("bukkitEntity");
        } catch (NoSuchFieldException e) {
-            Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger();
-            logger.warning("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded.");
+            Logger logger = JavaPlugin.getPlugin(OpenInv.class).getLogger();
+            logger.warning("Unable to obtain field to inject custom save process - certain player data may be lost when saving!");
            logger.log(java.util.logging.Level.WARNING, e.getMessage(), e);
            bukkitEntity = null;
        }
@@ -74,7 +95,7 @@ public class PlayerDataManager implements IPlayerDataManager {

        if (nmsPlayer == null) {
            // Could use reflection to examine fields, but it's honestly not worth the bother.
-            throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
+            throw new RuntimeException("Unable to fetch EntityPlayer from Player implementation " + player.getClass().getName());
        }

        return nmsPlayer;
@@ -87,11 +108,6 @@ public class PlayerDataManager implements IPlayerDataManager {
            return null;
        }

-        // Create a profile and entity to load the player data
-        // See net.minecraft.server.players.PlayerList#canPlayerLogin
-        // and net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello
-        GameProfile profile = new GameProfile(offline.getUniqueId(),
-                offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
        MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
        ServerLevel worldServer = server.getLevel(Level.OVERWORLD);

@@ -99,39 +115,105 @@ public class PlayerDataManager implements IPlayerDataManager {
            return null;
        }

-        ServerPlayer entity = new ServerPlayer(server, worldServer, profile);
+        // Create a new ServerPlayer.
+        ServerPlayer entity = createNewPlayer(server, worldServer, offline);

        // Stop listening for advancement progression - if this is not cleaned up, loading causes a memory leak.
        entity.getAdvancements().stopListening();

+        // Try to load the player's data.
+        if (loadData(entity)) {
+            // If data is loaded successfully, return the Bukkit entity.
+            return entity.getBukkitEntity();
+        }
+
+        return null;
+    }
+
+    private @NotNull ServerPlayer createNewPlayer(
+        @NotNull MinecraftServer server,
+        @NotNull ServerLevel worldServer,
+        @NotNull final OfflinePlayer offline) {
+        // See net.minecraft.server.players.PlayerList#canPlayerLogin(ServerLoginPacketListenerImpl, GameProfile)
+        // See net.minecraft.server.network.ServerLoginPacketListenerImpl#handleHello(ServerboundHelloPacket)
+        GameProfile profile = new GameProfile(offline.getUniqueId(),
+            offline.getName() != null ? offline.getName() : offline.getUniqueId().toString());
+
+        ClientInformation dummyInfo = new ClientInformation(
+            "en_us",
+            1, // Reduce distance just in case.
+            ChatVisiblity.HIDDEN, // Don't accept chat.
+            false,
+            ServerPlayer.DEFAULT_MODEL_CUSTOMIZATION,
+            ServerPlayer.DEFAULT_MAIN_HAND,
+            true,
+            false // Don't list in player list (not that this player is in the list anyway).
+        );
+
+        ServerPlayer entity = new ServerPlayer(server, worldServer, profile, dummyInfo);
+
        try {
            injectPlayer(entity);
        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
        }

-        // Load data. This also reads basic data into the player.
+        return entity;
+    }
+
+    static boolean loadData(@NotNull ServerPlayer player) {
        // See CraftPlayer#loadData
-        CompoundTag loadedData = server.getPlayerList().playerIo.load(entity);
+        CompoundTag loadedData = player.server.getPlayerList().playerIo.load(player);

        if (loadedData == null) {
            // Exceptions with loading are logged by Mojang.
-            return null;
+            return false;
        }

+        // Read basic data into the player.
+        player.load(loadedData);
        // Also read "extra" data.
-        entity.readAdditionalSaveData(loadedData);
+        player.readAdditionalSaveData(loadedData);
+        // Game type settings are also loaded separately.
+        player.loadGameTypes(loadedData);

-        if (entity.level() == null) {
-            // Paper: Move player to spawn
-            entity.spawnIn(null);
+        if (paper) {
+            // Paper: world is not loaded by ServerPlayer#load(CompoundTag).
+            parseWorld(player, loadedData);
        }

-        // Return the Bukkit entity.
-        return entity.getBukkitEntity();
+        return true;
    }

-    void injectPlayer(ServerPlayer player) throws IllegalAccessException {
+    private static void parseWorld(@NotNull ServerPlayer player, @NotNull CompoundTag loadedData) {
+        // See PlayerList#placeNewPlayer
+        World bukkitWorld;
+        if (loadedData.contains("WorldUUIDMost") && loadedData.contains("WorldUUIDLeast")) {
+            // Modern Bukkit world.
+            bukkitWorld = Bukkit.getServer().getWorld(new UUID(loadedData.getLong("WorldUUIDMost"), loadedData.getLong("WorldUUIDLeast")));
+        } else if (loadedData.contains("world", net.minecraft.nbt.Tag.TAG_STRING)) {
+            // Legacy Bukkit world.
+            bukkitWorld = Bukkit.getServer().getWorld(loadedData.getString("world"));
+        } else {
+            // Vanilla player data.
+            DimensionType.parseLegacy(new Dynamic<>(NbtOps.INSTANCE, loadedData.get("Dimension")))
+                .resultOrPartial(JavaPlugin.getPlugin(OpenInv.class).getLogger()::warning)
+                .map(player.server::getLevel)
+                // If ServerLevel exists, set, otherwise move to spawn.
+                .ifPresentOrElse(player::setServerLevel, () -> player.spawnIn(null));
+            return;
+        }
+        if (bukkitWorld == null) {
+            player.spawnIn(null);
+            return;
+        }
+        player.setServerLevel(((CraftWorld) bukkitWorld).getHandle());
+    }
+
+    private void injectPlayer(ServerPlayer player) throws IllegalAccessException {
        if (bukkitEntity == null) {
            return;
        }
@@ -141,9 +223,8 @@ public class PlayerDataManager implements IPlayerDataManager {
        bukkitEntity.set(player, new OpenPlayer(player.server.server, player));
    }

-    @NotNull
    @Override
-    public Player inject(@NotNull Player player) {
+    public @NotNull Player inject(@NotNull Player player) {
        try {
            ServerPlayer nmsPlayer = getHandle(player);
            if (nmsPlayer.getBukkitEntity() instanceof OpenPlayer openPlayer) {
@@ -152,14 +233,16 @@ public class PlayerDataManager implements IPlayerDataManager {
            injectPlayer(nmsPlayer);
            return nmsPlayer.getBukkitEntity();
        } catch (IllegalAccessException e) {
-            e.printStackTrace();
+            JavaPlugin.getPlugin(OpenInv.class).getLogger().log(
+                java.util.logging.Level.WARNING,
+                e,
+                () -> "Unable to inject ServerPlayer, certain player data may be lost when saving!");
            return player;
        }
    }

-    @Nullable
    @Override
-    public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
+    public @Nullable InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {

        ServerPlayer nmsPlayer = getHandle(player);

@@ -14,12 +14,9 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package com.lishid.openinv.internal.v1_20_R1;
+package com.lishid.openinv.internal.v1_20_R3;

 import com.lishid.openinv.internal.ISpecialEnderChest;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import net.minecraft.core.NonNullList;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -33,13 +30,17 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.EnderChestBlockEntity;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_20_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpecialEnderChest {

    private final CraftInventory inventory;
@@ -14,16 +14,10 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-package com.lishid.openinv.internal.v1_20_R1;
+package com.lishid.openinv.internal.v1_20_R3;

 import com.google.common.collect.ImmutableList;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;
 import net.minecraft.ReportedException;
@@ -47,13 +41,20 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_20_R1.entity.CraftHumanEntity;
-import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventory;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.InventoryHolder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerInventory {

    private final CraftInventory inventory;
@@ -21,7 +21,7 @@
  <parent>
    <artifactId>openinvparent</artifactId>
    <groupId>com.lishid</groupId>
-    <version>4.4.0</version>
+    <version>4.4.3</version>
  </parent>

  <artifactId>openinvplugincore</artifactId>
@@ -22,11 +22,12 @@ import com.lishid.openinv.internal.ISpecialEnderChest;
 import com.lishid.openinv.internal.ISpecialInventory;
 import com.lishid.openinv.internal.ISpecialPlayerInventory;
 import com.lishid.openinv.util.InventoryAccess;
-import java.lang.reflect.Constructor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;

+import java.lang.reflect.Constructor;
+
 class InternalAccessor {

    private final @NotNull Plugin plugin;
@@ -66,6 +67,7 @@ class InternalAccessor {
            case "v1_17_R1", "v1_18_R1" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.1.10";
            case "v1_19_R1" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.2.2";
            case "v1_18_R2", "v1_19_R2" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.3.0";
+            case "v1_20_R1" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.4.1";
            default -> "https://github.com/Jikoo/OpenInv/releases";
        };
    }
@@ -21,7 +21,7 @@
  <artifactId>openinvparent</artifactId>
  <name>OpenInv</name>
  <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>4.4.0</version>
+  <version>4.4.3</version>

  <packaging>pom</packaging>

@@ -41,8 +41,8 @@
        <module>api</module>
        <module>plugin</module>
        <module>internal/v1_19_R3</module>
-        <module>internal/v1_20_R1</module>
        <module>internal/v1_20_R2</module>
+        <module>internal/v1_20_R3</module>
        <module>assembly</module>
      </modules>
    </profile>
@@ -73,7 +73,7 @@
        <artifactId>annotations</artifactId>
        <groupId>org.jetbrains</groupId>
        <scope>provided</scope>
-        <version>24.0.1</version>
+        <version>24.1.0</version>
      </dependency>
      <dependency>
        <artifactId>spigot-api</artifactId>
@@ -85,13 +85,13 @@
        <artifactId>openinvapi</artifactId>
        <groupId>com.lishid</groupId>
        <scope>compile</scope>
-        <version>4.4.0</version>
+        <version>4.4.3</version>
      </dependency>
      <dependency>
        <artifactId>openinvplugincore</artifactId>
        <groupId>com.lishid</groupId>
        <scope>compile</scope>
-        <version>4.4.0</version>
+        <version>4.4.3</version>
        <exclusions>
          <exclusion>
            <groupId>com.lishid</groupId>
@@ -112,7 +112,7 @@
            -->
          <artifactId>maven-dependency-plugin</artifactId>
          <groupId>org.apache.maven.plugins</groupId>
-          <version>3.6.0</version>
+          <version>3.6.1</version>
        </plugin>

        <plugin>
@@ -151,7 +151,7 @@
        <plugin>
          <artifactId>maven-compiler-plugin</artifactId>
          <groupId>org.apache.maven.plugins</groupId>
-          <version>3.11.0</version>
+          <version>3.12.1</version>
        </plugin>

        <plugin>
Author	SHA1	Message	Date
Jikoo	176272a4b9	Bump version to 4.4.3 for release	2024-02-08 13:11:18 -05:00
Adam	c102e6650e	Fix game type not loading (#180 )	2024-02-08 13:07:23 -05:00
dependabot[bot]	c8fee82291	Bump pascalgn/automerge-action from 0.15.6 to 0.16.2 (#179 ) Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.15.6 to 0.16.2. - [Release notes](https://github.com/pascalgn/automerge-action/releases) - [Commits](https://github.com/pascalgn/automerge-action/compare/v0.15.6...v0.16.2) --- updated-dependencies: - dependency-name: pascalgn/automerge-action 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-02-08 13:02:28 -05:00
dependabot[bot]	0ae9982ce5	Bump actions/download-artifact from 3 to 4 (#177 ) Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-01-01 16:26:41 -05:00
dependabot[bot]	59d358d907	Bump actions/upload-artifact from 3 to 4 (#176 ) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-01-01 16:26:27 -05:00
dependabot[bot]	2621181c5d	Bump org.apache.maven.plugins:maven-compiler-plugin (#178 )	2024-01-01 18:07:35 +00:00
Jikoo	48d044af8c	Bump version to 4.4.3-SNAPSHOT for development	2023-12-29 10:05:02 -05:00
Jikoo	9a7623c209	Bump version to 4.4.2 for release	2023-12-29 10:04:28 -05:00
Adam	78354fdf68	Add support for 1.20.4 (#173 )	2023-12-29 10:01:54 -05:00
dependabot[bot]	859179d1fc	Bump actions/setup-java from 3 to 4 (#168 ) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-12-01 18:03:17 -05:00
dependabot[bot]	79f53e9086	Bump actions/github-script from 6 to 7 (#169 ) Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-12-01 18:02:30 -05:00
dependabot[bot]	c14d777519	Bump org.jetbrains:annotations from 24.0.1 to 24.1.0 (#170 )	2023-12-01 17:51:58 +00:00
Jikoo	1829babe69	Bump version to 4.4.2-SNAPSHOT for development	2023-11-12 14:29:31 -05:00
Jikoo	5aa959f1ac	Bump version to 4.4.1 for release	2023-11-12 14:29:11 -05:00
Adam	bc7e13f245	Expand preserved old data (#166 ) * Fix session timestamps being erroneously updated * Fix vehicle possibly not being re-mounted	2023-11-12 12:34:32 -05:00
Adam	73edebff54	Fix loading world on Paper (#165 ) Unify load process to reduce duplicate code and risk of missed cases	2023-11-12 12:24:19 -05:00
dependabot[bot]	faf1d387e9	Bump org.apache.maven.plugins:maven-dependency-plugin (#161 )	2023-11-01 17:32:32 +00:00
Jikoo	deed277376	Bump version to 4.4.1-SNAPSHOT for development	2023-10-04 22:19:02 -04:00