Skip to content

Bump deps and target latest papermc server api #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benwoo1110 merged 3 commits into from
Aug 8, 2025
Merged

Bump deps and target latest papermc server api #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3723164
Bump deps and target latest papermc server api
benwoo1110 Aug 8, 2025
5a9966c
Target core api version 5.2
benwoo1110 Aug 8, 2025
20544a5
Revert mockbukkit version
benwoo1110 Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -24,31 +24,26 @@ repositories {
}

configure(apiDependencies) {
serverApiVersion = '1.21.3-R0.1-SNAPSHOT'
serverApiVersion = '1.21.8-R0.1-SNAPSHOT'
mockBukkitServerApiVersion = '1.21'
mockBukkitVersion = '4.31.1'
}

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') {
exclude group: 'junit', module: 'junit'
}

// 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'
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mvplugins/multiverse/inventories/MultiverseInventories.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/mvplugins/multiverse/inventories/view/InventoryDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(),
Expand Down