Skip to content

Commit edd3f13

Browse files
authored
Switch to Advanture NBT (#2753)
* Add `adventure-nbt` dependency * Add NMS conversion utils * Initial `ItemRawNBT` changes * convertObjectToNbt - cleaner handling with switch * convertObjectToNbt - take ObjectTag input * ItemHelper update * ItemRawNBT: long array tags * ItemRawNBT: 1.21 mixed type lists * EntityHelper update * Update some more ItemRawNBT usages * Update ItemCustomData.java * SNBT parsing * WorldHelper update * Schematic loading/saving * CustomNBT update * ImprovedOfflinePlayer update * PacketHelper update * ItemScriptHelper, Item properties - update * Update BukkitBinaryTagExtensions.java * Update ItemTag.java * Remove JNBT * Fix relocations (don't relocate adventure text) * Unwrap lists when loading from binary * `NBTAdapter`: rename compound tag convert methods * `NBTAdapter`: dedicated list conversion methods * Cleanup `snbt_to_map` debug * Final fixes * Cleanup
1 parent 486680b commit edd3f13

File tree

80 files changed

+1494
-4227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1494
-4227
lines changed

dist/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,12 @@
137137
<include>**</include>
138138
</includes>
139139
</filter>
140+
<filter>
141+
<artifact>net.kyori:adventure-nbt</artifact>
142+
<includes>
143+
<include>**</include>
144+
</includes>
145+
</filter>
140146
</filters>
141147
<relocations>
142148
<relocation>
@@ -159,6 +165,14 @@
159165
<pattern>org.apache</pattern>
160166
<shadedPattern>com.denizenscript.shaded.org.apache</shadedPattern>
161167
</relocation>
168+
<relocation>
169+
<pattern>net.kyori.option</pattern>
170+
<shadedPattern>com.denizenscript.shaded.net.kyori.option</shadedPattern>
171+
</relocation>
172+
<relocation>
173+
<pattern>net.kyori.adventure.nbt</pattern>
174+
<shadedPattern>com.denizenscript.shaded.net.adventure.nbt</shadedPattern>
175+
</relocation>
162176
</relocations>
163177
</configuration>
164178
</execution>

plugin/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@
6767
<scope>system</scope>
6868
<systemPath>${project.basedir}/lib/Vault.jar</systemPath>
6969
</dependency>
70+
<dependency>
71+
<groupId>net.kyori</groupId>
72+
<artifactId>adventure-nbt</artifactId>
73+
<version>4.23.0</version>
74+
</dependency>
7075
<!-- Contained by Spigot-server -->
7176
<dependency>
7277
<groupId>it.unimi.dsi</groupId>

plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import com.denizenscript.denizen.nms.abstracts.*;
44
import com.denizenscript.denizen.nms.interfaces.*;
55
import com.denizenscript.denizen.nms.util.PlayerProfile;
6-
import com.denizenscript.denizen.nms.util.jnbt.CompoundTag;
7-
import com.denizenscript.denizen.nms.util.jnbt.Tag;
86
import org.bukkit.Bukkit;
97
import org.bukkit.Location;
108
import org.bukkit.NamespacedKey;
@@ -19,7 +17,6 @@
1917

2018
import java.util.ArrayList;
2119
import java.util.List;
22-
import java.util.Map;
2320
import java.util.UUID;
2421

2522
public abstract class NMSHandler {
@@ -123,12 +120,6 @@ public BiomeNMS getBiomeAt(Block block) {
123120

124121
public abstract double[] getRecentTps();
125122

126-
public abstract CompoundTag createCompoundTag(Map<String, Tag> value);
127-
128-
public CompoundTag parseSNBT(String snbt) {
129-
throw new UnsupportedOperationException();
130-
}
131-
132123
public abstract String getTitle(Inventory inventory);
133124

134125
public void setInventoryTitle(InventoryView view, String title) {

0 commit comments

Comments
 (0)