288 Commits

Author SHA1 Message Date
Flo0
9db9aeecee
#823: Add Block#isPreferredTool 2021-04-21 17:31:47 +10:00
Martoph
0e26ddb6a3
SPIGOT-5877: Add scaffolding for custom dimensions and biomes 2021-04-11 17:54:48 +10:00
md_5
90d6905b15
Repackage NMS 2021-03-16 09:00:00 +11:00
md_5
0c24068ad6
Organise imports 2021-03-09 08:47:33 +11:00
blablubbabc
e5cb519d6a
#793: Don't unnecessarily toString block in CraftBlockEntityState constructor 2021-02-06 10:35:00 +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
Martoph
424598d294
#752: Add the ability to retrieve hit, step, fall, and other sounds from blocks. 2020-11-26 09:36:57 +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
bf3d720714
Update to Minecraft 1.16.3 2020-09-11 07:00:00 +10:00
Parker Hawke
8c6115604b
#702: Add Block#applyBoneMeal() 2020-08-27 11:27:13 +10:00
jameslfc19
8408de02d2
#716: Fix barrel open API playing sound twice 2020-08-27 11:16:27 +10:00
md_5
9a9c2234a4
SPIGOT-6087: Revert "SPIGOT-6086: Twisting vines growing at top of world crashes server"
This reverts commit fad5fb9e8cfc2a2c6883e59203b604f4c0ecf421.
2020-08-18 20:44:06 +10:00
md_5
fad5fb9e8c
SPIGOT-6086: Twisting vines growing at top of world crashes server 2020-08-18 17:50:13 +10:00
md_5
2ee7318ae1
SPIGOT-6064: world.getBiome() null Error 2020-08-12 10:51:29 +10:00
md_5
9c9fb593f5
Update to Minecraft 1.16.2 2020-08-12 07:00:00 +10:00
jameslfc19
8fb65851f1
#660: Add support to change block's lid state 2020-07-29 19:41:00 +10:00
Matthew Miller
93cfb195ca
#704: Added explicit API to stop a Jukebox from playing 2020-07-10 09:02:21 +10:00
blablubbabc
69fddc725b
#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.
2020-07-09 08:49:55 +10:00
blablubbabc
f222b5bd4e
SPIGOT-5969: Update maximum structure block size 2020-07-09 08:46:32 +10:00
md_5
89c0a5c34d
SPIGOT-5886: Missing BlockData 2020-06-30 10:01:45 +10:00
md_5
983305bb4a
SPIGOT-5856: Soul Campfire BlockState cannot be cast to Campfire 2020-06-27 17:18:34 +10:00
md_5
6b20d04c71
SPIGOT-5826: Don't store chunk in block states 2020-06-26 09:34:25 +10:00
md_5
3f0c333870
SPIGOT-5809: block.getState() wall signs too 2020-06-25 20:08:32 +10:00
md_5
b5db08bea5
SPIGOT-5809: block.getState() instanceof Sign for crimson_sign missed 2020-06-25 19:42:38 +10:00
md_5
9a3bd97f60
SPIGOT-5809: block.getState() instanceof Sign for warped_sign missed 2020-06-25 19:30:42 +10:00
md_5
ca19c2f48e
SPIGOT-5806: Block#getDrops(ItemStack tool) does not work as it should 2020-06-25 17:04:07 +10:00
md_5
7ea3c040bc
Update to Minecraft 1.16.1 2020-06-25 10:00:00 +10:00
Lars Dormans
8637ec008d SPIGOT-5751: Made breakNaturally and getDrops returns the correct item if no argument is given 2020-06-03 19:28:13 +10:00
md_5
d07a78b1f3 SPIGOT-5716: Clarify documentation of MultipleFacing 2020-05-09 16:12:18 +10:00
md_5
46a1386066 SPIGOT-5718: Block.BreakBlockNaturally does not reflect tool used 2020-05-09 16:05:17 +10:00
md_5
ce66f6937b Misc checkstyle fixes 2020-04-14 12:34:43 +10:00
Lars Dormans
8bd0e9ab0e SPIGOT-5669: Fix Beehive.isSedated 2020-04-13 15:45:52 +10:00
md_5
f325b9beac SPIGOT-5641: Add Block.getDrops(ItemStack, Entity) 2020-04-05 16:52:06 +10:00
ShaneBee
2122c0b128 #649: CraftBell should implement Bell 2020-04-05 15:40:54 +10:00
md_5
bbe3d58efc SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 2020-04-01 09:30:47 +11:00
md_5
3075579f61 Add FaceAttachable interface to handle Grindstone facing in common with Switches 2020-04-01 09:14:29 +11:00
ShaneBee
708be69539 SPIGOT-5468: Improve Beehive TileEntity API 2020-02-09 10:47:11 +11:00
md_5
6bbb4e7348 Clean up CraftBlockData.toString 2020-01-29 09:53:13 +11:00
md_5
6515ea4957 SPIGOT-5537: Bee nests generated by growing trees near flower have no bees 2020-01-28 09:48:28 +11:00
md_5
edcb0a4b6a SPIGOT-5482: Structure Block setUsageMode encounters NullpointerException 2019-12-25 10:09:20 +11:00
ShaneBeee
b97d581af2 SPIGOT-5443: BEE_NEST BlockState
- Add missing BEE_NEST block state
- Add a missing break in CraftMetaBlockState
2019-12-13 09:12:38 +11:00
md_5
db0dafb17c SPIGOT-5422: Add support for 3-dimensional biomes 2019-12-11 15:28:37 +11:00
md_5
de42aa13f3 Update to Minecraft 1.15 2019-12-11 09:00:00 +11:00
md_5
656701746a SPIGOT-5417: Campfire should implement Directional 2019-12-09 12:52:46 +11:00
md_5
eeae942e44 SPIGOT-5416: Block.getDrops gives drops even when tool should not give drops 2019-12-08 10:39:57 +11:00
blablubbabc
13caf84858 SPIGOT-5370: Fix Block#rayTrace considering other blocks. 2019-10-18 20:28:06 +02:00
md_5
e73aabd666 Update to Minecraft 1.14.4 2019-07-20 09:00:00 +10:00
md_5
7ad3a1f468 SPIGOT-5146: BlockDataMeta does not work 2019-07-09 10:47:07 +10:00
md_5
5815136865 SPIGOT-5123: Snapshot tile entities can end up with a non-null world 2019-07-03 10:22:42 +10:00
md_5
401432b995 SPIGOT-4962: Bubble column blocks not classified as liquid 2019-05-20 19:27:02 +10:00