From 65c1d138be0d777f1173df0367b0afd150fd2c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petulikan=20D=C3=A1lnev=C3=ADm?= Date: Mon, 20 Jan 2025 20:49:48 +0100 Subject: [PATCH] 4.18.1 - Updated NBT-API - Transitioned from compiling NBT-API into jarfile to be used as a plugin directly - Updated paperweight userdev - Updated gradle to 8.12 - Plugin now requires NBT-API as a plugin dependency Signed-off-by: petulikan1 --- build.gradle.kts | 2 -- buildSrc/build.gradle.kts | 2 +- ...fyscript.wolfyutils.spigot.java-conventions.gradle.kts | 2 +- buildSrc/src/main/kotlin/wolfyutils.spigot.nms.gradle.kts | 2 +- .../utilities/bukkit/commands/QueryDebugCommand.java | 4 ++-- .../com/wolfyscript/utilities/bukkit/nbt/NBTQuery.java | 6 +++--- .../com/wolfyscript/utilities/bukkit/nbt/QueryNode.java | 6 +++--- .../utilities/bukkit/nbt/QueryNodeBoolean.java | 6 +++--- .../wolfyscript/utilities/bukkit/nbt/QueryNodeByte.java | 4 ++-- .../utilities/bukkit/nbt/QueryNodeByteArray.java | 4 ++-- .../utilities/bukkit/nbt/QueryNodeCompound.java | 4 ++-- .../wolfyscript/utilities/bukkit/nbt/QueryNodeDouble.java | 4 ++-- .../wolfyscript/utilities/bukkit/nbt/QueryNodeFloat.java | 4 ++-- .../wolfyscript/utilities/bukkit/nbt/QueryNodeInt.java | 4 ++-- .../utilities/bukkit/nbt/QueryNodeIntArray.java | 4 ++-- .../wolfyscript/utilities/bukkit/nbt/QueryNodeList.java | 6 +++--- .../utilities/bukkit/nbt/QueryNodeListCompound.java | 4 ++-- .../utilities/bukkit/nbt/QueryNodeListDouble.java | 3 +-- .../utilities/bukkit/nbt/QueryNodeListFloat.java | 3 +-- .../utilities/bukkit/nbt/QueryNodeListInt.java | 3 +-- .../utilities/bukkit/nbt/QueryNodeListLong.java | 3 +-- .../utilities/bukkit/nbt/QueryNodeListString.java | 3 +-- .../wolfyscript/utilities/bukkit/nbt/QueryNodeLong.java | 4 ++-- .../utilities/bukkit/nbt/QueryNodePrimitive.java | 2 +- .../wolfyscript/utilities/bukkit/nbt/QueryNodeShort.java | 4 ++-- .../wolfyscript/utilities/bukkit/nbt/QueryNodeString.java | 4 ++-- .../java/me/wolfyscript/utilities/api/nms/ItemUtil.java | 2 +- .../util/inventory/item_builder/AbstractItemBuilder.java | 8 ++++---- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 5 ++--- plugin-compatibility/build.gradle.kts | 2 +- .../plugins/mmoitems/MMOItemsStackIdentifier.java | 3 ++- .../plugins/mythicmobs/MythicMobsStackIdentifier.java | 2 +- settings.gradle.kts | 2 +- src/main/resources/plugin.yml | 2 ++ 35 files changed, 60 insertions(+), 65 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 26ef790f..f768fbbf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -124,7 +124,6 @@ tasks.named("shadowJar") { include(dependency(apis.dataformat.hocon.get().toString())) include(dependency("${libs.jackson.get().group}:.*")) include(dependency("${libs.bstats.get().group}:.*")) - include(dependency("${libs.nbtapi.api.get().group}:.*")) include(dependency("${libs.reflections.get().group}:.*")) include(dependency("${libs.javassist.get().group}:.*")) include(dependency("${libs.adventure.api.get().group}:.*")) @@ -141,7 +140,6 @@ tasks.named("shadowJar") { // Dependencies (pre spigot plugin.yml dependency update) required to be shaded! To be removed in v5! relocate("com.typesafe", "com.wolfyscript.lib.com.typesafe") - relocate("de.tr7zw.changeme.nbtapi", "com.wolfyscript.lib.nbt.nbtapi") // Still using me.wolfyscript.lib package! To be changed/removed in v5! relocate("org.reflections", "me.wolfyscript.lib.org.reflections") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 534875b7..4f79011c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,7 +11,7 @@ repositories { dependencies { implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0") - implementation(group = "io.papermc.paperweight", name = "paperweight-userdev", version = "1.7.6") + implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:2.0.0-beta.14") } gradlePlugin { diff --git a/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts index e06a971d..75ce1050 100644 --- a/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts @@ -38,7 +38,7 @@ dependencies { compileOnly("com.mojang:authlib:1.5.21") compileOnly("io.netty:netty-all:4.1.85.Final") compileOnly("org.bstats:bstats-bukkit:3.0.0") - compileOnly("de.tr7zw:item-nbt-api:2.14.0") + compileOnly("de.tr7zw:item-nbt-api-plugin:2.14.1") // Common Test libs testImplementation("com.wolfyscript.wolfyutils:wolfyutilities:${apiVersion}") } diff --git a/buildSrc/src/main/kotlin/wolfyutils.spigot.nms.gradle.kts b/buildSrc/src/main/kotlin/wolfyutils.spigot.nms.gradle.kts index 27a54bf9..d1ace9f8 100644 --- a/buildSrc/src/main/kotlin/wolfyutils.spigot.nms.gradle.kts +++ b/buildSrc/src/main/kotlin/wolfyutils.spigot.nms.gradle.kts @@ -26,7 +26,7 @@ dependencies { } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } publishing { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java index dc4682f8..17433eaa 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java @@ -1,8 +1,8 @@ package com.wolfyscript.utilities.bukkit.commands; import com.wolfyscript.utilities.bukkit.nbt.NBTQuery; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTItem; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTItem; import java.io.File; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.inventory.ItemUtils; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/NBTQuery.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/NBTQuery.java index 4b192091..c4eeee28 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/NBTQuery.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/NBTQuery.java @@ -27,9 +27,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.JsonNode; import com.wolfyscript.utilities.common.WolfyUtils; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTContainer; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTContainer; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.json.jackson.JacksonUtil; import java.io.File; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java index 19db427a..3ece9aa5 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java @@ -24,9 +24,9 @@ import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.node.ObjectNode; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTList; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTList; +import de.tr7zw.nbtapi.NBTType; import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonGetter; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeBoolean.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeBoolean.java index 2fbd7ee3..737aca21 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeBoolean.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeBoolean.java @@ -25,9 +25,9 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTList; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTList; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeByte.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeByte.java index 7ffbde63..0af87139 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeByte.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeByte.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeByteArray.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeByteArray.java index 23327682..06a91fae 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeByteArray.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeByteArray.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeCompound.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeCompound.java index b4899e10..46bed2e7 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeCompound.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeCompound.java @@ -28,8 +28,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.databind.JsonNode; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.HashMap; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeDouble.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeDouble.java index 56b61851..80804752 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeDouble.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeDouble.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeFloat.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeFloat.java index 90f4678f..957d49a3 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeFloat.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeFloat.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeInt.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeInt.java index efa870fc..664b9a68 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeInt.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeInt.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeIntArray.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeIntArray.java index 052bccdf..ceee1271 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeIntArray.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeIntArray.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeList.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeList.java index 27ee23ce..b84ba550 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeList.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeList.java @@ -28,9 +28,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTList; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTList; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.List; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListCompound.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListCompound.java index 0d0c70c8..142359d0 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListCompound.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListCompound.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.List; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListDouble.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListDouble.java index 5fd7f583..1c5c54c8 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListDouble.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListDouble.java @@ -2,8 +2,7 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tr7zw.changeme.nbtapi.NBTList; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.List; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListFloat.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListFloat.java index a948b469..ce9832d6 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListFloat.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListFloat.java @@ -2,8 +2,7 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tr7zw.changeme.nbtapi.NBTList; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.List; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListInt.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListInt.java index dd8851e6..07663197 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListInt.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListInt.java @@ -2,8 +2,7 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tr7zw.changeme.nbtapi.NBTList; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.List; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListLong.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListLong.java index 3bff7438..27ddf308 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListLong.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListLong.java @@ -2,8 +2,7 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tr7zw.changeme.nbtapi.NBTList; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.List; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListString.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListString.java index da4de45d..b6d70258 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListString.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeListString.java @@ -2,8 +2,7 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonProperty; -import de.tr7zw.changeme.nbtapi.NBTList; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.List; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeLong.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeLong.java index bc36d3a2..70f12922 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeLong.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeLong.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodePrimitive.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodePrimitive.java index 2209aba6..e5ed6aac 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodePrimitive.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodePrimitive.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JacksonInject; import com.fasterxml.jackson.annotation.JsonCreator; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.json.jackson.annotations.KeyedBaseType; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeShort.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeShort.java index f65a4022..f6e8c642 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeShort.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeShort.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeString.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeString.java index 6283a2dd..8327ea3b 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeString.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeString.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTType; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; import java.util.Optional; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/nms/ItemUtil.java b/core/src/main/java/me/wolfyscript/utilities/api/nms/ItemUtil.java index 422a5b89..f88efda6 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/nms/ItemUtil.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/nms/ItemUtil.java @@ -19,7 +19,7 @@ package me.wolfyscript.utilities.api.nms; import com.wolfyscript.utilities.paper.WolfyCorePaper; -import de.tr7zw.changeme.nbtapi.NBT; +import de.tr7zw.nbtapi.NBT; import org.bukkit.inventory.ItemStack; import java.io.IOException; diff --git a/core/src/main/java/me/wolfyscript/utilities/util/inventory/item_builder/AbstractItemBuilder.java b/core/src/main/java/me/wolfyscript/utilities/util/inventory/item_builder/AbstractItemBuilder.java index 562f7156..97aa0ad0 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/inventory/item_builder/AbstractItemBuilder.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/inventory/item_builder/AbstractItemBuilder.java @@ -21,10 +21,10 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.base.Preconditions; -import de.tr7zw.changeme.nbtapi.NBTCompound; -import de.tr7zw.changeme.nbtapi.NBTCompoundList; -import de.tr7zw.changeme.nbtapi.NBTItem; -import de.tr7zw.changeme.nbtapi.NBTListCompound; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTCompoundList; +import de.tr7zw.nbtapi.NBTItem; +import de.tr7zw.nbtapi.NBTListCompound; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.EncryptionUtils; import me.wolfyscript.utilities.util.version.MinecraftVersion; diff --git a/gradle.properties b/gradle.properties index 8d6d1278..97014ea8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=com.wolfyscript.wolfyutils.spigot -version=4.18-petu +version=4.18.1-petu diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac72c34e..f5985545 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,6 @@ +#Mon Jan 20 20:02:26 CET 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip -networkTimeout=10000 -validateDistributionUrl=true +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/plugin-compatibility/build.gradle.kts b/plugin-compatibility/build.gradle.kts index 44f5f8ca..d15d4cb9 100644 --- a/plugin-compatibility/build.gradle.kts +++ b/plugin-compatibility/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - compileOnly("com.ssomar.score:SCore:4.24.4.15") compileOnly("com.ssomar.executableblocks:ExecutableBlocks:4.24.4.15") + compileOnly(fileTree("./libs/")) compileOnly("com.denizenscript:denizen:1.2.5-SNAPSHOT") compileOnly("me.clip:placeholderapi:2.11.1") compileOnly("com.willfp:eco:6.74.2") diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mmoitems/MMOItemsStackIdentifier.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mmoitems/MMOItemsStackIdentifier.java index a28c2946..ab456315 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mmoitems/MMOItemsStackIdentifier.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mmoitems/MMOItemsStackIdentifier.java @@ -68,7 +68,8 @@ private String getTypeId() { public ItemStack stack(ItemCreateContext context) { MMOItem item = MMOItems.plugin.getMMOItem(itemType, itemName); if (item == null) return null; - ItemStack stack = item.newBuilder().buildSilently(); + + ItemStack stack = item.newBuilder().buildNBT().toItem(); stack.setAmount(context.amount()); return stack; } diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsStackIdentifier.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsStackIdentifier.java index 5e33af42..9ea6a6a8 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsStackIdentifier.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/MythicMobsStackIdentifier.java @@ -13,7 +13,7 @@ import com.wolfyscript.utilities.bukkit.world.items.reference.StackIdentifier; import com.wolfyscript.utilities.bukkit.world.items.reference.StackIdentifierParser; import com.wolfyscript.utilities.dependency.DependencyResolverSettings; -import de.tr7zw.changeme.nbtapi.NBTItem; +import de.tr7zw.nbtapi.NBTItem; import io.lumine.mythic.bukkit.MythicBukkit; import me.wolfyscript.utilities.compatibility.plugins.MythicMobsIntegration; import me.wolfyscript.utilities.util.NamespacedKey; diff --git a/settings.gradle.kts b/settings.gradle.kts index 818cff19..c411519f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -47,7 +47,7 @@ dependencyResolutionManagement { library("fastutil", "it.unimi.dsi", "fastutil").version("8.5.6") library("typesafe.config", "com.typesafe", "config").version("1.3.1") library("bstats", "org.bstats", "bstats-bukkit").version("3.0.0") - library("nbtapi-api", "de.tr7zw", "item-nbt-api").version("2.14.0") + library("nbtapi-api", "de.tr7zw", "item-nbt-api-plugin").version("2.14.1") } // Libraries only used for testing create("testLibs") { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d22cebc9..b579778f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,6 +4,8 @@ main: com.wolfyscript.utilities.bukkit.WolfyCoreBukkit api-version: 1.16 authors: [ WolfyScript ] load: STARTUP +depend: + - NBTAPI libraries: - "com.google.inject:guice:5.1.0"