Commit Graph

211 Commits

Author SHA1 Message Date
CraftBukkit/Spigot
69c16ea666 #792: Add EntityExhaustionEvent
By: Martoph <sager1018@gmail.com>
2021-03-04 08:28:05 +11:00
CraftBukkit/Spigot
04c4f1b337 Add more checkstyle checks
By: md_5 <git@md-5.net>
2021-01-31 10:08:41 +11:00
CraftBukkit/Spigot
cf47c45e20 #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.

By: blablubbabc <lukas@wirsindwir.de>
2021-01-01 08:53:14 +11:00
CraftBukkit/Spigot
6450eb0ab7 Update to Minecraft 1.16.4
By: md_5 <git@md-5.net>
2020-11-03 07:00:00 +11:00
CraftBukkit/Spigot
e54c8b2f3c SPIGOT-6147: InventoryCloseEvent does not fire after closing player inventory
By: md_5 <git@md-5.net>
2020-10-01 19:07:54 +10:00
CraftBukkit/Spigot
4f32c945c9 #697: Add ArrowBodyCountChangeEvent
By: Martoph <sager1018@gmail.com>
2020-09-02 18:52:40 +10:00
CraftBukkit/Spigot
5d37d3d19d #718: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
By: Parker Hawke <hawkeboyz2@hotmail.com>
2020-08-31 18:39:12 +10:00
CraftBukkit/Spigot
6e983a8106 #740: Fix EntityDamageEvent not being called for non EntityDamageSource for End Crystals
By: DiamondDagger590 <diamonddagger590@gmail.com>
2020-08-28 18:41:34 +10:00
CraftBukkit/Spigot
d44eec6c38 #723: Implement EntitySpellCastEvent for spellcaster illager
By: Parker Hawke <hawkeboyz2@hotmail.com>
2020-08-15 09:12:20 +10:00
CraftBukkit/Spigot
c9673f0556 #724: Re-implement player portal event search radius and creation API
This also fixes that the nether/end portals would be created even if the
event was cancelled as well as that the EntityPortalEvent would be
called for player portal usage which is not according to its API
specification

By: Phoenix616 <max@themoep.de>
2020-08-14 08:26:40 +10:00
CraftBukkit/Spigot
6a9e00d4b6 Update to Minecraft 1.16.2
By: md_5 <git@md-5.net>
2020-08-12 07:00:00 +10:00
CraftBukkit/Spigot
4724de7678 SPIGOT-5950: Add PrepareSmithingEvent event
By: jameslfc19 <jameslfc19@gmail.com>
2020-07-22 18:21:45 +10:00
CraftBukkit/Spigot
6edd913305 #676: Add PlayerHarvestBlockEvent
By: DiamondDagger590 <diamonddagger590@gmail.com>
2020-07-03 15:07:15 +10:00
CraftBukkit/Spigot
8b8fc993bd #686: Expand Strider and Steerable entity API
By: Parker Hawke <hawkeboyz2@hotmail.com>
2020-06-30 09:54:28 +10:00
CraftBukkit/Spigot
e86afc5eb3 SPIGOT-5735: Add EntityEnterLoveModeEvent
By: DiamondDagger590 <diamonddagger590@gmail.com>
2020-06-26 11:12:25 +10:00
CraftBukkit/Spigot
6ccde4e6fd SPIGOT-5830: Server crash when campfire lit via dispenser.
Also adds a missing call to BlockIgniteEvent for players igniting campfires with flint and steel.

By: Parker Hawke <hawkeboyz2@hotmail.com>
2020-06-25 19:01:18 -04:00
CraftBukkit/Spigot
50503fd516 Update to Minecraft 1.16.1
By: md_5 <git@md-5.net>
2020-06-25 10:00:00 +10:00
CraftBukkit/Spigot
5f36fbfcfe SPIGOT-5799: InventoryCloseEvent fires after PlayerQuitEvent
By: md_5 <git@md-5.net>
2020-06-24 09:54:59 +10:00
CraftBukkit/Spigot
fb92d00666 #662: Expose ItemStack and hand used in PlayerShearEntityEvent
By: Parker Hawke <hawkeboyz2@hotmail.com>
2020-05-02 17:48:37 +10:00
CraftBukkit/Spigot
c4099fa584 SPIGOT-2304: Implement LootGenerateEvent
By: Parker Hawke <hawkeboyz2@hotmail.com>
2020-04-30 19:15:58 +10:00
CraftBukkit/Spigot
18886036f4 Misc checkstyle fixes
By: md_5 <git@md-5.net>
2020-04-14 12:34:43 +10:00
CraftBukkit/Spigot
bc8ef512e1 #616: Fix exception on entity portal teleport attempt
By: Phoenix616 <mail@moep.tv>
2020-01-14 15:10:30 +01:00
CraftBukkit/Spigot
68fb3c06e5 SPIGOT-794: Add boats to EntityPlaceEvent
By: md_5 <git@md-5.net>
2019-12-19 12:53:27 +11:00
CraftBukkit/Spigot
0e142c7f03 Update to Minecraft 1.15
By: md_5 <git@md-5.net>
2019-12-11 09:00:00 +11:00
CraftBukkit/Spigot
f73b0d238f SPIGOT-5309: Call cancelled EntityDamageEvent when damaging invisible armor stands
By: jojokobi <jhocheneder@gmx.at>
2019-10-05 19:02:38 +02:00
CraftBukkit/Spigot
147ff6b1e3 SPIGOT-5301: BlockIgniteEvent for campfire + arrow
By: md_5 <git@md-5.net>
2019-09-02 13:14:13 +10:00
CraftBukkit/Spigot
8c18f2deaf SPIGOT-5211: Add Raid API
By: anhcraft <admin@anhcraft.dev>
2019-08-12 18:43:10 +07:00
CraftBukkit/Spigot
70c10a6e82 SPIGOT-5264: Call event for experience orbs losing their target
By: md_5 <git@md-5.net>
2019-08-24 19:06:17 +10:00
CraftBukkit/Spigot
7b8436f8e2 SPIGOT-5282: Improve bucket event API
By: md_5 <git@md-5.net>
2019-08-23 20:30:16 +10:00
CraftBukkit/Spigot
87a13de04a SPIGOT-5195 (#2): Player loot table does not drop when keepInventory is on
By: Carl Poole <mail@carlpoole.com>
2019-07-26 16:47:49 -05:00
CraftBukkit/Spigot
a4b8e8ce68 Update to Minecraft 1.14.4
By: md_5 <git@md-5.net>
2019-07-20 09:00:00 +10:00
CraftBukkit/Spigot
c1cc0cddf5 SPIGOT-5034: FoodLevelChangeEvent add getItem method
By: md_5 <git@md-5.net>
2019-06-14 19:41:36 +10:00
CraftBukkit/Spigot
5f2275f40a SPIGOT-4946: Add VillagerCareerChangeEvent
By: i509VCB <null>
2019-05-25 20:58:11 -05:00
CraftBukkit/Spigot
4d27af3c76 SPIGOT-4938: Call EntityPickupItemEvent for dolphins
By: Brokkonaut <hannos17@gmx.de>
2019-05-17 23:19:52 +02:00
CraftBukkit/Spigot
b407bebd8d SPIGOT-4900: Rearchitect multiworld support for better compat with new villager AI
By: md_5 <git@md-5.net>
2019-05-12 11:15:48 +10:00
CraftBukkit/Spigot
7a93a50d32 Add BlockShearEntityEvent for Dispensers shearing Sheep
By: nathat890 <nathat890@outlook.com>
2019-05-07 16:50:57 +01:00
CraftBukkit/Spigot
b84b23c451 Add TradeSelectEvent
By: Coleman Yantis <diamonddagger590@gmail.com>
2019-04-28 12:35:28 +10:00
CraftBukkit/Spigot
455eafa839 SPIGOT-4735: ProjectileHitEvent Fires Immediately
By: md_5 <git@md-5.net>
2019-04-25 09:23:21 +10:00
CraftBukkit/Spigot
09673c1a03 Apply import ordering rules to CraftBukkit classes
By: md_5 <git@md-5.net>
2019-04-23 14:54:36 +10:00
CraftBukkit/Spigot
a0f2b74c8d Update to Minecraft 1.14-pre5
By: md_5 <git@md-5.net>
2019-04-23 12:00:00 +10:00
CraftBukkit/Spigot
10b207e39b SPIGOT-4673: EntitySpawnEvent should not be called for players
By: md_5 <git@md-5.net>
2019-03-26 20:42:04 +11:00
CraftBukkit/Spigot
b8ededbf19 SPIGOT-4597: Make BlockDropItemEvent use a list
By: md_5 <git@md-5.net>
2019-01-30 11:20:39 +11:00
CraftBukkit/Spigot
5a915978fa SPIGOT-4570: Add FluidLevelChangeEvent
By: md_5 <git@md-5.net>
2019-01-08 21:23:11 +11:00
CraftBukkit/Spigot
92e8783d1e SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent
By: md_5 <git@md-5.net>
2018-12-27 12:19:45 +11:00
CraftBukkit/Spigot
6631f07cae Do not use deprecated ItemSpawnEvent constructor
By: md_5 <git@md-5.net>
2018-12-26 08:00:00 +11:00
CraftBukkit/Spigot
fbbba56eca SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event
By: md_5 <git@md-5.net>
2018-12-26 08:00:00 +11:00
CraftBukkit/Spigot
0d2bc86153 SPIGOT-4534: CreatureSpawnEvent not being called for CHUNK_GEN
By: md_5 <git@md-5.net>
2018-12-17 12:30:16 +11:00
CraftBukkit/Spigot
102dee7d4f Mappings Update
By: md_5 <git@md-5.net>
2018-12-06 10:00:00 +11:00
CraftBukkit/Spigot
e9e6bec4e5 Add list of entities to EntityTransformEvent & move die calls
By: nathat890 <nathat890@outlook.com>
2018-12-05 09:51:20 +11:00
CraftBukkit/Spigot
6fd5f1379b SPIGOT-4339: Add EntityTransformEvent
Thanks klugemonkey for some contributions in https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/pull-requests/351/overview

By: nathat890 <nathat890@outlook.com>
2018-11-14 14:10:22 +11:00