5153 Commits

Author SHA1 Message Date
blablubbabc
24c79a1446
SPIGOT-6303: Interpret text that Gson considers to be an empty JSON document as legacy text.
For example, this affects empty Strings, and Strings that consist only
of whitespace. In lenient mode this would also affect text that contains
comments, but that is not the case currently.
Minecraft's component parser (i.e. Gson) produces null for these texts
instead of throwing a parse exception. By interpreting this text as
legacy text we correctly create text components for them that contain
their contents.
2021-01-02 14:47:51 +11:00
Auxilor
f1187a24c7
#778: Added get/set ItemStack methods to trident 2021-01-02 08:49:22 +11:00
md_5
fa6d549d90
Update SQLite for Mac M1 support 2021-01-02 08:44:43 +11:00
blablubbabc
560b65c4f8
#707, SPIGOT-5063, SPIGOT-5304, SPIGOT-5656, SPIGOT-3206, SPIGOT-5350, SPIGOT-5980, SPIGOT-4672: Persist the exact internal text representation where possible.
Issues resolved by this:
* SPIGOT-5063: Internal text representation of ItemStacks changes during ItemStack serialization. This issue was initially primarily concerned with the conversion between color text attributes to legacy color codes.
* SPIGOT-5304: Internal text representation of ItemStacks changes when opening the inventory (in creative mode). In particularly, this issue is also concerned with the conversion between plain text representations to non-plain ones.
* SPIGOT-5656: Internal text representation of ItemStacks changes during ItemStack serialization. This issue is particularly concerned with reordering of text attributes in the text's Json representation.
* SPIGOT-3206: Internal text representation of book pages changes during ItemStack serialization.
* SPIGOT-5350: Any non-plain text features are stripped from books during ItemStack serialization.
* SPIGOT-5980: Written books are marked as 'resolved' during ItemStack serialization and on various inventory interactions, even though they aren't, and thereby breaking any non-resolved page contents.
* SPIGOT-4672: Since item display names are serialized in their internal Json representation, any translatable components get properly persisted as well now.

---------

Minecraft uses text components to represent text. Internally Minecraft stores these components as Json formatted Strings and dynamically parses the text components from this Json representation whenever required.

In some cases Minecraft will create the text components and then convert them to Json itself for the internal storage. In other cases the Json representation is specified by users (eg. in Minecraft give commands, loot tables, mob equipment specified via Minecraft's summon commands, etc.).
There are many different ways in which the same text components can be represented in Json. When Minecraft compares objects which store this textual information, it takes the exact Json representation into account to determine whether the objects are considered equal. For example, ItemStacks will not match (and therefore not stack) if there is a difference in this internal Json representation for at least one if the item's text attributes (such as display name, lore, book pages, etc.). And when specifying nbt data in command selectors (eg. to only match entities/players which hold an item with specific name), the selector compares the raw Json representation as well.

As long as the Json representation is valid and can be parsed, Minecraft will not modify or normalize it.
However, under various circumstances Spigot converts this text information from the internal Json representation to text components (and in some cases even to plain text with legacy color codes) and then later tries to convert the text from these representations back to text components in the Json representation. Because this backwards conversion is in many cases not able to reproduce the original Json representation, the internal data of some affected Minecraft objects (ItemStacks, TileEntities, Entities, etc.) will in some cases get modified.

One especially notable situation in which this issue can come up is Bukkit's configuration serialization of ItemStacks: When a plugin serializes and later deserializes ItemStacks with display name, localized name, lore, or book pages of signed books, Spigot would convert these textual ItemStack attributes to plain text with legacy color codes and later try to convert those back to chat components in the Json representation. If the reconstructed Json representation does not match the original representation, the deserialized ItemStacks would no longer match nor stack with any original ItemStacks.

This case is particularly common if the original ItemStacks are created by users via some vanilla Minecraft mechanism (eg. Minecraft's give command, loot tables, mob equipment specified via Minecraft's summon command, etc.) and the used internal text representation for the created ItemStacks does not match the text representation produced by Spigot. This is also quite likely to be case, because the internal text representation produced by Spigot can sometimes be slightly verbose and, until recently, contained legacy color codes which cannot be used in Minecraft commands in-game.
However, this issue is not limited to items created by users, but affects items created by Minecraft itself as well.

Other cases in which Spigot itself (without any plugins involved) will convert between these text representations include dragging items around inside the inventory or opening the inventory while in creative mode. In these cases Spigot creates Bukkit representations of the affected items for use in Bukkit events and then, after the events have been handled, converts these Bukkit representations back to Minecraft items. See for example SPIGOT-5656 and SPIGOT-5304.

The idea of these changes is to avoid this back and forth conversion between the internal Json representation and the text component or plain text representations in various situations in which it is not actually required:
* CraftMetaItem stores the raw original Json representation for the display name, localized name, lore and pages of signed books now. As long as no plugin modifies these text attributes via the API, they can be reapplied in their original form to an ItemStack.
* The configuration serialization will serialize the original Json representation for these text attributes now so that it can also be restored during deserialization.
* However, in order to still be able to deserialize previously serialized items, and in order to allow users to specify text in the more simple plain representation in configuration files, we also still accept plain text during deserialization. Our approach is to check if the serialized text contains legacy color codes, in which case we convert it to chat components using our own converter and then to Json. Otherwise we try to parse it via Minecraft's Json parser. If the parsing fails due to the text not being valid Json, we interpret the text as plain text and convert it via our own converter as well.
* Various duplicated code has been removed from CraftMetaBookSigned and instead the base CraftMetaBook class allows sub classes to override the relevant aspects of how pages are parsed, serialized and deserialized.
* The BlockStates for command blocks and signs preemptively retrieved the custom name and sign line components, converted them to plain text and later converted them back to text components when applying the BlockState. We now only perform this conversion if a plugin has explicitly modified these texts.

Other changes:
* Minor: We also retrieve, convert and update a few other BlockState attributes directly from the underlying snapshot and only when requested by plugins now.
* SPIGOT-5980: Written books did not properly persist their 'resolved' attribute, resulting in unresolved book pages not getting resolved.
* There are methods to get and set the resolved value for books. However, these are not yet exposed in Bukkit.
* Minor fix: CraftMetaBook#isBookEmpty did not check some of the book attributes. This is probably a minor issue, but for consistency reasons there are checks for the missing attribute(s) now.

----
Covered cases
---
* By remembering the raw original String data, we can persist the exact text representation (eg. the ordering of elements within the Json text object (SPIGOT-5656), used style of escaping quotes (single quotes, escaped double quotes, etc.), use of plain texts (SPIGOT-5304), used boolean style, modern text component features such as translatable texts (SPIGOT-4672), etc.). All of these differences would otherwise cause the ItemStack to no longer be considered equal to its original.
* An empty String in the serialized config data results in no display name rather than an empty display name, like before. An item with explicitly empty display name (`{display: {Name: '""'}}`) is saved as `'""'` and can also be loaded from that representation again.
* Any plain texts, with or without color codes, which don't parse as Json (eg. `display-name: 'Bla'`) are still getting run through Spigot's text to components converter, like before.
* We can now also persist empty but explicitly present lore (`{display:{Lore:[]}}`). Previously this would get removed when the ItemMeta gets reapplied to the item. And ItemMeta#equals would return true for items with and without this empty lore data, even though Minecraft considers them to be different. For plugins using the API there should be no change: #hasLore still checks whether the lore is both present and not empty, and #getLore returns an empty list instead of null in this case (however, it previously already returned an empty list in this case). And setting the lore to an empty list via #setLore will still result in an item with no lore.
* Similarly, we can also persist explicitly specified but empty lists of book pages now.

----
Cases that are not covered (i.e. which may lead to changes in items), but were already not covered previously:
----
* NBT data for text that is not actually of type String.
* Empty or unexpected entries within the display compound.
* Variations in the NBT data representation in item features other than the above mentioned ones.
* Texts containing color codes. During deserialization these texts get interpreted as plain text and converted to a text component representation. This will break the serialization of any ItemStacks which actually use a text component representation with embedded color codes for some reason. Usually the likelihood for encountering such items in practice would probably be small. However, in the past (pre MC 1.16) Spigot would actually produce such items during ItemStack deserialization or when plugins created ItemStack via the Bukkit API. However, Spigot has changed the text representation it produces in MC 1.16, so any previously created and still existing items with this text representation are already problematic anyways now. See SPIGOT-5964. A fix for this linked issue (eg. the automatic conversion of these items) would probably resolve this deficit here as well.
* Spigot's String to text components converter produces quite verbose components since 1.16. See SPIGOT-5964 as well. However, this applies regardless of the changes of this PR.
* Book ItemStacks with more pages than 100 pages or oversized pages are truncated (like before) and may therefore change.
hange.
2021-01-01 08:53:14 +11:00
md_5
b5e5adc428
SPIGOT-6296: Server crashes when burning something at y-level 0 2020-12-29 08:45:45 +11:00
md_5
72c5e7477a
SPIGOT-6273: Expose ItemFrame ItemDropChance through API 2020-12-28 08:58:39 +11:00
md_5
9f2b92e58e
SPIGOT-6292: LivingEntity.setNoDamageTicks no longer functions 2020-12-28 08:28:57 +11:00
md_5
6917945f07
SPIGOT-6289: Fix setting entity equipment 2020-12-23 07:55:15 +11:00
Parker Hawke
878b43758d
#772: Add API to set equipment silently 2020-12-21 18:30:48 +11:00
montlikadani
22d7fcc98f
SPIGOT-6256: Add method to check if the entity is in water 2020-12-21 18:20:54 +11:00
pop4959
768d7fc2df
#773: Add method to get max world size 2020-12-13 11:30:54 +11:00
md_5
5b747147e7
Increase outdated build delay 2020-12-03 19:29:47 +11:00
Parker Hawke
e1ebdd927a
#771: Add clear weather World API 2020-11-26 10:08:19 +11:00
Martoph
424598d294
#752: Add the ability to retrieve hit, step, fall, and other sounds from blocks. 2020-11-26 09:36:57 +11:00
Phoenix616
167ff59173
#770: Send messages without sender with SYSTEM type again
This was the behaviour before the 1.16 update and made it so that any
 message sent by a plugin was treated as a system message allowing the
 player to disable chat messages while keeping access to commands.

After 1.16 disabling the chat also disabled any plugin output, this
 restores the original behaviour.
2020-11-19 10:16:26 +11:00
md_5
4475707d74
SPIGOT-6244: /spawnpoint ignores angle 2020-11-18 08:13:56 +11:00
md_5
8b3b096d1a
SPIGOT-6242: Fix some file line endings 2020-11-18 08:13:04 +11:00
md_5
4b33c74995
SPIGOT-6186: Canceling a CreatureSpawnEvent​ results in a "Unable to summon entity due to duplicate UUIDs" error 2020-11-17 13:47:05 +11:00
md_5
2b3ca7264e
SPIGOT-6236: Vehicle passenger portal cooldown does not change 2020-11-17 12:29:51 +11:00
md_5
23618b2cb5
SPIGOT-6240: Use correct portal search radius 2020-11-13 18:06:34 +11:00
Airtheon
009f0ba0ef
#769: Fix FishHook.maxWaitTime 2020-11-09 18:21:10 +11:00
Airtheon
bc6a175eff
#767: Add wait time modification for FishHook 2020-11-06 18:51:48 +11:00
Sander Knauff
2fc37bcc05
SPIGOT-6197: Prevent world loading from updating spawn settings of all worlds 2020-11-06 18:46:21 +11:00
md_5
3eb7236e44
SPIGOT-6217: Missed PlayerEditBookEvent when editing books 2020-11-04 19:45:54 +11:00
Mariell Hoversholm
6fd677caf2
SPIGOT-6206: Use correct sender UUID for chat messages 2020-11-03 19:02:28 +11:00
md_5
a489dd4ac9
Revert "Downgrade NMS revision"
This reverts commit dd10b375c2bca25cf5f7acf2a832895839dcbaf0.
2020-11-03 19:02:28 +11:00
Mariell Hoversholm
ce64c84ca8
SPIGOT-6205: Rewrite enum to/from NMS type methods
The methods would otherwise cache wrong enum types for specific enums.
This would result in a `ClassCastException` at the caller location,
which obviously is no fun. This broke API with `Switch#getFace` and
`FaceAttachable#getAttachedFace`.

The existing implementation was also stupid.
2020-11-03 18:15:08 +11:00
md_5
dd10b375c2
Downgrade NMS revision
This is not a precedent, please see https://www.spigotmc.org/wiki/nms/
2020-11-03 18:15:08 +11:00
md_5
3af81c7179
Update to Minecraft 1.16.4 2020-11-03 07:00:00 +11:00
md_5
dea4138900
Remove outdated build delay. 2020-10-25 18:10:28 +11:00
Jakub Zacek
9da3b5bff8
#762: Add TNTPrimed#setSource method 2020-10-25 18:10:08 +11:00
Sander Knauff
55a78ffbd7
SPIGOT-6193: Allow small fireballs to ignite players when MobGriefing is disabled 2020-10-23 18:29:08 +11:00
md_5
b8dd5ec216
Rename Chunk "BukkitValues" key to "ChunkBukkitValues"
This will discard extra data increasing the size of the chunk from users affected by the bug in the previous commits.
The impact of this (affecting all users) is likely to be much higher than users with plugins relying on an API introduced within the last 12 hours.
2020-10-18 07:24:10 +11:00
Bjarne Koll
9e91bcabf2
SPIGOT-6194: Read correct nbt compound into chunk pdc
Previously spigots chunk pdc loading logic would read the entire chunk
nbt compound into the persistent data container of the chunk instead of
just reading the "BukkitValues".

Furthermore this commit also now correctly checks if the nbt compounds
of entities, tile entities and chunks actually have a value for the
"BukkitValues" key, as the previous 'getCompound' call would always
return an instance, the null check was useless. This commit now uses
'get', which returns null if no key exists and then runs an instanceof
check to both validate a non-null instance and an NBTTagCompound
instance.
2020-10-18 07:01:15 +11:00
md_5
4ef13f94d6
Misc maven build updates 2020-10-17 17:57:05 +11:00
Mariell Hoversholm
04639f5a2f
#759: Allow sending messages from specific UUIDs 2020-10-17 17:46:14 +11:00
Nesaak
77c894a2ab
#672: Add PersistentDataHolder to Chunk 2020-10-17 17:41:56 +11:00
Shane Bee
055870c4bc
#758: Item - add getters/setters for owner/thrower 2020-10-14 19:56:14 +11:00
Shane Bee
29dd68eb99
#757: PoweredMinecart - add getter/setter for fuel 2020-10-13 18:59:56 +11:00
md_5
2a3ca137e1
SPIGOT-6175: Fix generating loot tables for entities 2020-10-11 10:23:10 +11:00
md_5
1f4693a8c3
SPIGOT-6168: Fix error with Player.getBedSpawnLocation when world is unloaded while server running 2020-10-06 18:36:43 +11:00
md_5
aa8206a857
SPIGOT-6130: Fix API loot table generation with certain contexts 2020-10-03 10:27:00 +10:00
md_5
5c77bd2816
SPIGOT-6147: InventoryCloseEvent does not fire after closing player inventory 2020-10-01 19:07:54 +10:00
md_5
5da21f87d6
SPIGOT-6152: End exit gates in custom ends do not send back to overworld 2020-09-30 08:58:36 +10:00
md_5
1ee373fe28
SPIGOT-6157: Crash when PortalCreateEvent cancelled 2020-09-29 18:10:57 +10:00
SydMontague
a339310c48
#755: Fix NPE when calling getInventory() for virtual EnderChests 2020-09-27 11:47:50 +10:00
md_5
2577f9bfbe
Increase outdated build delay 2020-09-25 17:12:30 +10:00
SydMontague
1dabfdc82f
#754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
The underlying issue is a change by Mojang how UUID are stored in NBT.
This patch will have CraftBukkit convert the format during
deserialization.
2020-09-25 17:09:59 +10:00
Shane Bee
f8d4da08e1
#743: LivingEntity - add methods for getting/setting invisibility 2020-09-19 17:48:58 +10:00
Martoph
da9bb3ea92
#753: RecipeIterator#hasNext will now accurately represent if the current iterator has a next item. 2020-09-18 18:44:19 +10:00