mirror of
https://github.com/YatopiaMC/Yatopia.git
synced 2024-09-29 15:47:42 +02:00
9f3986a30b
* Updated Upstream and Sidestream(s) (Paper/Purpur) 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: 088fa6f28 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot) Purpur Changes: a8c9e3d Add unsafe Entity serialization API (#139) 631520c Add ender crystal explosion options (#168) 3880ddf Config to always tame in Creative (#166) 9ae031c Updated Upstream (Paper) 006e47f Fix #167 `persistent-droppable-entity-display-names` renames lead on named mobs ec81b87 Update Gradle to 6.8.2 * Updated Upstream and Sidestream(s) (Purpur) 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. Purpur Changes: b15a2e9 Add ghast allow-griefing option * Updated Upstream and Sidestream(s) (Purpur) 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. Purpur Changes: 9537c77 Add phantom allow-griefing option
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 e1c693d4d9e26e29d81ca0eee92a11e7dc2943be..3772b54690f1cbce2f9f175b1b94e9ce9ba75603 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -56,6 +56,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>
|
|
|
|
<pluginRepositories>
|
|
@@ -170,6 +175,11 @@
|
|
<artifactId>asm-commons</artifactId>
|
|
<version>9.0</version>
|
|
</dependency>
|
|
+ <dependency>
|
|
+ <groupId>de.tr7zw</groupId>
|
|
+ <artifactId>item-nbt-api</artifactId>
|
|
+ <version>2.7.1</version>
|
|
+ </dependency>
|
|
</dependencies>
|
|
|
|
<build>
|
|
@@ -245,6 +255,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 2b7e8c7f24b2d9dd49db901f6279b8b5930a3006..04f7fedc8ab4aaf35bbe5c028b87c9fd9f235867 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -765,4 +765,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 23cef1e67236a879525f39da994efc9a9c5cd289..a666626d9658f9a7f784514d34794a2ecb944ac9 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
@@ -1427,4 +1427,42 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
|
}
|
|
|
|
// 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
|
|
}
|