mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-12-01 23:23:27 +01:00
0f2c8e806a
Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Paper Changes: bc7ea673a Add internal channel initialization listeners (#5557) b28ad17ac Check for world change in MoveEvent API methods 3095c7592 [Auto] Updated Upstream (CraftBukkit) f56989c97 Add RespawnFlags to PlayerRespawnEvent (#5533) 7579c2667 Add more API to PlayerMoveEvent (#5553) ef60c01c4 [Auto] Updated Upstream (CraftBukkit) 0256dbea3 [Auto] Updated Upstream (Bukkit/CraftBukkit) 91ef74029 Updated Upstream (Spigot) (#5550) fdf2a59d5 Updated Upstream (Bukkit/CraftBukkit) (#5549) Purpur Changes: 97185df [CI-SKIP] Update mcdevimports documentation 1099c24 Config for wither explosion radius (closes #265) c5c9527 Configurable damage settings for magma blocks (adds #247) 1389b02 Updated Upstream (Paper) (#300) 79c82d2 Configuration to change the maximum number of bees in a hive (#301) 9fd776e Add configurable minecart speed and move controllable minecart options
178 lines
6.3 KiB
Diff
178 lines
6.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: tr7zw <tr7zw@live.de>
|
|
Date: Sat, 1 Aug 2020 15:55:15 -0500
|
|
Subject: [PATCH] Add NBT API as a first-class lib
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 57ab779204e6e98d52d4b21e6aad82c33ccc8958..cc3149a51f5780b73c11492e13dbe7eb86d83e6c 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -47,6 +47,11 @@
|
|
<id>mojang</id>
|
|
<url>https://libraries.minecraft.net/</url>
|
|
</repository>
|
|
+ <!-- CodeMC -->
|
|
+ <repository>
|
|
+ <id>codemc-repo</id>
|
|
+ <url>https://repo.codemc.io/repository/maven-public/</url>
|
|
+ </repository>
|
|
</repositories>
|
|
|
|
<!-- Paper start -->
|
|
@@ -186,6 +191,11 @@
|
|
<artifactId>asm-commons</artifactId>
|
|
<version>9.1</version>
|
|
</dependency>
|
|
+ <dependency>
|
|
+ <groupId>de.tr7zw</groupId>
|
|
+ <artifactId>item-nbt-api</artifactId>
|
|
+ <version>2.7.1</version>
|
|
+ </dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
@@ -260,6 +270,12 @@
|
|
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
|
|
<!-- when downloading via Maven we can pull depends individually -->
|
|
<shadedArtifactAttached>true</shadedArtifactAttached>
|
|
+ <relocations>
|
|
+ <relocation>
|
|
+ <pattern>de.tr7zw.changeme.nbtapi</pattern>
|
|
+ <shadedPattern>de.tr7zw.nbtapi</shadedPattern>
|
|
+ </relocation>
|
|
+ </relocations>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
|
|
index 98263d896f316983609432c45b85401a2692432d..afaa459d2c351f99b598ec9054a6838ffb0098e8 100644
|
|
--- a/src/main/java/org/bukkit/Chunk.java
|
|
+++ b/src/main/java/org/bukkit/Chunk.java
|
|
@@ -275,4 +275,16 @@ public interface Chunk extends PersistentDataHolder {
|
|
* @return if the block is contained within
|
|
*/
|
|
boolean contains(@NotNull BlockData block);
|
|
+
|
|
+ // Yatopia start
|
|
+ /**
|
|
+ * Returns a custom tag container of this chunk.
|
|
+ *
|
|
+ * @return custom NBT tags container
|
|
+ */
|
|
+ @NotNull
|
|
+ default de.tr7zw.changeme.nbtapi.NBTCompound getNBTC() {
|
|
+ return new de.tr7zw.changeme.nbtapi.NBTChunk(this).getPersistentDataContainer();
|
|
+ }
|
|
+ // Yatopia end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/block/TileState.java b/src/main/java/org/bukkit/block/TileState.java
|
|
index 3b10fcc13893403b29f0260b8605144679e89b82..1e9a96d8b08cc396acf73dc42083009354e89d8a 100644
|
|
--- a/src/main/java/org/bukkit/block/TileState.java
|
|
+++ b/src/main/java/org/bukkit/block/TileState.java
|
|
@@ -36,4 +36,26 @@ public interface TileState extends BlockState, PersistentDataHolder {
|
|
@NotNull
|
|
@Override
|
|
PersistentDataContainer getPersistentDataContainer();
|
|
+
|
|
+ // Yatopia start
|
|
+ /**
|
|
+ * Returns NBT representation of this tile entity.
|
|
+ *
|
|
+ * @return vanilla NBT tags container
|
|
+ */
|
|
+ @NotNull
|
|
+ default de.tr7zw.changeme.nbtapi.NBTTileEntity getNBT() {
|
|
+ return new de.tr7zw.changeme.nbtapi.NBTTileEntity(this);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns a custom tag container of this tile entity.
|
|
+ *
|
|
+ * @return custom NBT tags container
|
|
+ */
|
|
+ @NotNull
|
|
+ default de.tr7zw.changeme.nbtapi.NBTCompound getNBTC() {
|
|
+ return getNBT().getPersistentDataContainer();
|
|
+ }
|
|
+ // Yatopia end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
|
index 7fa5242bd44c9b19648d79fa8fecbb7ee125288e..592c65017e601534dad56e988d096992ad70b05a 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -771,4 +771,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
*/
|
|
boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason);
|
|
// Purpur end
|
|
+
|
|
+ // Yatopia start
|
|
+ /**
|
|
+ * Returns NBT representation of this entity.
|
|
+ *
|
|
+ * @return vanilla NBT tags container
|
|
+ */
|
|
+ @NotNull
|
|
+ default de.tr7zw.changeme.nbtapi.NBTEntity getNBT() {
|
|
+ return new de.tr7zw.changeme.nbtapi.NBTEntity(this);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns a custom tag container of this entity.
|
|
+ *
|
|
+ * @return custom NBT tags container
|
|
+ */
|
|
+ @NotNull
|
|
+ default de.tr7zw.changeme.nbtapi.NBTCompound getNBTC() {
|
|
+ return getNBT().getPersistentDataContainer();
|
|
+ }
|
|
+ // Yatopia end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
index 314658c7dac1b1fbb440ec85133e6670e52ba684..714070dcb1fc35ba4aa42a3ecece810599777c22 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
@@ -1478,4 +1478,42 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
|
|
}
|
|
|
|
// Purpur end
|
|
+
|
|
+ // Yatopia start
|
|
+ /**
|
|
+ * Returns NBT representation of this item. The ItemStack will be cloned!
|
|
+ *
|
|
+ * @return item's NBT tags container
|
|
+ */
|
|
+ @NotNull
|
|
+ public de.tr7zw.changeme.nbtapi.NBTItem getNBT() {
|
|
+ return getNBT(false);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns NBT representation of this item. If directApply is true,
|
|
+ * all changes will be mapped to the original item. Changes to the NBTItem will
|
|
+ * overwrite changes done to the original item in that case.
|
|
+ *
|
|
+ * @param directApply if true, changes to NBTItem will affect this ItemStack
|
|
+ * @return item's NBT tags container
|
|
+ */
|
|
+ @NotNull
|
|
+ public de.tr7zw.changeme.nbtapi.NBTItem getNBT(boolean directApply) {
|
|
+ return new de.tr7zw.changeme.nbtapi.NBTItem(this, directApply);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Applies NBT data from the provided NBT item.
|
|
+ *
|
|
+ * @param nbt ItemStack's NBT container
|
|
+ */
|
|
+ public void setNBT(@NotNull de.tr7zw.changeme.nbtapi.NBTItem nbt) {
|
|
+ ItemStack nbtItem = nbt.getItem();
|
|
+ setType(nbtItem.getType());
|
|
+ setAmount(nbtItem.getAmount());
|
|
+ setData(nbtItem.getData());
|
|
+ setItemMeta(nbtItem.getItemMeta());
|
|
+ }
|
|
+ // Yatopia end
|
|
}
|