Commit Graph

293 Commits

Author SHA1 Message Date
CraftBukkit/Spigot
9a2165ab37 #855: Add Block#getCollisionShape and associated API
By: konsolas <vincentyntang@gmail.com>
2021-06-14 08:33:32 +10:00
CraftBukkit/Spigot
55abb0fd8c #857: Add Block#getBreakSpeed(Player)
By: konsolas <vincentyntang@gmail.com>
2021-06-14 08:28:45 +10:00
CraftBukkit/Spigot
35223329b1 SPIGOT-6514: Small Dripleaf block data is missing half property
By: DerFrZocker <derrieple@gmail.com>
2021-06-12 08:47:11 +10:00
CraftBukkit/Spigot
b3a8254758 Update to Minecraft 1.17
By: md_5 <git@md-5.net>
2021-06-11 15:00:00 +10:00
CraftBukkit/Spigot
4d77463831 SPIGOT-6464: Fix ShulkerBox#getColor for undyed shulkers
By: md_5 <git@md-5.net>
2021-05-23 08:30:36 +10:00
CraftBukkit/Spigot
d6327a1b65 #823: Add Block#isPreferredTool
By: Flo0 <unconfigured@null.spigotmc.org>
2021-04-21 17:31:47 +10:00
CraftBukkit/Spigot
103e1bf3b5 SPIGOT-5877: Add scaffolding for custom dimensions and biomes
By: Martoph <sager1018@gmail.com>
2021-04-11 17:54:48 +10:00
CraftBukkit/Spigot
9da047989c Repackage NMS
By: md_5 <git@md-5.net>
2021-03-16 09:00:00 +11:00
CraftBukkit/Spigot
b2efd58164 Organise imports
By: md_5 <git@md-5.net>
2021-03-09 08:47:33 +11:00
CraftBukkit/Spigot
d5f80533da #793: Don't unnecessarily toString block in CraftBlockEntityState constructor
By: blablubbabc <lukas@wirsindwir.de>
2021-02-06 10:35:00 +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
d9f5dbb3e6 #752: Add the ability to retrieve hit, step, fall, and other sounds from blocks.
By: Martoph <sager1018@gmail.com>
2020-11-26 09:36:57 +11:00
CraftBukkit/Spigot
11227b2076 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.

By: Mariell Hoversholm <proximyst@proximyst.com>
2020-11-03 18:15:08 +11:00
CraftBukkit/Spigot
5425f6ba43 Update to Minecraft 1.16.3
By: md_5 <git@md-5.net>
2020-09-11 07:00:00 +10:00
CraftBukkit/Spigot
c49ac166f7 #702: Add Block#applyBoneMeal()
By: Parker Hawke <hawkeboyz2@hotmail.com>
2020-08-27 11:27:13 +10:00
CraftBukkit/Spigot
b734aa8117 #716: Fix barrel open API playing sound twice
By: jameslfc19 <jameslfc19@gmail.com>
2020-08-27 11:16:27 +10:00
CraftBukkit/Spigot
48770ca8fe SPIGOT-6087: Revert "SPIGOT-6086: Twisting vines growing at top of world crashes server"
This reverts commit af2cee1e50.

By: md_5 <git@md-5.net>
2020-08-18 20:43:39 +10:00
CraftBukkit/Spigot
af2cee1e50 SPIGOT-6086: Twisting vines growing at top of world crashes server
By: md_5 <git@md-5.net>
2020-08-18 17:50:13 +10:00
CraftBukkit/Spigot
6c307816d0 SPIGOT-6064: world.getBiome() null Error
By: md_5 <git@md-5.net>
2020-08-12 10:50:20 +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
c555653b93 #660: Add support to change block's lid state
By: jameslfc19 <jameslfc19@gmail.com>
2020-07-29 19:41:00 +10:00
CraftBukkit/Spigot
0796e55598 #704: Added explicit API to stop a Jukebox from playing
By: Matthew Miller <mnmiller1@me.com>
2020-07-10 09:02:21 +10:00
CraftBukkit/Spigot
7f2d17c68a #705: Improve implementation of furnace related block states
CraftFurnace is the base class for all concrete types of furnaces (this
mimics Minecraft's underlying type hierarchy). It is marked as abstract
now to avoid accidental instantiation.

Also, the various furnace sub types were missing type parameters.

By: blablubbabc <lukas@wirsindwir.de>
2020-07-09 08:49:55 +10:00
CraftBukkit/Spigot
8cb1e21c2b SPIGOT-5969: Update maximum structure block size
By: blablubbabc <lukas@wirsindwir.de>
2020-07-09 08:46:32 +10:00
CraftBukkit/Spigot
aef11bebb7 SPIGOT-5886: Missing BlockData
By: md_5 <git@md-5.net>
2020-06-30 10:01:45 +10:00
CraftBukkit/Spigot
87462b8620 SPIGOT-5856: Soul Campfire BlockState cannot be cast to Campfire
By: md_5 <git@md-5.net>
2020-06-27 17:18:34 +10:00
CraftBukkit/Spigot
36434feb10 SPIGOT-5826: Don't store chunk in block states
By: md_5 <git@md-5.net>
2020-06-26 09:34:25 +10:00
CraftBukkit/Spigot
4478e7e0d8 SPIGOT-5809: block.getState() wall signs too
By: md_5 <git@md-5.net>
2020-06-25 20:08:32 +10:00
CraftBukkit/Spigot
a955c5cbab SPIGOT-5809: block.getState() instanceof Sign for crimson_sign missed
By: md_5 <git@md-5.net>
2020-06-25 19:42:38 +10:00
CraftBukkit/Spigot
189c2a0e03 SPIGOT-5809: block.getState() instanceof Sign for warped_sign missed
By: md_5 <git@md-5.net>
2020-06-25 19:22:27 +10:00
CraftBukkit/Spigot
6da7d19c96 SPIGOT-5806: Block#getDrops(ItemStack tool) does not work as it should
By: md_5 <git@md-5.net>
2020-06-25 17:04:07 +10: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
3be59d8d05 SPIGOT-5751: Made breakNaturally and getDrops returns the correct item if no argument is given
By: Lars Dormans <lars.dormans@live.nl>
2020-06-03 19:28:13 +10:00
CraftBukkit/Spigot
809449f545 SPIGOT-5716: Clarify documentation of MultipleFacing
By: md_5 <git@md-5.net>
2020-05-09 16:12:18 +10:00
CraftBukkit/Spigot
a00b0adb43 SPIGOT-5718: Block.BreakBlockNaturally does not reflect tool used
By: md_5 <git@md-5.net>
2020-05-09 16:05:17 +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
5833b4d35c SPIGOT-5669: Fix Beehive.isSedated
By: Lars Dormans <lars.dormans@live.nl>
2020-04-13 00:49:58 +02:00
CraftBukkit/Spigot
466de0ab57 SPIGOT-5641: Add Block.getDrops(ItemStack, Entity)
By: md_5 <git@md-5.net>
2020-04-05 16:52:06 +10:00
CraftBukkit/Spigot
96b5fcb92f #649: CraftBell should implement Bell
By: ShaneBee <shanebolenback@me.com>
2020-04-04 02:32:15 -07:00
CraftBukkit/Spigot
deee71fef3 SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException
By: md_5 <git@md-5.net>
2020-04-01 09:30:47 +11:00
CraftBukkit/Spigot
7cc234d159 Add FaceAttachable interface to handle Grindstone facing in common with Switches
By: md_5 <git@md-5.net>
2020-04-01 09:14:29 +11:00
CraftBukkit/Spigot
6b39c5d083 SPIGOT-5468: Improve Beehive TileEntity API
By: ShaneBee <shanebolenback@me.com>
2020-02-09 10:47:11 +11:00
CraftBukkit/Spigot
fe92a3fcfd Clean up CraftBlockData.toString
By: md_5 <git@md-5.net>
2020-01-29 09:53:13 +11:00
CraftBukkit/Spigot
e0ee6f0a50 SPIGOT-5537: Bee nests generated by growing trees near flower have no bees
By: md_5 <git@md-5.net>
2020-01-28 09:48:28 +11:00
CraftBukkit/Spigot
03662947f3 SPIGOT-5482: Structure Block setUsageMode encounters NullpointerException
By: md_5 <git@md-5.net>
2019-12-25 10:09:20 +11:00
CraftBukkit/Spigot
aaeee556da SPIGOT-5443: BEE_NEST BlockState
- Add missing BEE_NEST block state
- Add a missing break in CraftMetaBlockState

By: ShaneBeee <shanebolenback@me.com>
2019-12-11 21:40:10 -08:00
CraftBukkit/Spigot
7dbf1ee072 SPIGOT-5422: Add support for 3-dimensional biomes
By: md_5 <git@md-5.net>
2019-12-11 15:28:37 +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
1400103b2f SPIGOT-5417: Campfire should implement Directional
By: md_5 <git@md-5.net>
2019-12-09 12:52:46 +11:00
CraftBukkit/Spigot
75d96db6f3 SPIGOT-5416: Block.getDrops gives drops even when tool should not give drops
By: md_5 <git@md-5.net>
2019-12-08 10:39:57 +11:00