# Conflicts:
#	src/main/java/cn/nukkit/Player.java
#	src/main/java/cn/nukkit/entity/EntityHuman.java
#	src/main/java/cn/nukkit/entity/data/Skin.java
#	src/main/java/cn/nukkit/item/Item.java
#	src/main/java/cn/nukkit/item/ItemBucket.java
#	src/main/java/cn/nukkit/item/ItemEdible.java
#	src/main/java/cn/nukkit/level/GlobalBlockPalette.java
#	src/main/java/cn/nukkit/nbt/NBTIO.java
#	src/main/java/cn/nukkit/network/protocol/LoginPacket.java
#	src/main/java/cn/nukkit/network/protocol/PlayerSkinPacket.java
#	src/main/resources/lang
#	src/main/resources/recipes.json
#	src/main/resources/runtime_block_states.dat

# Conflicts:
#	src/main/java/cn/nukkit/item/ItemBucket.java
#	src/main/java/cn/nukkit/level/GlobalBlockPalette.java

This works but we need to update the block palette.

They are the same apart from the block palette which does not cause
issues because we don't use any new blocks.

� Conflicts:
�	src/main/java/cn/nukkit/block/BlockDoor.java

# Conflicts:
#	src/main/java/cn/nukkit/block/BlockPistonBase.java

# Conflicts:
#	src/main/java/cn/nukkit/level/GlobalBlockPalette.java

…Nukkit into redstone

…Nukkit into redstone

� Conflicts:
�	src/main/java/cn/nukkit/block/BlockPistonBase.java
�	src/main/java/cn/nukkit/block/BlockPistonHead.java
�	src/main/java/cn/nukkit/block/BlockUndyedShulkerBox.java
�	src/main/java/cn/nukkit/blockentity/BlockEntityHopper.java

� Conflicts:
�	src/main/java/cn/nukkit/level/GlobalBlockPalette.java

* Added call BlockGrowEvent (#1403)

Added call BlockGrowEvent in Sugarcane

* Added PlayerJumpEvent (#1405)

* Create PlayerJumpEvent.java

* Call PlayerJumpEvent

* Removed Cancellable

* Fix wrong flags in MoveEntityAbsolutePacket + set onGround (#1410)

Co-authored-by: PetteriM1 <petteri.malkavaara1@gmail.com>

Update redstone branch

# Conflicts:
#	src/main/java/cn/nukkit/Nukkit.java
#	src/main/java/cn/nukkit/level/GlobalBlockPalette.java
#	src/main/java/cn/nukkit/network/Network.java

# Conflicts:
#	src/main/java/cn/nukkit/block/BlockButton.java
#	src/main/java/cn/nukkit/block/BlockLever.java
#	src/main/java/cn/nukkit/blockentity/BlockEntityPistonArm.java
#	src/main/java/cn/nukkit/level/generator/Normal.java
#	src/main/java/cn/nukkit/plugin/PluginManager.java
#	src/main/java/cn/nukkit/raknet/server/UDPServerSocket.java
#	src/main/resources/lang

* Number of entries needs to be unsigned (#1623)

* TwistedAsylumMC

* Fix transfer (#1622)

* Fix transfer

* Update Player.java

* Update Player.java

* Bump RakNet to 1.6.21

Fixes memory leaks that can occur randomly.

* Downgrade RakNet to 1.6.20

This reverts commit 2641751

* Max stack size in BE is 64 (#1627)

* Potted plants can now be removed from the pot by clicking on it (#1629)

* Update fuels (#1631)

* Event for dragon egg teleporting (#1632)

* Implement multiple snow layers (#1633)

* Fix beacons giving too high effect levels (#1638)

* Remove unnecessary packet broadcasts (#1639)

* Implement netherite items (#1641)

* Improve sponge placement (#1640)

* Bucket fixes and improvements (#1644)

* Implement vine growth (#1645)

* Make getSafeSpawn() account for non-generated chunks (#1634)

* Make getSafeSpawn() account for non-generated chunks

* move to Level.initLevel()

* Totem doesn't save from suicide (#1642)

* Vines can be harvested with an axe that has the Silk Touch enchantment (#1646)

* No weather in nether and end (#1647)

* Cleanup command params (#1637)

* Cleanup command params

* Remove deprecated constructor

* deprecate old constructors

* CommandEnum(String, String...)

* Fix block break time (#1649)

* Fix block break time

* Update Block.java

* parse difficulty from string (#1652)

* Fix dropped items falling thru grass path & farmland (#1653)

* Implement Curse of Vanishing (#1654)

* Limit the spawn height of nether portal (#1655)

* Fix incorrect meta in BlockButton's toItem() (#1656)

* Better constructor for DefaultPlayerDataSerializer (#1657)

* Update DefaultPlayerDataSerializer.java

Make this class more flexible, so youre able to use it for e.g. on other directories and hold no server instance.

* Update DefaultPlayerDataSerializer.java

* change initialization of DefaultPlayerData serialized to prevent null datapath (#1662)

* Set new distribution URLs

* Update to raknet 1.6.22 (#1665)

* Update resources (#1658)

* Implement StructureGrowEvent (#1669)

* Implement StructureGrowEvent

* Fix replacing saplings

* Fix finding saplings and fix cocoa age

* Add XUID to PlayerAsyncPreLoginEvent (#1675)

* Fix end portal creation (#1667)

* Add trident pickup event (#1679)

* Update Particle.java (#1676)

* Update Particle.java

Add utility methods

* Update Particle.java

add missing import

* Update Particle.java

Fix typo

* Update Particle.java

next time work the whole time with the IDE to prevent such stupid small mistakes lol

* Artifactory Integration (#1680)

* Test artifactory publishing

* Missed pom field

* Remove maven tool

* Have another shot at this

* Include javadoc jar

* Fix level loading (#1681)

* Make snowballs to damage blazes (#1682)

* Add TimeSinceRest (#1670)

* implement that Haybales reduce fall damage (#1690)

* Lava doesn't turn concrete powder into concrete (#1712)

* Fix typo in ShowParticles (#1725)

* NetherPortal block can't be destroyed by liquid flow (#1726)

* 1.16.200 (#1708)

* Initial 1.16.100 support

CreativeContentPacket is corrupting for some odd reason and crashing the client.

* Many performance changes & fix crashing

* Remove remapping and send pre-mapped values

* Fixes for skins, commands and inventories (#1685)

- Fixed client crashing on Windows 10 (when you use persona-skin).
- Added new parameter for SkinAnimation - "AnimationExpression".
- Fixed commands enabling.
- Fixed opening / closing inventories on client-side.

Co-authored-by: xBeeegsone <xbeeegsone@users.noreply.github.com>

* fix for skin + geometry, for entityhumans (#1688)

* Item translations using item palette (#1694)

* Move batching code down to RakNetInterface

* Fix ContainerClosePacket (#1696)

* Update Sound enum to 1.16.100 (#1693)

* Do not remove session before it gets ticked

* initial 1.16.200 support (#1707)

* fix for skin + geometry, for entityhumans

* initial 1.16.200 support

* change comment

* Don't batch batched packets

* Remove extra data from chunk encoding

* Refactor packet batching code

* More refactoring of RakNetInterface

- Should improve performance further as we are now decompressing packets on the network threads unlike before.
- May fix the disconnect issues but I haven't been able to reproduce it so can't be certain it does.
- PlayerCreationEvent was being called async which could have caused further issues. It is now queued onto the main thread.
- Broken packets from the client will now cause them to be force disconnected from the server.
- Bumped RakNet to 1.6.25

* Don't batch broadcasted packets

* Catch and log errors whilst handling packets

* Don't encode packets on netty threads

* Remove RakNet testing version

Co-authored-by: Alex <21226684+xBeeegsone@users.noreply.github.com>
Co-authored-by: xBeeegsone <xbeeegsone@users.noreply.github.com>
Co-authored-by: Erik Miller <Meaglepvp@gmail.com>
Co-authored-by: Alemiz <45739737+Alemiz112@users.noreply.github.com>
Co-authored-by: Wodor <17339354+wode490390@users.noreply.github.com>

* Support for arm64, k8s, helm (#1552)

* Initial helm chart, docker for arm64.

* Add missing slash to local helm values file in gitignore.

* Add in support to provide loadBalancerIP by helm value.

* Ports should not be set on the service if using default ClusterIP svc type.

* Revert svc condition.

* Remove condition on service ports.

* Add in nodePort key as a value configurable.

* Provide a default nodePort value.

* Make nodePort conditional.

* Fix a typo (#1731)

* Fix floating vines (#1727)

* Fix floating vines

* Use BlockFace

* Pass LoginChainData and Skin to PlayerAsyncPreLoginEvent (#1717)

* Fix resource packs for 1.16.200 (Fixes #1718) (#1736)

* Make undead mobs to take damage from healing potions and heal from damage potions (#1743)

* No smoke particles on boat/minecart death (#1745)

* No smoke particles on boat/minecart death

* Remove unused imports

* Fixed BlockDispenser and made BlockPistonBase not show white moving entity

* Fix boat variants (#1748)

* Tridents don't despawn on Bedrock Edition (#1747)

* Fixes & improvements (#1756)

Fixes for spectator and adventure game modes by XKazzuKX

* Use player display name in updatePlayerListData (#1760)

* Implement bStats metrics (#1761)

* Implement bStats metrics

* Hardcode server name

* Add a check to make sure metrics isnt started twice

* Actully initialize metrics... (#1763)

* Add server codename to metrics (#1766)

I see PowerNukkit has already merged in metrics...so here we go

* Implement ItemNameTag (#1765)

* Add ItemNameTag class

* Uncomment nametag in item list

* Use custom name + add check

* Move nametag behaviour into EntityCreature

* Humans and Dragons cannot be name-tagged.

* Added gamemode check

* Use !isCreative() instead

* Remove removeItem duplication

* Implement Fatal Poison (#1758)

* Allow "flying" with Slow Falling effect (#1762)

* Fix anvil (#1616)

* Fix anvil

* Implement anvil damage

* AnvilDamagePacket cannot be trusted

* Add support for hardcoded MultiRecipe

* Implement cost calculation

* Add support for netherite items

* Fix #703 (#1769)

* Fix #703

* Change inbound queue to SPSC

* Register new effects (#1771)

* Allow anvil items to be renamed (#1772)

This is untested with other PRs, but it allows the client to recognize that items can be renamed.

* Update WhitelistCommand.java (#1778)

* Allow equipping equipping armor with something on already (#1783)

* Update runtime_item_ids.json (#1781)

* Make EnchantmentTridentImpaling actually do something (#1775)

* Fire aspect can ignite tnt (#1774)

* Add basic ServerStopEvent (#834)

* Make netherite items fireproof (#1788)

* Update command param types (#1792)

* Full vanilla turtle shell (#1767)

* 1.16.210 (#1795)

* Start working on .210 changes

* Save and load PlayFabID

* Update block palette

* Update entity flags

* Don't allow empty sub-motd

* Update command param types

https://discord.com/channels/393465748535640064/703967014481297448/819182033602478131

* Fix crafting in 1.16.210 (#1799)

Technical explanation: Bedrock behaves much better when each recipe in the CraftingDataPacket is assigned a network ID, even when using client-authoritative inventories.

* Update entity data ids (#1801)

* Fix entity data ids by removing unused data values

* Adding entity data with correct ids

* Update BlockDirt (#1803)

* Update Sound enum to 1.16.210 (#1802)

* Fix the flow speed of lava in nether (#1800)

* use EntityRuntimeId (#1773)

* Add getter for LoginChainData in PlayerAsyncPreLoginEvent (#1780)

* Update PlayerAsyncPreLoginEvent.java

* API_VERSION to 1.0.12

* Bump GSON version (#1711)

* Allow sugarcane to be placed on podzol (#1807)

* Ice melts in nether + supports silk touch (#1809)

* Ice melts in nether + supports silk touch

* oops

* Fixed normal pistons, working on sticky ones

* Fixed sticky pistons mostly

* Sticky pistons do not duplicate anymore

Co-authored-by: Twisted <twistedasylummc@gmail.com>
Co-authored-by: Wodor <17339354+wode490390@users.noreply.github.com>
Co-authored-by: SupremeMortal <6178101+SupremeMortal@users.noreply.github.com>
Co-authored-by: Erkam Kahriman <erkamkahriman@gmail.com>
Co-authored-by: PetteriM1 <26197131+PetteriM1@users.noreply.github.com>
Co-authored-by: Sleepybear <sleepy@sleepybear.us>
Co-authored-by: Serhat G <serhatguler@hotmail.de>
Co-authored-by: Kevims <kcodeyt@gmail.com>
Co-authored-by: Luke <32024335+lukeeey@users.noreply.github.com>
Co-authored-by: VixikHD <40556088+VixikHD@users.noreply.github.com>
Co-authored-by: good777LUCKY <43497313+good777LUCKY@users.noreply.github.com>
Co-authored-by: Erik Miller <Meaglepvp@gmail.com>
Co-authored-by: Kazuk <46299532+XKazzuKX@users.noreply.github.com>
Co-authored-by: Alex <21226684+xBeeegsone@users.noreply.github.com>
Co-authored-by: xBeeegsone <xbeeegsone@users.noreply.github.com>
Co-authored-by: Alemiz <45739737+Alemiz112@users.noreply.github.com>
Co-authored-by: Chris Fordham <chris@fordham.id.au>
Co-authored-by: DenielW <denielmirzoyan@gmail.com>
Co-authored-by: Will <16578982+CloudG360@users.noreply.github.com>
Co-authored-by: Hancho1577 <vojougae35@gmail.com>
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
Co-authored-by: William Qi <20137336+WillQi@users.noreply.github.com>
Co-authored-by: pffsac2 <79375297+pffsac2@users.noreply.github.com>
Co-authored-by: Dima Uzyanov <55317472+kk4444w@users.noreply.github.com>
Co-authored-by: LT_Name <45508179+lt-name@users.noreply.github.com>
Co-authored-by: blohnungde <35181949+belohnung@users.noreply.github.com>

Merge 1.16.221 into redstone