Skip to content

Commit 3723164

Browse files
committed
Bump deps and target latest papermc server api
1 parent 9502586 commit 3723164

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

build.gradle

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'checkstyle'
3-
id 'org.mvplugins.multiverse-plugin' version '1.1.0'
3+
id 'org.mvplugins.multiverse-plugin' version '1.2.1'
44
}
55

66
group = 'org.mvplugins.multiverse.inventories'
@@ -24,31 +24,26 @@ repositories {
2424
}
2525

2626
configure(apiDependencies) {
27-
serverApiVersion = '1.21.3-R0.1-SNAPSHOT'
27+
serverApiVersion = '1.21.8-R0.1-SNAPSHOT'
2828
mockBukkitServerApiVersion = '1.21'
29-
mockBukkitVersion = '4.31.1'
29+
mockBukkitVersion = '4.72.2'
3030
}
3131

3232
dependencies {
33-
// Server API
34-
// TODO make our custom plugin target paper instead of spigot
35-
externalPlugin 'io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT'
36-
3733
// Core
38-
// TODO update to correct version once we have it published
39-
externalPlugin 'org.mvplugins.multiverse.core:multiverse-core:5.2.0-SNAPSHOT'
34+
externalPlugin 'org.mvplugins.multiverse.core:multiverse-core:5.2.0'
4035

4136
// Config
4237
shadowed 'com.dumptruckman.minecraft:JsonConfiguration:1.2-SNAPSHOT'
43-
shadowed 'net.minidev:json-smart:2.5.1'
38+
shadowed 'net.minidev:json-smart:2.6.0'
4439

4540
// Utils
4641
shadowed('com.dumptruckman.minecraft:Logging:1.1.1') {
4742
exclude group: 'junit', module: 'junit'
4843
}
4944

5045
// Caching
51-
shadowed("com.github.ben-manes.caffeine:caffeine:3.2.0")
46+
shadowed("com.github.ben-manes.caffeine:caffeine:3.2.2")
5247

5348
// PlaceholderAPI
5449
externalPlugin 'me.clip:placeholderapi:2.11.6'
@@ -69,11 +64,11 @@ dependencies {
6964
}
7065

7166
// hk2 for annotation processing only
72-
compileOnly('org.glassfish.hk2:hk2-api:3.0.3') {
67+
compileOnly('org.glassfish.hk2:hk2-api:3.1.1') {
7368
exclude group: '*', module: '*'
7469
}
75-
annotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
76-
testAnnotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
70+
annotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.1.1'
71+
testAnnotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.1.1'
7772
}
7873

7974
shadowJar {

src/main/java/org/mvplugins/multiverse/inventories/view/InventoryDataProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.bukkit.ChatColor;
66
import org.bukkit.Location;
77
import org.bukkit.OfflinePlayer;
8-
import org.bukkit.attribute.Attribute;
98
import org.bukkit.entity.Player;
109
import org.bukkit.inventory.ItemStack;
1110
import org.jetbrains.annotations.ApiStatus;
@@ -105,7 +104,7 @@ private CompletableFuture<PlayerInventoryData> loadInventoryDataFromPlayer(
105104
InventoryStatus.LIVE_INVENTORY,
106105
profileType,
107106
onlineTarget.getHealth(),
108-
onlineTarget.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(),
107+
onlineTarget.getMaxHealth(), //todo: Use attributes instead of this deprecated method
109108
onlineTarget.getLevel(),
110109
onlineTarget.getExp(),
111110
onlineTarget.getFoodLevel(),

0 commit comments

Comments
 (0)