From 3723164d58333e9e567bf42781b655de5e9f8f2b Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 8 Aug 2025 21:46:04 +0800
Subject: [PATCH 1/3] Bump deps and target latest papermc server api

---
 build.gradle                                  | 23 ++++++++-----------
 .../view/InventoryDataProvider.java           |  3 +--
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index a9d231a2..b9542dac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'checkstyle'
-    id 'org.mvplugins.multiverse-plugin' version '1.1.0'
+    id 'org.mvplugins.multiverse-plugin' version '1.2.1'
 }
 
 group = 'org.mvplugins.multiverse.inventories'
@@ -24,23 +24,18 @@ repositories {
 }
 
 configure(apiDependencies) {
-    serverApiVersion = '1.21.3-R0.1-SNAPSHOT'
+    serverApiVersion = '1.21.8-R0.1-SNAPSHOT'
     mockBukkitServerApiVersion = '1.21'
-    mockBukkitVersion = '4.31.1'
+    mockBukkitVersion = '4.72.2'
 }
 
 dependencies {
-    // Server API
-    // TODO make our custom plugin target paper instead of spigot
-    externalPlugin 'io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT'
-
     // Core
-    // TODO update to correct version once we have it published
-    externalPlugin 'org.mvplugins.multiverse.core:multiverse-core:5.2.0-SNAPSHOT'
+    externalPlugin 'org.mvplugins.multiverse.core:multiverse-core:5.2.0'
 
     // Config
     shadowed 'com.dumptruckman.minecraft:JsonConfiguration:1.2-SNAPSHOT'
-    shadowed 'net.minidev:json-smart:2.5.1'
+    shadowed 'net.minidev:json-smart:2.6.0'
 
     // Utils
     shadowed('com.dumptruckman.minecraft:Logging:1.1.1') {
@@ -48,7 +43,7 @@ dependencies {
     }
 
     // Caching
-    shadowed("com.github.ben-manes.caffeine:caffeine:3.2.0")
+    shadowed("com.github.ben-manes.caffeine:caffeine:3.2.2")
 
     // PlaceholderAPI
     externalPlugin 'me.clip:placeholderapi:2.11.6'
@@ -69,11 +64,11 @@ dependencies {
     }
 
     // hk2 for annotation processing only
-    compileOnly('org.glassfish.hk2:hk2-api:3.0.3') {
+    compileOnly('org.glassfish.hk2:hk2-api:3.1.1') {
         exclude group: '*', module: '*'
     }
-    annotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
-    testAnnotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
+    annotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.1.1'
+    testAnnotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.1.1'
 }
 
 shadowJar {
diff --git a/src/main/java/org/mvplugins/multiverse/inventories/view/InventoryDataProvider.java b/src/main/java/org/mvplugins/multiverse/inventories/view/InventoryDataProvider.java
index d47c1ce9..66ef402c 100644
--- a/src/main/java/org/mvplugins/multiverse/inventories/view/InventoryDataProvider.java
+++ b/src/main/java/org/mvplugins/multiverse/inventories/view/InventoryDataProvider.java
@@ -5,7 +5,6 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.ApiStatus;
@@ -105,7 +104,7 @@ private CompletableFuture<PlayerInventoryData> loadInventoryDataFromPlayer(
                 InventoryStatus.LIVE_INVENTORY,
                 profileType,
                 onlineTarget.getHealth(),
-                onlineTarget.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(),
+                onlineTarget.getMaxHealth(), //todo: Use attributes instead of this deprecated method
                 onlineTarget.getLevel(),
                 onlineTarget.getExp(),
                 onlineTarget.getFoodLevel(),

From 5a9966c3f9d8532afa87aa431f13fb5045d7c662 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 8 Aug 2025 21:46:20 +0800
Subject: [PATCH 2/3] Target core api version 5.2

---
 .../mvplugins/multiverse/inventories/MultiverseInventories.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java b/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java
index 338d84c0..4ee6a611 100644
--- a/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java
+++ b/src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java
@@ -44,7 +44,7 @@
 @Service
 public class MultiverseInventories extends MultiverseModule {
 
-    private static final double TARGET_CORE_API_VERSION = 5.0;
+    private static final double TARGET_CORE_API_VERSION = 5.2;
 
     @Inject
     private Provider<CoreConfig> coreConfig;

From 20544a5bd9cdf9312423d2df540aaf6283daab84 Mon Sep 17 00:00:00 2001
From: Ben Woo <30431861+benwoo1110@users.noreply.github.com>
Date: Fri, 8 Aug 2025 22:05:38 +0800
Subject: [PATCH 3/3] Revert mockbukkit version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b9542dac..83ca65ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ repositories {
 configure(apiDependencies) {
     serverApiVersion = '1.21.8-R0.1-SNAPSHOT'
     mockBukkitServerApiVersion = '1.21'
-    mockBukkitVersion = '4.72.2'
+    mockBukkitVersion = '4.31.1'
 }
 
 dependencies {